diff --git a/code/__defines/directions.dm b/code/__defines/directions.dm index 6db079fe47..be67eb1f2e 100644 --- a/code/__defines/directions.dm +++ b/code/__defines/directions.dm @@ -8,8 +8,8 @@ #define DOWN 16 #define UP 32 -/proc/is_cardinal_dir(var/dir) +/proc/is_cardinal_dir(dir) return dir && (dir == NORTH || dir == SOUTH || dir == EAST || dir == WEST) -/proc/is_intercardinal_dir(var/dir) - return dir && (dir == NORTHEAST || dir == SOUTHEAST || dir == SOUTHWEST || dir == NORTHWEST) \ No newline at end of file +/proc/is_intercardinal_dir(dir) + return dir && (dir == NORTHEAST || dir == SOUTHEAST || dir == SOUTHWEST || dir == NORTHWEST) diff --git a/code/__defines/radio.dm b/code/__defines/radio.dm index e1fa7287dc..e26bb155e1 100644 --- a/code/__defines/radio.dm +++ b/code/__defines/radio.dm @@ -39,7 +39,7 @@ #define RADIO_FREQ_MAX 1899 -/proc/frequency_to_name(var/frequency) +/proc/frequency_to_name(frequency) switch(frequency) if(RADIO_FREQ_ALPHA) @@ -63,4 +63,4 @@ if(frequency == SSradio.radio_rev) return "Revolutionary" - return "Unknown" \ No newline at end of file + return "Unknown" diff --git a/code/__defines/types.dm b/code/__defines/types.dm index 0e9b65e6e8..0c79042ff5 100644 --- a/code/__defines/types.dm +++ b/code/__defines/types.dm @@ -3,7 +3,7 @@ var/global/list/all_typecaches = list() #define istypecache(needle,haystack) (needle && length(all_typecaches[haystack]) ? (all_typecaches[haystack][needle.type] ? TRUE : FALSE) : FALSE) #define ispathcache(needle,haystack) (needle && length(all_typecaches[haystack]) ? (all_typecaches[haystack][needle] ? TRUE : FALSE) : FALSE) -/proc/createtypecache(var/datum/type_to_generate) +/proc/createtypecache(datum/type_to_generate) if(all_typecaches[type_to_generate]) CRASH("Tried generating a typecache that already exists!") diff --git a/code/__helpers/adjectives.dm b/code/__helpers/adjectives.dm index e67ad04ddf..95afaa280f 100644 --- a/code/__helpers/adjectives.dm +++ b/code/__helpers/adjectives.dm @@ -1,4 +1,4 @@ -/proc/get_numerical_adjective(var/current=0.5,var/min=0,var/max=1) +/proc/get_numerical_adjective(current=0.5,min=0,max=1) var/scaled_number = SCALE(current,min,max) switch(0) diff --git a/code/__helpers/alert.dm b/code/__helpers/alert.dm index 7a969d88a0..cd1e8570b8 100644 --- a/code/__helpers/alert.dm +++ b/code/__helpers/alert.dm @@ -1,6 +1,6 @@ #define within_range(point_A,point_B,range) (point_A.z == point_B.z && get_dist(point_A,point_B) <= range) -/proc/create_alert_process(var/list/list_to_use,var/range = VIEW_RANGE,var/atom/epicenter,var/atom/alert_source,var/alert_level = ALERT_LEVEL_NOISE,var/visual=FALSE) +/proc/create_alert_process(list/list_to_use,range = VIEW_RANGE,atom/epicenter,atom/alert_source,alert_level = ALERT_LEVEL_NOISE,visual=FALSE) . = 0 @@ -29,7 +29,7 @@ -/proc/create_alert(var/range = VIEW_RANGE,var/turf/epicenter,var/atom/alert_source,var/alert_level = ALERT_LEVEL_NOISE,var/visual=FALSE) +/proc/create_alert(range = VIEW_RANGE,turf/epicenter,atom/alert_source,alert_level = ALERT_LEVEL_NOISE,visual=FALSE) if(!epicenter) CRASH("create_alert() had no epicenter!") diff --git a/code/__helpers/armor.dm b/code/__helpers/armor.dm index 493c22205f..0cfb723562 100644 --- a/code/__helpers/armor.dm +++ b/code/__helpers/armor.dm @@ -1,6 +1,6 @@ /* OLD //https://www.desmos.com/calculator/uyznrero9w -/proc/calculate_damage_with_armor(var/damage_dealt,var/armor_rating) +/proc/calculate_damage_with_armor(damage_dealt,armor_rating) if(damage_dealt < 0) CRASH_SAFE("Damage [damage_dealt] was negative!") return 0 @@ -16,7 +16,7 @@ /* OLD //https://www.desmos.com/calculator/vsmeclqdpy -/proc/calculate_damage_with_armor(var/damage_dealt,var/armor_rating) +/proc/calculate_damage_with_armor(damage_dealt,armor_rating) if(damage_dealt < 0) CRASH_SAFE("Damage [damage_dealt] was negative!") return 0 @@ -31,7 +31,7 @@ /* OLD //https://www.desmos.com/calculator/sf50j6wote -/proc/calculate_damage_with_armor(var/damage_dealt,var/armor_rating) +/proc/calculate_damage_with_armor(damage_dealt,armor_rating) if(damage_dealt < 0) CRASH_SAFE("Damage [damage_dealt] was negative!") return 0 @@ -46,7 +46,7 @@ /* OLD //https://www.desmos.com/calculator/ihpykmskji -/proc/calculate_damage_with_armor(var/damage_dealt,var/armor_rating) +/proc/calculate_damage_with_armor(damage_dealt,armor_rating) if(damage_dealt < 0) CRASH_SAFE("Damage [damage_dealt] was negative!") return 0 @@ -69,7 +69,7 @@ */ // https://www.desmos.com/calculator/4fggsyju5k -/proc/calculate_damage_with_armor(var/damage_dealt,var/armor_rating) +/proc/calculate_damage_with_armor(damage_dealt,armor_rating) if(damage_dealt < 0) CRASH("Damage [damage_dealt] was negative!") diff --git a/code/__helpers/astar.dm b/code/__helpers/astar.dm index cdc42f5792..0923808c12 100644 --- a/code/__helpers/astar.dm +++ b/code/__helpers/astar.dm @@ -118,7 +118,7 @@ Some code modified to work with Burgerstation. -/proc/AStar_Circle_node(var/obj/marker/map_node/start, var/obj/marker/map_node/goal, var/atom/movable/walker, min_dist=0, maxtraverse=100,var/debug=FALSE) +/proc/AStar_Circle_node(obj/marker/map_node/start, obj/marker/map_node/goal, atom/movable/walker, min_dist=0, maxtraverse=100,debug=FALSE) var/list/obj/marker/map_node/closedSet = list() var/list/obj/marker/map_node/openSet = list(start) @@ -158,4 +158,4 @@ Some code modified to work with Burgerstation. if(traverse > maxtraverse) if(debug) log_debug("AStar_Circle_node: Maximum traverse reached...") return null // it's taking too long, abandon - return null // if we reach this part, there's no more nodes left to explore \ No newline at end of file + return null // if we reach this part, there's no more nodes left to explore diff --git a/code/__helpers/blood.dm b/code/__helpers/blood.dm index 6422b2e50e..a5d34ebcac 100644 --- a/code/__helpers/blood.dm +++ b/code/__helpers/blood.dm @@ -1,7 +1,7 @@ #define BLOOD_LIMIT 3 #define BLOOD_LIMIT_HARD 6 //Maximum of how many blood particles there are on a turf. -/proc/create_blood(var/obj/effect/cleanable/blood/desired_effect, var/turf/simulated/desired_loc,var/desired_color = "#FFFFFF",var/desired_x=0,var/desired_y=0,var/bypass_blood_limit=FALSE) +/proc/create_blood(obj/effect/cleanable/blood/desired_effect, turf/simulated/desired_loc,desired_color = "#FFFFFF",desired_x=0,desired_y=0,bypass_blood_limit=FALSE) if(!desired_loc) CRASH("No desired_loc provided!") @@ -45,4 +45,4 @@ //Move the blood to desired location. if(desired_x || desired_y) animate(B,pixel_x = clamp(desired_x,-8,8), pixel_y = clamp(desired_y,-8,8), time = 3) - return B \ No newline at end of file + return B diff --git a/code/__helpers/cmp.dm b/code/__helpers/cmp.dm index 78992e1131..d7a709ba77 100644 --- a/code/__helpers/cmp.dm +++ b/code/__helpers/cmp.dm @@ -25,10 +25,10 @@ /proc/cmp_name_dsc(atom/a, atom/b) return sorttext(a.name, b.name) -/proc/cmp_recipe_name_asc(var/reagent_recipe/A,var/reagent_recipe/B) +/proc/cmp_recipe_name_asc(reagent_recipe/A,reagent_recipe/B) return sorttext(B.name, A.name) -/proc/cmp_recipe_name_dsc(var/reagent_recipe/A,var/reagent_recipe/B) +/proc/cmp_recipe_name_dsc(reagent_recipe/A,reagent_recipe/B) return sorttext(A.name, B.name) // Datum cmp with vars is always slower than a specialist cmp proc, use your judgement. @@ -56,7 +56,7 @@ /proc/cmp_subsystem_priority(subsystem/a, subsystem/b) return cmp_numeric_asc(a.priority,b.priority) -/proc/cmp_generation_priority(var/obj/marker/generation/a,var/obj/marker/generation/b) +/proc/cmp_generation_priority(obj/marker/generation/a,obj/marker/generation/b) return cmp_numeric_asc(a.priority,b.priority) /proc/cmp_cqc_priority(cqc/a, cqc/b) @@ -83,14 +83,14 @@ /proc/cmp_typepaths_asc(A, B) return sorttext("[B]","[A]") -/proc/cmp_worn_layer_hybrid_asc(var/obj/item/A,var/obj/item/B) +/proc/cmp_worn_layer_hybrid_asc(obj/item/A,obj/item/B) var/A_score = A.item_slot*10 + A.item_slot_layer var/B_score = B.item_slot*10 + B.item_slot_layer return cmp_numeric_asc(A_score,B_score) -/proc/cmp_loadout_dsc(var/list/A,var/list/B) +/proc/cmp_loadout_dsc(list/A,list/B) return sorttext("[A["name"]]","[B["name"]]") -/proc/cmp_recipe_priority_dsc(var/reagent_recipe/A,var/reagent_recipe/B) +/proc/cmp_recipe_priority_dsc(reagent_recipe/A,reagent_recipe/B) return cmp_numeric_dsc(A.priority,B.priority) diff --git a/code/__helpers/colors.dm b/code/__helpers/colors.dm index 5c69fb4690..018a0f9d78 100644 --- a/code/__helpers/colors.dm +++ b/code/__helpers/colors.dm @@ -9,17 +9,17 @@ // Couple of helpers to get the RGB of a hexadecimal colour string. -/proc/GetRedPart(var/hexadecimal) +/proc/GetRedPart(hexadecimal) return hex2num(copytext(hexadecimal, 2, 4)) -/proc/GetGreenPart(var/hexadecimal) +/proc/GetGreenPart(hexadecimal) return hex2num(copytext(hexadecimal, 4, 6)) -/proc/GetBluePart(var/hexadecimal) +/proc/GetBluePart(hexadecimal) return hex2num(copytext(hexadecimal, 6)) -/proc/blend_colors(var/color_01,var/color_02,var/power = 0.5) +/proc/blend_colors(color_01,color_02,power = 0.5) power = clamp(power,0,1) var/new_red = GetRedPart(color_01)*(1-power) + GetRedPart(color_02)*power var/new_green = GetGreenPart(color_01)*(1-power) + GetGreenPart(color_02)*power @@ -28,11 +28,11 @@ /* -/proc/blend_colors(var/color_01,var/color_02,var/power = 0.5) +/proc/blend_colors(color_01,color_02,power = 0.5) power = clamp(power,0,1) var/new_red = GetRedPart(color_01) + GetRedPart(color_02)*power var/new_green = GetGreenPart(color_01) + GetGreenPart(color_02)*power var/new_blue = GetBluePart(color_01) + GetBluePart(color_02)*power var/mod = max(1,max(new_red,new_green,new_blue)/255) //Normalize if needed. return rgb(new_red/mod,new_green/mod,new_blue/mod) -*/ \ No newline at end of file +*/ diff --git a/code/__helpers/conversions.dm b/code/__helpers/conversions.dm index ac1545601e..b81acd69fa 100644 --- a/code/__helpers/conversions.dm +++ b/code/__helpers/conversions.dm @@ -361,7 +361,7 @@ //The string is well, obviously the string being checked //The datum is used as a source for var names, to check validity //Otherwise every single word could technically be a variable! -/proc/string2listofvars(var/t_string, var/datum/var_source) +/proc/string2listofvars(t_string, datum/var_source) if(!t_string || !var_source) return list() diff --git a/code/__helpers/debug.dm b/code/__helpers/debug.dm index 0612ba268b..036ffd4867 100644 --- a/code/__helpers/debug.dm +++ b/code/__helpers/debug.dm @@ -1,4 +1,4 @@ -/proc/type_debug(var/x) +/proc/type_debug(x) if(ispath(x)) return "[x] (PATH)" @@ -15,4 +15,4 @@ var/datum/D = x return D.get_debug_name() - return "[x] (UNKNOWN)" \ No newline at end of file + return "[x] (UNKNOWN)" diff --git a/code/__helpers/direction.dm b/code/__helpers/direction.dm index fbed658d26..cdc95f2454 100644 --- a/code/__helpers/direction.dm +++ b/code/__helpers/direction.dm @@ -1,4 +1,4 @@ -/proc/reverse_direction(var/dir) +/proc/reverse_direction(dir) return turn(dir, 180) proc/direction_to_pixel_offset(var/dir) @@ -6,21 +6,21 @@ proc/direction_to_pixel_offset(var/dir) var/offset_y = (dir & NORTH ? 1 : 0) - (dir & SOUTH ? 1 : 0) return list(offset_x,offset_y) -/proc/get_angle(var/atom/A1,var/atom/A2) +/proc/get_angle(atom/A1,atom/A2) if(!A1 || !A1.z || !A2 || !A2.z) return 0 return MODULUS(ATAN2(A1.x - A2.x,A2.y - A1.y) - 90,360) //The 90 offset is needed. -/proc/is_behind(var/atom/A,var/atom/B) //Returns the facing direction if A is directly behind B. +/proc/is_behind(atom/A,atom/B) //Returns the facing direction if A is directly behind B. return A.loc != B.loc && (get_true_4dir(B.dir) & get_dir_advanced(A,B)) -/proc/is_facing(var/atom/A,var/atom/B) //Returns the facing direction if A is facing B. +/proc/is_facing(atom/A,atom/B) //Returns the facing direction if A is facing B. return A.loc != B.loc && (get_true_4dir(A.dir) & get_dir_advanced(A,B)) -/proc/is_facing_cheap(var/atom/A,var/atom/B) //Returns the facing direction if A is facing B. +/proc/is_facing_cheap(atom/A,atom/B) //Returns the facing direction if A is facing B. return A.loc != B.loc && (get_true_4dir(A.dir) & get_dir(A,B)) -/proc/get_directional_offsets(var/atom/A,var/atom/B) +/proc/get_directional_offsets(atom/A,atom/B) var/x_diff = B.x - A.x var/y_diff = B.y - A.y var/maximum = max(abs(x_diff),abs(y_diff)) @@ -75,11 +75,11 @@ proc/get_true_4dir_advanced(var/previous_dir,var/dir) //Converts a possible 8 wa return . -/proc/get_dir_advanced(var/atom/A,var/atom/B,var/cardinal_only=FALSE) +/proc/get_dir_advanced(atom/A,atom/B,cardinal_only=FALSE) var/angle = get_angle(A,B) return cardinal_only ? angle2dir_cardinal(angle) : angle2dir(angle) -/proc/sanitize_direction(var/dir) +/proc/sanitize_direction(dir) . = 0x0 var/north = dir & NORTH @@ -99,5 +99,5 @@ proc/get_true_4dir_advanced(var/previous_dir,var/dir) //Converts a possible 8 wa if(west && !east) . |= WEST -/proc/dir2letter(var/x) - return "[x & 1 ? "n" : ""][x & 2 ? "s" : ""][x & 4 ? "e" : ""][x & 8 ? "w" : ""]" \ No newline at end of file +/proc/dir2letter(x) + return "[x & 1 ? "n" : ""][x & 2 ? "s" : ""][x & 4 ? "e" : ""][x & 8 ? "w" : ""]" diff --git a/code/__helpers/dview.dm b/code/__helpers/dview.dm index 3af4b8f211..7817a5c3b3 100644 --- a/code/__helpers/dview.dm +++ b/code/__helpers/dview.dm @@ -2,7 +2,7 @@ var/mob/abstract/dview/dview = new // Version of view() that ignores luminosity and allows you to set -/proc/dview(var/range = world.view, var/atom/source, var/see_invisible = 0) +/proc/dview(range = world.view, atom/source, see_invisible = 0) dview.loc = source dview.see_invisible = see_invisible @@ -13,4 +13,4 @@ var/mob/abstract/dview/dview = new dview.see_invisible = invis_flags; \ for(type in view(range, dview)) -#define END_FOR_DVIEW dview.loc = null \ No newline at end of file +#define END_FOR_DVIEW dview.loc = null diff --git a/code/__helpers/experience.dm b/code/__helpers/experience.dm index e1522035b8..92988a1c11 100644 --- a/code/__helpers/experience.dm +++ b/code/__helpers/experience.dm @@ -1,4 +1,4 @@ -/proc/calculate_class(var/mob/living/owner,var/list/skills_and_attributes) +/proc/calculate_class(mob/living/owner,list/skills_and_attributes) var/list/experience/total_list = owner.skills + owner.attributes diff --git a/code/__helpers/footstep.dm b/code/__helpers/footstep.dm index 69ecdf78c4..b0e730a4fd 100644 --- a/code/__helpers/footstep.dm +++ b/code/__helpers/footstep.dm @@ -1 +1 @@ -/proc/get_footstep_sound(var/material_type) +/proc/get_footstep_sound(material_type) diff --git a/code/__helpers/get.dm b/code/__helpers/get.dm index e2655ebe50..366185264a 100644 --- a/code/__helpers/get.dm +++ b/code/__helpers/get.dm @@ -1,4 +1,4 @@ -/proc/mobs_in_range(var/range = VIEW_RANGE,var/atom/A = usr) +/proc/mobs_in_range(range = VIEW_RANGE,atom/A = usr) . = list() var/turf/T = get_turf(A) for(var/k in SSliving.all_mobs) diff --git a/code/__helpers/ghost.dm b/code/__helpers/ghost.dm index f4339c27af..7b91065e07 100644 --- a/code/__helpers/ghost.dm +++ b/code/__helpers/ghost.dm @@ -1,7 +1,7 @@ -/proc/notify_ghosts(var/text,var/turf/T) +/proc/notify_ghosts(text,turf/T) var/formatted_message = span("dead bold","[text] (Click here to observe.)") for(var/mob/abstract/observer/ghost/O in SSliving.all_mobs) O.to_chat(formatted_message) - return TRUE \ No newline at end of file + return TRUE diff --git a/code/__helpers/html.dm b/code/__helpers/html.dm index af35176ac2..80677dc1ea 100644 --- a/code/__helpers/html.dm +++ b/code/__helpers/html.dm @@ -1,6 +1,6 @@ -/proc/span(var/class,var/text,var/style) +/proc/span(class,text,style) return "[text]" -/proc/div(var/class,var/text) +/proc/div(class,text) return "
[text]
" \ No newline at end of file diff --git a/code/__helpers/list.dm b/code/__helpers/list.dm index 6f7da23946..80eb0866da 100644 --- a/code/__helpers/list.dm +++ b/code/__helpers/list.dm @@ -1,4 +1,4 @@ -/proc/debug_list(var/list/L) +/proc/debug_list(list/L) for(var/k in L) var/v = L[k] log_debug("[k]: [v]") diff --git a/code/__helpers/lists.dm b/code/__helpers/lists.dm index 841a038c78..edc93b08a5 100644 --- a/code/__helpers/lists.dm +++ b/code/__helpers/lists.dm @@ -1,20 +1,20 @@ #define ADD_SORTED(list, A, cmp_proc) if(!list.len) {list.Add(A)} else {list.Insert(FindElementIndex(A, list, cmp_proc), A)} -/proc/subtypesof(var/prototype) +/proc/subtypesof(prototype) return (typesof(prototype) - prototype) -/proc/listclearnulls(var/list/L) +/proc/listclearnulls(list/L) var/start_len = L.len var/list/N = new(start_len) L -= N return L.len < start_len -/proc/list2text(var/list/L,var/Start=1,var/End=0,var/nothing_text = "nothing", var/and_text = " and ", var/comma_text = ", ", var/final_comma_text = "", var/quote = "") +/proc/list2text(list/L,Start=1,End=0,nothing_text = "nothing", and_text = " and ", comma_text = ", ", final_comma_text = "", quote = "") . = L.Copy(Start,End) return english_list(.,nothing_text,and_text,comma_text,final_comma_text,quote) -/proc/english_list(var/list/input, var/nothing_text = "nothing", var/and_text = ", and ", var/comma_text = ", ", var/final_comma_text = "", var/quote = "") +/proc/english_list(list/input, nothing_text = "nothing", and_text = ", and ", comma_text = ", ", final_comma_text = "", quote = "") var/total = input.len if (!total) return "[nothing_text]" @@ -35,7 +35,7 @@ return "[output][and_text][quote][input[index]][quote]" /* old shit that didn't work -/proc/pickweight(var/list/L,var/rarity=0) //Credit to Nanako for some of this code. Rarity should be between 0 and 1. Higher rarities mean that lower weights are picked more. +/proc/pickweight(list/L,rarity=0) //Credit to Nanako for some of this code. Rarity should be between 0 and 1. Higher rarities mean that lower weights are picked more. if(!L) CRASH("pickweight() invalid list provided!") rarity = clamp(rarity,0,1) var/highest = 0 @@ -91,7 +91,7 @@ return null */ -/proc/pickweight(list/list_to_pick,var/rarity) //Stolen from /tg/ with changes by burger. +/proc/pickweight(list/list_to_pick,rarity) //Stolen from /tg/ with changes by burger. var/total = 0 var/item @@ -122,7 +122,7 @@ #define value_or_null(the_list,key) the_list[key] ? the_list[key] : null -/proc/get_best_key(var/list/input) +/proc/get_best_key(list/input) var/best_key = null var/best_value = null @@ -140,7 +140,7 @@ return best_key -/proc/get_last_value(var/list/L) +/proc/get_last_value(list/L) if(!L || !length(L)) return null @@ -151,7 +151,7 @@ return null -/proc/get_first_missing_value(var/list/L) +/proc/get_first_missing_value(list/L) if(!L || !length(L)) return FALSE @@ -163,7 +163,7 @@ return FALSE -/proc/get_best_key_assoc(var/list/L,var/highest = TRUE) +/proc/get_best_key_assoc(list/L,highest = TRUE) var/initialized = FALSE var/best_key @@ -190,14 +190,14 @@ return best_key -/proc/text2numlist(var/text, var/delimiter="\n") //Stolen from Aurora +/proc/text2numlist(text, delimiter="\n") //Stolen from Aurora var/list/num_list = list() for(var/x in jointext(text, delimiter)) num_list += text2num(x) return num_list //Credit goes to AJX. -/proc/sort_by_closest(var/list/L,var/atom/target) +/proc/sort_by_closest(list/L,atom/target) var/atom/A var/atom/B @@ -208,7 +208,7 @@ if(get_dist_real(target,A) > get_dist_real(target,B)) L.Swap(i,i+1) -/proc/sort_by_closest_assoc(var/list/L,var/atom/target) +/proc/sort_by_closest_assoc(list/L,atom/target) var/atom/A var/atom/B @@ -223,7 +223,7 @@ L.Swap(i,i+1) -/proc/is_assoc_list(var/list/L) //Credit to SpaceManiac for providing this +/proc/is_assoc_list(list/L) //Credit to SpaceManiac for providing this try if(!islist(L) || !length(L)) @@ -238,17 +238,17 @@ catch() return FALSE -/proc/make_associative(var/list/flat_list) +/proc/make_associative(list/flat_list) . = list() for(var/thing in flat_list) .[thing] = TRUE -/proc/make_associative_count(var/list/flat_list) +/proc/make_associative_count(list/flat_list) . = list() for(var/thing in flat_list) .[thing]++ -/proc/assoc_list_strip_value(var/list/input) +/proc/assoc_list_strip_value(list/input) var/list/ret = list() for(var/key in input) ret += key @@ -276,7 +276,7 @@ inserted_list.Swap(i, rand(i, inserted_list.len)) //replaces old reverseList ~Carnie -/proc/reverseList(var/list/L, var/start=1, var/end=0) +/proc/reverseList(list/L, start=1, end=0) if(L.len) start = start % L.len end = end % (L.len+1) @@ -292,7 +292,7 @@ return L -/proc/get_real_length(var/list/L) +/proc/get_real_length(list/L) if(!L) return 0 @@ -305,4 +305,4 @@ if(L[i]) actual_length++ - return actual_length \ No newline at end of file + return actual_length diff --git a/code/__helpers/lizard_language.dm b/code/__helpers/lizard_language.dm index f1d2fbadd1..ab97db9cea 100644 --- a/code/__helpers/lizard_language.dm +++ b/code/__helpers/lizard_language.dm @@ -1,4 +1,4 @@ -/proc/convert_langage_to_lizard(var/text) +/proc/convert_langage_to_lizard(text) var/static/list/vowels = make_associative(list( "a","e","i","o" diff --git a/code/__helpers/logging.dm b/code/__helpers/logging.dm index 17f44b8a9e..33c786ebd0 100644 --- a/code/__helpers/logging.dm +++ b/code/__helpers/logging.dm @@ -2,12 +2,12 @@ #define RENAME_DIR "data/server/rename_log.txt" -/proc/print_list(var/list_name,var/list/L) +/proc/print_list(list_name,list/L) log_debug("Printing list '[list_name]' of length [length(L)]:") for(var/i=1,i<=length(L),i++) log_debug("[i]: [L[i]]") -/proc/print_assoc_list(var/list_name,var/list/L) +/proc/print_assoc_list(list_name,list/L) log_debug("Printing list '[list_name]' of length [length(L)]:") var/i=1 for(var/k in L) @@ -18,19 +18,19 @@ log_debug("[i]: [k]") i++ -/proc/print_list_dir(var/list_name,var/list/L) +/proc/print_list_dir(list_name,list/L) log_debug("Printing direction list '[list_name]' of length [length(L)]:") for(var/k in L) var/v = L[k] log_debug("[dir2text(text2num(k))]: [v]") -/proc/log_subsystem(var/subsystem_name,var/log_text) +/proc/log_subsystem(subsystem_name,log_text) if(SSconfig?.initialized && !CONFIG("ENABLE_LOGGING",TRUE)) return FALSE world_log("[subsystem_name]: [log_text]") SSlogging.buffered_log_subsystem += "[subsystem_name]: [log_text]" -/proc/log_error(var/log_text) +/proc/log_error(log_text) if(SSconfig?.initialized && !CONFIG("ENABLE_LOGGING",TRUE)) return FALSE world_log("[log_text]") @@ -38,7 +38,7 @@ var/global/list/all_error_ids = list() -/proc/log_error_once(var/log_id,var/log_text) +/proc/log_error_once(log_id,log_text) if(SSconfig?.initialized && !CONFIG("ENABLE_LOGGING",TRUE)) return FALSE if(!log_text) @@ -49,24 +49,24 @@ var/global/list/all_error_ids = list() world_log("[log_text]") SSlogging.buffered_log_error += log_text -/proc/log_debug(var/log_text) +/proc/log_debug(log_text) if(SSconfig?.initialized && !CONFIG("ENABLE_LOGGING",TRUE)) return FALSE world_log("[log_text]") SSlogging.buffered_log_debug += log_text -/proc/log_admin(var/log_text) +/proc/log_admin(log_text) if(SSconfig?.initialized && !CONFIG("ENABLE_LOGGING",TRUE)) return FALSE world_log("[log_text]") SSlogging.buffered_log_admin += log_text -/proc/log_chat(var/log_text) +/proc/log_chat(log_text) if(SSconfig?.initialized && !CONFIG("ENABLE_LOGGING",TRUE)) return FALSE SSlogging.buffered_log_chat += log_text -/proc/world_log(var/log_text) +/proc/world_log(log_text) if(SSconfig?.initialized && !CONFIG("ENABLE_LOGGING",TRUE)) return FALSE - world.log << log_text \ No newline at end of file + world.log << log_text diff --git a/code/__helpers/loyalty_iff.dm b/code/__helpers/loyalty_iff.dm index c2a846778f..ff305377cb 100644 --- a/code/__helpers/loyalty_iff.dm +++ b/code/__helpers/loyalty_iff.dm @@ -1,6 +1,6 @@ var/global/enable_friendly_fire = FALSE -/proc/set_friendly_fire(var/desired_friendly_fire=TRUE) +/proc/set_friendly_fire(desired_friendly_fire=TRUE) if(enable_friendly_fire == desired_friendly_fire) return FALSE @@ -16,7 +16,7 @@ var/global/enable_friendly_fire = FALSE #define allow_hostile_action(loyalty_tag,victim) check_loyalty_against(loyalty_tag,victim,TRUE) #define allow_helpful_action(loyalty_tag,victim) check_loyalty_against(loyalty_tag,victim,FALSE) -/proc/check_iff_against(var/iff_attacker,var/mob/living/victim,var/hostile=TRUE) +/proc/check_iff_against(iff_attacker,mob/living/victim,hostile=TRUE) if(hostile && iff_attacker == "NanoTrasen") var/turf/T = get_turf(victim) @@ -36,7 +36,7 @@ var/global/enable_friendly_fire = FALSE else //Friendly return !hostile -/proc/check_loyalty_against(var/loyalty_attacker,var/mob/living/victim,var/hostile=TRUE) +/proc/check_loyalty_against(loyalty_attacker,mob/living/victim,hostile=TRUE) if(hostile && loyalty_attacker == "NanoTrasen") var/turf/T = get_turf(victim) @@ -54,4 +54,4 @@ var/global/enable_friendly_fire = FALSE if(loyalty_attacker != victim.loyalty_tag || loyalty_attacker == null) //Unfriendly. return hostile else //Friendly - return !hostile \ No newline at end of file + return !hostile diff --git a/code/__helpers/math.dm b/code/__helpers/math.dm index e085930ef9..40cef6bd1e 100644 --- a/code/__helpers/math.dm +++ b/code/__helpers/math.dm @@ -1,11 +1,11 @@ -/proc/split_direction(var/input=0x0) +/proc/split_direction(input=0x0) . = list() for(var/dir in DIRECTIONS_CARDINAL) if(input & dir) . += dir -/proc/nice_number(var/input) +/proc/nice_number(input) var/absolute = abs(input) @@ -20,7 +20,7 @@ return "[input]" -/proc/rand_map(var/turf/T,var/n = 50,var/seed=1) //0 to 100. +/proc/rand_map(turf/T,n = 50,seed=1) //0 to 100. if(n <= 0) return FALSE @@ -29,4 +29,4 @@ var/found_number = text2num(rustg_noise_get_at_coordinates("[SSturf.seeds[T.z]]","[T.x / world.maxx]","[T.y / world.maxy]")) - return found_number*100 <= n \ No newline at end of file + return found_number*100 <= n diff --git a/code/__helpers/path.dm b/code/__helpers/path.dm index f1522687c0..235427f508 100644 --- a/code/__helpers/path.dm +++ b/code/__helpers/path.dm @@ -1,4 +1,4 @@ -/proc/text2path_safe(var/path_as_text,var/extra_check) +/proc/text2path_safe(path_as_text,extra_check) var/first = TRUE while(TRUE) var/result = text2path(path_as_text) @@ -18,7 +18,7 @@ return null first = FALSE -/proc/ec_valid_item(var/obj/item/I) +/proc/ec_valid_item(obj/item/I) if(initial(I.value) < 0) return null - return TRUE \ No newline at end of file + return TRUE diff --git a/code/__helpers/pooling.dm b/code/__helpers/pooling.dm index 58d1d6ee7e..4d6506ed8e 100644 --- a/code/__helpers/pooling.dm +++ b/code/__helpers/pooling.dm @@ -1,6 +1,6 @@ -/proc/returnToPool(var/datum/thing) +/proc/returnToPool(datum/thing) qdel(thing) /proc/getFromPool(type) var/list/new_args = args.Copy(2) - return new type(arglist(new_args)) \ No newline at end of file + return new type(arglist(new_args)) diff --git a/code/__helpers/random.dm b/code/__helpers/random.dm index b9dae0d793..27dd123048 100644 --- a/code/__helpers/random.dm +++ b/code/__helpers/random.dm @@ -1,4 +1,4 @@ -/proc/get_luck_calc(var/atom/positive,var/positive_luck_mul,var/atom/negative,var/negative_luck_mul) +/proc/get_luck_calc(atom/positive,positive_luck_mul,atom/negative,negative_luck_mul) var/base_prob = 0 @@ -16,7 +16,7 @@ return base_prob -/proc/luck(var/input,var/base_value=50,var/positive=TRUE) +/proc/luck(input,base_value=50,positive=TRUE) if(base_value >= 100) return TRUE @@ -38,4 +38,4 @@ var/mod = positive ? 0.5 + (luck_to_use/50)*0.5 : 1.5 - (luck_to_use/50)*0.5 . *= mod - return prob(base_value*.) \ No newline at end of file + return prob(base_value*.) diff --git a/code/__helpers/recursive.dm b/code/__helpers/recursive.dm index 7242dbf020..d86a3eb4e8 100644 --- a/code/__helpers/recursive.dm +++ b/code/__helpers/recursive.dm @@ -1,6 +1,6 @@ -/proc/recursive_find_item(var/obj/item/I,var/desired_obj,var/desired_proc) +/proc/recursive_find_item(obj/item/I,desired_obj,desired_proc) if(!I) CRASH("recursive_find_mob not supplied with an item!") @@ -27,7 +27,7 @@ return FALSE -/proc/recursive_find_mob(var/mob/living/advanced/A,var/desired_obj,var/desired_proc) +/proc/recursive_find_mob(mob/living/advanced/A,desired_obj,desired_proc) if(!A) CRASH("recursive_find_mob not supplied with an advanced mob!") @@ -49,4 +49,4 @@ if(result) return result - return FALSE \ No newline at end of file + return FALSE diff --git a/code/__helpers/screen_location.dm b/code/__helpers/screen_location.dm index 59b5cc8c1d..77f3218639 100644 --- a/code/__helpers/screen_location.dm +++ b/code/__helpers/screen_location.dm @@ -1,6 +1,6 @@ var/global/regex/ScreenLocRegex = regex("(\\d+):(\\d+),(\\d+):(\\d+)") -/proc/parse_screen_loc(var/screen_loc) +/proc/parse_screen_loc(screen_loc) if(ScreenLocRegex.Find(screen_loc)) var/list/data = ScreenLocRegex.group @@ -12,4 +12,4 @@ var/global/regex/ScreenLocRegex = regex("(\\d+):(\\d+),(\\d+):(\\d+)") return returning - return null \ No newline at end of file + return null diff --git a/code/__helpers/text.dm b/code/__helpers/text.dm index bb742f86b3..db1d5be5cd 100644 --- a/code/__helpers/text.dm +++ b/code/__helpers/text.dm @@ -1,6 +1,6 @@ #define ICON_TO_HTML(icon,icon_state,width,height) ("") -/proc/debug_args(var/proc_name,var/args) +/proc/debug_args(proc_name,args) . = "[proc_name](" @@ -14,7 +14,7 @@ -/proc/scramble(var/text,var/strength = 50) +/proc/scramble(text,strength = 50) . = "" for(var/word in splittext(text," ")) @@ -26,10 +26,10 @@ -/proc/deunderscore(var/text) +/proc/deunderscore(text) return replacetextEx(text,"_"," ") -/proc/remove_trailing_punctuation(var/text) +/proc/remove_trailing_punctuation(text) if(!text) return text @@ -39,7 +39,7 @@ return text -/proc/remove_non_letters(var/text,var/keep_spaces=TRUE) +/proc/remove_non_letters(text,keep_spaces=TRUE) if(!text) return text @@ -51,7 +51,7 @@ //Skull132 made this -/proc/repeat_text(var/text_to_repeat, var/times_to_repeat=1) +/proc/repeat_text(text_to_repeat, times_to_repeat=1) var/list/returning_list = list() @@ -60,7 +60,7 @@ return returning_list.Join("") -/proc/sanitize(var/input, var/max_length, var/encode = 1, var/trim = 1, var/extra = 1) +/proc/sanitize(input, max_length, encode = 1, trim = 1, extra = 1) if(!input) return @@ -83,7 +83,7 @@ return input -/proc/police_text(var/client/caller, var/input, var/min_length, var/max_length, var/capitalize = FALSE, var/periodize = FALSE, var/check_name = FALSE, var/check_characters = FALSE, var/encode = TRUE, var/trim=TRUE, var/extra=TRUE) +/proc/police_text(client/caller, input, min_length, max_length, capitalize = FALSE, periodize = FALSE, check_name = FALSE, check_characters = FALSE, encode = TRUE, trim=TRUE, extra=TRUE) if(!min_length) min_length = 1 @@ -121,7 +121,7 @@ return input -/proc/replace_characters(var/t,var/list/repl_chars) +/proc/replace_characters(t,list/repl_chars) for(var/char in repl_chars) t = replacetext(t, char, repl_chars[char]) return t @@ -145,10 +145,10 @@ return trim_left(trim_right(text)) //Returns a string with the first element of the string capitalized. -/proc/capitalize(var/t as text) +/proc/capitalize(t as text) return uppertext(copytext(t, 1, 2)) + copytext(t, 2) -/proc/periodize(var/t as text) +/proc/periodize(t as text) var/last_char = t[length(t)] var/static/list/valid_ends = make_associative(list("~","-",".",",","?","!")) @@ -158,7 +158,7 @@ return t -/proc/get_filename(var/file_path) +/proc/get_filename(file_path) var/position = findlasttext(file_path,"/") return copytext(file_path,position) @@ -167,17 +167,17 @@ return ascii2text(text2ascii(string, pos)) -/proc/has_prefix(var/haystack,var/needle) +/proc/has_prefix(haystack,needle) if(length(needle) > length(haystack)) return FALSE return copytext(haystack,1,length(needle)+1) == needle -/proc/has_suffix(var/haystack,var/needle) +/proc/has_suffix(haystack,needle) if(length(needle) > length(haystack)) return FALSE return copytext(haystack,-length(needle),0) == needle -/proc/get_pronoun_he_she_it(var/mob/M) +/proc/get_pronoun_he_she_it(mob/M) switch(M.gender) if(MALE) return "he" @@ -186,7 +186,7 @@ return "it" -/proc/get_pronoun_his_her_their(var/mob/M) +/proc/get_pronoun_his_her_their(mob/M) switch(M.gender) if(MALE) return "his" @@ -194,14 +194,14 @@ return "her" return "their" -/proc/proper_url_encode(var/input) +/proc/proper_url_encode(input) return url_encode(replacetextEx(input,"\n","")) -/proc/ref2num(var/ref) +/proc/ref2num(ref) return text2num(copytext(ref,2,-1),16) // Used to get a sanitized input. -/proc/stripped_input(var/mob/user, var/message = "", var/title = "", var/default = "", var/max_length) +/proc/stripped_input(mob/user, message = "", title = "", default = "", max_length) if(!max_length) max_length = CONFIG("MAX_MESSAGE_LENGTH",512) var/name = input(user, message, title, default) as text|null - return html_encode(trim(name, max_length)) \ No newline at end of file + return html_encode(trim(name, max_length)) diff --git a/code/__helpers/time.dm b/code/__helpers/time.dm index 4316fb6bb6..89dd6af0b9 100644 --- a/code/__helpers/time.dm +++ b/code/__helpers/time.dm @@ -20,7 +20,7 @@ proc/time_x_newer_than_y(var/x_date,var/x_time,var/y_date,var/y_time) return FALSE -/proc/get_nice_time(var/seconds) +/proc/get_nice_time(seconds) var/time_list = list() @@ -47,7 +47,7 @@ proc/time_x_newer_than_y(var/x_date,var/x_time,var/y_date,var/y_time) #define FORMAT_MINUTE 0x2 #define FORMAT_SECOND 0x4 -/proc/get_clock_time(var/seconds,var/format_type = FORMAT_MINUTE | FORMAT_SECOND) +/proc/get_clock_time(seconds,format_type = FORMAT_MINUTE | FORMAT_SECOND) if(seconds < 0) seconds = 0 diff --git a/code/__helpers/turf.dm b/code/__helpers/turf.dm index 1a841f49dc..fee415c3a4 100644 --- a/code/__helpers/turf.dm +++ b/code/__helpers/turf.dm @@ -1,13 +1,13 @@ -/proc/get_area(var/datum/A) +/proc/get_area(datum/A) if(is_area(A)) return A var/turf/T = get_turf(A) return T ? T.loc : null -/proc/get_dist_real(var/atom/A1,var/atom/A2) //More intensive than get_dist, but more accurate. +/proc/get_dist_real(atom/A1,atom/A2) //More intensive than get_dist, but more accurate. return sqrt( ((A1.x - A2.x)**2) + ((A1.y - A2.y)**2) ) /* -/proc/get_dist_advanced(var/atom/A1,var/atom/A2) +/proc/get_dist_advanced(atom/A1,atom/A2) var/best_distance = get_dist(A1,A2) @@ -33,7 +33,7 @@ */ -/proc/get_dist_advanced(var/atom/A1,var/atom/A2) +/proc/get_dist_advanced(atom/A1,atom/A2) if(!A1 || !A2) return max(world.maxx,world.maxy) diff --git a/code/__helpers/world.dm b/code/__helpers/world.dm index b27e816893..71287e40aa 100644 --- a/code/__helpers/world.dm +++ b/code/__helpers/world.dm @@ -71,7 +71,7 @@ proc/get_true_offset_y(var/atom/atom_a,var/atom/atom_b) D.finalized = TRUE; \ } -/proc/CREATE(var/atom/A,var/atom/desired_loc) +/proc/CREATE(atom/A,atom/desired_loc) A = new A(desired_loc) INITIALIZE(A) GENERATE(A) @@ -230,4 +230,4 @@ proc/create_destruction(var/turf/T,var/list/objects_to_spawn,var/material_id = n if(return_list) return line else - return null \ No newline at end of file + return null diff --git a/code/_core/area/_area.dm b/code/_core/area/_area.dm index 1d098693a3..c493eb4337 100644 --- a/code/_core/area/_area.dm +++ b/code/_core/area/_area.dm @@ -93,7 +93,7 @@ return ..() -/area/proc/update_lighting_overlay_color(var/desired_color) +/area/proc/update_lighting_overlay_color(desired_color) for(var/turf/T in contents) if(T.lighting_overlay) @@ -101,7 +101,7 @@ return TRUE -/area/New(var/desired_loc) +/area/New(desired_loc) if(requires_power) powered_doors = list() @@ -179,7 +179,7 @@ return TRUE -/area/proc/setup_sunlight(var/turf/T) +/area/proc/setup_sunlight(turf/T) if(sunlight_freq <= 0) return FALSE @@ -201,10 +201,10 @@ return TRUE -/area/Entered(var/atom/movable/enterer,var/atom/old_loc) +/area/Entered(atom/movable/enterer,atom/old_loc) return TRUE -/area/Exited(var/atom/movable/exiter,var/atom/old_loc) +/area/Exited(atom/movable/exiter,atom/old_loc) return TRUE /area/proc/smash_all_lights() @@ -269,7 +269,7 @@ return TRUE -/area/proc/toggle_power_doors(var/enable=ON|AUTO,var/force=FALSE) +/area/proc/toggle_power_doors(enable=ON|AUTO,force=FALSE) if(!requires_power) CRASH("Called toggle_power_doors on an [src.type] that doesn't require power.") @@ -296,7 +296,7 @@ return TRUE -/area/proc/toggle_power_machines(var/enable=ON|AUTO,var/force=FALSE) +/area/proc/toggle_power_machines(enable=ON|AUTO,force=FALSE) if(!requires_power) CRASH("Called toggle_power_machines on an [src.type] that doesn't require power.") @@ -322,7 +322,7 @@ return TRUE -/area/proc/toggle_power_lights(var/enable=ON|AUTO,var/force=FALSE) +/area/proc/toggle_power_lights(enable=ON|AUTO,force=FALSE) if(!requires_power) CRASH("Called toggle_power_lights on an [src.type] that doesn't require power.") diff --git a/code/_core/area/city/_city.dm b/code/_core/area/city/_city.dm index a864528975..0861e56077 100644 --- a/code/_core/area/city/_city.dm +++ b/code/_core/area/city/_city.dm @@ -16,7 +16,7 @@ var/global/list/vr_possible_nuke_areas = list() sunlight_freq = 0 sunlight_color = "FFFFFF" -/area/city/interior/New(var/desired_loc) +/area/city/interior/New(desired_loc) . = ..() vr_possible_nuke_areas |= src diff --git a/code/_core/area/interior.dm b/code/_core/area/interior.dm index 9ca696bf37..a1cbceebe4 100644 --- a/code/_core/area/interior.dm +++ b/code/_core/area/interior.dm @@ -11,7 +11,7 @@ -/area/interior/cave/lava/setup_sunlight(var/turf/T) +/area/interior/cave/lava/setup_sunlight(turf/T) if(istype(T,/turf/simulated/floor/lava/)) diff --git a/code/_core/area/transit/_transit.dm b/code/_core/area/transit/_transit.dm index 166edfb9a1..bfc18d4828 100644 --- a/code/_core/area/transit/_transit.dm +++ b/code/_core/area/transit/_transit.dm @@ -9,7 +9,7 @@ map_color = COLOR_PINK interior = TRUE -/area/transit/New(var/desired_loc) +/area/transit/New(desired_loc) transit_areas[type] = src return ..() diff --git a/code/_core/atom/_atom.dm b/code/_core/atom/_atom.dm index 28bf94d906..04bc29c11f 100644 --- a/code/_core/atom/_atom.dm +++ b/code/_core/atom/_atom.dm @@ -60,7 +60,7 @@ var/map_spawn = FALSE //Set to true to indicate this object was spawned in via dmm_suite -/atom/proc/set_density(var/desired_density=TRUE,var/force=FALSE) +/atom/proc/set_density(desired_density=TRUE,force=FALSE) if(density == desired_density && !force) return FALSE @@ -69,10 +69,10 @@ return TRUE -/atom/proc/get_display_name(var/mob/caller) +/atom/proc/get_display_name(mob/caller) return "[src.name]" -/atom/proc/update_name(var/desired_name) +/atom/proc/update_name(desired_name) name = desired_name if(label) name = "[name] ([label])" @@ -98,10 +98,10 @@ return TRUE return FALSE -/atom/proc/can_do_destruction(var/damage=TRUE) +/atom/proc/can_do_destruction(damage=TRUE) return TRUE -/atom/proc/on_destruction(var/damage = TRUE) +/atom/proc/on_destruction(damage = TRUE) HOOK_CALL("on_destruction") return TRUE @@ -140,14 +140,14 @@ /atom/proc/get_base_transform() return matrix() -/atom/proc/defer_click_on_object(var/mob/caller,location,control,params) +/atom/proc/defer_click_on_object(mob/caller,location,control,params) return src /atom/proc/get_xp_multiplier() //How much XP should this object give for interacting with it. return 0 -/atom/proc/can_be_attacked(var/atom/attacker,var/atom/weapon,var/params,var/damagetype/damage_type) +/atom/proc/can_be_attacked(atom/attacker,atom/weapon,params,damagetype/damage_type) if(!src.finalized) return FALSE @@ -160,7 +160,7 @@ /atom/proc/think() return TRUE -/atom/proc/get_touching_space(var/intercardinal = FALSE) +/atom/proc/get_touching_space(intercardinal = FALSE) . = 0x0 @@ -171,7 +171,7 @@ . |= dir -/atom/proc/get_best_touching_space(var/intercardinal = TRUE) +/atom/proc/get_best_touching_space(intercardinal = TRUE) var/turf/T = get_turf(src) for(var/dir in list(NORTH,SOUTH,EAST,WEST)) @@ -196,10 +196,10 @@ /atom/get_log_name() return "[src.name]([src.type])([x],[y],[z])" -/atom/proc/get_inaccuracy(var/atom/source,var/atom/target,var/inaccuracy_mod=1) +/atom/proc/get_inaccuracy(atom/source,atom/target,inaccuracy_mod=1) return 0 -/atom/proc/on_projectile_hit(var/atom/hit_atom,var/turf/old_loc,var/turf/new_loc) +/atom/proc/on_projectile_hit(atom/hit_atom,turf/old_loc,turf/new_loc) return TRUE /atom/proc/is_busy() @@ -222,10 +222,10 @@ /atom/Crossed(atom/movable/O,atom/OldLoc) //Override default return TRUE -/atom/proc/on_listen(var/atom/speaker,var/datum/source,var/text,var/raw_text,var/language_text,var/talk_type,var/frequency,var/language=LANGUAGE_BASIC,var/talk_range=TALK_RANGE) //Note that this is sanitized. +/atom/proc/on_listen(atom/speaker,datum/source,text,raw_text,language_text,talk_type,frequency,language=LANGUAGE_BASIC,talk_range=TALK_RANGE) //Note that this is sanitized. return TRUE -/atom/proc/do_say(var/text_to_say, var/should_sanitize = TRUE, var/talk_type_to_use = TEXT_TALK,var/talk_range=TALK_RANGE,var/language_to_use=null) +/atom/proc/do_say(text_to_say, should_sanitize = TRUE, talk_type_to_use = TEXT_TALK,talk_range=TALK_RANGE,language_to_use=null) if(should_sanitize) text_to_say = sanitize(text_to_say) @@ -234,7 +234,7 @@ return TRUE -/atom/proc/on_dmm_suite_rotate(var/angle_offset=0) +/atom/proc/on_dmm_suite_rotate(angle_offset=0) return TRUE diff --git a/code/_core/atom/acts.dm b/code/_core/atom/acts.dm index 889db3f47b..4c1853d3ad 100644 --- a/code/_core/atom/acts.dm +++ b/code/_core/atom/acts.dm @@ -1,4 +1,4 @@ -/atom/proc/act_explode(var/atom/owner,var/atom/source,var/atom/epicenter,var/magnitude,var/desired_loyalty_tag) +/atom/proc/act_explode(atom/owner,atom/source,atom/epicenter,magnitude,desired_loyalty_tag) var/damagetype/D = SSdamagetype.all_damage_types[/damagetype/explosion] @@ -14,7 +14,7 @@ return TRUE -/atom/proc/act_emp(var/atom/owner,var/atom/source,var/atom/epicenter,var/magnitude,var/desired_loyalty_tag) +/atom/proc/act_emp(atom/owner,atom/source,atom/epicenter,magnitude,desired_loyalty_tag) var/damagetype/D = SSdamagetype.all_damage_types[/damagetype/explosion] diff --git a/code/_core/atom/attacking.dm b/code/_core/atom/attacking.dm index eaa275b45d..e9be9a59ea 100644 --- a/code/_core/atom/attacking.dm +++ b/code/_core/atom/attacking.dm @@ -1,14 +1,14 @@ -/atom/proc/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/atom/proc/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) HOOK_CALL("on_damage_received") return TRUE -/atom/proc/change_victim(var/atom/attacker) +/atom/proc/change_victim(atom/attacker) return src -/atom/proc/should_cleave(var/atom/attacker,var/atom/victim,var/list/params) +/atom/proc/should_cleave(atom/attacker,atom/victim,list/params) return FALSE -/atom/proc/attack(var/atom/attacker,var/atom/victim,var/list/params=list(),var/atom/blamed,var/ignore_distance = FALSE, var/precise = FALSE,var/damage_multiplier=1,var/damagetype/damage_type_override) //The src attacks the victim, with the blamed taking responsibility +/atom/proc/attack(atom/attacker,atom/victim,list/params=list(),atom/blamed,ignore_distance = FALSE, precise = FALSE,damage_multiplier=1,damagetype/damage_type_override) //The src attacks the victim, with the blamed taking responsibility if(!attacker) attacker = src @@ -149,16 +149,16 @@ return DT.swing(attacker,victims,object_to_damage_with,hit_objects,attacker) -/atom/proc/get_block_power(var/atom/victim,var/atom/attacker,var/atom/weapon,var/atom/object_to_damage,var/damagetype/DT) +/atom/proc/get_block_power(atom/victim,atom/attacker,atom/weapon,atom/object_to_damage,damagetype/DT) return 0.5 -/atom/proc/get_object_to_damage(var/atom/attacker,var/atom/weapon,var/damagetype/damage_type,var/list/params = list(),var/accurate=FALSE,var/find_closest=FALSE,var/inaccuracy_modifier=1) +/atom/proc/get_object_to_damage(atom/attacker,atom/weapon,damagetype/damage_type,list/params = list(),accurate=FALSE,find_closest=FALSE,inaccuracy_modifier=1) return src -/atom/proc/get_object_to_damage_with(var/atom/attacker,var/atom/victim,var/list/params=list()) //Which object should the attacker damage with? +/atom/proc/get_object_to_damage_with(atom/attacker,atom/victim,list/params=list()) //Which object should the attacker damage with? return src -/atom/proc/can_attack(var/atom/attacker,var/atom/victim,var/atom/weapon,var/params,var/damagetype/damage_type) +/atom/proc/can_attack(atom/attacker,atom/victim,atom/weapon,params,damagetype/damage_type) if(attack_next > world.time) return FALSE @@ -178,5 +178,5 @@ return TRUE -/atom/proc/get_damage_type(var/atom/attacker,var/atom/victim) +/atom/proc/get_damage_type(atom/attacker,atom/victim) return damage_type \ No newline at end of file diff --git a/code/_core/atom/attacking_old.dm b/code/_core/atom/attacking_old.dm index 7b767f2faa..316d41d287 100644 --- a/code/_core/atom/attacking_old.dm +++ b/code/_core/atom/attacking_old.dm @@ -1,4 +1,4 @@ -/atom/proc/get_attack_delay(var/mob/user) +/atom/proc/get_attack_delay(mob/user) if(is_living(user)) var/mob/living/L = user @@ -6,20 +6,20 @@ return attack_delay -/atom/proc/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/list/damage_table,var/damage_amount) +/atom/proc/on_damage_received(atom/atom_damaged,atom/attacker,list/damage_table,damage_amount) if(health) health.update_health(damage_amount,attacker) return TRUE -/atom/proc/change_victim(var/atom/attacker) +/atom/proc/change_victim(atom/attacker) return src -/atom/proc/help(var/atom/caller,var/atom/object,var/list/params=list()) //The src attacks the victim, with the blamed taking responsibility +/atom/proc/help(atom/caller,atom/object,list/params=list()) //The src attacks the victim, with the blamed taking responsibility return FALSE -/atom/proc/attack(var/atom/attacker,var/atom/victim,var/list/params=list(),var/atom/blamed,var/ignore_distance = FALSE) //The src attacks the victim, with the blamed taking responsibility +/atom/proc/attack(atom/attacker,atom/victim,list/params=list(),atom/blamed,ignore_distance = FALSE) //The src attacks the victim, with the blamed taking responsibility if(!attacker) attacker = src @@ -93,13 +93,13 @@ return TRUE -/atom/proc/get_object_to_damage(var/atom/attacker,params) //Which object should the attacker damage? +/atom/proc/get_object_to_damage(atom/attacker,params) //Which object should the attacker damage? return src -/atom/proc/get_object_to_damage_with(var/atom/attacker,var/atom/victim,params) //Which object should the attacker damage with? +/atom/proc/get_object_to_damage_with(atom/attacker,atom/victim,params) //Which object should the attacker damage with? return src -/atom/proc/can_attack(var/atom/victim,var/atom/weapon,var/params) +/atom/proc/can_attack(atom/victim,atom/weapon,params) if(!mouse_opacity) return FALSE @@ -123,19 +123,19 @@ return TRUE -/atom/proc/get_parry_chance(var/atom/attacker,var/atom/weapon,var/atom/target) +/atom/proc/get_parry_chance(atom/attacker,atom/weapon,atom/target) return 0 -/atom/proc/get_miss_chance(var/atom/attacker,var/atom/weapon,var/atom/target) //Chance that hitting this atom is a miss. +/atom/proc/get_miss_chance(atom/attacker,atom/weapon,atom/target) //Chance that hitting this atom is a miss. return 0 -/atom/proc/get_dodge_chance(var/atom/attacker,var/atom/weapon,var/atom/target,var/damagetype/DT) +/atom/proc/get_dodge_chance(atom/attacker,atom/weapon,atom/target,damagetype/DT) return 0 -/atom/proc/get_block_chance(var/atom/attacker,var/atom/weapon,var/atom/target,var/damagetype/DT) +/atom/proc/get_block_chance(atom/attacker,atom/weapon,atom/target,damagetype/DT) return 0 -/atom/proc/perform_block(var/atom/attacker,var/atom/weapon,var/atom/target,var/damagetype/DT) +/atom/proc/perform_block(atom/attacker,atom/weapon,atom/target,damagetype/DT) if(attacker == src) return FALSE var/base_chance = get_block_chance(attacker,weapon,target,DT) * DT.block_chance_mul @@ -155,7 +155,7 @@ return TRUE -/atom/proc/perform_parry(var/atom/attacker,var/atom/weapon,var/atom/target,var/damagetype/DT,var/allow_parry_counter) +/atom/proc/perform_parry(atom/attacker,atom/weapon,atom/target,damagetype/DT,allow_parry_counter) if(attacker == src) return FALSE var/base_chance = get_parry_chance(attacker,weapon,target) * DT.parry_chance_mul @@ -177,7 +177,7 @@ return TRUE -/atom/proc/perform_dodge(var/atom/attacker,var/atom/weapon,var/atom/target,var/damagetype/DT) +/atom/proc/perform_dodge(atom/attacker,atom/weapon,atom/target,damagetype/DT) if(attacker == src) return FALSE var/base_chance = get_dodge_chance(attacker,weapon,target,DT) * DT.dodge_chance_mul diff --git a/code/_core/atom/circuits.dm b/code/_core/atom/circuits.dm index 0486c64a32..8ac5f9b113 100644 --- a/code/_core/atom/circuits.dm +++ b/code/_core/atom/circuits.dm @@ -1,2 +1,2 @@ -/atom/proc/trigger(var/mob/caller,var/atom/source,var/signal_freq,var/signal_code) +/atom/proc/trigger(mob/caller,atom/source,signal_freq,signal_code) return TRUE \ No newline at end of file diff --git a/code/_core/atom/directon.dm b/code/_core/atom/directon.dm index af3cf6902b..2f2d9f019b 100644 --- a/code/_core/atom/directon.dm +++ b/code/_core/atom/directon.dm @@ -1,4 +1,4 @@ -/atom/proc/set_dir(var/desired_dir,var/force = FALSE) +/atom/proc/set_dir(desired_dir,force = FALSE) if(!desired_dir) return null @@ -10,10 +10,10 @@ return dir -/atom/proc/face_atom(var/atom/A) +/atom/proc/face_atom(atom/A) return set_dir(get_relative_dir(A)) -/atom/proc/get_relative_dir(var/atom/A) +/atom/proc/get_relative_dir(atom/A) if(!A || !x || !y || !A.x || !A.y) return var/dx = A.x - x var/dy = A.y - y diff --git a/code/_core/atom/icon.dm b/code/_core/atom/icon.dm index 496198f11c..b5ca6cce84 100644 --- a/code/_core/atom/icon.dm +++ b/code/_core/atom/icon.dm @@ -15,7 +15,7 @@ /atom/proc/update_underlays() return TRUE -/atom/proc/add_overlay(var/datum/desired_overlay) +/atom/proc/add_overlay(datum/desired_overlay) if(length(overlays) >= 100) CRASH("Warning: [get_debug_name()] exceeds 100 overlays![is_datum(desired_overlay) ? " Overlay name: [desired_overlay.get_debug_name()]." : ""]") @@ -24,7 +24,7 @@ return TRUE -/atom/proc/add_underlay(var/datum/desired_underlay) +/atom/proc/add_underlay(datum/desired_underlay) if(length(underlays) >= 100) CRASH("Warning: [get_debug_name()] exceeds 100 underlays![is_datum(desired_underlay) ? " Overlay name: [desired_underlay.get_debug_name()]." : ""]") @@ -33,7 +33,7 @@ return TRUE -/atom/movable/proc/add_vis_content(var/atom/movable/desired_vis_content) +/atom/movable/proc/add_vis_content(atom/movable/desired_vis_content) if(length(vis_contents) >= 100) CRASH("Warning: [get_debug_name()] exceeds 100 vis contents![is_datum(desired_vis_content) ? " Overlay name: [desired_vis_content.get_debug_name()]." : ""]") @@ -42,7 +42,7 @@ return TRUE -/atom/movable/proc/remove_vis_content(var/atom/movable/desired_vis_content) +/atom/movable/proc/remove_vis_content(atom/movable/desired_vis_content) vis_contents -= desired_vis_content diff --git a/code/_core/atom/interaction.dm b/code/_core/atom/interaction.dm index 783016771e..62cf39f91f 100644 --- a/code/_core/atom/interaction.dm +++ b/code/_core/atom/interaction.dm @@ -1,29 +1,29 @@ -/atom/proc/on_mouse_up(var/mob/caller as mob, var/atom/object,location,control,params) +/atom/proc/on_mouse_up(mob/caller as mob, atom/object,location,control,params) return FALSE /atom/proc/mouse_wheel_on_object(caller,delta_x,delta_y,location,control,params) return FALSE -/atom/proc/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) //The src is used on the object. This is called first. +/atom/proc/click_on_object(mob/caller as mob,atom/object,location,control,params) //The src is used on the object. This is called first. return FALSE -/atom/proc/click_on_object_alt(var/mob/caller as mob,var/atom/object,location,control,params) //Basically a special attack. For wielded objects. +/atom/proc/click_on_object_alt(mob/caller as mob,atom/object,location,control,params) //Basically a special attack. For wielded objects. return FALSE -/atom/proc/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/atom/proc/clicked_on_by_object(mob/caller,atom/object,location,control,params) return FALSE -/atom/proc/drop_on_object(var/mob/caller,var/atom/object,location,control,params) +/atom/proc/drop_on_object(mob/caller,atom/object,location,control,params) return FALSE -/atom/proc/dropped_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/atom/proc/dropped_on_by_object(mob/caller,atom/object,location,control,params) return FALSE -/atom/get_examine_list(var/mob/examiner) +/atom/get_examine_list(mob/examiner) var/object_icon = ICON_TO_HTML(icon,icon_state,32,32) return list(div("examine_title","[object_icon][src.name]"),div("examine_description","\"[src.desc]\""),div("examine_description_long",src.desc_extended)) -/atom/proc/can_caller_interact_with(var/mob/caller,var/enable_message = TRUE,var/delay_checks=TRUE,var/distance_checks=TRUE,var/turf_checks=TRUE) +/atom/proc/can_caller_interact_with(mob/caller,enable_message = TRUE,delay_checks=TRUE,distance_checks=TRUE,turf_checks=TRUE) if(src.qdeleting) return FALSE @@ -60,9 +60,9 @@ if(distance_checks && !(src.interaction_flags & FLAG_INTERACTION_NO_DISTANCE) && get_dist(caller,src) > interact_distance) return FALSE -/atom/proc/click_self(var/mob/caller,location,control,params) +/atom/proc/click_self(mob/caller,location,control,params) return FALSE -/atom/proc/set_color(var/desired_color,var/desired_substype) +/atom/proc/set_color(desired_color,desired_substype) color = desired_color return TRUE diff --git a/code/_core/atom/moveable/_movable.dm b/code/_core/atom/moveable/_movable.dm index 68f16fc7a9..0be5f2c7e3 100644 --- a/code/_core/atom/moveable/_movable.dm +++ b/code/_core/atom/moveable/_movable.dm @@ -112,7 +112,7 @@ return TRUE -/atom/movable/set_dir(var/desired_dir,var/force = FALSE) +/atom/movable/set_dir(desired_dir,force = FALSE) . = ..() @@ -123,11 +123,11 @@ continue LS.set_dir(desired_dir,force) -/atom/movable/New(var/desired_loc) +/atom/movable/New(desired_loc) light_sprite_sources = list() . = ..() -/atom/movable/proc/update_collisions(var/normal,var/bullet,var/c_dir,var/force = FALSE) +/atom/movable/proc/update_collisions(normal,bullet,c_dir,force = FALSE) . = FALSE @@ -143,7 +143,7 @@ collision_dir = c_dir . = TRUE -/atom/movable/proc/can_be_grabbed(var/atom/grabber,var/messages=TRUE) +/atom/movable/proc/can_be_grabbed(atom/grabber,messages=TRUE) if(grabber == src) if(messages && is_living(grabber)) @@ -181,7 +181,7 @@ value = get_base_value() -/proc/is_valid_dir(var/direction) +/proc/is_valid_dir(direction) /* if(!direction || (direction & EAST && direction & WEST) || (direction & NORTH && direction & SOUTH)) @@ -205,7 +205,7 @@ return "[src.name]([src.type])[location_info]" -/atom/movable/proc/set_anchored(var/desired_anchored=TRUE,var/force=FALSE) +/atom/movable/proc/set_anchored(desired_anchored=TRUE,force=FALSE) if(anchored == desired_anchored && !force) return FALSE @@ -219,14 +219,14 @@ return FALSE -/atom/movable/proc/dust(var/atom/source) +/atom/movable/proc/dust(atom/source) return FALSE -/atom/movable/proc/gib(var/gib_direction=0x0,var/hard=FALSE) +/atom/movable/proc/gib(gib_direction=0x0,hard=FALSE) qdel(src) return TRUE -/atom/movable/proc/is_safe_to_delete(var/check_loc = TRUE) +/atom/movable/proc/is_safe_to_delete(check_loc = TRUE) if(check_loc && loc && !src.z) //This means we're in something that isn't a turf. return FALSE @@ -241,7 +241,7 @@ return TRUE -/atom/movable/set_density(var/desired_density=TRUE,var/force=FALSE) +/atom/movable/set_density(desired_density=TRUE,force=FALSE) . = ..() diff --git a/code/_core/atom/moveable/astar.dm b/code/_core/atom/moveable/astar.dm index 7d94cffc19..48f7ab907e 100644 --- a/code/_core/atom/moveable/astar.dm +++ b/code/_core/atom/moveable/astar.dm @@ -1,4 +1,4 @@ -/proc/get_astar_path(var/atom/movable/mover,var/turf/source,var/turf/destination,var/needed_distance) +/proc/get_astar_path(atom/movable/mover,turf/source,turf/destination,needed_distance) set background = 1 diff --git a/code/_core/atom/moveable/attacking.dm b/code/_core/atom/moveable/attacking.dm index 718217623e..d3986dc19c 100644 --- a/code/_core/atom/moveable/attacking.dm +++ b/code/_core/atom/moveable/attacking.dm @@ -1,4 +1,4 @@ -/atom/movable/can_attack(var/atom/attacker,var/atom/victim,var/atom/weapon,var/params,var/damagetype/damage_type) +/atom/movable/can_attack(atom/attacker,atom/victim,atom/weapon,params,damagetype/damage_type) if(attacker && !is_turf(attacker.loc)) return FALSE . = ..() \ No newline at end of file diff --git a/code/_core/atom/moveable/gibbing.dm b/code/_core/atom/moveable/gibbing.dm index 94fb88073a..18131b7bb6 100644 --- a/code/_core/atom/moveable/gibbing.dm +++ b/code/_core/atom/moveable/gibbing.dm @@ -1,2 +1,2 @@ -/atom/movable/proc/on_crush(var/message=TRUE) //What happens when this object is crushed by a larger object, like a shuttle. +/atom/movable/proc/on_crush(message=TRUE) //What happens when this object is crushed by a larger object, like a shuttle. return TRUE \ No newline at end of file diff --git a/code/_core/atom/moveable/movement.dm b/code/_core/atom/moveable/movement.dm index 04ebf63dde..0d240b3688 100644 --- a/code/_core/atom/moveable/movement.dm +++ b/code/_core/atom/moveable/movement.dm @@ -1,9 +1,9 @@ -/atom/movable/proc/get_movement_delay(var/include_stance=TRUE) +/atom/movable/proc/get_movement_delay(include_stance=TRUE) return movement_delay /* -/atom/movable/proc/can_enter_turf(var/turf/T,var/loc_overide = src.loc) +/atom/movable/proc/can_enter_turf(turf/T,loc_overide = src.loc) if(!T.has_dense_atom) return TRUE @@ -21,7 +21,7 @@ -/atom/movable/proc/handle_movement(var/adjust_delay = 1) //Measured in ticks +/atom/movable/proc/handle_movement(adjust_delay = 1) //Measured in ticks if(anchored || CALLBACK_EXISTS("momentum_\ref[src]")) is_moving = FALSE @@ -142,7 +142,7 @@ return is_moving -/atom/movable/proc/force_move(var/atom/new_loc) +/atom/movable/proc/force_move(atom/new_loc) var/atom/old_loc = loc @@ -180,7 +180,7 @@ /atom/movable/proc/get_max_acceleration_value() return 100 -/atom/movable/proc/post_move(var/atom/old_loc) +/atom/movable/proc/post_move(atom/old_loc) if(grabbing_hand) grabbing_hand.check_grab() @@ -205,7 +205,7 @@ HOOK_CALL("post_move") return TRUE -/atom/movable/proc/on_chunk_cross(var/chunk/old_chunk,var/chunk/new_chunk) +/atom/movable/proc/on_chunk_cross(chunk/old_chunk,chunk/new_chunk) if(enable_chunk_clean) if(new_chunk) new_chunk.cleanables += src @@ -225,7 +225,7 @@ -/atom/movable/Move(var/atom/NewLoc,var/Dir=0x0,var/step_x=0,var/step_y=0) +/atom/movable/Move(atom/NewLoc,Dir=0x0,step_x=0,step_y=0) var/atom/OldLoc = loc @@ -313,11 +313,11 @@ return TRUE -/atom/movable/proc/on_fall(var/turf/old_turf) +/atom/movable/proc/on_fall(turf/old_turf) return TRUE /* -/atom/movable/proc/start_momentum(var/desired_momentum_speed=0,var/desired_momentum_dir=0x0) +/atom/movable/proc/start_momentum(desired_momentum_speed=0,desired_momentum_dir=0x0) if(!desired_momentum_speed || !desired_momentum_dir) return FALSE @@ -337,7 +337,7 @@ return TRUE -/atom/movable/proc/process_momentum(var/no_move=FALSE) +/atom/movable/proc/process_momentum(no_move=FALSE) if(momentum_speed <= 0 || !momentum_dir) return FALSE diff --git a/code/_core/atom/moveable/throwing.dm b/code/_core/atom/moveable/throwing.dm index b4ebfb4be8..74d087dd04 100644 --- a/code/_core/atom/moveable/throwing.dm +++ b/code/_core/atom/moveable/throwing.dm @@ -1,4 +1,4 @@ -/atom/movable/proc/throw_self(var/atom/thrower,var/atom/desired_target,var/target_x,var/target_y,var/vel_x,var/vel_y,var/lifetime = -1, var/steps_allowed = VIEW_RANGE,var/desired_loyalty_tag,var/damage_multiplier=1) +/atom/movable/proc/throw_self(atom/thrower,atom/desired_target,target_x,target_y,vel_x,vel_y,lifetime = -1, steps_allowed = VIEW_RANGE,desired_loyalty_tag,damage_multiplier=1) if(!thrower) CRASH("No thrower exists!") @@ -49,5 +49,5 @@ src.force_move(P) //Move it to contents. return P -/atom/movable/proc/on_thrown(var/atom/owner,var/atom/hit_atom) //What happens after the person is thrown and it hits an object. +/atom/movable/proc/on_thrown(atom/owner,atom/hit_atom) //What happens after the person is thrown and it hits an object. return TRUE diff --git a/code/_core/client/View-Variables.dm b/code/_core/client/View-Variables.dm index b299360bd0..e084b86d2b 100644 --- a/code/_core/client/View-Variables.dm +++ b/code/_core/client/View-Variables.dm @@ -858,7 +858,7 @@ client/proc/debug_variable(name, value, level, var/datum/DA = null) return var_value -/client/proc/mod_list_add(var/list/L) +/client/proc/mod_list_add(list/L) var/class = "text" @@ -902,7 +902,7 @@ client/proc/debug_variable(name, value, level, var/datum/DA = null) if("No") L += var_value -/client/proc/mod_list(var/list/L) +/client/proc/mod_list(list/L) if(!istype(L,/list)) to_chat(src, "Not a List.") @@ -1038,7 +1038,7 @@ client/proc/debug_variable(name, value, level, var/datum/DA = null) if(temp_var) L[variable] = temp_var -/client/proc/modify_variables(var/atom/O, var/param_var_name = null, var/autodetect_class = 0) +/client/proc/modify_variables(atom/O, param_var_name = null, autodetect_class = 0) var/class var/variable @@ -1237,7 +1237,7 @@ client/proc/debug_variable(name, value, level, var/datum/DA = null) if(var_new==null) return O.vars[variable] = var_new -/client/proc/cmd_mass_modify_object_variables(atom/A, var/var_name) +/client/proc/cmd_mass_modify_object_variables(atom/A, var_name) set category = "Debug" set name = "Mass Edit Variables" set desc="(target) Edit all instances of a target item's variables" @@ -1262,7 +1262,7 @@ client/proc/debug_variable(name, value, level, var/datum/DA = null) src.massmodify_variables(A, var_name, method) -/client/proc/massmodify_variables(var/atom/O, var/var_name = "", var/method = 0) +/client/proc/massmodify_variables(atom/O, var_name = "", method = 0) var/list/names = list() for (var/V in O.vars) @@ -1604,7 +1604,7 @@ Because if you select a player mob as owner it tries to do the proc for But you can call procs that are of type /mob/living/carbon/human/proc/ for that player. */ -/client/proc/callproc(var/target = null) +/client/proc/callproc(target = null) set category = "Debug" set name = "Advanced ProcCall" set waitfor = 0 diff --git a/code/_core/client/_client.dm b/code/_core/client/_client.dm index 791dc5c95f..709aab4f96 100644 --- a/code/_core/client/_client.dm +++ b/code/_core/client/_client.dm @@ -143,7 +143,7 @@ return ..() -/client/proc/examine(var/datum/object) +/client/proc/examine(datum/object) for(var/v in object.get_examine_list(src.mob)) if(v) src.mob.to_chat(v) @@ -308,7 +308,7 @@ var/global/total_clients = 0 */ /* -/client/proc/get_variables(var/datum/object) +/client/proc/get_variables(datum/object) for(var/v in object.vars) to_chat("[v] = [object.vars[v]]") */ diff --git a/code/_core/client/camera.dm b/code/_core/client/camera.dm index a0cd88f07b..52384f35b8 100644 --- a/code/_core/client/camera.dm +++ b/code/_core/client/camera.dm @@ -1,7 +1,7 @@ #define CAMERA_RECOIL_SPEED 16 #define CAMERA_PUNCH_SPEED 6 -/client/proc/update_zoom(var/desired_zoom_level = 2) +/client/proc/update_zoom(desired_zoom_level = 2) if(!mob || !eye || eye != mob) zoom_level = initial(zoom_level) @@ -12,7 +12,7 @@ return TRUE -/client/proc/spectate(var/atom/A) +/client/proc/spectate(atom/A) if(A == mob) A = null @@ -39,7 +39,7 @@ return TRUE -/client/proc/update_camera_offset(var/desired_x_offset=0,var/desired_y_offset=0) +/client/proc/update_camera_offset(desired_x_offset=0,desired_y_offset=0) var/zoom_mul = 1 if(is_advanced(mob)) var/mob/living/advanced/A = mob diff --git a/code/_core/client/chat.dm b/code/_core/client/chat.dm index c4dc4b6d63..4708b11b4f 100644 --- a/code/_core/client/chat.dm +++ b/code/_core/client/chat.dm @@ -1,4 +1,4 @@ -/client/proc/to_chat(var/text,var/chat_type=CHAT_TYPE_INFO) +/client/proc/to_chat(text,chat_type=CHAT_TYPE_INFO) if(!text || !chat_type) return FALSE diff --git a/code/_core/client/chat/_chat.dm b/code/_core/client/chat/_chat.dm index b8d1981861..4859558627 100644 --- a/code/_core/client/chat/_chat.dm +++ b/code/_core/client/chat/_chat.dm @@ -1,9 +1,9 @@ -/proc/broadcast_to_clients(var/text_to_say as text, var/chat_type = CHAT_TYPE_OOC) +/proc/broadcast_to_clients(text_to_say as text, chat_type = CHAT_TYPE_OOC) for(var/k in SSclient.all_clients) var/client/C = SSclient.all_clients[k] C.to_chat(text_to_say,chat_type) -/proc/use_radio(var/atom/speaker, var/atom/source, var/text_to_say, var/raw_text_to_say, var/language_text_to_say, var/text_type, var/frequency, var/language = LANGUAGE_BASIC,var/talk_range=TALK_RANGE) +/proc/use_radio(atom/speaker, atom/source, text_to_say, raw_text_to_say, language_text_to_say, text_type, frequency, language = LANGUAGE_BASIC,talk_range=TALK_RANGE) var/list/radio_data = list( "speaker" = speaker, @@ -27,7 +27,7 @@ return TRUE -/proc/use_ears(var/atom/speaker, var/atom/source, var/text_to_say, var/raw_text_to_say, var/language_text_to_say, var/text_type, var/frequency, var/language = LANGUAGE_BASIC,var/talk_range=TALK_RANGE,var/talk_range_override) +/proc/use_ears(atom/speaker, atom/source, text_to_say, raw_text_to_say, language_text_to_say, text_type, frequency, language = LANGUAGE_BASIC,talk_range=TALK_RANGE,talk_range_override) var/turf/T1 = get_turf(source) @@ -57,7 +57,7 @@ return TRUE -/proc/talk(var/atom/speaker, var/atom/source, var/text_to_say, var/text_type=TEXT_TALK, var/frequency=-1, var/language = LANGUAGE_BASIC,var/talk_range=TALK_RANGE) //Range only applies to TALK and RADIO +/proc/talk(atom/speaker, atom/source, text_to_say, text_type=TEXT_TALK, frequency=-1, language = LANGUAGE_BASIC,talk_range=TALK_RANGE) //Range only applies to TALK and RADIO if(!text_to_say) return FALSE @@ -136,7 +136,7 @@ if(speaker.is_player_controlled()) log_chat("GHOST: [speaker.get_log_name()]: [text_to_say]") -/atom/proc/visible_message(var/third_person_text,var/first_person_text,var/blind_text,var/view_range=VIEW_RANGE) +/atom/proc/visible_message(third_person_text,first_person_text,blind_text,view_range=VIEW_RANGE) var/turf/T = get_turf(src) diff --git a/code/_core/client/chat/chat_old.dm b/code/_core/client/chat/chat_old.dm index bbb28761cc..79e9faa0f5 100644 --- a/code/_core/client/chat/chat_old.dm +++ b/code/_core/client/chat/chat_old.dm @@ -1,10 +1,10 @@ /* -/proc/broadcast(var/text_to_say as text, var/text_type = TEXT_OOC) +/proc/broadcast(text_to_say as text, text_type = TEXT_OOC) for(var/mob/object in world) object.to_chat(text_to_say) */ -/proc/broadcast_to_clients(var/text_to_say as text, var/text_type = TEXT_OOC) +/proc/broadcast_to_clients(text_to_say as text, text_type = TEXT_OOC) for(var/k in all_clients) var/client/C = all_clients[k] C.to_chat(text_to_say,text_type) @@ -188,7 +188,7 @@ proc/talk(var/atom/speaker, var/atom/source, var/text_to_say, var/text_type, var new/obj/effect/chat_text(source,text_to_say) -/atom/proc/visible_message(var/third_person_text,var/first_person_text,var/blind_text,var/view_range=VIEW_RANGE) +/atom/proc/visible_message(third_person_text,first_person_text,blind_text,view_range=VIEW_RANGE) var/turf/T = get_turf(src) diff --git a/code/_core/client/chat/formatting.dm b/code/_core/client/chat/formatting.dm index 28878a5429..0807807d0d 100644 --- a/code/_core/client/chat/formatting.dm +++ b/code/_core/client/chat/formatting.dm @@ -5,7 +5,7 @@ var/global/icon/chat_toolbox = new('icons/hud/chat_toolbox_old.dmi') var/global/icon/chat_admin = new('icons/hud/chat_admin.dmi') /* -/proc/format_language(var/speaker,var/text,var/language = LANGUAGE_BASIC) //Here lies a failed experiment +/proc/format_language(speaker,text,language = LANGUAGE_BASIC) //Here lies a failed experiment var/language/LA = SSlanguage.all_languages[language] var/language_text = LA.process_text(speaker,text) return tooltip(text,language_text) @@ -50,7 +50,7 @@ proc/format_speech(var/speaker,var/datum/source,var/text,var/talk_type,var/frequ return html -/proc/get_chat_icons(var/datum/speaker) +/proc/get_chat_icons(datum/speaker) . = "" @@ -67,7 +67,7 @@ proc/format_speech(var/speaker,var/datum/source,var/text,var/talk_type,var/frequ if(C.permissions & FLAG_PERMISSION_ADMIN || C.permissions & FLAG_PERMISSION_MODERATOR) . += ICON_TO_HTML(chat_admin.icon,"admin",20,13) -/proc/get_ooc_color(var/datum/speaker) //WIP +/proc/get_ooc_color(datum/speaker) //WIP if(istype(speaker,/client/)) var/client/C = speaker diff --git a/code/_core/client/interaction.dm b/code/_core/client/interaction.dm index 0dcee8ca15..67ef76b361 100644 --- a/code/_core/client/interaction.dm +++ b/code/_core/client/interaction.dm @@ -8,7 +8,7 @@ last_control = world.time; -/client/proc/get_click_flags(var/list/params,var/check_swap = FALSE) +/client/proc/get_click_flags(list/params,check_swap = FALSE) . = 0x0 @@ -26,7 +26,7 @@ if((settings.loaded_data["swap_mouse"] && check_swap) ? ("right" in params) : ("left" in params)) . |= CLICK_LEFT -/client/MouseWheel(var/atom/object,delta_x,delta_y,location,control,params) +/client/MouseWheel(atom/object,delta_x,delta_y,location,control,params) GLOBAL_CLICK_DELAY @@ -54,7 +54,7 @@ . = ..() -/client/Click(var/atom/object,location,control,params) +/client/Click(atom/object,location,control,params) var/list/new_params = params2list(params) new_params[PARAM_ICON_X] = text2num(new_params[PARAM_ICON_X]) @@ -88,7 +88,7 @@ . = ..() -/client/MouseDown(var/atom/object,location,control,params) +/client/MouseDown(atom/object,location,control,params) var/list/new_params = params2list(params) new_params[PARAM_ICON_X] = text2num(new_params[PARAM_ICON_X]) @@ -157,7 +157,7 @@ . = ..() -/client/MouseUp(var/atom/object,location,control,params) +/client/MouseUp(atom/object,location,control,params) var/list/new_params = params2list(params) new_params[PARAM_ICON_X] = text2num(new_params[PARAM_ICON_X]) @@ -193,7 +193,7 @@ . = ..() -/client/MouseDrop(var/atom/src_object,var/atom/over_object,src_location,over_location,src_control,over_control,params) +/client/MouseDrop(atom/src_object,atom/over_object,src_location,over_location,src_control,over_control,params) var/list/new_params = params2list(params) @@ -235,7 +235,7 @@ . = ..() -/client/MouseDrag(var/atom/src_object,var/atom/over_object,var/atom/src_location,var/atom/over_location,src_control,over_control,params) +/client/MouseDrag(atom/src_object,atom/over_object,atom/src_location,atom/over_location,src_control,over_control,params) if(!src_object || !over_object || src_object.qdeleting || over_object.qdeleting) return FALSE diff --git a/code/_core/client/karma.dm b/code/_core/client/karma.dm index 22b19f42d0..526448f3a8 100644 --- a/code/_core/client/karma.dm +++ b/code/_core/client/karma.dm @@ -1,3 +1,3 @@ -/client/proc/add_karma(var/amount) +/client/proc/add_karma(amount) karma += amount return TRUE \ No newline at end of file diff --git a/code/_core/client/life.dm b/code/_core/client/life.dm index 3b2fd5322d..ff5323078d 100644 --- a/code/_core/client/life.dm +++ b/code/_core/client/life.dm @@ -73,7 +73,7 @@ return TRUE -/client/proc/set_zoom(var/desired_zoom) +/client/proc/set_zoom(desired_zoom) is_zoomed = desired_zoom /* if(desired_zoom) diff --git a/code/_core/client/mob.dm b/code/_core/client/mob.dm index f6f52227ee..5621b6bfa8 100644 --- a/code/_core/client/mob.dm +++ b/code/_core/client/mob.dm @@ -20,7 +20,7 @@ . = M //No break here as ckey_last needs a priority. -/client/proc/make_ghost(var/turf/desired_loc) +/client/proc/make_ghost(turf/desired_loc) if(!desired_loc && mob) desired_loc = get_turf(mob) @@ -38,7 +38,7 @@ INITIALIZE(O) FINALIZE(O) -/client/proc/make_observer(var/turf/desired_loc) +/client/proc/make_observer(turf/desired_loc) if(mob) mob.ckey_last = null @@ -49,7 +49,7 @@ return TRUE -/client/proc/control_mob(var/mob/M,var/delete_last_mob = FALSE) +/client/proc/control_mob(mob/M,delete_last_mob = FALSE) if(!M) return FALSE @@ -84,7 +84,7 @@ update_statpanel = TRUE -/client/proc/clear_mob(var/mob/M,var/hard = FALSE) //This is called when the client no longer controls this mob. +/client/proc/clear_mob(mob/M,hard = FALSE) //This is called when the client no longer controls this mob. known_inventory?.Cut() known_buttons?.Cut() @@ -106,7 +106,7 @@ mob = null -/client/proc/load(var/savedata/client/mob/U,var/file_num) +/client/proc/load(savedata/client/mob/U,file_num) if(restricted) src.to_chat(span("danger",restricted)) diff --git a/code/_core/client/mousemove.dm b/code/_core/client/mousemove.dm index 050fbe5f44..6e3803b1af 100644 --- a/code/_core/client/mousemove.dm +++ b/code/_core/client/mousemove.dm @@ -1,4 +1,4 @@ -/client/MouseMove(var/atom/object,location,control,params) +/client/MouseMove(atom/object,location,control,params) if(mob && examine_mode) var/list/aug = params2list(params) diff --git a/code/_core/client/movement.dm b/code/_core/client/movement.dm index 2cdd05ce6a..c896f261fa 100644 --- a/code/_core/client/movement.dm +++ b/code/_core/client/movement.dm @@ -1,2 +1,2 @@ -/client/proc/post_move(var/atom/old_loc,var/atom/new_loc) +/client/proc/post_move(atom/old_loc,atom/new_loc) return TRUE diff --git a/code/_core/client/varedit.dm b/code/_core/client/varedit.dm index 1b3b8faf99..c48088f2c1 100644 --- a/code/_core/client/varedit.dm +++ b/code/_core/client/varedit.dm @@ -1,4 +1,4 @@ -/proc/get_value_text_for_debug(var/datum/D,var/key,var/value) +/proc/get_value_text_for_debug(datum/D,key,value) if(is_datum(value)) var/datum/VD = value @@ -44,7 +44,7 @@ var/global/static/list/variable_names_to_ignore = list( //"contents" = TRUE ) -/proc/check_garbage(var/datum/needle) +/proc/check_garbage(datum/needle) set background = 1 @@ -110,7 +110,7 @@ var/global/static/list/variable_names_to_ignore = list( usr.to_chat(span("notice","Checked [length(checked_refs)] refs.")) -/proc/check_garbage_list(var/list/haystack,var/datum/needle,var/list/checked_refs,var/recursion_limit) +/proc/check_garbage_list(list/haystack,datum/needle,list/checked_refs,recursion_limit) if(recursion_limit <= 0) return null @@ -160,7 +160,7 @@ var/global/static/list/variable_names_to_ignore = list( return null -/proc/check_garbage_datum(var/datum/haystack,var/datum/needle,var/list/checked_refs,var/recursion_limit) +/proc/check_garbage_datum(datum/haystack,datum/needle,list/checked_refs,recursion_limit) if(recursion_limit <= 0) return null diff --git a/code/_core/client/verbs/admin.dm b/code/_core/client/verbs/admin.dm index 06740a16d4..2e99107599 100644 --- a/code/_core/client/verbs/admin.dm +++ b/code/_core/client/verbs/admin.dm @@ -1,4 +1,4 @@ -/client/verb/adminhelp(var/text_to_say as message) +/client/verb/adminhelp(text_to_say as message) set name = "Adminhelp" set category = "Admin" @@ -26,7 +26,7 @@ var/ticket/T = new T.open(src,text_to_say,TRUE) -/client/verb/bwoink(var/ckey_to_bwoink as text, var/bwoink_message as message) +/client/verb/bwoink(ckey_to_bwoink as text, bwoink_message as message) set name = "Bwoink" set category = "Admin" @@ -117,7 +117,7 @@ return TRUE -/client/proc/ban_raw(var/target_ckey as text,var/ban_duration_minutes = -1 as num, var/ban_reason = "No reason given." as message) +/client/proc/ban_raw(target_ckey as text,ban_duration_minutes = -1 as num, ban_reason = "No reason given." as message) ban_duration_minutes = text2num(ban_duration_minutes) @@ -142,7 +142,7 @@ return TRUE -/client/verb/change_variable(var/datum/object as anything, var/desired_varable_key as text, var/desired_varable_value as anything) +/client/verb/change_variable(datum/object as anything, desired_varable_key as text, desired_varable_value as anything) set name = "Change Variable" set category = "Admin" set hidden = TRUE @@ -170,7 +170,7 @@ object.vars[desired_varable_key] = desired_varable_value var_edit(object) -/client/verb/var_edit(var/object as anything in view()) +/client/verb/var_edit(object as anything in view()) set name = "VarEdit" set category = "Admin" @@ -195,7 +195,7 @@ src << browse("[span("debug",returning_text)]","window=help") -/client/verb/add_new_wikibot_entry(var/wikibot_question as text,var/wikibot_answer as text) +/client/verb/add_new_wikibot_entry(wikibot_question as text,wikibot_answer as text) set category = "Admin" set name = "Add New Wikibot Entry" diff --git a/code/_core/client/verbs/chat.dm b/code/_core/client/verbs/chat.dm index 84e3838f24..8fb6dcc58a 100644 --- a/code/_core/client/verbs/chat.dm +++ b/code/_core/client/verbs/chat.dm @@ -1,4 +1,4 @@ -/client/verb/pm(var/k as null|anything in SSclient.all_clients, var/text_to_say as text) +/client/verb/pm(k as null|anything in SSclient.all_clients, text_to_say as text) set name = "PM" set category = "Communication" @@ -24,7 +24,7 @@ return TRUE -/client/verb/ooc(var/text_to_say as text) +/client/verb/ooc(text_to_say as text) set name = "OOC" set category = "Communication" diff --git a/code/_core/client/verbs/debug.dm b/code/_core/client/verbs/debug.dm index 3b9692ca5b..bbadabcbd1 100644 --- a/code/_core/client/verbs/debug.dm +++ b/code/_core/client/verbs/debug.dm @@ -519,7 +519,7 @@ var/global/static/list/destroy_everything_whitelist = list( return TRUE -/client/verb/set_attribute(var/mob/mob as mob) +/client/verb/set_attribute(mob/mob as mob) set name = "Set Attribute Level" set category = "Debug" @@ -552,7 +552,7 @@ var/global/static/list/destroy_everything_whitelist = list( log_admin("[src.get_debug_name()] set [L.get_debug_name()]'s [chosen_attribute] from [old_level] to [chosen_value].") -/client/verb/set_skill(var/mob/mob as mob) +/client/verb/set_skill(mob/mob as mob) set name = "Set Skill Level" set category = "Debug" diff --git a/code/_core/client/verbs/game.dm b/code/_core/client/verbs/game.dm index b8cf35a318..66225187ba 100644 --- a/code/_core/client/verbs/game.dm +++ b/code/_core/client/verbs/game.dm @@ -117,7 +117,7 @@ return TRUE -/client/verb/examine_atom(var/atom/A as anything) +/client/verb/examine_atom(atom/A as anything) set name = "Examine" set category = "Game" if(!A) return diff --git a/code/_core/client/verbs/gamemaster.dm b/code/_core/client/verbs/gamemaster.dm index 88883a77c4..d51b4dee9e 100644 --- a/code/_core/client/verbs/gamemaster.dm +++ b/code/_core/client/verbs/gamemaster.dm @@ -48,7 +48,7 @@ log_admin("[src.get_debug_name()] added [points_to_add] points to current gamemode.") -/client/verb/spawn_from_path(var/object as text) //TODO: Make this work. +/client/verb/spawn_from_path(object as text) //TODO: Make this work. set name = "Spawn Object" set desc = "Spawn an object." set category = "Fun" @@ -107,7 +107,7 @@ -/client/verb/smite_living(var/mob/living/target) +/client/verb/smite_living(mob/living/target) set name = "Smite Living" set category = "Fun" @@ -141,7 +141,7 @@ log_admin("[L1.get_debug_name()] was smited by [src.get_debug_name()].") -/client/verb/break_bones(var/mob/living/advanced/target) +/client/verb/break_bones(mob/living/advanced/target) set name = "Break Bones" set category = "Fun" @@ -177,7 +177,7 @@ log_admin("[A1.get_debug_name()] bones were broken by [src.get_debug_name()].") -/client/verb/give_credits(var/dosh_amount as num) +/client/verb/give_credits(dosh_amount as num) set name = "Give Credits" set category = "Cheat" diff --git a/code/_core/client/verbs/settings.dm b/code/_core/client/verbs/settings.dm index 8c7b3b41fb..0fcbe26711 100644 --- a/code/_core/client/verbs/settings.dm +++ b/code/_core/client/verbs/settings.dm @@ -30,7 +30,7 @@ winshow(src,"browser([id])",TRUE) src << output(html_to_send, "browser([id])") -/client/verb/set_fps(var/desired_fps as num) +/client/verb/set_fps(desired_fps as num) set hidden = TRUE var/old_fps = clamp(src.fps,FPS_SERVER,FPS_CLIENT) desired_fps = clamp(desired_fps,FPS_SERVER,FPS_CLIENT) @@ -40,7 +40,7 @@ src.fps = desired_fps settings.change_setting("fps_client",desired_fps) -/client/verb/set_view_range(var/desired_view_range as num) +/client/verb/set_view_range(desired_view_range as num) set hidden = TRUE var/old_view_range = view settings.change_setting("view_range",desired_view_range) @@ -65,27 +65,27 @@ sleep(1) winset(src,"main","is-maximized=true") -/client/verb/set_volume_master(var/desired_volume as num) +/client/verb/set_volume_master(desired_volume as num) set hidden = TRUE settings.change_setting("volume_master",desired_volume) stop_sound() -/client/verb/set_volume_fx(var/desired_volume as num) +/client/verb/set_volume_fx(desired_volume as num) set hidden = TRUE settings.change_setting("volume_fx",desired_volume) stop_sound() -/client/verb/set_volume_ambient(var/desired_volume as num) +/client/verb/set_volume_ambient(desired_volume as num) set hidden = TRUE settings.change_setting("volume_ambient",desired_volume) stop_sound() -/client/verb/set_volume_music(var/desired_volume as num) +/client/verb/set_volume_music(desired_volume as num) set hidden = TRUE settings.change_setting("volume_music",desired_volume) stop_sound() -/client/verb/set_volume_footsteps(var/desired_volume as num) +/client/verb/set_volume_footsteps(desired_volume as num) set hidden = TRUE settings.change_setting("volume_footsteps",desired_volume) stop_sound() diff --git a/code/_core/datum/_datum.dm b/code/_core/datum/_datum.dm index bbc536f8ad..66f64f6fb3 100644 --- a/code/_core/datum/_datum.dm +++ b/code/_core/datum/_datum.dm @@ -5,10 +5,10 @@ var/queue_delete_immune = FALSE var/list/hooks -/datum/proc/get_examine_list(var/mob/examiner) +/datum/proc/get_examine_list(mob/examiner) return list(div("examine_title","[src]"),div("examine_description","[src.type]")) -/datum/proc/get_examine_details_list(var/mob/examiner) +/datum/proc/get_examine_details_list(mob/examiner) return list() /datum/proc/delete() diff --git a/code/_core/datum/ability/_ability.dm b/code/_core/datum/ability/_ability.dm index b536bae392..560a36a0bf 100644 --- a/code/_core/datum/ability/_ability.dm +++ b/code/_core/datum/ability/_ability.dm @@ -12,7 +12,7 @@ var/category -/ability/proc/activate(var/mob/caller) +/ability/proc/activate(mob/caller) var/atom/target var/list/params var/location @@ -30,10 +30,10 @@ return FALSE return src.on_cast(caller,target,location,params) -/ability/proc/is_active(var/mob/caller) +/ability/proc/is_active(mob/caller) return FALSE -/ability/proc/on_cast_pre(var/mob/caller,var/atom/target,location,params) +/ability/proc/on_cast_pre(mob/caller,atom/target,location,params) if(world.time < cooldown_end) return FALSE @@ -59,7 +59,7 @@ return TRUE -/ability/proc/on_cast(var/mob/caller,var/atom/target,location,params) +/ability/proc/on_cast(mob/caller,atom/target,location,params) return TRUE diff --git a/code/_core/datum/ability/cqc.dm b/code/_core/datum/ability/cqc.dm index 4625670eb7..104fc30ffd 100644 --- a/code/_core/datum/ability/cqc.dm +++ b/code/_core/datum/ability/cqc.dm @@ -12,7 +12,7 @@ cost = 10 cooldown = 4 SECONDS -/ability/cqc/on_cast(var/mob/caller,var/atom/target,location,params) +/ability/cqc/on_cast(mob/caller,atom/target,location,params) if(is_advanced(caller)) var/mob/living/advanced/L = caller @@ -23,7 +23,7 @@ return TRUE -/ability/cqc/is_active(var/mob/caller) +/ability/cqc/is_active(mob/caller) if(is_advanced(caller)) var/mob/living/advanced/L = caller diff --git a/code/_core/datum/ability/dash.dm b/code/_core/datum/ability/dash.dm index f44480fc92..c550470622 100644 --- a/code/_core/datum/ability/dash.dm +++ b/code/_core/datum/ability/dash.dm @@ -13,7 +13,7 @@ category = "Dash" -/ability/dash/on_cast(var/mob/caller,var/atom/target,location,params) +/ability/dash/on_cast(mob/caller,atom/target,location,params) var/mob/living/L = caller L.dash_direction = L.move_dir ? L.move_dir : L.dir L.dash_amount = dash_strength @@ -30,7 +30,7 @@ cooldown = 5 SECONDS cost = 50 -/ability/dash/controlled/on_cast(var/mob/caller,var/atom/target,location,params) +/ability/dash/controlled/on_cast(mob/caller,atom/target,location,params) var/mob/living/L = caller L.dash_amount = dash_strength play_sound('sound/effects/dodge.ogg',get_turf(caller)) @@ -48,7 +48,7 @@ category = "Dash" -/ability/dash/targeted/on_cast(var/mob/caller,var/atom/target,location,params) +/ability/dash/targeted/on_cast(mob/caller,atom/target,location,params) var/mob/living/L = caller L.dash_target = target L.dash_amount = dash_strength @@ -66,7 +66,7 @@ category = "Dash" -/ability/dash/random/on_cast(var/mob/caller,var/atom/target,location,params) +/ability/dash/random/on_cast(mob/caller,atom/target,location,params) var/mob/living/L = caller L.dash_direction = pick(DIRECTIONS_ALL) L.dash_amount = dash_strength @@ -84,7 +84,7 @@ category = "Dash" -/ability/dash/fleeting/on_cast(var/mob/caller,var/atom/target,location,params) +/ability/dash/fleeting/on_cast(mob/caller,atom/target,location,params) var/mob/living/L = caller L.dash_direction = get_dir(target,caller) L.dash_amount = dash_strength diff --git a/code/_core/datum/ability/magic/_magic_projectile.dm b/code/_core/datum/ability/magic/_magic_projectile.dm index 67c1cdd51d..fd7807e52d 100644 --- a/code/_core/datum/ability/magic/_magic_projectile.dm +++ b/code/_core/datum/ability/magic/_magic_projectile.dm @@ -19,7 +19,7 @@ var/shoot_alert_to_use = ALERT_LEVEL_CAUTION -/ability/magic/projectile/on_cast(var/mob/caller,var/atom/target,location,params) +/ability/magic/projectile/on_cast(mob/caller,atom/target,location,params) var/icon_pos_x = params[PARAM_ICON_X] var/icon_pos_y = params[PARAM_ICON_Y] diff --git a/code/_core/datum/ability/magic/_magic_summon_item.dm b/code/_core/datum/ability/magic/_magic_summon_item.dm index 1492ccce58..3d2d0b46cc 100644 --- a/code/_core/datum/ability/magic/_magic_summon_item.dm +++ b/code/_core/datum/ability/magic/_magic_summon_item.dm @@ -2,7 +2,7 @@ var/obj/item/item_to_summon -/ability/magic/summon_item/on_cast(var/mob/caller,var/atom/target,location,params) +/ability/magic/summon_item/on_cast(mob/caller,atom/target,location,params) . = ..() diff --git a/code/_core/datum/ability/magic/radial_blind.dm b/code/_core/datum/ability/magic/radial_blind.dm index c0402d4369..a613bc390a 100644 --- a/code/_core/datum/ability/magic/radial_blind.dm +++ b/code/_core/datum/ability/magic/radial_blind.dm @@ -5,7 +5,7 @@ cost = 80 cooldown = 30 SECONDS -/ability/magic/radial_blind/on_cast(var/mob/caller,var/atom/target,location,params) +/ability/magic/radial_blind/on_cast(mob/caller,atom/target,location,params) var/turf/T = get_turf(caller) new/obj/effect/temp/phase(T) diff --git a/code/_core/datum/ability/magic/wrath.dm b/code/_core/datum/ability/magic/wrath.dm index 1634cfc64d..4b813a238b 100644 --- a/code/_core/datum/ability/magic/wrath.dm +++ b/code/_core/datum/ability/magic/wrath.dm @@ -7,7 +7,7 @@ -/ability/magic/wrath/on_cast(var/mob/caller,var/atom/target,location,params) +/ability/magic/wrath/on_cast(mob/caller,atom/target,location,params) . = ..() diff --git a/code/_core/datum/ability/quick_draw.dm b/code/_core/datum/ability/quick_draw.dm index e9fbbaeda1..56e8ab47f2 100644 --- a/code/_core/datum/ability/quick_draw.dm +++ b/code/_core/datum/ability/quick_draw.dm @@ -8,7 +8,7 @@ category = "Quick Draw" -/ability/quick_draw/on_cast_pre(var/mob/caller,var/atom/target,location,params) +/ability/quick_draw/on_cast_pre(mob/caller,atom/target,location,params) if(!is_advanced(caller)) return FALSE diff --git a/code/_core/datum/addiction/_addiction.dm b/code/_core/datum/addiction/_addiction.dm index 9ee445ba90..f7aec3f4ee 100644 --- a/code/_core/datum/addiction/_addiction.dm +++ b/code/_core/datum/addiction/_addiction.dm @@ -6,7 +6,7 @@ var/organic = TRUE var/robotic = FALSE -/addiction/proc/can_add(var/mob/living/advanced/A,var/obj/item/organ/internal/brain/B,var/addiction_value=0,var/withdrawal_value=0) +/addiction/proc/can_add(mob/living/advanced/A,obj/item/organ/internal/brain/B,addiction_value=0,withdrawal_value=0) if(!organic && B.health.organic) return FALSE if(!robotic && !B.health.organic) @@ -14,14 +14,14 @@ return TRUE -/addiction/proc/on_add(var/mob/living/advanced/A,var/obj/item/organ/internal/brain/B,var/addiction_value=0,var/withdrawal_value=0) +/addiction/proc/on_add(mob/living/advanced/A,obj/item/organ/internal/brain/B,addiction_value=0,withdrawal_value=0) return TRUE -/addiction/proc/on_add_initial(var/mob/living/advanced/A,var/obj/item/organ/internal/brain/B,var/addiction_value=0,var/withdrawal_value=0) +/addiction/proc/on_add_initial(mob/living/advanced/A,obj/item/organ/internal/brain/B,addiction_value=0,withdrawal_value=0) A.to_chat(span("danger","You've become addicted to [reagent_name].")) return TRUE -/addiction/proc/on_life(var/mob/living/advanced/A,var/obj/item/organ/internal/brain/B,var/addiction_value=0,var/withdrawal_value=0) +/addiction/proc/on_life(mob/living/advanced/A,obj/item/organ/internal/brain/B,addiction_value=0,withdrawal_value=0) if(B.addictions[src.type] <= 0) on_remove(A,B) @@ -34,6 +34,6 @@ return TRUE -/addiction/proc/on_remove(var/mob/living/advanced/A,var/obj/item/organ/internal/brain/B) +/addiction/proc/on_remove(mob/living/advanced/A,obj/item/organ/internal/brain/B) A.to_chat(span("notice","You are no longer addicted to [reagent_name].")) return TRUE \ No newline at end of file diff --git a/code/_core/datum/addiction/addiction_health.dm b/code/_core/datum/addiction/addiction_health.dm index 28ed89216f..e3d118ed3d 100644 --- a/code/_core/datum/addiction/addiction_health.dm +++ b/code/_core/datum/addiction/addiction_health.dm @@ -3,7 +3,7 @@ reagent_name = "Health Products" -/addiction/health/on_life(var/mob/living/advanced/A,var/obj/item/organ/internal/brain/B,var/addiction_value=0,var/withdrawal_value=0) +/addiction/health/on_life(mob/living/advanced/A,obj/item/organ/internal/brain/B,addiction_value=0,withdrawal_value=0) if(withdrawal_value >= 5 && prob(withdrawal_value)) diff --git a/code/_core/datum/addiction/addiction_nicotine.dm b/code/_core/datum/addiction/addiction_nicotine.dm index 0c50b51f02..fd1645aed6 100644 --- a/code/_core/datum/addiction/addiction_nicotine.dm +++ b/code/_core/datum/addiction/addiction_nicotine.dm @@ -3,7 +3,7 @@ reagent_name = "Nicotine" -/addiction/nicotine/on_life(var/mob/living/advanced/A,var/obj/item/organ/internal/brain/B,var/addiction_value=0,var/withdrawal_value=0) +/addiction/nicotine/on_life(mob/living/advanced/A,obj/item/organ/internal/brain/B,addiction_value=0,withdrawal_value=0) if(withdrawal_value >= 5 && prob(withdrawal_value)) diff --git a/code/_core/datum/addiction/addiction_painkillesr.dm b/code/_core/datum/addiction/addiction_painkillesr.dm index be2497df09..4388dc9505 100644 --- a/code/_core/datum/addiction/addiction_painkillesr.dm +++ b/code/_core/datum/addiction/addiction_painkillesr.dm @@ -3,7 +3,7 @@ reagent_name = "Painkillers" -/addiction/painkillers/on_life(var/mob/living/advanced/A,var/obj/item/organ/internal/brain/B,var/addiction_value=0,var/withdrawal_value=0) +/addiction/painkillers/on_life(mob/living/advanced/A,obj/item/organ/internal/brain/B,addiction_value=0,withdrawal_value=0) if(withdrawal_value >= 15 && prob(withdrawal_value)) diff --git a/code/_core/datum/ai/_ai.dm b/code/_core/datum/ai/_ai.dm index f3d28f7ea4..32b8f37160 100644 --- a/code/_core/datum/ai/_ai.dm +++ b/code/_core/datum/ai/_ai.dm @@ -163,7 +163,7 @@ var/queue_find_new_objectives = FALSE -/ai/proc/set_master_ai(var/ai/target_ai) +/ai/proc/set_master_ai(ai/target_ai) if(target_ai == master_ai) return FALSE @@ -243,7 +243,7 @@ . = ..() -/ai/New(var/desired_loc,var/mob/living/desired_owner) //Byond assumes the first variable is always the loc so desired_loc needs to be in there. This makes me cry. +/ai/New(desired_loc,mob/living/desired_owner) //Byond assumes the first variable is always the loc so desired_loc needs to be in there. This makes me cry. owner = desired_owner roaming_counter = roaming_distance*2 objective_ticks = rand(0,objective_delay) //So enemies are desynced and don't move as one. diff --git a/code/_core/datum/ai/advanced/_advanced.dm b/code/_core/datum/ai/advanced/_advanced.dm index d5dab79e5d..ce74eb8ef4 100644 --- a/code/_core/datum/ai/advanced/_advanced.dm +++ b/code/_core/datum/ai/advanced/_advanced.dm @@ -86,7 +86,7 @@ return ..() -/ai/advanced/proc/create_ammo_for_weapon(var/obj/item/weapon/ranged/bullet/W,var/desired_amount=5,var/drop_on_fail=TRUE) +/ai/advanced/proc/create_ammo_for_weapon(obj/item/weapon/ranged/bullet/W,desired_amount=5,drop_on_fail=TRUE) . = FALSE @@ -269,7 +269,7 @@ return FALSE -/ai/advanced/proc/handle_grenade(var/obj/item/grenade/G) +/ai/advanced/proc/handle_grenade(obj/item/grenade/G) if(!G || !is_inventory(G.loc)) return FALSE @@ -342,7 +342,7 @@ return FALSE //Well, shit's fucked. -/ai/advanced/proc/handle_bow(var/obj/item/weapon/ranged/bow/R) +/ai/advanced/proc/handle_bow(obj/item/weapon/ranged/bow/R) if(R.next_shoot_time > world.time) return TRUE @@ -375,7 +375,7 @@ return FALSE //All good. -/ai/advanced/proc/handle_gun(var/obj/item/weapon/ranged/R) //Handles all the reloading and other stuff. +/ai/advanced/proc/handle_gun(obj/item/weapon/ranged/R) //Handles all the reloading and other stuff. //Returning TRUE means don't attack on the same tick. It's good to return true if you want the shooter to wait before firing. @@ -617,7 +617,7 @@ . = ..() -/ai/advanced/do_attack(var/atom/target,var/left_click=FALSE) +/ai/advanced/do_attack(atom/target,left_click=FALSE) if(!target) return FALSE @@ -649,7 +649,7 @@ return TRUE -/ai/advanced/proc/is_grenade(var/atom/A) +/ai/advanced/proc/is_grenade(atom/A) return istype(A,/obj/item/grenade/) /ai/advanced/proc/find_grenade() @@ -668,7 +668,7 @@ return TRUE -/ai/advanced/proc/find_best_weapon(var/atom/possible_target) +/ai/advanced/proc/find_best_weapon(atom/possible_target) var/mob/living/advanced/A = owner @@ -689,7 +689,7 @@ return best_weapon -/ai/advanced/proc/equip_weapon(var/obj/item/weapon/W) +/ai/advanced/proc/equip_weapon(obj/item/weapon/W) var/mob/living/advanced/A = owner @@ -714,7 +714,7 @@ checked_weapons = FALSE checked_cover = FALSE -/ai/advanced/proc/unequip_weapon(var/obj/item/weapon/W) +/ai/advanced/proc/unequip_weapon(obj/item/weapon/W) var/mob/living/advanced/A = owner if(A.dead) return FALSE @@ -731,7 +731,7 @@ -/ai/advanced/on_alert_level_changed(var/old_alert_level,var/new_alert_level,var/atom/alert_source) +/ai/advanced/on_alert_level_changed(old_alert_level,new_alert_level,atom/alert_source) var/mob/living/advanced/A = owner @@ -863,7 +863,7 @@ return FALSE -/ai/advanced/proc/find_and_set_cover(var/atom/enemy) +/ai/advanced/proc/find_and_set_cover(atom/enemy) var/turf/T = get_turf(owner) @@ -971,7 +971,7 @@ return TRUE -/ai/advanced/set_objective(var/atom/A) +/ai/advanced/set_objective(atom/A) . = ..() @@ -979,7 +979,7 @@ remove_cover() -/ai/advanced/set_alert_level(var/desired_alert_level,var/atom/alert_source = null,var/atom/alert_epicenter = null,var/can_lower=FALSE) +/ai/advanced/set_alert_level(desired_alert_level,atom/alert_source = null,atom/alert_epicenter = null,can_lower=FALSE) var/mob/living/advanced/A = owner if(A.handcuffed) diff --git a/code/_core/datum/ai/advanced/abductor.dm b/code/_core/datum/ai/advanced/abductor.dm index 7989d8dbb9..927f42d90c 100644 --- a/code/_core/datum/ai/advanced/abductor.dm +++ b/code/_core/datum/ai/advanced/abductor.dm @@ -13,7 +13,7 @@ A.visible_message(span("warning","\The [A.name] quickly presses a series of buttons on their left arm...")) CALLBACK("\ref[src]_fuckoff",(rand(1,2)) SECONDS,src,src::fuckoff()) -/ai/advanced/abductor/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/ai/advanced/abductor/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) . = ..() diff --git a/code/_core/datum/ai/advanced/beef.dm b/code/_core/datum/ai/advanced/beef.dm index d3b2f0c47c..839f7e2ced 100644 --- a/code/_core/datum/ai/advanced/beef.dm +++ b/code/_core/datum/ai/advanced/beef.dm @@ -5,14 +5,14 @@ enable_loc_safety = FALSE attack_movement_obstructions = TRUE -/ai/advanced/beef/check_aggression(var/mob/living/target,var/aggression_override = src.aggression) +/ai/advanced/beef/check_aggression(mob/living/target,aggression_override = src.aggression) if(target == hunt_target) return target.horizontal || is_facing(target,owner) return ..() -/ai/advanced/beef/should_attack_mob(var/mob/living/L,var/aggression_check=TRUE) +/ai/advanced/beef/should_attack_mob(mob/living/L,aggression_check=TRUE) if(!L.dead) return ..() diff --git a/code/_core/datum/ai/advanced/clockwork_cult.dm b/code/_core/datum/ai/advanced/clockwork_cult.dm index b6293b1a33..52b5e52b69 100644 --- a/code/_core/datum/ai/advanced/clockwork_cult.dm +++ b/code/_core/datum/ai/advanced/clockwork_cult.dm @@ -1,7 +1,7 @@ /ai/advanced/clockwork_cult -/ai/advanced/clockwork_cult/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/ai/advanced/clockwork_cult/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) . = ..() @@ -14,7 +14,7 @@ ) owner.do_say(pick(responses),language_to_use = LANGUAGE_CLOCKWORK) -/ai/advanced/clockwork_cult/on_alert_level_changed(var/old_alert_level,var/new_alert_level,var/atom/alert_source) +/ai/advanced/clockwork_cult/on_alert_level_changed(old_alert_level,new_alert_level,atom/alert_source) . = ..() diff --git a/code/_core/datum/ai/advanced/cult.dm b/code/_core/datum/ai/advanced/cult.dm index e844d453e9..6c2a93b3d3 100644 --- a/code/_core/datum/ai/advanced/cult.dm +++ b/code/_core/datum/ai/advanced/cult.dm @@ -1,7 +1,7 @@ /ai/advanced/cult -/ai/advanced/cult/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/ai/advanced/cult/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) . = ..() @@ -14,7 +14,7 @@ ) owner.do_say(pick(responses),language_to_use = LANGUAGE_CULT) -/ai/advanced/cult/on_alert_level_changed(var/old_alert_level,var/new_alert_level,var/atom/alert_source) +/ai/advanced/cult/on_alert_level_changed(old_alert_level,new_alert_level,atom/alert_source) . = ..() diff --git a/code/_core/datum/ai/advanced/daddy.dm b/code/_core/datum/ai/advanced/daddy.dm index bb25f48aac..025adfdb96 100644 --- a/code/_core/datum/ai/advanced/daddy.dm +++ b/code/_core/datum/ai/advanced/daddy.dm @@ -2,7 +2,7 @@ var/next_chat_time = 0 guard = TRUE -/ai/advanced/daddy/handle_current_objectives(var/tick_rate) +/ai/advanced/daddy/handle_current_objectives(tick_rate) . = ..() diff --git a/code/_core/datum/ai/advanced/hostage.dm b/code/_core/datum/ai/advanced/hostage.dm index a89379ccfe..959997983b 100644 --- a/code/_core/datum/ai/advanced/hostage.dm +++ b/code/_core/datum/ai/advanced/hostage.dm @@ -9,7 +9,7 @@ aggression = 0 assistance = 0 -/ai/advanced/hostage/is_enemy(var/atom/A,var/safety_check=TRUE) +/ai/advanced/hostage/is_enemy(atom/A,safety_check=TRUE) if(!is_living(A)) return ..() var/mob/living/L = A diff --git a/code/_core/datum/ai/advanced/space_cop.dm b/code/_core/datum/ai/advanced/space_cop.dm index 0d0b046daa..b3a67afe18 100644 --- a/code/_core/datum/ai/advanced/space_cop.dm +++ b/code/_core/datum/ai/advanced/space_cop.dm @@ -28,7 +28,7 @@ var/global/list/space_cop_tag_shitlist = list() return ..() -/ai/advanced/space_cop/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/ai/advanced/space_cop/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) . = ..() @@ -37,7 +37,7 @@ var/global/list/space_cop_tag_shitlist = list() if(L.loyalty_tag && L.loyalty_tag != owner.loyalty_tag && !space_cop_tag_shitlist[L.loyalty_tag]) space_cop_tag_shitlist[L.loyalty_tag] = TRUE -/ai/advanced/space_cop/is_enemy(var/atom/A,var/safety_check=TRUE) +/ai/advanced/space_cop/is_enemy(atom/A,safety_check=TRUE) if(is_living(A)) var/mob/living/L = A if(L.loyalty_tag && space_cop_tag_shitlist[L.loyalty_tag]) diff --git a/code/_core/datum/ai/advanced/stand.dm b/code/_core/datum/ai/advanced/stand.dm index 0b78355626..36e048552c 100644 --- a/code/_core/datum/ai/advanced/stand.dm +++ b/code/_core/datum/ai/advanced/stand.dm @@ -16,18 +16,18 @@ /ai/advanced/stand/handle_movement_roaming() return FALSE -/ai/advanced/stand/set_objective(var/mob/living/L) +/ai/advanced/stand/set_objective(mob/living/L) . = ..() owner.set_dir(owner.dir,TRUE) -/ai/advanced/stand/is_enemy(var/atom/A,var/safety_check=TRUE) +/ai/advanced/stand/is_enemy(atom/A,safety_check=TRUE) if(is_living(A)) var/mob/living/L = A if(L.stand && L.stand.linked_stand == owner) return FALSE return ..() -/ai/advanced/stand/should_attack_mob(var/mob/living/L) +/ai/advanced/stand/should_attack_mob(mob/living/L) if(L.dead) return FALSE @@ -44,7 +44,7 @@ return TRUE -/ai/advanced/stand/is_enemy(var/atom/A,var/safety_check=TRUE) +/ai/advanced/stand/is_enemy(atom/A,safety_check=TRUE) if(A == owner) return FALSE if(!safety_check) @@ -57,7 +57,7 @@ return TRUE return FALSE -/ai/advanced/stand/get_attack_score(var/mob/living/L) +/ai/advanced/stand/get_attack_score(mob/living/L) . = ..() if(istype(L,/mob/living/advanced/stand/)) . += 10 diff --git a/code/_core/datum/ai/advanced/taxman.dm b/code/_core/datum/ai/advanced/taxman.dm index a92c5f219d..515be8c300 100644 --- a/code/_core/datum/ai/advanced/taxman.dm +++ b/code/_core/datum/ai/advanced/taxman.dm @@ -2,7 +2,7 @@ aggression = 1 assistance = 1 -/ai/advanced/taxman/is_enemy(var/atom/A,var/safety_check=TRUE,var/aggression_check=TRUE) +/ai/advanced/taxman/is_enemy(atom/A,safety_check=TRUE,aggression_check=TRUE) if(is_player(A)) var/mob/living/advanced/player/P = A diff --git a/code/_core/datum/ai/advanced/zombie.dm b/code/_core/datum/ai/advanced/zombie.dm index dde021912e..618476913c 100644 --- a/code/_core/datum/ai/advanced/zombie.dm +++ b/code/_core/datum/ai/advanced/zombie.dm @@ -55,7 +55,7 @@ else play_sound('sound/voice/zombie/clown/cluwnebreathe.ogg',T) -/ai/advanced/zombie/clown/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/ai/advanced/zombie/clown/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) . = ..() diff --git a/code/_core/datum/ai/ai_active.dm b/code/_core/datum/ai/ai_active.dm index 9bf85a75cd..d7346f5bab 100644 --- a/code/_core/datum/ai/ai_active.dm +++ b/code/_core/datum/ai/ai_active.dm @@ -1,4 +1,4 @@ -/ai/proc/add_to_active_list(var/z) +/ai/proc/add_to_active_list(z) if(z <= 0) log_error("FATAL ERROR: Tried adding [src.get_debug_name()] to active ai list of z [z]!") return FALSE @@ -9,13 +9,13 @@ active_ai_list["[z]"] += src return FALSE -/ai/proc/remove_from_active_list(var/z) +/ai/proc/remove_from_active_list(z) if(debug) log_debug("Removing from active list [z].") var/list/active_ai_list = boss ? SSbossai.active_ai_by_z : SSai.active_ai_by_z if(length(active_ai_list) && active_ai_list["[z]"]) active_ai_list["[z]"] -= src -/ai/proc/add_to_inactive_list(var/z) +/ai/proc/add_to_inactive_list(z) if(z <= 0) log_error("FATAL ERROR: Tried adding [src.get_debug_name()] to inactive ai list of z [z]!") return FALSE @@ -25,13 +25,13 @@ inactive_ai_list["[z]"] = list() inactive_ai_list["[z]"] += src -/ai/proc/remove_from_inactive_list(var/z) +/ai/proc/remove_from_inactive_list(z) if(debug) log_debug("Removing from inactive list [z].") var/list/inactive_ai_list = boss ? SSbossai.inactive_ai_by_z : SSai.inactive_ai_by_z if(length(inactive_ai_list) && inactive_ai_list["[z]"]) inactive_ai_list["[z]"] -= src -/ai/proc/set_active(var/desired_active=TRUE,var/deleting=FALSE) +/ai/proc/set_active(desired_active=TRUE,deleting=FALSE) if(desired_active) if(!owner) diff --git a/code/_core/datum/ai/ai_alert.dm b/code/_core/datum/ai/ai_alert.dm index 16ef641105..c9739845df 100644 --- a/code/_core/datum/ai/ai_alert.dm +++ b/code/_core/datum/ai/ai_alert.dm @@ -1,4 +1,4 @@ -/ai/proc/set_alert_level(var/desired_alert_level,var/atom/alert_source = null,var/atom/alert_epicenter = null,var/can_lower=FALSE) +/ai/proc/set_alert_level(desired_alert_level,atom/alert_source = null,atom/alert_epicenter = null,can_lower=FALSE) if(!use_alerts) return FALSE @@ -58,7 +58,7 @@ return FALSE -/ai/proc/on_alert_level_changed(var/old_alert_level,var/new_alert_level,var/atom/alert_source) +/ai/proc/on_alert_level_changed(old_alert_level,new_alert_level,atom/alert_source) alert_time = initial(alert_time) diff --git a/code/_core/datum/ai/ai_combat.dm b/code/_core/datum/ai/ai_combat.dm index 677c8d6454..a25a34ad0a 100644 --- a/code/_core/datum/ai/ai_combat.dm +++ b/code/_core/datum/ai/ai_combat.dm @@ -1,7 +1,7 @@ /ai/proc/attack_message() return TRUE -/ai/proc/do_attack(var/atom/target,var/left_click=FALSE) +/ai/proc/do_attack(atom/target,left_click=FALSE) if(!owner || !target) return FALSE @@ -54,7 +54,7 @@ spawn do_attack(objective_to_attack,prob(left_click_chance)) //The spawn here is important as attacking has its own sleeps and whatnot. return TRUE -/ai/proc/get_attack_score(var/atom/A) //Higher the score, the better. +/ai/proc/get_attack_score(atom/A) //Higher the score, the better. var/dist = get_dist(A.loc,owner.loc) @@ -83,7 +83,7 @@ return -dist + -500 //Not a living being. -/ai/proc/should_attack_mob(var/mob/living/L,var/aggression_check=TRUE) +/ai/proc/should_attack_mob(mob/living/L,aggression_check=TRUE) if(L == owner) return FALSE @@ -113,7 +113,7 @@ return TRUE -/ai/proc/is_enemy(var/atom/A,var/safety_check=TRUE,var/aggression_check=TRUE) +/ai/proc/is_enemy(atom/A,safety_check=TRUE,aggression_check=TRUE) if(A.qdeleting || !A.finalized) return FALSE @@ -158,7 +158,7 @@ return TRUE -/ai/proc/check_aggression(var/mob/living/target,var/aggression_override = src.aggression) +/ai/proc/check_aggression(mob/living/target,aggression_override = src.aggression) if(hunt_target) return FALSE @@ -180,7 +180,7 @@ return FALSE -/ai/proc/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/ai/proc/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) if(is_living(attacker) && !stealthy && attacker != objective_attack) if(should_attack_mob(attacker,FALSE)) diff --git a/code/_core/datum/ai/ai_dialogue.dm b/code/_core/datum/ai/ai_dialogue.dm index a785837b60..8fd285124e 100644 --- a/code/_core/datum/ai/ai_dialogue.dm +++ b/code/_core/datum/ai/ai_dialogue.dm @@ -1,4 +1,4 @@ -/ai/proc/do_dialogue(var/response_type,var/swear_chance=10) +/ai/proc/do_dialogue(response_type,swear_chance=10) if(!active || owner.dead) return FALSE var/returning_dialogue = SSdialogue.get_combat_dialogue(owner.combat_dialogue,response_type,swear_chance) diff --git a/code/_core/datum/ai/ai_life.dm b/code/_core/datum/ai/ai_life.dm index 4a5e50ddfc..be0e570c61 100644 --- a/code/_core/datum/ai/ai_life.dm +++ b/code/_core/datum/ai/ai_life.dm @@ -21,7 +21,7 @@ return TRUE -/ai/proc/on_life(var/tick_rate=1) +/ai/proc/on_life(tick_rate=1) //Safeties. if(objective_attack && !objective_attack.z) diff --git a/code/_core/datum/ai/ai_movement.dm b/code/_core/datum/ai/ai_movement.dm index 4a3335e20d..a0e291f724 100644 --- a/code/_core/datum/ai/ai_movement.dm +++ b/code/_core/datum/ai/ai_movement.dm @@ -1,5 +1,5 @@ -/ai/proc/post_move(var/mob/living/L,args) +/ai/proc/post_move(mob/living/L,args) var/atom/old_loc = args[1] @@ -16,7 +16,7 @@ return TRUE -/ai/proc/set_move_objective(var/atom/desired_objective,var/distance=0,var/astar = FALSE,var/follow = FALSE) //Set follow to true if it should constantly follow the person. +/ai/proc/set_move_objective(atom/desired_objective,distance=0,astar = FALSE,follow = FALSE) //Set follow to true if it should constantly follow the person. if(desired_objective) set_active(TRUE) objective_move = desired_objective @@ -317,7 +317,7 @@ return FALSE -/ai/proc/Bump(var/atom/obstacle,var/trigger_other_bump=TRUE) +/ai/proc/Bump(atom/obstacle,trigger_other_bump=TRUE) if(!obstacle) return TRUE diff --git a/code/_core/datum/ai/ai_objectives.dm b/code/_core/datum/ai/ai_objectives.dm index 03f9d6f83a..3b96830431 100644 --- a/code/_core/datum/ai/ai_objectives.dm +++ b/code/_core/datum/ai/ai_objectives.dm @@ -1,4 +1,4 @@ -/ai/proc/set_hunt_target(var/atom/A) +/ai/proc/set_hunt_target(atom/A) if(!owner || owner.qdeleting) return FALSE @@ -27,7 +27,7 @@ return TRUE -/ai/proc/set_objective(var/atom/A) +/ai/proc/set_objective(atom/A) if(!owner || owner.qdeleting) return FALSE @@ -95,7 +95,7 @@ return TRUE -/ai/proc/handle_current_objectives(var/tick_rate) +/ai/proc/handle_current_objectives(tick_rate) if(objective_attack.qdeleting || !objective_attack.health) //Object destroyed. set_objective(null) @@ -261,7 +261,7 @@ .[L] = detection_level CHECK_TICK(75,FPS_SERVER) -/ai/proc/try_investigate(var/atom/desired_target,var/cooldown=reaction_time,var/force_if_on_cooldown=FALSE) +/ai/proc/try_investigate(atom/desired_target,cooldown=reaction_time,force_if_on_cooldown=FALSE) if(!desired_target) return FALSE @@ -286,7 +286,7 @@ return TRUE -/ai/proc/investigate(var/atom/desired_target) +/ai/proc/investigate(atom/desired_target) if(!desired_target) return FALSE diff --git a/code/_core/datum/ai/ai_path.dm b/code/_core/datum/ai/ai_path.dm index dea52c7050..482d60323b 100644 --- a/code/_core/datum/ai/ai_path.dm +++ b/code/_core/datum/ai/ai_path.dm @@ -1,4 +1,4 @@ -/ai/proc/set_path_fallback(var/turf/destination,var/atom/pathing_object) +/ai/proc/set_path_fallback(turf/destination,atom/pathing_object) if(master_ai) return FALSE @@ -33,7 +33,7 @@ return set_path_node(found_path,pathing_object=pathing_object) -/ai/proc/set_path_node(var/list/obj/marker/map_node/desired_path,var/atom/pathing_object) +/ai/proc/set_path_node(list/obj/marker/map_node/desired_path,atom/pathing_object) if(!desired_path || !length(desired_path)) if(node_path_current) @@ -82,7 +82,7 @@ return TRUE -/ai/proc/set_path_astar(var/turf/destination,var/min_distance=0,var/atom/pathing_object) +/ai/proc/set_path_astar(turf/destination,min_distance=0,atom/pathing_object) if(!destination) if(astar_path_current) diff --git a/code/_core/datum/ai/ai_sight.dm b/code/_core/datum/ai/ai_sight.dm index e772bff985..4659bac79d 100644 --- a/code/_core/datum/ai/ai_sight.dm +++ b/code/_core/datum/ai/ai_sight.dm @@ -1,4 +1,4 @@ -/ai/proc/get_detection_level(var/atom/A,var/view_check=FALSE) //Returns a value 0 to 1. +/ai/proc/get_detection_level(atom/A,view_check=FALSE) //Returns a value 0 to 1. var/turf/T_owner = get_turf(owner) var/turf/T_atom = get_turf(A) diff --git a/code/_core/datum/ai/boss/ai_core.dm b/code/_core/datum/ai/boss/ai_core.dm index 63f4328baa..46428b718f 100644 --- a/code/_core/datum/ai/boss/ai_core.dm +++ b/code/_core/datum/ai/boss/ai_core.dm @@ -1,7 +1,7 @@ /ai/boss/ai_core can_attack = FALSE -/ai/boss/ai_core/set_objective(var/atom/A) +/ai/boss/ai_core/set_objective(atom/A) . = ..() if(.) owner.update_icon() \ No newline at end of file diff --git a/code/_core/datum/ai/boss/ash_drake.dm b/code/_core/datum/ai/boss/ash_drake.dm index f0feeb260e..e0e5d45727 100644 --- a/code/_core/datum/ai/boss/ash_drake.dm +++ b/code/_core/datum/ai/boss/ash_drake.dm @@ -15,7 +15,7 @@ night_vision = 0.25 -/ai/boss/ash_drake/New(var/desired_loc,var/mob/living/desired_owner) +/ai/boss/ash_drake/New(desired_loc,mob/living/desired_owner) owner_as_ash_drake = desired_owner return ..() @@ -23,7 +23,7 @@ owner_as_ash_drake = null return ..() -/ai/boss/ash_drake/set_active(var/desired_active=TRUE,var/deleting=FALSE) +/ai/boss/ash_drake/set_active(desired_active=TRUE,deleting=FALSE) . = ..() if(. && owner_as_ash_drake.boss_state == 1 && !active) owner_as_ash_drake.start_land() diff --git a/code/_core/datum/ai/boss/bubblegum.dm b/code/_core/datum/ai/boss/bubblegum.dm index ef6ee03aad..75df26ced9 100644 --- a/code/_core/datum/ai/boss/bubblegum.dm +++ b/code/_core/datum/ai/boss/bubblegum.dm @@ -5,7 +5,7 @@ night_vision = 0 -/ai/boss/bubblegum/New(var/desired_loc,var/mob/living/desired_owner) +/ai/boss/bubblegum/New(desired_loc,mob/living/desired_owner) owner_as_bubblegum = desired_owner return ..() diff --git a/code/_core/datum/ai/boss/can_man.dm b/code/_core/datum/ai/boss/can_man.dm index c467b11037..17fbae8956 100644 --- a/code/_core/datum/ai/boss/can_man.dm +++ b/code/_core/datum/ai/boss/can_man.dm @@ -16,7 +16,7 @@ var/strafe_count = 0 var/strafe_latch = -1 //-1 or 1 -/ai/boss/can_man/New(var/desired_loc,var/mob/living/desired_owner) +/ai/boss/can_man/New(desired_loc,mob/living/desired_owner) owner_as_can_man = desired_owner return ..() @@ -25,7 +25,7 @@ return ..() -/ai/boss/can_man/set_objective(var/atom/A) +/ai/boss/can_man/set_objective(atom/A) var/had_previous_objective = objective_attack . = ..() if(. && objective_attack && !had_previous_objective) diff --git a/code/_core/datum/ai/boss/gabber.dm b/code/_core/datum/ai/boss/gabber.dm index 8d172427e9..6b774905b1 100644 --- a/code/_core/datum/ai/boss/gabber.dm +++ b/code/_core/datum/ai/boss/gabber.dm @@ -24,7 +24,7 @@ ignore_hazard_turfs = FALSE -/ai/boss/gabber/New(var/desired_loc,var/mob/living/desired_owner) +/ai/boss/gabber/New(desired_loc,mob/living/desired_owner) owner_as_gabber = desired_owner return ..() @@ -32,7 +32,7 @@ owner_as_gabber = null return ..() -/ai/boss/gabber/set_objective(var/atom/A) +/ai/boss/gabber/set_objective(atom/A) var/had_previous_objective = objective_attack . = ..() if(. && objective_attack && !had_previous_objective) @@ -73,7 +73,7 @@ . = ..() -/ai/boss/gabber/proc/start_block(var/duration = 3 SECONDS) +/ai/boss/gabber/proc/start_block(duration = 3 SECONDS) owner_as_gabber.attack_flags |= CONTROL_MOD_BLOCK next_unblock = world.time + duration owner_as_gabber.handle_blocking() @@ -190,7 +190,7 @@ if(owner_as_gabber.has_status_effect(IMMORTAL)) return FALSE -/ai/boss/gabber/on_life(var/tick_rate=1) +/ai/boss/gabber/on_life(tick_rate=1) . = ..() diff --git a/code/_core/datum/ai/boss/goblin_king.dm b/code/_core/datum/ai/boss/goblin_king.dm index 09a9f20b5e..a1c8e62323 100644 --- a/code/_core/datum/ai/boss/goblin_king.dm +++ b/code/_core/datum/ai/boss/goblin_king.dm @@ -4,7 +4,7 @@ var/last_totem_spawn = 0 var/last_screech = 0 -/ai/boss/goblin_king/New(var/desired_loc,var/mob/living/desired_owner) +/ai/boss/goblin_king/New(desired_loc,mob/living/desired_owner) owner_as_goblin_king = desired_owner return ..() @@ -12,7 +12,7 @@ owner_as_goblin_king = null return ..() -/ai/boss/goblin_king/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/ai/boss/goblin_king/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) . = ..() if(owner && !owner.dead && objective_attack) var/choose_attack = rand(1,3) diff --git a/code/_core/datum/ai/boss/herald.dm b/code/_core/datum/ai/boss/herald.dm index dc33ef3da2..c0886c9b18 100644 --- a/code/_core/datum/ai/boss/herald.dm +++ b/code/_core/datum/ai/boss/herald.dm @@ -3,7 +3,7 @@ var/mob/living/simple/herald/owner_as_herald -/ai/boss/herald/New(var/desired_loc,var/mob/living/desired_owner) +/ai/boss/herald/New(desired_loc,mob/living/desired_owner) owner_as_herald = desired_owner return ..() @@ -18,7 +18,7 @@ if(owner_as_herald.health && owner_as_herald.health.health_current <= owner_as_herald.health.health_max*0.5) owner_as_herald.movement_flags = MOVEMENT_RUNNING -/ai/boss/herald/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/ai/boss/herald/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) . = ..() if(!owner_as_herald.dead && owner_as_herald.next_teleport <= world.time && get_dist(owner_as_herald,attacker) >= 4) diff --git a/code/_core/datum/ai/boss/hierophant.dm b/code/_core/datum/ai/boss/hierophant.dm index fd6f5c8811..bbf315fdfa 100644 --- a/code/_core/datum/ai/boss/hierophant.dm +++ b/code/_core/datum/ai/boss/hierophant.dm @@ -5,7 +5,7 @@ var/next_big_attack = 0 -/ai/boss/hierophant/New(var/desired_loc,var/mob/living/desired_owner) +/ai/boss/hierophant/New(desired_loc,mob/living/desired_owner) owner_as_hierophant = desired_owner return ..() @@ -13,7 +13,7 @@ owner_as_hierophant = null return ..() -/ai/boss/hierophant/handle_current_objectives(var/tick_rate) +/ai/boss/hierophant/handle_current_objectives(tick_rate) . = ..() diff --git a/code/_core/datum/ai/boss/leaper.dm b/code/_core/datum/ai/boss/leaper.dm index afa385e93b..5b2f17b398 100644 --- a/code/_core/datum/ai/boss/leaper.dm +++ b/code/_core/datum/ai/boss/leaper.dm @@ -12,7 +12,7 @@ var/last_teleport_health_mod = 0 -/ai/boss/leaper/New(var/desired_loc,var/mob/living/desired_owner) +/ai/boss/leaper/New(desired_loc,mob/living/desired_owner) owner_as_leaper = desired_owner return ..() diff --git a/code/_core/datum/ai/boss/slime_king.dm b/code/_core/datum/ai/boss/slime_king.dm index e83aa097fa..b7b177cf00 100644 --- a/code/_core/datum/ai/boss/slime_king.dm +++ b/code/_core/datum/ai/boss/slime_king.dm @@ -7,11 +7,11 @@ owner_as_slime_king = null . = ..() -/ai/boss/slime_king/New(var/desired_loc,var/mob/living/desired_owner) +/ai/boss/slime_king/New(desired_loc,mob/living/desired_owner) owner_as_slime_king = desired_owner . = ..() -/ai/boss/slime_king/set_objective(var/atom/A) +/ai/boss/slime_king/set_objective(atom/A) var/had_previous_objective = objective_attack diff --git a/code/_core/datum/ai/boss/xeno_queen.dm b/code/_core/datum/ai/boss/xeno_queen.dm index cd9904f959..5ac2416cb3 100644 --- a/code/_core/datum/ai/boss/xeno_queen.dm +++ b/code/_core/datum/ai/boss/xeno_queen.dm @@ -12,7 +12,7 @@ owner_as_queen = null return ..() -/ai/boss/xeno_queen/New(var/desired_loc,var/mob/living/desired_owner) +/ai/boss/xeno_queen/New(desired_loc,mob/living/desired_owner) owner_as_queen = desired_owner return ..() @@ -44,7 +44,7 @@ next_spit = world.time + 4 SECONDS return TRUE -/ai/boss/xeno_queen/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/ai/boss/xeno_queen/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) . = ..() if(!owner_as_queen.dead && owner_as_queen.health && owner_as_queen.health.health_current <= owner_as_queen.health.health_max*0.5 && owner_as_queen.next_screech <= world.time) diff --git a/code/_core/datum/ai/ghost/_ghost.dm b/code/_core/datum/ai/ghost/_ghost.dm index 0dc5c8e600..b0663f1ded 100644 --- a/code/_core/datum/ai/ghost/_ghost.dm +++ b/code/_core/datum/ai/ghost/_ghost.dm @@ -44,7 +44,7 @@ . = ..() owner_as_ghost = null -/ai/ghost/New(var/desired_loc,var/mob/living/desired_owner) +/ai/ghost/New(desired_loc,mob/living/desired_owner) . = ..() @@ -162,7 +162,7 @@ owner_as_ghost.icon_state = ghost_type owner_as_ghost.name = ghost_type -/ai/ghost/proc/create_emf(var/turf/loc,var/desired_level=3,var/desired_range=VIEW_RANGE) +/ai/ghost/proc/create_emf(turf/loc,desired_level=3,desired_range=VIEW_RANGE) if(!desired_level || !desired_range) return FALSE @@ -200,7 +200,7 @@ return null -/ai/ghost/on_life(var/tick_rate) +/ai/ghost/on_life(tick_rate) anger = clamp(anger,0,200) @@ -404,12 +404,12 @@ return TRUE -/ai/ghost/get_attack_score(var/mob/living/L) +/ai/ghost/get_attack_score(mob/living/L) if(!is_advanced(L)) return -100 return L.ckey && directed_anger[L.ckey] ? directed_anger[L.ckey] : 1 -/ai/ghost/proc/add_anger(var/ckey,var/amount) +/ai/ghost/proc/add_anger(ckey,amount) if(!amount) return TRUE if(ckey) @@ -420,7 +420,7 @@ anger += amount return TRUE -/ai/ghost/set_alert_level(var/desired_alert_level,var/atom/alert_source,var/atom/alert_epicenter,var/can_lower=FALSE) +/ai/ghost/set_alert_level(desired_alert_level,atom/alert_source,atom/alert_epicenter,can_lower=FALSE) //Trying to alert it just pisses it off. if(!stat_hates_noise) @@ -439,7 +439,7 @@ return TRUE -/ai/ghost/shitass/New(var/desired_loc,var/mob/living/desired_owner) +/ai/ghost/shitass/New(desired_loc,mob/living/desired_owner) . = ..() stat_vocal = FALSE @@ -450,7 +450,7 @@ owner_as_ghost.name = "shitass" -/ai/ghost/post_move(var/mob/living/L,args) +/ai/ghost/post_move(mob/living/L,args) . = ..() if(. && prob(10)) var/list/valid_objects = list() diff --git a/code/_core/datum/ai/mech/_mech.dm b/code/_core/datum/ai/mech/_mech.dm index 3beaaf3ef8..f907c5c192 100644 --- a/code/_core/datum/ai/mech/_mech.dm +++ b/code/_core/datum/ai/mech/_mech.dm @@ -2,7 +2,7 @@ distance_target_min = 3 distance_target_max = VIEW_RANGE -/ai/mech/do_attack(var/atom/target,var/left_click=FALSE) +/ai/mech/do_attack(atom/target,left_click=FALSE) if(!istype(owner,/mob/living/vehicle/)) return ..() diff --git a/code/_core/datum/ai/simple/bot.dm b/code/_core/datum/ai/simple/bot.dm index b7849d0731..3eaba2117f 100644 --- a/code/_core/datum/ai/simple/bot.dm +++ b/code/_core/datum/ai/simple/bot.dm @@ -14,7 +14,7 @@ aggression = 0 assistance = 0 -/ai/bot/medical/New(var/desired_loc,var/mob/living/desired_owner) +/ai/bot/medical/New(desired_loc,mob/living/desired_owner) . = ..() next_idle_voice = world.time + rand(100,300) owner_as_bot = owner @@ -24,7 +24,7 @@ healing_target = null return ..() -/ai/bot/medical/proc/is_valid_healing_target(var/mob/living/L) +/ai/bot/medical/proc/is_valid_healing_target(mob/living/L) if(!L || L.qdeleting) return FALSE if(L == owner) diff --git a/code/_core/datum/ai/simple/carp.dm b/code/_core/datum/ai/simple/carp.dm index edd85a6d3b..649ba4829e 100644 --- a/code/_core/datum/ai/simple/carp.dm +++ b/code/_core/datum/ai/simple/carp.dm @@ -6,7 +6,7 @@ carp_leader = null return ..() -/ai/carp/proc/is_valid_leader(var/mob/living/simple/spacecarp/leader/L) +/ai/carp/proc/is_valid_leader(mob/living/simple/spacecarp/leader/L) return !(L.dead) /ai/carp/proc/get_leader() diff --git a/code/_core/datum/ai/simple/clown/clown_subtypes.dm b/code/_core/datum/ai/simple/clown/clown_subtypes.dm index c5c6443713..4575959af2 100644 --- a/code/_core/datum/ai/simple/clown/clown_subtypes.dm +++ b/code/_core/datum/ai/simple/clown/clown_subtypes.dm @@ -1,11 +1,11 @@ /ai/clown/hulk jokes = list( "Are you a magician? Because whenever I look at you, everyone else disappears. BECAUSE EVERYONE ELSE IS DEAD.", - "I’m not a photographer, but I can picture me and you together. RIPPING YOU APART.", + "I�m not a photographer, but I can picture me and you together. RIPPING YOU APART.", "They say Disneyland is the happiest place on earth. Well apparently, no one has ever been standing next to you RIPPING OUT YOUR ENTRAILS.", "For some reason, I was feeling a little off today. But when you came along, you definitely turned me on IN THE MOOD FOR MURDER.", "I seem to have lost my phone number. Can I have yours SO I CAN NOTIFY YOUR NEXT OF KIN.", - "I’m lost. Can you give me directions to your heart SO I CAN RIP IT OUT.", + "I�m lost. Can you give me directions to your heart SO I CAN RIP IT OUT.", "Hi, how was heaven when you left it BECAUSE YOU'RE GOING BACK TO IT." ) @@ -26,7 +26,7 @@ "What did the dentist say to the computer? THIS WON'T HURT A BYTE.", "What did the dentist see at the North Pole? A MOLAR BEAR!", "What does a dentist do on a roller coaster? HE BRACES HIMSELF.", - "Why didn’t the dentist ask his secretary out? HE WAS ALREADY TAKING OUT A TOOTH.", + "Why didn�t the dentist ask his secretary out? HE WAS ALREADY TAKING OUT A TOOTH.", "What does the dentist of the year get? A LITTLE PLAQUE." ) @@ -51,7 +51,7 @@ /ai/clown/mutant/ jokes = list() -/ai/clown/mutant/New(var/desired_loc,var/mob/desired_owner) +/ai/clown/mutant/New(desired_loc,mob/desired_owner) . = ..() diff --git a/code/_core/datum/ai/simple/cult.dm b/code/_core/datum/ai/simple/cult.dm index 8d5568a44c..450f94bda1 100644 --- a/code/_core/datum/ai/simple/cult.dm +++ b/code/_core/datum/ai/simple/cult.dm @@ -20,7 +20,7 @@ return ..() -/ai/artificer/proc/remove_tracked_mob(var/mob/living/L,var/args) +/ai/artificer/proc/remove_tracked_mob(mob/living/L,args) tracked_mobs -= L diff --git a/code/_core/datum/ai/simple/cyborg_ai.dm b/code/_core/datum/ai/simple/cyborg_ai.dm index 5f8c046bce..0d300c342a 100644 --- a/code/_core/datum/ai/simple/cyborg_ai.dm +++ b/code/_core/datum/ai/simple/cyborg_ai.dm @@ -2,7 +2,7 @@ distance_target_max = VIEW_RANGE -/ai/cyborg/do_attack(var/atom/target,var/left_click=FALSE) +/ai/cyborg/do_attack(atom/target,left_click=FALSE) if(!owner || !target) return FALSE diff --git a/code/_core/datum/ai/simple/doorman.dm b/code/_core/datum/ai/simple/doorman.dm index e513575d9c..543f197b1f 100644 --- a/code/_core/datum/ai/simple/doorman.dm +++ b/code/_core/datum/ai/simple/doorman.dm @@ -18,7 +18,7 @@ return ..() -/ai/doorman/should_attack_mob(var/mob/living/L) +/ai/doorman/should_attack_mob(mob/living/L) if(L == owner) return FALSE @@ -47,7 +47,7 @@ return TRUE -/ai/doorman/find_new_objectives(var/tick_rate) +/ai/doorman/find_new_objectives(tick_rate) if(length(attackers)) var/mob/living/chosen_target = pick(attackers) @@ -57,7 +57,7 @@ return TRUE -/ai/doorman/handle_current_objectives(var/tick_rate) +/ai/doorman/handle_current_objectives(tick_rate) if(!(locate(/obj/structure/interactive/scanner/living) in objective_attack.loc.contents)) attackers -= objective_attack diff --git a/code/_core/datum/ai/simple/goblin.dm b/code/_core/datum/ai/simple/goblin.dm index 90da16d247..00eb448628 100644 --- a/code/_core/datum/ai/simple/goblin.dm +++ b/code/_core/datum/ai/simple/goblin.dm @@ -21,7 +21,7 @@ return FALSE -/ai/goblin/on_life(var/tick_rate) +/ai/goblin/on_life(tick_rate) if(!obsessed_item) item_ticks += tick_rate diff --git a/code/_core/datum/ai/simple/goliath.dm b/code/_core/datum/ai/simple/goliath.dm index e35a6caacc..0737810366 100644 --- a/code/_core/datum/ai/simple/goliath.dm +++ b/code/_core/datum/ai/simple/goliath.dm @@ -12,7 +12,7 @@ allow_far_roaming = FALSE roaming_distance = VIEW_RANGE -/ai/goliath/New(var/desired_loc,var/mob/living/desired_owner) +/ai/goliath/New(desired_loc,mob/living/desired_owner) owner_as_goliath = desired_owner return ..() diff --git a/code/_core/datum/ai/simple/gutlunch.dm b/code/_core/datum/ai/simple/gutlunch.dm index eb206bdb10..2f31bae782 100644 --- a/code/_core/datum/ai/simple/gutlunch.dm +++ b/code/_core/datum/ai/simple/gutlunch.dm @@ -9,7 +9,7 @@ roaming_distance = VIEW_RANGE*2 -/ai/gutlunch/should_attack_mob(var/mob/living/L,var/aggression_check=TRUE) +/ai/gutlunch/should_attack_mob(mob/living/L,aggression_check=TRUE) if(!L.dead) return ..() diff --git a/code/_core/datum/ai/simple/karma_borg.dm b/code/_core/datum/ai/simple/karma_borg.dm index 537e2e03f7..c062bff82e 100644 --- a/code/_core/datum/ai/simple/karma_borg.dm +++ b/code/_core/datum/ai/simple/karma_borg.dm @@ -27,14 +27,14 @@ else if(owner.movement_flags & MOVEMENT_RUNNING && prob(5)) owner.movement_flags &= ~MOVEMENT_RUNNING -/ai/simple/karma_borg/get_attack_score(var/mob/living/L) +/ai/simple/karma_borg/get_attack_score(mob/living/L) if(L == true_target) return 1000 return ..() -/ai/simple/karma_borg/should_attack_mob(var/mob/living/L) +/ai/simple/karma_borg/should_attack_mob(mob/living/L) if(L == true_target) return TRUE diff --git a/code/_core/datum/ai/simple/legion.dm b/code/_core/datum/ai/simple/legion.dm index e810909db0..aa9d19ce89 100644 --- a/code/_core/datum/ai/simple/legion.dm +++ b/code/_core/datum/ai/simple/legion.dm @@ -3,7 +3,7 @@ var/next_legion = 0 -/ai/legion/New(var/desired_loc,var/mob/living/desired_owner) +/ai/legion/New(desired_loc,mob/living/desired_owner) owner_as_legion = desired_owner return ..() diff --git a/code/_core/datum/ai/simple/legion_head.dm b/code/_core/datum/ai/simple/legion_head.dm index a49c5d48e5..e5d67227fd 100644 --- a/code/_core/datum/ai/simple/legion_head.dm +++ b/code/_core/datum/ai/simple/legion_head.dm @@ -5,11 +5,11 @@ var/mob/living/simple/legionare_head/owner_as_legion_head use_alerts = FALSE -/ai/legion_head/New(var/desired_loc,var/mob/living/desired_owner) +/ai/legion_head/New(desired_loc,mob/living/desired_owner) owner_as_legion_head = desired_owner return ..() -/ai/legion_head/should_attack_mob(var/mob/living/L) //Only thing different is that it targets handcuffed and dead targets. +/ai/legion_head/should_attack_mob(mob/living/L) //Only thing different is that it targets handcuffed and dead targets. if(L == owner) return FALSE diff --git a/code/_core/datum/ai/simple/silicon_spawner.dm b/code/_core/datum/ai/simple/silicon_spawner.dm index f3792b16b4..5766257bfa 100644 --- a/code/_core/datum/ai/simple/silicon_spawner.dm +++ b/code/_core/datum/ai/simple/silicon_spawner.dm @@ -16,7 +16,7 @@ can_attack = FALSE -/ai/silicon_spawner/set_objective(var/atom/A) +/ai/silicon_spawner/set_objective(atom/A) . = ..() diff --git a/code/_core/datum/ai/simple/slime.dm b/code/_core/datum/ai/simple/slime.dm index 36f309a435..c719ab93ac 100644 --- a/code/_core/datum/ai/simple/slime.dm +++ b/code/_core/datum/ai/simple/slime.dm @@ -8,7 +8,7 @@ target_distribution_x = list(12,16,20) target_distribution_y = list(4.8,12,16) -/ai/slime/proc/can_absorb_slime(var/mob/living/simple/slime/S) +/ai/slime/proc/can_absorb_slime(mob/living/simple/slime/S) var/mob/living/simple/slime/self = owner @@ -38,14 +38,14 @@ return TRUE -/ai/slime/is_enemy(var/atom/A,var/safety_check=TRUE,var/aggression_check=TRUE) +/ai/slime/is_enemy(atom/A,safety_check=TRUE,aggression_check=TRUE) if(istype(A,/mob/living/simple/slime)) return can_absorb_slime(A) . = ..() -/ai/slime/do_attack(var/atom/atom_to_attack) +/ai/slime/do_attack(atom/atom_to_attack) if(!istype(atom_to_attack,/mob/living/simple/slime/) || !can_absorb_slime(atom_to_attack)) //Double check to be safe. return ..() diff --git a/code/_core/datum/ai/simple/swarmer.dm b/code/_core/datum/ai/simple/swarmer.dm index 39fde8c74e..d209914a3f 100644 --- a/code/_core/datum/ai/simple/swarmer.dm +++ b/code/_core/datum/ai/simple/swarmer.dm @@ -18,7 +18,7 @@ var/maxconstructions = 5 var/currentconstructions = list() -/ai/swarmer/builder/New(var/desired_loc,var/mob/living/constructor) +/ai/swarmer/builder/New(desired_loc,mob/living/constructor) parent_drone = constructor return ..() @@ -89,7 +89,7 @@ //swarmer structures /ai/swarmer/console -/ai/swarmer/console/New(var/desired_loc,var/mob/living/desired_owner) +/ai/swarmer/console/New(desired_loc,mob/living/desired_owner) parent_console = desired_owner return ..() @@ -116,7 +116,7 @@ //communication -/ai/swarmer/on_alert_level_changed(var/old_alert_level,var/new_alert_level,var/atom/alert_source) +/ai/swarmer/on_alert_level_changed(old_alert_level,new_alert_level,atom/alert_source) . = ..() @@ -163,7 +163,7 @@ owner.do_say(pick(responses),language_to_use = owner.default_language) next_talk = world.time + 5 SECONDS -/ai/swarmer/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/ai/swarmer/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) . = ..() diff --git a/code/_core/datum/ai/simple/syndicate_cyborg.dm b/code/_core/datum/ai/simple/syndicate_cyborg.dm index 0840b53d50..1909c9fb81 100644 --- a/code/_core/datum/ai/simple/syndicate_cyborg.dm +++ b/code/_core/datum/ai/simple/syndicate_cyborg.dm @@ -2,7 +2,7 @@ var/mob/living/simple/silicon/syndieborg/owner_as_borg var/next_shoot = 0 -/ai/syndicate_cyborg/New(var/desired_loc,var/mob/living/desired_owner) +/ai/syndicate_cyborg/New(desired_loc,mob/living/desired_owner) owner_as_borg = desired_owner return ..() diff --git a/code/_core/datum/ai/simple/turret.dm b/code/_core/datum/ai/simple/turret.dm index 0eda6a8109..c59b140804 100644 --- a/code/_core/datum/ai/simple/turret.dm +++ b/code/_core/datum/ai/simple/turret.dm @@ -21,7 +21,7 @@ var/scan_key = 1 var/scan_mod = 1 -/ai/turret/New(var/desired_loc,var/mob/living/desired_owner) +/ai/turret/New(desired_loc,mob/living/desired_owner) . = ..() @@ -66,7 +66,7 @@ /ai/turret/deployable var/mob/living/simple/turret/deployable/owner_as_turret -/ai/turret/deployable/New(var/desired_loc,var/mob/living/desired_owner) +/ai/turret/deployable/New(desired_loc,mob/living/desired_owner) . = ..() owner_as_turret = owner @@ -83,7 +83,7 @@ . = ..() -/ai/turret/deployable/on_life(var/tick_rate=1) +/ai/turret/deployable/on_life(tick_rate=1) . = ..() var/obj/item/powercell/B = owner_as_turret.get_battery() B?.charge_current -= tick_rate diff --git a/code/_core/datum/armor/_armor.dm b/code/_core/datum/armor/_armor.dm index 8de762340b..d276e2da31 100644 --- a/code/_core/datum/armor/_armor.dm +++ b/code/_core/datum/armor/_armor.dm @@ -10,7 +10,7 @@ var/value = 0 //Mainly used for clothing. -/armor/New(var/desired_loc) +/armor/New(desired_loc) . = ..() value = 0 var/total_armor = 0 diff --git a/code/_core/datum/burgerdmm/_burgerdmm.dm b/code/_core/datum/burgerdmm/_burgerdmm.dm index 16510b78ac..1f1257e00b 100644 --- a/code/_core/datum/burgerdmm/_burgerdmm.dm +++ b/code/_core/datum/burgerdmm/_burgerdmm.dm @@ -25,7 +25,7 @@ var/global/regex/tiles_regex = regex(@'"[^"]+"') -/proc/parse_map(var/map_file,var/base_x=0,var/base_y=0,var/base_z = world.maxz+1,var/angle_offset=0,var/map_tag) +/proc/parse_map(map_file,base_x=0,base_y=0,base_z = world.maxz+1,angle_offset=0,map_tag) set background = 1 diff --git a/code/_core/datum/button_tracker/button_tracker.dm b/code/_core/datum/button_tracker/button_tracker.dm index dcf134b4fd..c6b7359bbc 100644 --- a/code/_core/datum/button_tracker/button_tracker.dm +++ b/code/_core/datum/button_tracker/button_tracker.dm @@ -7,19 +7,19 @@ owner = null . = ..() -/button_tracker/New(var/client/spawning_client) +/button_tracker/New(client/spawning_client) owner = spawning_client /button_tracker/proc/get_pressed() return pressed_list -/button_tracker/proc/set_pressed(var/button) +/button_tracker/proc/set_pressed(button) if(!pressed_list[button]) pressed_list[button] = TRUE on_pressed(button) return TRUE -/button_tracker/proc/set_released(var/button) +/button_tracker/proc/set_released(button) if(pressed_list[button]) pressed_list -= button on_released(button) diff --git a/code/_core/datum/choice/_choice.dm b/code/_core/datum/choice/_choice.dm index e321c5db11..c98a4e0659 100644 --- a/code/_core/datum/choice/_choice.dm +++ b/code/_core/datum/choice/_choice.dm @@ -8,7 +8,7 @@ var/mob/owner var/choice_made = null -/choice/New(var/mob/desired_owner) +/choice/New(mob/desired_owner) if(desired_owner) owner = desired_owner diff --git a/code/_core/datum/class/_class.dm b/code/_core/datum/class/_class.dm index 5603ea5ba1..2b76da47ea 100644 --- a/code/_core/datum/class/_class.dm +++ b/code/_core/datum/class/_class.dm @@ -46,7 +46,7 @@ var/total_skill_weight = 0 var/total_attribute_weight = 0 -/class/New(var/desired_loc) +/class/New(desired_loc) . = ..() total_skill_weight = 0 total_attribute_weight = 0 diff --git a/code/_core/datum/colors/_icon_blend.dm b/code/_core/datum/colors/_icon_blend.dm index dfde8ae60c..90896f0242 100644 --- a/code/_core/datum/colors/_icon_blend.dm +++ b/code/_core/datum/colors/_icon_blend.dm @@ -14,7 +14,7 @@ var/can_save var/layer -/icon_blend/New(var/desired_id, var/desired_icon,var/desired_icon_state,var/desired_color,var/desired_blend, var/desired_type, var/desired_should_save, var/desired_layer) +/icon_blend/New(desired_id, desired_icon,desired_icon_state,desired_color,desired_blend, desired_type, desired_should_save, desired_layer) if(desired_icon) icon = desired_icon diff --git a/code/_core/datum/command/_command.dm b/code/_core/datum/command/_command.dm index 0b64573404..af70508d4c 100644 --- a/code/_core/datum/command/_command.dm +++ b/code/_core/datum/command/_command.dm @@ -4,7 +4,7 @@ id = null var/permission = 0 -/command/proc/run_command(var/mob/user,var/list/params) +/command/proc/run_command(mob/user,list/params) if(!user.client) return FALSE diff --git a/code/_core/datum/command/moderation.dm b/code/_core/datum/command/moderation.dm index 48e1bada61..3ba532ab29 100644 --- a/code/_core/datum/command/moderation.dm +++ b/code/_core/datum/command/moderation.dm @@ -4,7 +4,7 @@ id = "kick" permission = FLAG_PERMISSION_MODERATOR -/command/kick/run_command(var/mob/user,var/list/params) +/command/kick/run_command(mob/user,list/params) . = ..() diff --git a/code/_core/datum/cooking_recipe/_cooking_recipe.dm b/code/_core/datum/cooking_recipe/_cooking_recipe.dm index be3fd182fa..0ef91ed640 100644 --- a/code/_core/datum/cooking_recipe/_cooking_recipe.dm +++ b/code/_core/datum/cooking_recipe/_cooking_recipe.dm @@ -17,10 +17,10 @@ item_requirements = make_associative_count(item_requirements) special_item_requirements = make_associative_count(special_item_requirements) -/cooking_recipe/proc/check_item_requirement(var/obj/item/I,var/triggering_id) //Triggering ID being the crafting ID. +/cooking_recipe/proc/check_item_requirement(obj/item/I,triggering_id) //Triggering ID being the crafting ID. return TRUE -/cooking_recipe/proc/check(var/list/items_to_check,var/reagent_container/container_to_check) +/cooking_recipe/proc/check(list/items_to_check,reagent_container/container_to_check) if(length(reagent_requirements) && (!container_to_check || !length(container_to_check.stored_reagents))) return FALSE diff --git a/code/_core/datum/cooking_recipe/cooking_recipe_plate.dm b/code/_core/datum/cooking_recipe/cooking_recipe_plate.dm index 7ffbd06bc4..9204832f55 100644 --- a/code/_core/datum/cooking_recipe/cooking_recipe_plate.dm +++ b/code/_core/datum/cooking_recipe/cooking_recipe_plate.dm @@ -12,7 +12,7 @@ result = /obj/item/container/edible/stuffed_legion -/cooking_recipe/plate/stuffed_legion/check_item_requirement(var/obj/item/I,var/triggering_id) +/cooking_recipe/plate/stuffed_legion/check_item_requirement(obj/item/I,triggering_id) . = ..() switch(triggering_id) if(/obj/item/container/edible/dynamic/meat) diff --git a/code/_core/datum/cqc/_cqc.dm b/code/_core/datum/cqc/_cqc.dm index bd51622140..de0a83d390 100644 --- a/code/_core/datum/cqc/_cqc.dm +++ b/code/_core/datum/cqc/_cqc.dm @@ -6,14 +6,14 @@ var/priority = 0 //Lower values get more priority. Automatically assigned based on combo length var/category -/cqc/New(var/desired_loc) +/cqc/New(desired_loc) if(!priority) priority = 1000 - length(combo) . = ..() -/cqc/proc/should_apply(var/mob/living/advanced/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/atom/blamed,var/damagetype/DT) +/cqc/proc/should_apply(mob/living/advanced/attacker,atom/victim,atom/weapon,atom/hit_object,atom/blamed,damagetype/DT) var/combo_length = length(combo) diff --git a/code/_core/datum/damagetype/_damagetype.dm b/code/_core/datum/damagetype/_damagetype.dm index a769ec15c6..aee406a8a1 100644 --- a/code/_core/datum/damagetype/_damagetype.dm +++ b/code/_core/datum/damagetype/_damagetype.dm @@ -155,7 +155,7 @@ var/allow_damage_numbers = TRUE -/damagetype/proc/get_examine_text(var/mob/caller) +/damagetype/proc/get_examine_text(mob/caller) /* . = "" . += "" @@ -167,10 +167,10 @@ return list() -/damagetype/proc/get_crit_chance(var/mob/living/L) +/damagetype/proc/get_crit_chance(mob/living/L) return crit_chance + (crit_chance_max - crit_chance)*(L.get_skill_power(SKILL_PRECISION,0,1,2)*0.75 + (L.get_attribute_power(ATTRIBUTE_LUCK,0,1) - 0.5)*0.25) -/damagetype/proc/get_combat_rating(var/mob/living/L) +/damagetype/proc/get_combat_rating(mob/living/L) var/combat_rating = 0 @@ -188,7 +188,7 @@ /damagetype/proc/get_attack_type() return ATTACK_TYPE_MELEE -/damagetype/proc/perform_miss(var/atom/attacker,var/atom/victim,var/atom/weapon) +/damagetype/proc/perform_miss(atom/attacker,atom/victim,atom/weapon) if(!victim) victim = get_step(attacker,attacker.dir) . = max(1,do_attack_animation(attacker,victim,weapon)) @@ -200,13 +200,13 @@ if(V.loyalty_tag != A.loyalty_tag && V.is_player_controlled()) V.add_skill_xp(SKILL_EVASION,1) -/damagetype/proc/do_critical_hit(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/list/damage_to_deal) +/damagetype/proc/do_critical_hit(atom/attacker,atom/victim,atom/weapon,atom/hit_object,list/damage_to_deal) return crit_multiplier -/damagetype/proc/do_sneak_hit(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/list/damage_to_deal) +/damagetype/proc/do_sneak_hit(atom/attacker,atom/victim,atom/weapon,atom/hit_object,list/damage_to_deal) return sneak_attack_multiplier -/damagetype/proc/get_attack_damage(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/damage_multiplier=1) +/damagetype/proc/get_attack_damage(atom/attacker,atom/victim,atom/weapon,atom/hit_object,damage_multiplier=1) if(attacker == victim) if(!allow_self_damage) @@ -257,7 +257,7 @@ return new_attack_damage -/damagetype/proc/get_sneak_hit_condition(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/proc/get_sneak_hit_condition(atom/attacker,atom/victim,atom/weapon,atom/hit_object) if(is_living(victim)) var/mob/living/L = victim @@ -266,7 +266,7 @@ return FALSE -/damagetype/proc/get_critical_hit_condition(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/proc/get_critical_hit_condition(atom/attacker,atom/victim,atom/weapon,atom/hit_object) if(!attacker.is_player_controlled() || victim.is_player_controlled()) return FALSE @@ -285,16 +285,16 @@ return luck(list(attacker,weapon),crit_chance) -/damagetype/proc/perform_clash(var/atom/attacker,var/atom/victim,var/atom/weapon_attacker,var/atom/weapon_victim) +/damagetype/proc/perform_clash(atom/attacker,atom/victim,atom/weapon_attacker,atom/weapon_victim) . = max(1,do_attack_animation(attacker,victim,weapon_attacker)) CALLBACK("\ref[attacker]_\ref[victim]_[world.time]_clash_sound",.*0.125,src,src::do_clash_effect(),attacker,victim,weapon_attacker) return . -/damagetype/proc/do_clash_effect(var/atom/attacker,var/atom/victim,var/atom/weapon) +/damagetype/proc/do_clash_effect(atom/attacker,atom/victim,atom/weapon) play_sound('sound/effects/deflect.ogg',get_turf(attacker),range_max=VIEW_RANGE*0.75) return FALSE -/damagetype/proc/windup(var/atom/attacker,var/list/atom/victims = list(),var/atom/weapon,var/list/atom/hit_objects = list(),var/atom/blamed,var/damage_multiplier=1) +/damagetype/proc/windup(atom/attacker,list/atom/victims = list(),atom/weapon,list/atom/hit_objects = list(),atom/blamed,damage_multiplier=1) if(!length(victims)) return FALSE @@ -322,7 +322,7 @@ CALLBACK("swing_\ref[weapon]",local_power_attack_delay,src,src::swing(),attacker,victims,weapon,hit_objects,blamed,damage_multiplier) -/damagetype/proc/swing(var/atom/attacker,var/list/atom/victims = list(),var/atom/weapon,var/list/atom/hit_objects = list(),var/atom/blamed,var/damage_multiplier=1) +/damagetype/proc/swing(atom/attacker,list/atom/victims = list(),atom/weapon,list/atom/hit_objects = list(),atom/blamed,damage_multiplier=1) . = do_swing(attacker,victims,weapon,hit_objects,blamed,damage_multiplier) @@ -332,7 +332,7 @@ else attacker.attack_next = world.time + . -/damagetype/proc/do_swing(var/atom/attacker,var/list/atom/victims = list(),var/atom/weapon,var/list/atom/hit_objects = list(),var/atom/blamed,var/damage_multiplier=1) +/damagetype/proc/do_swing(atom/attacker,list/atom/victims = list(),atom/weapon,list/atom/hit_objects = list(),atom/blamed,damage_multiplier=1) if(!length(victims)) return perform_miss(attacker,null,weapon) @@ -407,7 +407,7 @@ return . -/damagetype/proc/process_damage_group(var/atom/attacker,var/list/atom/victims,var/atom/weapon,var/atom/blamed,var/damage_multiplier=1) +/damagetype/proc/process_damage_group(atom/attacker,list/atom/victims,atom/weapon,atom/blamed,damage_multiplier=1) /* Disabled for now. if(allow_heavy_attack && is_advanced(attacker)) @@ -437,7 +437,7 @@ return TRUE -/damagetype/proc/process_damage(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/atom/blamed,var/damage_multiplier=1) +/damagetype/proc/process_damage(atom/attacker,atom/victim,atom/weapon,atom/hit_object,atom/blamed,damage_multiplier=1) if(!is_valid(attacker)) return FALSE @@ -807,14 +807,14 @@ return list(total_damage_dealt,damage_blocked_with_armor,damage_blocked_with_shield,deflection_rating) -/damagetype/proc/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/proc/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(alert_on_impact != ALERT_LEVEL_NONE && alert_range > 0) create_alert(VIEW_RANGE,victim_turf,attacker,alert_level = alert_on_impact) return TRUE -/damagetype/proc/do_attack_visuals(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/total_damage_dealt=0) +/damagetype/proc/do_attack_visuals(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,total_damage_dealt=0) if(hit_effect) new hit_effect(victim_turf) @@ -836,7 +836,7 @@ M.client.recoil_pixel_x -= offsets[1]*multiplier*0.5 M.client.recoil_pixel_y -= offsets[2]*multiplier*0.5 -/damagetype/proc/do_attack_sound(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/total_damage_dealt=0,var/flesh=FALSE) +/damagetype/proc/do_attack_sound(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,total_damage_dealt=0,flesh=FALSE) var/desired_volume = 25 + min(75,total_damage_dealt/2) @@ -848,21 +848,21 @@ return TRUE -/damagetype/proc/do_swing_sound(var/atom/attacker,var/atom/victim,var/atom/weapon) +/damagetype/proc/do_swing_sound(atom/attacker,atom/victim,atom/weapon) if(length(swing_sounds)) var/turf/T = get_turf(victim) play_sound(pick(swing_sounds),T,range_max=VIEW_RANGE*0.5) return TRUE return FALSE -/damagetype/proc/do_miss_sound(var/atom/attacker,var/atom/victim,var/atom/weapon) +/damagetype/proc/do_miss_sound(atom/attacker,atom/victim,atom/weapon) if(length(miss_sounds)) var/turf/T = get_turf(victim) play_sound(pick(miss_sounds),T,range_max=VIEW_RANGE*0.75) return TRUE return FALSE -/damagetype/proc/do_attack_animation(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/proc/do_attack_animation(atom/attacker,atom/victim,atom/weapon,atom/hit_object) if(!attacker) return 0 @@ -888,17 +888,17 @@ if(draw_weapon && is_item(weapon)) new /obj/effect/temp/impact/weapon_clone(get_turf(attacker),. * 0.5,victim,attacker,weapon) -/damagetype/proc/get_block_power_penetration(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/proc/get_block_power_penetration(atom/attacker,atom/victim,atom/weapon,atom/hit_object) return 0 -/damagetype/proc/get_weapon_name(var/atom/backup) +/damagetype/proc/get_weapon_name(atom/backup) if(weapon_name) return weapon_name if(backup) return backup.name return "weapon" -/damagetype/proc/get_attack_message_3rd(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/proc/get_attack_message_3rd(atom/attacker,atom/victim,atom/weapon,atom/hit_object) var/victim_text var/attacker_text @@ -915,7 +915,7 @@ return "\The [attacker.name] [pick(attack_verbs)]s [victim_text][attacker_text]" -/damagetype/proc/get_attack_message_1st(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/proc/get_attack_message_1st(atom/attacker,atom/victim,atom/weapon,atom/hit_object) var/victim_text var/attacker_text @@ -932,28 +932,28 @@ return "You [pick(attack_verbs)] [victim_text][attacker_text]" -/damagetype/proc/get_attack_message_sound(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/proc/get_attack_message_sound(atom/attacker,atom/victim,atom/weapon,atom/hit_object) return "You hear a strong [pick(attack_verbs)]." -/damagetype/proc/get_miss_message_3rd(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/proc/get_miss_message_3rd(atom/attacker,atom/victim,atom/weapon,atom/hit_object) return "[copytext(get_attack_message_3rd(attacker,victim,weapon,hit_object),1,-1)], but the attack was #REASON!" -/damagetype/proc/get_miss_message_1st(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/proc/get_miss_message_1st(atom/attacker,atom/victim,atom/weapon,atom/hit_object) return "[copytext(get_attack_message_1st(attacker,victim,weapon,hit_object),1,-1)], but the attack was #REASON!" -/damagetype/proc/get_miss_message_sound(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/proc/get_miss_message_sound(atom/attacker,atom/victim,atom/weapon,atom/hit_object) return "You hear a swoosh..." -/damagetype/proc/get_glance_message_sound(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/proc/get_glance_message_sound(atom/attacker,atom/victim,atom/weapon,atom/hit_object) return "You hear a weak [pick(attack_verbs)]." -/damagetype/proc/get_glance_message_3rd(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/proc/get_glance_message_3rd(atom/attacker,atom/victim,atom/weapon,atom/hit_object) return "[copytext(get_attack_message_3rd(attacker,victim,weapon,hit_object),1,-1)]... but it has no effect!" -/damagetype/proc/get_glance_message_1st(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/proc/get_glance_message_1st(atom/attacker,atom/victim,atom/weapon,atom/hit_object) return "[copytext(get_attack_message_1st(attacker,victim,weapon,hit_object),1,-1)]... but it has no effect!" -/damagetype/proc/display_glance_message(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/proc/display_glance_message(atom/attacker,atom/victim,atom/weapon,atom/hit_object) if(enable_logs < 3) return FALSE @@ -968,7 +968,7 @@ ) return TRUE -/damagetype/proc/display_hit_message(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/proc/display_hit_message(atom/attacker,atom/victim,atom/weapon,atom/hit_object) if(enable_logs < 3) return FALSE @@ -983,7 +983,7 @@ ) return TRUE -/damagetype/proc/display_miss_message(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/miss_text = "misses!") +/damagetype/proc/display_miss_message(atom/attacker,atom/victim,atom/weapon,atom/hit_object,miss_text = "misses!") if(enable_logs < 3) return FALSE @@ -999,7 +999,7 @@ return TRUE -/damagetype/proc/get_attack_delay(var/atom/attacker) +/damagetype/proc/get_attack_delay(atom/attacker) if(is_living(attacker)) var/mob/living/L = attacker diff --git a/code/_core/datum/damagetype/balance_helpers.dm b/code/_core/datum/damagetype/balance_helpers.dm index 9fd6a58f14..d2f14604a1 100644 --- a/code/_core/datum/damagetype/balance_helpers.dm +++ b/code/_core/datum/damagetype/balance_helpers.dm @@ -1,4 +1,4 @@ -/damagetype/proc/get_damage_per_hit(var/armor_to_use=0,var/self_armor_to_use=0) +/damagetype/proc/get_damage_per_hit(armor_to_use=0,self_armor_to_use=0) if(IS_INF(armor_to_use)) return 0 diff --git a/code/_core/datum/damagetype/error.dm b/code/_core/datum/damagetype/error.dm index 0aae0e5430..e361b6ec58 100644 --- a/code/_core/datum/damagetype/error.dm +++ b/code/_core/datum/damagetype/error.dm @@ -1,5 +1,5 @@ -/damagetype/error/swing(var/atom/attacker,var/list/atom/victims = list(),var/atom/weapon,var/list/atom/hit_objects = list(),var/atom/blamed,var/damage_multiplier=1) +/damagetype/error/swing(atom/attacker,list/atom/victims = list(),atom/weapon,list/atom/hit_objects = list(),atom/blamed,damage_multiplier=1) CRASH("An object that shouldn't do damage ([weapon.get_debug_name()]) tried swinging!") -/damagetype/error/process_damage(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/atom/blamed,var/damage_multiplier=1) +/damagetype/error/process_damage(atom/attacker,atom/victim,atom/weapon,atom/hit_object,atom/blamed,damage_multiplier=1) CRASH("An object that shouldn't do damage ([weapon.get_debug_name()]) tried processing damage!") \ No newline at end of file diff --git a/code/_core/datum/damagetype/explosion.dm b/code/_core/datum/damagetype/explosion.dm index aa9f4fbce3..44cb41b4cd 100644 --- a/code/_core/datum/damagetype/explosion.dm +++ b/code/_core/datum/damagetype/explosion.dm @@ -23,7 +23,7 @@ enable_logs = 1 -/damagetype/explosion/process_damage(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/atom/blamed,var/damage_multiplier=1) +/damagetype/explosion/process_damage(atom/attacker,atom/victim,atom/weapon,atom/hit_object,atom/blamed,damage_multiplier=1) . = ..() diff --git a/code/_core/datum/damagetype/fire.dm b/code/_core/datum/damagetype/fire.dm index 52b32d8393..8b013f1e92 100644 --- a/code/_core/datum/damagetype/fire.dm +++ b/code/_core/datum/damagetype/fire.dm @@ -35,7 +35,7 @@ enable_logs = 1 allow_damage_numbers = FALSE -/damagetype/on_fire/do_attack_animation(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/on_fire/do_attack_animation(atom/attacker,atom/victim,atom/weapon,atom/hit_object) return FALSE @@ -60,7 +60,7 @@ allow_damage_numbers = FALSE -/damagetype/fire_turf/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/fire_turf/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_living(victim)) var/mob/living/L = victim diff --git a/code/_core/datum/damagetype/melee/_melee.dm b/code/_core/datum/damagetype/melee/_melee.dm index 86b2c8f5ab..47dcfc9a38 100644 --- a/code/_core/datum/damagetype/melee/_melee.dm +++ b/code/_core/datum/damagetype/melee/_melee.dm @@ -19,14 +19,14 @@ can_be_parried = TRUE -/damagetype/melee/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/melee/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) . = ..() if(condition_on_hit && is_item(weapon)) var/obj/item/I = weapon I.use_condition(1) -/damagetype/melee/get_attack_damage(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/damage_multiplier=1) +/damagetype/melee/get_attack_damage(atom/attacker,atom/victim,atom/weapon,atom/hit_object,damage_multiplier=1) if(victim && is_living(victim)) var/mob/living/L = victim diff --git a/code/_core/datum/damagetype/melee/club/drill.dm b/code/_core/datum/damagetype/melee/club/drill.dm index ea02618d40..fc963a7af8 100644 --- a/code/_core/datum/damagetype/melee/club/drill.dm +++ b/code/_core/datum/damagetype/melee/club/drill.dm @@ -38,12 +38,12 @@ target_floors = TRUE -/damagetype/melee/club/drill/get_critical_hit_condition(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/melee/club/drill/get_critical_hit_condition(atom/attacker,atom/victim,atom/weapon,atom/hit_object) if(is_wall(victim)) return TRUE return ..() -/damagetype/melee/club/drill/do_critical_hit(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/list/damage_to_deal) +/damagetype/melee/club/drill/do_critical_hit(atom/attacker,atom/victim,atom/weapon,atom/hit_object,list/damage_to_deal) if(is_wall(victim)) return 4 return ..() diff --git a/code/_core/datum/damagetype/melee/club/pickaxe.dm b/code/_core/datum/damagetype/melee/club/pickaxe.dm index 2f949c7d81..cc15ef2a9f 100644 --- a/code/_core/datum/damagetype/melee/club/pickaxe.dm +++ b/code/_core/datum/damagetype/melee/club/pickaxe.dm @@ -40,12 +40,12 @@ target_floors = TRUE -/damagetype/melee/club/pickaxe/get_critical_hit_condition(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/melee/club/pickaxe/get_critical_hit_condition(atom/attacker,atom/victim,atom/weapon,atom/hit_object) if(is_wall(victim)) return TRUE return ..() -/damagetype/melee/club/pickaxe/do_critical_hit(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/list/damage_to_deal) +/damagetype/melee/club/pickaxe/do_critical_hit(atom/attacker,atom/victim,atom/weapon,atom/hit_object,list/damage_to_deal) if(is_wall(victim)) return 4 return ..() diff --git a/code/_core/datum/damagetype/melee/club/shovel.dm b/code/_core/datum/damagetype/melee/club/shovel.dm index 1c9f9d0284..84faad3acb 100644 --- a/code/_core/datum/damagetype/melee/club/shovel.dm +++ b/code/_core/datum/damagetype/melee/club/shovel.dm @@ -35,12 +35,12 @@ target_floors = TRUE -/damagetype/melee/club/shovel/get_critical_hit_condition(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/melee/club/shovel/get_critical_hit_condition(atom/attacker,atom/victim,atom/weapon,atom/hit_object) if(is_floor(hit_object)) return TRUE return ..() -/damagetype/melee/club/shovel/do_critical_hit(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/list/damage_to_deal) +/damagetype/melee/club/shovel/do_critical_hit(atom/attacker,atom/victim,atom/weapon,atom/hit_object,list/damage_to_deal) if(is_floor(hit_object)) return 4 return ..() diff --git a/code/_core/datum/damagetype/melee/club/vampire_killer.dm b/code/_core/datum/damagetype/melee/club/vampire_killer.dm index 87d5bd7880..afabd483f0 100644 --- a/code/_core/datum/damagetype/melee/club/vampire_killer.dm +++ b/code/_core/datum/damagetype/melee/club/vampire_killer.dm @@ -34,7 +34,7 @@ attack_delay = 15 attack_delay_max = 20 -/damagetype/melee/club/vampire_killer/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/melee/club/vampire_killer/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_living(victim) && prob(total_damage_dealt*0.5)) var/mob/living/L = victim diff --git a/code/_core/datum/damagetype/melee/sword/combat.dm b/code/_core/datum/damagetype/melee/sword/combat.dm index 85913b9533..f11118776e 100644 --- a/code/_core/datum/damagetype/melee/sword/combat.dm +++ b/code/_core/datum/damagetype/melee/sword/combat.dm @@ -32,8 +32,8 @@ crit_multiplier = 4 -/damagetype/melee/sword/combat_knife/get_crit_chance(var/mob/living/L) +/damagetype/melee/sword/combat_knife/get_crit_chance(mob/living/L) return 0 -/damagetype/melee/sword/combat_knife/get_critical_hit_condition(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/melee/sword/combat_knife/get_critical_hit_condition(atom/attacker,atom/victim,atom/weapon,atom/hit_object) return attacker.dir == victim.dir diff --git a/code/_core/datum/damagetype/melee/sword/plightbringer.dm b/code/_core/datum/damagetype/melee/sword/plightbringer.dm index 028414f17c..b85b7af84d 100644 --- a/code/_core/datum/damagetype/melee/sword/plightbringer.dm +++ b/code/_core/datum/damagetype/melee/sword/plightbringer.dm @@ -66,7 +66,7 @@ attack_delay = 20 attack_delay_max = 20 -/damagetype/melee/sword/plightbringer/on/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/melee/sword/plightbringer/on/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) . = ..() diff --git a/code/_core/datum/damagetype/melee/sword/rev_bayonet.dm b/code/_core/datum/damagetype/melee/sword/rev_bayonet.dm index 1888839f1d..58572cc2c0 100644 --- a/code/_core/datum/damagetype/melee/sword/rev_bayonet.dm +++ b/code/_core/datum/damagetype/melee/sword/rev_bayonet.dm @@ -34,8 +34,8 @@ crit_multiplier = 4 -/damagetype/melee/sword/rev_bayonet/get_crit_chance(var/mob/living/L) +/damagetype/melee/sword/rev_bayonet/get_crit_chance(mob/living/L) return 0 -/damagetype/melee/sword/rev_bayonet/get_critical_hit_condition(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/melee/sword/rev_bayonet/get_critical_hit_condition(atom/attacker,atom/victim,atom/weapon,atom/hit_object) return get_true_4dir(attacker.dir) == get_true_4dir(victim.dir) \ No newline at end of file diff --git a/code/_core/datum/damagetype/npc/_npc.dm b/code/_core/datum/damagetype/npc/_npc.dm index d69e761d47..6f28502e93 100644 --- a/code/_core/datum/damagetype/npc/_npc.dm +++ b/code/_core/datum/damagetype/npc/_npc.dm @@ -8,5 +8,5 @@ can_be_parried = TRUE -/damagetype/npc/get_attack_message_sound(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/npc/get_attack_message_sound(atom/attacker,atom/victim,atom/weapon,atom/hit_object) return span("warning","You hear bone hitting flesh.") \ No newline at end of file diff --git a/code/_core/datum/damagetype/npc/antag.dm b/code/_core/datum/damagetype/npc/antag.dm index a332aae3d6..d4f65cd9ba 100644 --- a/code/_core/datum/damagetype/npc/antag.dm +++ b/code/_core/datum/damagetype/npc/antag.dm @@ -22,7 +22,7 @@ attack_delay_max = 30 -/damagetype/npc/antag/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/npc/antag/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_living(victim)) var/mob/living/L = victim diff --git a/code/_core/datum/damagetype/npc/beepsky.dm b/code/_core/datum/damagetype/npc/beepsky.dm index 301fcd4688..5d26af7159 100644 --- a/code/_core/datum/damagetype/npc/beepsky.dm +++ b/code/_core/datum/damagetype/npc/beepsky.dm @@ -25,7 +25,7 @@ attack_delay = 10 attack_delay_max = 10 -/damagetype/npc/captain_beepsky/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/npc/captain_beepsky/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_living(victim)) var/mob/living/L = victim diff --git a/code/_core/datum/damagetype/npc/blob_attack.dm b/code/_core/datum/damagetype/npc/blob_attack.dm index 3397d5b440..85ffa38f1a 100644 --- a/code/_core/datum/damagetype/npc/blob_attack.dm +++ b/code/_core/datum/damagetype/npc/blob_attack.dm @@ -21,7 +21,7 @@ crit_multiplier = 8 //Crits only when it hits walls. -/damagetype/blob_attack/get_critical_hit_condition(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/blob_attack/get_critical_hit_condition(atom/attacker,atom/victim,atom/weapon,atom/hit_object) if(!is_living(victim) && !istype(victim,/obj/structure/interactive/blob)) return TRUE diff --git a/code/_core/datum/damagetype/npc/blob_spore.dm b/code/_core/datum/damagetype/npc/blob_spore.dm index e7ff6a0590..61dd3a7d45 100644 --- a/code/_core/datum/damagetype/npc/blob_spore.dm +++ b/code/_core/datum/damagetype/npc/blob_spore.dm @@ -25,7 +25,7 @@ attack_delay = 14*0.5 attack_delay_max = 14 -/damagetype/npc/blob_spore/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/npc/blob_spore/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) . = ..() if(victim_turf && is_advanced(victim) && is_organ(hit_object) && istype(attacker,/mob/living/simple/blob_spore)) var/obj/item/organ/O = hit_object diff --git a/code/_core/datum/damagetype/npc/chess.dm b/code/_core/datum/damagetype/npc/chess.dm index 2b4d34ca9e..3f9c8096a0 100644 --- a/code/_core/datum/damagetype/npc/chess.dm +++ b/code/_core/datum/damagetype/npc/chess.dm @@ -19,5 +19,5 @@ crit_multiplier = 20 -/damagetype/chess/get_critical_hit_condition(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/chess/get_critical_hit_condition(atom/attacker,atom/victim,atom/weapon,atom/hit_object) return istype(victim,/mob/living/simple/chess_piece) \ No newline at end of file diff --git a/code/_core/datum/damagetype/npc/dick_kickem.dm b/code/_core/datum/damagetype/npc/dick_kickem.dm index e835e78402..eeaadd442b 100644 --- a/code/_core/datum/damagetype/npc/dick_kickem.dm +++ b/code/_core/datum/damagetype/npc/dick_kickem.dm @@ -36,7 +36,7 @@ attack_delay = 14*0.5 attack_delay_max = 14 -/damagetype/npc/dick_kickem/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/npc/dick_kickem/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_living(victim)) var/list/offsets = get_directional_offsets(attacker,victim) diff --git a/code/_core/datum/damagetype/npc/gorilla.dm b/code/_core/datum/damagetype/npc/gorilla.dm index 510e690d18..0650c48a5b 100644 --- a/code/_core/datum/damagetype/npc/gorilla.dm +++ b/code/_core/datum/damagetype/npc/gorilla.dm @@ -36,7 +36,7 @@ attack_delay = 14*0.5 attack_delay_max = 14 -/damagetype/npc/gorilla/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/npc/gorilla/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_living(victim)) var/list/offsets = get_directional_offsets(attacker,victim) diff --git a/code/_core/datum/damagetype/npc/legion_assault.dm b/code/_core/datum/damagetype/npc/legion_assault.dm index 076f46794d..77379f707a 100644 --- a/code/_core/datum/damagetype/npc/legion_assault.dm +++ b/code/_core/datum/damagetype/npc/legion_assault.dm @@ -36,7 +36,7 @@ attack_delay_max = 14 -/damagetype/npc/legion_assault/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/npc/legion_assault/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) . = ..() diff --git a/code/_core/datum/damagetype/ranged/_ranged.dm b/code/_core/datum/damagetype/ranged/_ranged.dm index 71aec34922..bbdd749490 100644 --- a/code/_core/datum/damagetype/ranged/_ranged.dm +++ b/code/_core/datum/damagetype/ranged/_ranged.dm @@ -43,16 +43,16 @@ alert_on_impact = ALERT_LEVEL_CAUTION -/damagetype/ranged/get_block_power_penetration(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/ranged/get_block_power_penetration(atom/attacker,atom/victim,atom/weapon,atom/hit_object) return 0.5 /damagetype/ranged/get_attack_type() return ATTACK_TYPE_RANGED -/damagetype/ranged/do_attack_animation(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/ranged/do_attack_animation(atom/attacker,atom/victim,atom/weapon,atom/hit_object) return FALSE -/damagetype/ranged/process_damage_group(var/atom/attacker,var/list/atom/victims,var/atom/weapon,var/atom/blamed,var/damage_multiplier=1) +/damagetype/ranged/process_damage_group(atom/attacker,list/atom/victims,atom/weapon,atom/blamed,damage_multiplier=1) if(allow_glancing_blows && is_living(attacker)) var/mob/living/L = attacker @@ -63,7 +63,7 @@ . = ..() -/damagetype/ranged/do_attack_visuals(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/total_damage_dealt=0) +/damagetype/ranged/do_attack_visuals(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,total_damage_dealt=0) if(hit_effect) new hit_effect(victim_turf) @@ -81,23 +81,23 @@ /* -/damagetype/ranged/get_attack_message_3rd(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/ranged/get_attack_message_3rd(atom/attacker,atom/victim,atom/weapon,atom/hit_object) if(hit_object == victim) return span("warning","\The [victim] is hit by \the [src.name]!") else return span("warning","\The [victim] is hit in \the [hit_object.name] by the [src.name]!") -/damagetype/ranged/get_attack_message_1st(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/ranged/get_attack_message_1st(atom/attacker,atom/victim,atom/weapon,atom/hit_object) if(hit_object == victim) return span("danger","You are hit by \the [src.name]!") else return span("danger","You are hit in \the [hit_object.name] by the [src.name]!") -/damagetype/ranged/get_attack_message_sound(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/ranged/get_attack_message_sound(atom/attacker,atom/victim,atom/weapon,atom/hit_object) return span("danger","You hear an impact.") -/damagetype/ranged/display_hit_message(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/ranged/display_hit_message(atom/attacker,atom/victim,atom/weapon,atom/hit_object) if(!ismob(victim)) return FALSE @@ -108,7 +108,7 @@ get_attack_message_sound(attacker,victim,weapon,hit_object)\ ) -/damagetype/ranged/display_miss_message(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/miss_text = "misses!") +/damagetype/ranged/display_miss_message(atom/attacker,atom/victim,atom/weapon,atom/hit_object,miss_text = "misses!") if(!ismob(victim)) return FALSE @@ -119,10 +119,10 @@ replacetext(get_miss_message_sound(attacker,victim,weapon,hit_object),"#REASON",miss_text)\ ) -/damagetype/ranged/get_miss_message_3rd(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/ranged/get_miss_message_3rd(atom/attacker,atom/victim,atom/weapon,atom/hit_object) return span("warning","\The [victim] #REASON the [src.name]!") -/damagetype/ranged/get_miss_message_1st(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/ranged/get_miss_message_1st(atom/attacker,atom/victim,atom/weapon,atom/hit_object) return span("warning","You #REASON the [src.name]!") */ diff --git a/code/_core/datum/damagetype/ranged/bullet/fiendish_resilience.dm b/code/_core/datum/damagetype/ranged/bullet/fiendish_resilience.dm index 6c4fbbf5f0..976d78724f 100644 --- a/code/_core/datum/damagetype/ranged/bullet/fiendish_resilience.dm +++ b/code/_core/datum/damagetype/ranged/bullet/fiendish_resilience.dm @@ -22,7 +22,7 @@ falloff = VIEW_RANGE*1 -/damagetype/ranged/bullet/fiendish_resilience/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/ranged/bullet/fiendish_resilience/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_living(attacker) && is_living(victim)) var/mob/living/V = victim diff --git a/code/_core/datum/damagetype/ranged/bullet/gauss.dm b/code/_core/datum/damagetype/ranged/bullet/gauss.dm index 89a79042a7..6084df265c 100644 --- a/code/_core/datum/damagetype/ranged/bullet/gauss.dm +++ b/code/_core/datum/damagetype/ranged/bullet/gauss.dm @@ -57,7 +57,7 @@ PIERCE = 40 ) -/damagetype/ranged/bullet/gauss_gun/incendiary/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/ranged/bullet/gauss_gun/incendiary/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_living(victim)) var/mob/living/L = victim L.add_status_effect(FIRE,300,300,stealthy=L.on_fire) diff --git a/code/_core/datum/damagetype/ranged/bullet/gyrojet.dm b/code/_core/datum/damagetype/ranged/bullet/gyrojet.dm index 670e23fc66..a2256fd9c5 100644 --- a/code/_core/datum/damagetype/ranged/bullet/gyrojet.dm +++ b/code/_core/datum/damagetype/ranged/bullet/gyrojet.dm @@ -16,7 +16,7 @@ ) falloff = 0 -/damagetype/ranged/bullet/gyrojet/rubber_grenade/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/ranged/bullet/gyrojet/rubber_grenade/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_living(victim)&& victim.health) var/mob/living/V = victim V.health.adjust_stamina(-75) diff --git a/code/_core/datum/damagetype/ranged/bullet/pistol_10mm.dm b/code/_core/datum/damagetype/ranged/bullet/pistol_10mm.dm index 5f8fdb2594..d545689529 100644 --- a/code/_core/datum/damagetype/ranged/bullet/pistol_10mm.dm +++ b/code/_core/datum/damagetype/ranged/bullet/pistol_10mm.dm @@ -47,7 +47,7 @@ crit_multiplier = 3 stealthy = TRUE -/damagetype/ranged/bullet/pistol_40/tranq/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/ranged/bullet/pistol_40/tranq/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) . = ..() if(victim.health && is_living(victim)) var/mob/living/L = victim @@ -57,7 +57,7 @@ else L.add_status_effect(SLEEP,600,600) //1 minute of sleep -/damagetype/ranged/bullet/pistol_40/tranq/get_critical_hit_condition(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/ranged/bullet/pistol_40/tranq/get_critical_hit_condition(atom/attacker,atom/victim,atom/weapon,atom/hit_object) return istype(hit_object,/obj/item/organ/head) /damagetype/ranged/bullet/pistol_40/tranq/surplus diff --git a/code/_core/datum/damagetype/ranged/bullet/pistol_11mm.dm b/code/_core/datum/damagetype/ranged/bullet/pistol_11mm.dm index 36586297ba..e2a3803c90 100644 --- a/code/_core/datum/damagetype/ranged/bullet/pistol_11mm.dm +++ b/code/_core/datum/damagetype/ranged/bullet/pistol_11mm.dm @@ -62,7 +62,7 @@ damage_mod = SURPLUS_MUL penetration_mod = SURPLUS_MUL -/damagetype/ranged/bullet/tranq_11mm/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/ranged/bullet/tranq_11mm/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) . = ..() if(victim.health && is_living(victim)) var/mob/living/L = victim @@ -72,6 +72,6 @@ else L.add_status_effect(SLEEP,600,600) //1 minute of sleep -/damagetype/ranged/bullet/tranq_11mm/get_critical_hit_condition(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/ranged/bullet/tranq_11mm/get_critical_hit_condition(atom/attacker,atom/victim,atom/weapon,atom/hit_object) return istype(hit_object,/obj/item/organ/head) diff --git a/code/_core/datum/damagetype/ranged/bullet/rifle_223.dm b/code/_core/datum/damagetype/ranged/bullet/rifle_223.dm index 4ce0b3fd45..5a84475e50 100644 --- a/code/_core/datum/damagetype/ranged/bullet/rifle_223.dm +++ b/code/_core/datum/damagetype/ranged/bullet/rifle_223.dm @@ -34,7 +34,7 @@ /damagetype/ranged/bullet/rifle_223/syndicate_turret -/damagetype/ranged/bullet/rifle_223/syndicate_turret/get_attack_damage(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/damage_multiplier=1) +/damagetype/ranged/bullet/rifle_223/syndicate_turret/get_attack_damage(atom/attacker,atom/victim,atom/weapon,atom/hit_object,damage_multiplier=1) if(is_living(victim)) var/mob/living/L = victim diff --git a/code/_core/datum/damagetype/ranged/bullet/rocket.dm b/code/_core/datum/damagetype/ranged/bullet/rocket.dm index 02dcb710eb..914161d826 100644 --- a/code/_core/datum/damagetype/ranged/bullet/rocket.dm +++ b/code/_core/datum/damagetype/ranged/bullet/rocket.dm @@ -22,7 +22,7 @@ ) falloff = 0 -/damagetype/ranged/bullet/rocket/wp/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/ranged/bullet/rocket/wp/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_living(victim)) var/mob/living/L = victim L.add_status_effect(FIRE,200,200,stealthy=L.on_fire) @@ -39,7 +39,7 @@ ) falloff = 0 -/damagetype/ranged/bullet/rocket/ap/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/ranged/bullet/rocket/ap/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_living(victim)) var/mob/living/L = victim L.add_status_effect(STUN,20,20) @@ -55,7 +55,7 @@ damagetype/ranged/bullet/rocket/nuclear ) falloff = 0 -/damagetype/ranged/bullet/rocket/nuclear/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/ranged/bullet/rocket/nuclear/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_living(victim)) var/mob/living/L = victim L.add_status_effect(STUN,40,40) diff --git a/code/_core/datum/damagetype/ranged/bullet/shotgun_23.dm b/code/_core/datum/damagetype/ranged/bullet/shotgun_23.dm index 80c8839f0e..9e2f6d8e88 100644 --- a/code/_core/datum/damagetype/ranged/bullet/shotgun_23.dm +++ b/code/_core/datum/damagetype/ranged/bullet/shotgun_23.dm @@ -84,7 +84,7 @@ ) falloff = 3 -/damagetype/ranged/bullet/shotgun_23/fire/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/ranged/bullet/shotgun_23/fire/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_living(victim)) var/mob/living/L = victim L.add_status_effect(FIRE,30,30,stealthy=L.on_fire) diff --git a/code/_core/datum/damagetype/ranged/bullet/smg_4mm.dm b/code/_core/datum/damagetype/ranged/bullet/smg_4mm.dm index 70d3be3e0e..8855c249ad 100644 --- a/code/_core/datum/damagetype/ranged/bullet/smg_4mm.dm +++ b/code/_core/datum/damagetype/ranged/bullet/smg_4mm.dm @@ -52,7 +52,7 @@ PIERCE = 25 ) -/damagetype/ranged/bullet/smg_4mm/incendiary/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/ranged/bullet/smg_4mm/incendiary/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_living(victim)) var/mob/living/L = victim L.add_status_effect(FIRE,20,20,stealthy=L.on_fire) diff --git a/code/_core/datum/damagetype/ranged/bullet/sniper_127.dm b/code/_core/datum/damagetype/ranged/bullet/sniper_127.dm index 27a6156596..29758b7499 100644 --- a/code/_core/datum/damagetype/ranged/bullet/sniper_127.dm +++ b/code/_core/datum/damagetype/ranged/bullet/sniper_127.dm @@ -66,7 +66,7 @@ damage_mod = 0.5 penetration_mod = 0 -/damagetype/ranged/bullet/sniper_50/incendiary/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/ranged/bullet/sniper_50/incendiary/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_living(victim)) var/mob/living/L = victim L.add_status_effect(FIRE,150,150,stealthy=L.on_fire) diff --git a/code/_core/datum/damagetype/ranged/laser/chrono.dm b/code/_core/datum/damagetype/ranged/laser/chrono.dm index 29a42fd621..eed56d90bc 100644 --- a/code/_core/datum/damagetype/ranged/laser/chrono.dm +++ b/code/_core/datum/damagetype/ranged/laser/chrono.dm @@ -19,7 +19,7 @@ crit_multiplier = 10 -/damagetype/ranged/laser/chronogun/get_critical_hit_condition(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/ranged/laser/chronogun/get_critical_hit_condition(atom/attacker,atom/victim,atom/weapon,atom/hit_object) if(SSbadnames.all_badnames[lowertext(victim.name)]) return TRUE diff --git a/code/_core/datum/damagetype/ranged/laser/cutter.dm b/code/_core/datum/damagetype/ranged/laser/cutter.dm index cd8c57c04f..6fa6ea2869 100644 --- a/code/_core/datum/damagetype/ranged/laser/cutter.dm +++ b/code/_core/datum/damagetype/ranged/laser/cutter.dm @@ -9,7 +9,7 @@ ) -/damagetype/ranged/laser/plasma_cutter/process_damage(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/atom/blamed,var/damage_multiplier=1) +/damagetype/ranged/laser/plasma_cutter/process_damage(atom/attacker,atom/victim,atom/weapon,atom/hit_object,atom/blamed,damage_multiplier=1) if(is_turf(hit_object)) damage_multiplier *= 8 //More damage against walls. diff --git a/code/_core/datum/damagetype/ranged/laser/emitter.dm b/code/_core/datum/damagetype/ranged/laser/emitter.dm index 3e45e76180..c76239e6d3 100644 --- a/code/_core/datum/damagetype/ranged/laser/emitter.dm +++ b/code/_core/datum/damagetype/ranged/laser/emitter.dm @@ -6,7 +6,7 @@ LASER = 0 ) -/damagetype/ranged/laser/emitter/process_damage(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/atom/blamed,var/damage_multiplier=1) +/damagetype/ranged/laser/emitter/process_damage(atom/attacker,atom/victim,atom/weapon,atom/hit_object,atom/blamed,damage_multiplier=1) if(istype(hit_object,/obj/structure/interactive/supermatter)) var/obj/structure/interactive/supermatter/S = hit_object diff --git a/code/_core/datum/damagetype/ranged/laser/flamethrower.dm b/code/_core/datum/damagetype/ranged/laser/flamethrower.dm index fe183eb159..8f1b3a4544 100644 --- a/code/_core/datum/damagetype/ranged/laser/flamethrower.dm +++ b/code/_core/datum/damagetype/ranged/laser/flamethrower.dm @@ -6,7 +6,7 @@ HEAT = 0 ) -/damagetype/ranged/laser/flamethrower/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/ranged/laser/flamethrower/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_living(victim)) var/mob/living/L = victim diff --git a/code/_core/datum/damagetype/ranged/laser/kinetic.dm b/code/_core/datum/damagetype/ranged/laser/kinetic.dm index 328e0c3c01..ad434eb1c9 100644 --- a/code/_core/datum/damagetype/ranged/laser/kinetic.dm +++ b/code/_core/datum/damagetype/ranged/laser/kinetic.dm @@ -7,7 +7,7 @@ ) -/damagetype/ranged/laser/kinetic/process_damage(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/atom/blamed,var/damage_multiplier=1) +/damagetype/ranged/laser/kinetic/process_damage(atom/attacker,atom/victim,atom/weapon,atom/hit_object,atom/blamed,damage_multiplier=1) if(is_turf(hit_object)) damage_multiplier *= 2 //More damage against walls. diff --git a/code/_core/datum/damagetype/ranged/ling_tentacle.dm b/code/_core/datum/damagetype/ranged/ling_tentacle.dm index 9dd0f141ce..d1c619faa2 100644 --- a/code/_core/datum/damagetype/ranged/ling_tentacle.dm +++ b/code/_core/datum/damagetype/ranged/ling_tentacle.dm @@ -31,7 +31,7 @@ throw_mul = 1 -/damagetype/ranged/ling_tentacle/pull/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/ranged/ling_tentacle/pull/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_living(victim)) var/list/offsets = get_directional_offsets(attacker,victim) @@ -77,7 +77,7 @@ throw_mul = 1 -/damagetype/ranged/ling_tentacle/warp/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/ranged/ling_tentacle/warp/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) //Make sure to thank Burger. if(is_living(victim)) var/mob/living/L = victim diff --git a/code/_core/datum/damagetype/ranged/magic/_magic.dm b/code/_core/datum/damagetype/ranged/magic/_magic.dm index 17d8d4fc8a..b4dd7f7732 100644 --- a/code/_core/datum/damagetype/ranged/magic/_magic.dm +++ b/code/_core/datum/damagetype/ranged/magic/_magic.dm @@ -5,7 +5,7 @@ return ATTACK_TYPE_MAGIC -/damagetype/ranged/magic/get_attack_damage(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/damage_multiplier=1) +/damagetype/ranged/magic/get_attack_damage(atom/attacker,atom/victim,atom/weapon,atom/hit_object,damage_multiplier=1) . = ..() diff --git a/code/_core/datum/damagetype/ranged/magic/blackflame.dm b/code/_core/datum/damagetype/ranged/magic/blackflame.dm index 4bc3694374..7aee64301d 100644 --- a/code/_core/datum/damagetype/ranged/magic/blackflame.dm +++ b/code/_core/datum/damagetype/ranged/magic/blackflame.dm @@ -27,7 +27,7 @@ force_attacker_armor_calculations_with = DARK -/damagetype/ranged/magic/blackflame/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/ranged/magic/blackflame/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_living(victim)) var/mob/living/L = victim diff --git a/code/_core/datum/damagetype/ranged/magic/fireball.dm b/code/_core/datum/damagetype/ranged/magic/fireball.dm index b1d38b5cb9..f751833154 100644 --- a/code/_core/datum/damagetype/ranged/magic/fireball.dm +++ b/code/_core/datum/damagetype/ranged/magic/fireball.dm @@ -22,7 +22,7 @@ force_attacker_armor_calculations_with = ARCANE -/damagetype/ranged/magic/fireball/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/ranged/magic/fireball/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_living(victim)) var/mob/living/L = victim diff --git a/code/_core/datum/damagetype/ranged/magic/inferno.dm b/code/_core/datum/damagetype/ranged/magic/inferno.dm index 7bbc21ea9d..ef84cba927 100644 --- a/code/_core/datum/damagetype/ranged/magic/inferno.dm +++ b/code/_core/datum/damagetype/ranged/magic/inferno.dm @@ -21,7 +21,7 @@ force_attacker_armor_calculations_with = ARCANE -/damagetype/ranged/magic/inferno/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/ranged/magic/inferno/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_living(victim)) var/mob/living/L = victim diff --git a/code/_core/datum/damagetype/unarmed/_unarmed.dm b/code/_core/datum/damagetype/unarmed/_unarmed.dm index 4f5b9260e9..018bafb577 100644 --- a/code/_core/datum/damagetype/unarmed/_unarmed.dm +++ b/code/_core/datum/damagetype/unarmed/_unarmed.dm @@ -35,7 +35,7 @@ return ATTACK_TYPE_UNARMED /* -/damagetype/unarmed/do_wound(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/damage_dealt) +/damagetype/unarmed/do_wound(atom/attacker,atom/victim,atom/weapon,atom/hit_object,damage_dealt) if(is_organ(hit_object)) new/wound/bruise/(victim,hit_object,attacker,weapon,damage_dealt/20) diff --git a/code/_core/datum/damagetype/unarmed/bite.dm b/code/_core/datum/damagetype/unarmed/bite.dm index a1013fe16b..1086b70d8f 100644 --- a/code/_core/datum/damagetype/unarmed/bite.dm +++ b/code/_core/datum/damagetype/unarmed/bite.dm @@ -42,7 +42,7 @@ attack_delay = 10 attack_delay_max = 20 -/damagetype/unarmed/bite/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/unarmed/bite/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_living(victim) && is_living(attacker) && victim.reagents && total_damage_dealt >= 10 && prob(total_damage_dealt)) var/mob/living/L = attacker diff --git a/code/_core/datum/damagetype/unarmed/cqc/boss.dm b/code/_core/datum/damagetype/unarmed/cqc/boss.dm index 0175323021..54b9cd9588 100644 --- a/code/_core/datum/damagetype/unarmed/cqc/boss.dm +++ b/code/_core/datum/damagetype/unarmed/cqc/boss.dm @@ -34,7 +34,7 @@ attack_delay = 7.5 attack_delay_max = 15 -/damagetype/unarmed/cqc/boss/fast_grab/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/unarmed/cqc/boss/fast_grab/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_advanced(attacker) && ismovable(victim) && is_turf(victim.loc)) var/mob/living/advanced/A = attacker @@ -88,7 +88,7 @@ attack_delay = 40 attack_delay_max = 60 -/damagetype/unarmed/cqc/boss/grab_slam/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/unarmed/cqc/boss/grab_slam/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_living(victim) && is_living(attacker)) var/mob/living/L = victim @@ -147,7 +147,7 @@ attack_delay = 10 attack_delay_max = 15 -/damagetype/unarmed/cqc/boss/staggering_punch/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/unarmed/cqc/boss/staggering_punch/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_living(victim)) var/mob/living/L = victim @@ -201,7 +201,7 @@ attack_delay = 30 attack_delay_max = 45 -/damagetype/unarmed/cqc/boss/stunning_punch/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/unarmed/cqc/boss/stunning_punch/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_living(victim) && is_living(attacker)) var/mob/living/L = victim @@ -248,7 +248,7 @@ attack_delay = 8 attack_delay_max = 16 -/damagetype/unarmed/cqc/boss/disarm_theft/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/unarmed/cqc/boss/disarm_theft/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_advanced(attacker) && is_advanced(victim)) var/mob/living/advanced/A = attacker @@ -311,7 +311,7 @@ attack_delay = 40 attack_delay_max = 60 -/damagetype/unarmed/cqc/boss/tactical_hug/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/unarmed/cqc/boss/tactical_hug/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_advanced(attacker) && is_advanced(victim)) var/mob/living/advanced/V = victim diff --git a/code/_core/datum/damagetype/unarmed/cqc/sleeping_carp.dm b/code/_core/datum/damagetype/unarmed/cqc/sleeping_carp.dm index 5ab1dff80f..fa0a577d8a 100644 --- a/code/_core/datum/damagetype/unarmed/cqc/sleeping_carp.dm +++ b/code/_core/datum/damagetype/unarmed/cqc/sleeping_carp.dm @@ -1,4 +1,4 @@ -/damagetype/unarmed/cqc/sleeping_carp/damagetype/get_critical_hit_condition(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/unarmed/cqc/sleeping_carp/damagetype/get_critical_hit_condition(atom/attacker,atom/victim,atom/weapon,atom/hit_object) if(is_living(attacker)) var/mob/living/L = attacker @@ -47,7 +47,7 @@ attack_delay = 20 attack_delay_max = 30 -/damagetype/unarmed/cqc/sleeping_carp/crashing_wave_kick/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/unarmed/cqc/sleeping_carp/crashing_wave_kick/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_living(victim)) var/list/offsets = get_directional_offsets(attacker,victim) @@ -102,7 +102,7 @@ attack_delay_max = 15 -/damagetype/unarmed/cqc/sleeping_carp/keelhaul/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/unarmed/cqc/sleeping_carp/keelhaul/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_living(victim)) var/mob/living/L = victim diff --git a/code/_core/datum/damagetype/unarmed/fists.dm b/code/_core/datum/damagetype/unarmed/fists.dm index 59f67bda67..ad518cc290 100644 --- a/code/_core/datum/damagetype/unarmed/fists.dm +++ b/code/_core/datum/damagetype/unarmed/fists.dm @@ -37,7 +37,7 @@ attack_delay = 5 attack_delay_max = 10 -/damagetype/unarmed/fists/get_critical_hit_condition(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/unarmed/fists/get_critical_hit_condition(atom/attacker,atom/victim,atom/weapon,atom/hit_object) if(is_living(attacker)) var/mob/living/L = attacker @@ -128,7 +128,7 @@ draw_blood = FALSE -/damagetype/unarmed/fists/disarm/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/unarmed/fists/disarm/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(is_living(victim) && is_living(attacker)) var/mob/living/L = victim @@ -183,7 +183,7 @@ inaccuracy_mod = 2 -/damagetype/unarmed/fists/grab/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/unarmed/fists/grab/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) if(victim_turf && is_advanced(attacker) && ismovable(victim)) var/mob/living/advanced/A = attacker diff --git a/code/_core/datum/damagetype/unarmed/fists_traits.dm b/code/_core/datum/damagetype/unarmed/fists_traits.dm index 75888f928b..0a47936195 100644 --- a/code/_core/datum/damagetype/unarmed/fists_traits.dm +++ b/code/_core/datum/damagetype/unarmed/fists_traits.dm @@ -36,7 +36,7 @@ attack_delay = 12*0.5 attack_delay_max = 12 -/damagetype/unarmed/fists/shock_touch/do_attack_sound(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/unarmed/fists/shock_touch/do_attack_sound(atom/attacker,atom/victim,atom/weapon,atom/hit_object,total_damage_dealt=0) . = ..() diff --git a/code/_core/datum/damagetype/unarmed/foot.dm b/code/_core/datum/damagetype/unarmed/foot.dm index 85d94376df..42ae71b3a1 100644 --- a/code/_core/datum/damagetype/unarmed/foot.dm +++ b/code/_core/datum/damagetype/unarmed/foot.dm @@ -38,7 +38,7 @@ attack_delay_max = 14 -/damagetype/unarmed/foot/post_on_hit(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/atom/blamed,var/total_damage_dealt=0) +/damagetype/unarmed/foot/post_on_hit(atom/attacker,atom/victim,atom/weapon,atom/hit_object,atom/blamed,total_damage_dealt=0) if(is_living(victim)) var/mob/living/L = victim diff --git a/code/_core/datum/damagetype/unarmed/holy.dm b/code/_core/datum/damagetype/unarmed/holy.dm index fd2a5c9d6b..23694a7e4a 100644 --- a/code/_core/datum/damagetype/unarmed/holy.dm +++ b/code/_core/datum/damagetype/unarmed/holy.dm @@ -46,7 +46,7 @@ attack_delay = 5*2 attack_delay_max = 10*2 -/damagetype/unarmed/holy/slam/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/unarmed/holy/slam/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) . = ..() @@ -61,7 +61,7 @@ attack_delay = 5*2 attack_delay_max = 10*2 -/damagetype/unarmed/holy/kick/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/unarmed/holy/kick/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) . = ..() diff --git a/code/_core/datum/damagetype/unarmed/powerfist.dm b/code/_core/datum/damagetype/unarmed/powerfist.dm index d765b6d171..bb5441d1dd 100644 --- a/code/_core/datum/damagetype/unarmed/powerfist.dm +++ b/code/_core/datum/damagetype/unarmed/powerfist.dm @@ -49,10 +49,10 @@ crit_chance = 0 crit_chance_max = 0 -/damagetype/unarmed/powerfist/can_man/get_crit_chance(var/mob/living/L) +/damagetype/unarmed/powerfist/can_man/get_crit_chance(mob/living/L) return 0 -/damagetype/unarmed/powerfist/can_man/get_critical_hit_condition(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/damagetype/unarmed/powerfist/can_man/get_critical_hit_condition(atom/attacker,atom/victim,atom/weapon,atom/hit_object) if(!ismovable(victim)) return TRUE diff --git a/code/_core/datum/damagetype/unarmed/slaughter.dm b/code/_core/datum/damagetype/unarmed/slaughter.dm index 3ae389571b..e04ce86151 100644 --- a/code/_core/datum/damagetype/unarmed/slaughter.dm +++ b/code/_core/datum/damagetype/unarmed/slaughter.dm @@ -45,7 +45,7 @@ attack_delay = 4 attack_delay_max = 10 -/damagetype/unarmed/slaughter/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/unarmed/slaughter/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) . = ..() diff --git a/code/_core/datum/damagetype/unarmed/smite.dm b/code/_core/datum/damagetype/unarmed/smite.dm index 20ce8de818..8a64160758 100644 --- a/code/_core/datum/damagetype/unarmed/smite.dm +++ b/code/_core/datum/damagetype/unarmed/smite.dm @@ -47,7 +47,7 @@ allow_power_attacks = FALSE crit_multiplier = 1 -/damagetype/unarmed/smite/get_attack_damage(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/damage_multiplier=1) +/damagetype/unarmed/smite/get_attack_damage(atom/attacker,atom/victim,atom/weapon,atom/hit_object,damage_multiplier=1) . = list() @@ -57,7 +57,7 @@ .[DARK] = 1 -/damagetype/unarmed/smite/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/unarmed/smite/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) . = ..() diff --git a/code/_core/datum/damagetype/voice_of_god.dm b/code/_core/datum/damagetype/voice_of_god.dm index 15ed8feaa1..e9818ec1db 100644 --- a/code/_core/datum/damagetype/voice_of_god.dm +++ b/code/_core/datum/damagetype/voice_of_god.dm @@ -8,7 +8,7 @@ DARK = 250, ) -/damagetype/voice_of_god/kill/post_on_hit(var/atom/attacker,var/turf/attacker_turf,var/atom/victim,var/turf/victim_turf,var/atom/weapon,var/atom/hit_object,var/total_damage_dealt=0) +/damagetype/voice_of_god/kill/post_on_hit(atom/attacker,turf/attacker_turf,atom/victim,turf/victim_turf,atom/weapon,atom/hit_object,total_damage_dealt=0) . = ..() diff --git a/code/_core/datum/dialogue/_dialogue.dm b/code/_core/datum/dialogue/_dialogue.dm index 9986644ac6..8f21e0571a 100644 --- a/code/_core/datum/dialogue/_dialogue.dm +++ b/code/_core/datum/dialogue/_dialogue.dm @@ -3,10 +3,10 @@ /dialogue/ -/dialogue/proc/get_dialogue_options(var/mob/living/advanced/player/P,var/list/known_options) +/dialogue/proc/get_dialogue_options(mob/living/advanced/player/P,list/known_options) return list() -/dialogue/proc/set_topic(var/mob/living/advanced/player/P,var/topic) //When you click on a dialogue option. topic var should be unsanitized +/dialogue/proc/set_topic(mob/living/advanced/player/P,topic) //When you click on a dialogue option. topic var should be unsanitized if(!topic) CRASH("No topic arg presented!") diff --git a/code/_core/datum/dialogue/hostage/_hostage.dm b/code/_core/datum/dialogue/hostage/_hostage.dm index 4db32de883..b078f8715b 100644 --- a/code/_core/datum/dialogue/hostage/_hostage.dm +++ b/code/_core/datum/dialogue/hostage/_hostage.dm @@ -1,6 +1,6 @@ /dialogue/npc/hostage/ -/dialogue/npc/hostage/get_dialogue_options(var/mob/living/advanced/player/P,var/list/known_options) +/dialogue/npc/hostage/get_dialogue_options(mob/living/advanced/player/P,list/known_options) var/mob/living/L = P.dialogue_target @@ -37,7 +37,7 @@ "You already have someone with you." ) -/dialogue/npc/hostage/set_topic(var/mob/living/advanced/player/P,var/topic) +/dialogue/npc/hostage/set_topic(mob/living/advanced/player/P,topic) . = ..() diff --git a/code/_core/datum/dialogue/hostage/assistant.dm b/code/_core/datum/dialogue/hostage/assistant.dm index a5971d19a1..96ab5f4189 100644 --- a/code/_core/datum/dialogue/hostage/assistant.dm +++ b/code/_core/datum/dialogue/hostage/assistant.dm @@ -1,6 +1,6 @@ /dialogue/npc/hostage/assistant -/dialogue/npc/hostage/assistant/get_dialogue_options(var/mob/living/advanced/player/P,var/list/known_options) +/dialogue/npc/hostage/assistant/get_dialogue_options(mob/living/advanced/player/P,list/known_options) var/mob/living/advanced/npc/unique/hostage/L = P.dialogue_target diff --git a/code/_core/datum/dialogue/npc/burger_challenge.dm b/code/_core/datum/dialogue/npc/burger_challenge.dm index 8c8b26e48a..97f7b11f43 100644 --- a/code/_core/datum/dialogue/npc/burger_challenge.dm +++ b/code/_core/datum/dialogue/npc/burger_challenge.dm @@ -1,7 +1,7 @@ /dialogue/npc/burger_challenge -/dialogue/npc/burger_challenge/get_dialogue_options(var/mob/living/advanced/player/P,var/list/known_options) +/dialogue/npc/burger_challenge/get_dialogue_options(mob/living/advanced/player/P,list/known_options) . = list() @@ -32,7 +32,7 @@ "Pssst. Talk to me again when the mission is announced" ) -/dialogue/npc/burger_challenge/set_topic(var/mob/living/advanced/player/P,var/topic) +/dialogue/npc/burger_challenge/set_topic(mob/living/advanced/player/P,topic) . = ..() diff --git a/code/_core/datum/dialogue/npc/cargo_computer.dm b/code/_core/datum/dialogue/npc/cargo_computer.dm index df0d497e6f..d82b4bf758 100644 --- a/code/_core/datum/dialogue/npc/cargo_computer.dm +++ b/code/_core/datum/dialogue/npc/cargo_computer.dm @@ -1,6 +1,6 @@ /dialogue/npc/cargo_computer/ -/dialogue/npc/cargo_computer/get_dialogue_options(var/mob/living/advanced/player/P,var/list/known_options) +/dialogue/npc/cargo_computer/get_dialogue_options(mob/living/advanced/player/P,list/known_options) . = list() @@ -66,7 +66,7 @@ "*main menu" ) -/dialogue/npc/cargo_computer/set_topic(var/mob/living/advanced/player/P,var/topic) +/dialogue/npc/cargo_computer/set_topic(mob/living/advanced/player/P,topic) . = ..() diff --git a/code/_core/datum/dialogue/npc/chargen_computer.dm b/code/_core/datum/dialogue/npc/chargen_computer.dm index 07f2f59b0d..a1fa255cba 100644 --- a/code/_core/datum/dialogue/npc/chargen_computer.dm +++ b/code/_core/datum/dialogue/npc/chargen_computer.dm @@ -1,6 +1,6 @@ /dialogue/npc/chargen_computer/ -/dialogue/npc/chargen_computer/get_dialogue_options(var/mob/living/advanced/player/P,var/list/known_options) +/dialogue/npc/chargen_computer/get_dialogue_options(mob/living/advanced/player/P,list/known_options) var/list/dialogue_options = list() @@ -123,7 +123,7 @@ return dialogue_options -/dialogue/npc/chargen_computer/set_topic(var/mob/living/advanced/player/P,var/topic) +/dialogue/npc/chargen_computer/set_topic(mob/living/advanced/player/P,topic) . = ..() diff --git a/code/_core/datum/dialogue/npc/contractor.dm b/code/_core/datum/dialogue/npc/contractor.dm index f227b8fdc6..267f90370b 100644 --- a/code/_core/datum/dialogue/npc/contractor.dm +++ b/code/_core/datum/dialogue/npc/contractor.dm @@ -2,7 +2,7 @@ var/static/list/valid_contract_locations = list("contract",BODY_HAND_LEFT_HELD,BODY_HAND_RIGHT_HELD) -/dialogue/npc/contractor/get_dialogue_options(var/mob/living/advanced/player/P,var/list/known_options) +/dialogue/npc/contractor/get_dialogue_options(mob/living/advanced/player/P,list/known_options) . = list() @@ -39,7 +39,7 @@ "You have no contracts in your hand that are completed. Please do not waste my time." ) -/dialogue/npc/contractor/set_topic(var/mob/living/advanced/player/P,var/topic) +/dialogue/npc/contractor/set_topic(mob/living/advanced/player/P,topic) if(topic == "purchase a blood contract") if(istype(P.dialogue_target,/mob/living/advanced/npc/unique/contractor)) diff --git a/code/_core/datum/dialogue/npc/job_providers/chief_engineer.dm b/code/_core/datum/dialogue/npc/job_providers/chief_engineer.dm index 24ce09a567..b92d6a901a 100644 --- a/code/_core/datum/dialogue/npc/job_providers/chief_engineer.dm +++ b/code/_core/datum/dialogue/npc/job_providers/chief_engineer.dm @@ -1,7 +1,7 @@ /dialogue/npc/chief_engineer/ -/dialogue/npc/chief_engineer/get_dialogue_options(var/mob/living/advanced/player/P,var/list/known_options) +/dialogue/npc/chief_engineer/get_dialogue_options(mob/living/advanced/player/P,list/known_options) . = list() @@ -66,7 +66,7 @@ "job" ) -/dialogue/npc/chief_engineer/set_topic(var/mob/living/advanced/player/P,var/topic) +/dialogue/npc/chief_engineer/set_topic(mob/living/advanced/player/P,topic) . = ..() diff --git a/code/_core/datum/dialogue/npc/job_providers/chief_medical_officer.dm b/code/_core/datum/dialogue/npc/job_providers/chief_medical_officer.dm index dcada80ec0..3e16d99d87 100644 --- a/code/_core/datum/dialogue/npc/job_providers/chief_medical_officer.dm +++ b/code/_core/datum/dialogue/npc/job_providers/chief_medical_officer.dm @@ -1,7 +1,7 @@ /dialogue/npc/chief_medical_officer -/dialogue/npc/chief_medical_officer/get_dialogue_options(var/mob/living/advanced/player/P,var/list/known_options) +/dialogue/npc/chief_medical_officer/get_dialogue_options(mob/living/advanced/player/P,list/known_options) . = list() @@ -39,7 +39,7 @@ "job" ) -/dialogue/npc/chief_medical_officer/set_topic(var/mob/living/advanced/player/P,var/topic) +/dialogue/npc/chief_medical_officer/set_topic(mob/living/advanced/player/P,topic) . = ..() diff --git a/code/_core/datum/dialogue/npc/job_providers/head_of_personel.dm b/code/_core/datum/dialogue/npc/job_providers/head_of_personel.dm index ba2fc786de..ba9b5261c5 100644 --- a/code/_core/datum/dialogue/npc/job_providers/head_of_personel.dm +++ b/code/_core/datum/dialogue/npc/job_providers/head_of_personel.dm @@ -1,7 +1,7 @@ /dialogue/npc/hop/ -/dialogue/npc/hop/get_dialogue_options(var/mob/living/advanced/player/P,var/list/known_options) +/dialogue/npc/hop/get_dialogue_options(mob/living/advanced/player/P,list/known_options) . = list() @@ -65,7 +65,7 @@ ) -/dialogue/npc/hop/set_topic(var/mob/living/advanced/player/P,var/topic) +/dialogue/npc/hop/set_topic(mob/living/advanced/player/P,topic) if(topic == "*Yes, retire and spend out the rest of your days being miserable over the fact that you don't have a job.") var/menu/M = get_menu(/menu/dialogue/) diff --git a/code/_core/datum/dialogue/npc/job_providers/head_of_security.dm b/code/_core/datum/dialogue/npc/job_providers/head_of_security.dm index 06fdf44645..b19c223895 100644 --- a/code/_core/datum/dialogue/npc/job_providers/head_of_security.dm +++ b/code/_core/datum/dialogue/npc/job_providers/head_of_security.dm @@ -1,7 +1,7 @@ /dialogue/npc/head_of_security/ -/dialogue/npc/head_of_security/get_dialogue_options(var/mob/living/advanced/player/P,var/list/known_options) +/dialogue/npc/head_of_security/get_dialogue_options(mob/living/advanced/player/P,list/known_options) . = list() @@ -53,7 +53,7 @@ "job" ) -/dialogue/npc/head_of_security/set_topic(var/mob/living/advanced/player/P,var/topic) +/dialogue/npc/head_of_security/set_topic(mob/living/advanced/player/P,topic) . = ..() diff --git a/code/_core/datum/dialogue/npc/job_providers/jestmaster.dm b/code/_core/datum/dialogue/npc/job_providers/jestmaster.dm index 4002e8d06e..40949e6ab7 100644 --- a/code/_core/datum/dialogue/npc/job_providers/jestmaster.dm +++ b/code/_core/datum/dialogue/npc/job_providers/jestmaster.dm @@ -1,6 +1,6 @@ /dialogue/npc/jestmaster -/dialogue/npc/jestmaster/get_dialogue_options(var/mob/living/advanced/player/P,var/list/known_options) +/dialogue/npc/jestmaster/get_dialogue_options(mob/living/advanced/player/P,list/known_options) . = list() @@ -47,7 +47,7 @@ "Her" ) -/dialogue/npc/jestmaster/set_topic(var/mob/living/advanced/player/P,var/topic) +/dialogue/npc/jestmaster/set_topic(mob/living/advanced/player/P,topic) . = ..() diff --git a/code/_core/datum/dialogue/npc/master.dm b/code/_core/datum/dialogue/npc/master.dm index 540cb04656..26b91d0f3d 100644 --- a/code/_core/datum/dialogue/npc/master.dm +++ b/code/_core/datum/dialogue/npc/master.dm @@ -1,6 +1,6 @@ /dialogue/npc/master/ -/dialogue/npc/master/get_dialogue_options(var/mob/living/advanced/player/P,var/list/known_options) +/dialogue/npc/master/get_dialogue_options(mob/living/advanced/player/P,list/known_options) . = list() @@ -46,7 +46,7 @@ "Enjoy your reward!", ) -/dialogue/npc/master/set_topic(var/mob/living/advanced/player/P,var/topic) +/dialogue/npc/master/set_topic(mob/living/advanced/player/P,topic) . = ..() @@ -100,7 +100,7 @@ -/dialogue/npc/master/proc/try_prestige(var/mob/living/advanced/player/P) +/dialogue/npc/master/proc/try_prestige(mob/living/advanced/player/P) var/list/valid_skills = list() diff --git a/code/_core/datum/dialogue/npc/mech_fabricator.dm b/code/_core/datum/dialogue/npc/mech_fabricator.dm index d7114597cd..37965fa1c5 100644 --- a/code/_core/datum/dialogue/npc/mech_fabricator.dm +++ b/code/_core/datum/dialogue/npc/mech_fabricator.dm @@ -1,6 +1,6 @@ /dialogue/npc/mech_fabricator/ -/dialogue/npc/mech_fabricator/get_dialogue_options(var/mob/living/advanced/player/P,var/list/known_options) +/dialogue/npc/mech_fabricator/get_dialogue_options(mob/living/advanced/player/P,list/known_options) var/list/dialogue_options = list() diff --git a/code/_core/datum/dialogue/npc/merchant_goblin.dm b/code/_core/datum/dialogue/npc/merchant_goblin.dm index f9bc8ac4aa..c94bfd499f 100644 --- a/code/_core/datum/dialogue/npc/merchant_goblin.dm +++ b/code/_core/datum/dialogue/npc/merchant_goblin.dm @@ -1,6 +1,6 @@ /dialogue/npc/goblin_merchant/ -/dialogue/npc/goblin_merchant/get_dialogue_options(var/mob/living/advanced/player/P,var/list/known_options) +/dialogue/npc/goblin_merchant/get_dialogue_options(mob/living/advanced/player/P,list/known_options) . = list() @@ -31,7 +31,7 @@ .["*access your bank"] = list("...") -/dialogue/npc/goblin_merchant/set_topic(var/mob/living/advanced/player/P,var/topic) +/dialogue/npc/goblin_merchant/set_topic(mob/living/advanced/player/P,topic) . = ..() diff --git a/code/_core/datum/dialogue/npc/nanotrasen_soldier.dm b/code/_core/datum/dialogue/npc/nanotrasen_soldier.dm index 884acfc18f..8ebe36fd70 100644 --- a/code/_core/datum/dialogue/npc/nanotrasen_soldier.dm +++ b/code/_core/datum/dialogue/npc/nanotrasen_soldier.dm @@ -1,6 +1,6 @@ /dialogue/npc/soldier/ -/dialogue/npc/soldier/get_dialogue_options(var/mob/living/advanced/player/P,var/list/known_options) +/dialogue/npc/soldier/get_dialogue_options(mob/living/advanced/player/P,list/known_options) var/mob/living/L = P.dialogue_target @@ -39,7 +39,7 @@ "You already have too many people with you." ) -/dialogue/npc/soldier/set_topic(var/mob/living/advanced/player/P,var/topic) +/dialogue/npc/soldier/set_topic(mob/living/advanced/player/P,topic) . = ..() diff --git a/code/_core/datum/dialogue/npc/taxman.dm b/code/_core/datum/dialogue/npc/taxman.dm index 6dc2815276..9dec77011f 100644 --- a/code/_core/datum/dialogue/npc/taxman.dm +++ b/code/_core/datum/dialogue/npc/taxman.dm @@ -1,6 +1,6 @@ /dialogue/npc/taxman/ -/dialogue/npc/taxman/get_dialogue_options(var/mob/living/advanced/player/P,var/list/known_options) +/dialogue/npc/taxman/get_dialogue_options(mob/living/advanced/player/P,list/known_options) . = list() @@ -46,7 +46,7 @@ however it may save you from being placed in a higher tax bracket if you didn't pay." ) -/dialogue/npc/taxman/set_topic(var/mob/living/advanced/player/P,var/topic) +/dialogue/npc/taxman/set_topic(mob/living/advanced/player/P,topic) . = ..() diff --git a/code/_core/datum/dialogue/npc/wizard_ambassador.dm b/code/_core/datum/dialogue/npc/wizard_ambassador.dm index a0fe291987..d14ac0e05c 100644 --- a/code/_core/datum/dialogue/npc/wizard_ambassador.dm +++ b/code/_core/datum/dialogue/npc/wizard_ambassador.dm @@ -1,6 +1,6 @@ /dialogue/npc/wizard_ambassador/ -/dialogue/npc/wizard_ambassador/get_dialogue_options(var/mob/living/advanced/player/P,var/list/known_options) +/dialogue/npc/wizard_ambassador/get_dialogue_options(mob/living/advanced/player/P,list/known_options) . = list() diff --git a/code/_core/datum/dialogue/tutorial/_tutorial.dm b/code/_core/datum/dialogue/tutorial/_tutorial.dm index ec44eba4c2..51f49be520 100644 --- a/code/_core/datum/dialogue/tutorial/_tutorial.dm +++ b/code/_core/datum/dialogue/tutorial/_tutorial.dm @@ -1,6 +1,6 @@ /dialogue/tutorial/front_desk -/dialogue/tutorial/front_desk/get_dialogue_options(var/mob/living/advanced/player/P,var/list/known_options) +/dialogue/tutorial/front_desk/get_dialogue_options(mob/living/advanced/player/P,list/known_options) var/list/dialogue_options = list() diff --git a/code/_core/datum/disease/_disease.dm b/code/_core/datum/disease/_disease.dm index dbd99d31c9..52ce9134bc 100644 --- a/code/_core/datum/disease/_disease.dm +++ b/code/_core/datum/disease/_disease.dm @@ -9,13 +9,13 @@ var/immune_system_mod = 10 //This value times stage is added to the owner's immune system. var/immune_system_mod_starts_at_stage = 2 //Stage at which the immune system mod should kick in. -/disease/proc/on_add(var/mob/living/owner) +/disease/proc/on_add(mob/living/owner) return TRUE -/disease/proc/on_remove(var/mob/living/owner) +/disease/proc/on_remove(mob/living/owner) return TRUE -/disease/proc/on_life(var/mob/living/owner) +/disease/proc/on_life(mob/living/owner) var/mul = (2 - owner.immune_system_strength/100) var/stage_to_add = TICKS_TO_SECONDS(LIFE_TICK_SLOW)/(stage_per_minute*60) stage = clamp(stage+(stage_to_add*mul),0,stage_max) @@ -31,7 +31,7 @@ Symptoms include lethargy, trouble breathing and erratic eye movements." var/inhale_switch = FALSE -/disease/hrp/on_life(var/mob/living/owner) +/disease/hrp/on_life(mob/living/owner) . = ..() if(prob(stage*10)) if(stage >= 1 && prob(40)) diff --git a/code/_core/datum/dna/_dna.dm b/code/_core/datum/dna/_dna.dm index beebd3db08..c28378c202 100644 --- a/code/_core/datum/dna/_dna.dm +++ b/code/_core/datum/dna/_dna.dm @@ -39,7 +39,7 @@ var/beard_color_same_as_skin_color = FALSE var/has_seperate_beard_color = FALSE -/dna/proc/generate_eye_color(var/fallback="#FFFFFF") +/dna/proc/generate_eye_color(fallback="#FFFFFF") if(!length(eye_color_rarity)) return fallback @@ -51,7 +51,7 @@ var/tint_mod = rgb(brightness+rand(-10,10),brightness+rand(-10,10),brightness+rand(-10,10)) return blend_colors(final_color,tint_mod,0.1) -/dna/proc/generate_skin_color(var/fallback="#FFFFFF") +/dna/proc/generate_skin_color(fallback="#FFFFFF") if(!length(skin_color_rarity)) return fallback @@ -63,7 +63,7 @@ var/tint_mod = rgb(brightness+rand(-10,10),brightness+rand(-10,10),brightness+rand(-10,10)) return blend_colors(final_color,tint_mod,0.1) -/dna/proc/generate_hair_color(var/fallback="#FFFFFF") +/dna/proc/generate_hair_color(fallback="#FFFFFF") if(!length(hair_color_rarity)) return fallback @@ -75,7 +75,7 @@ var/tint_mod = rgb(brightness+rand(-10,10),brightness+rand(-10,10),brightness+rand(-10,10)) return blend_colors(final_color,tint_mod,0.1) -/dna/proc/generate_beard_color(var/fallback="#FFFFFF") +/dna/proc/generate_beard_color(fallback="#FFFFFF") if(!length(beard_color_rarity)) return generate_hair_color(fallback) @@ -88,7 +88,7 @@ return blend_colors(final_color,tint_mod,0.1) -/dna/proc/generate_hair_style(var/gender=NEUTER,var/fallback="#FFFFFF") +/dna/proc/generate_hair_style(gender=NEUTER,fallback="#FFFFFF") switch(gender) if(MALE) @@ -104,7 +104,7 @@ return "error" -/dna/proc/generate_beard_style(var/gender=NEUTER,var/fallback="#FFFFFF") +/dna/proc/generate_beard_style(gender=NEUTER,fallback="#FFFFFF") switch(gender) if(MALE) diff --git a/code/_core/datum/emote/_emote.dm b/code/_core/datum/emote/_emote.dm index fb7a46c86f..99281c919c 100644 --- a/code/_core/datum/emote/_emote.dm +++ b/code/_core/datum/emote/_emote.dm @@ -5,14 +5,14 @@ var/action = "\The #USER stares as they cannot scream." var/action_target -/emote/proc/can_emote(var/atom/emoter,var/atom/target) +/emote/proc/can_emote(atom/emoter,atom/target) if(is_living(emoter)) var/mob/living/L = emoter if(L.dead) return FALSE return TRUE -/emote/proc/on_emote(var/atom/emoter,var/atom/target) +/emote/proc/on_emote(atom/emoter,atom/target) if(!target || !action_target) if(action) emoter.visible_message(span("emote",replacetextEx(action,"#USER","[emoter.name]"))) diff --git a/code/_core/datum/emote/sound.dm b/code/_core/datum/emote/sound.dm index 9e396e3ba9..eed838d537 100644 --- a/code/_core/datum/emote/sound.dm +++ b/code/_core/datum/emote/sound.dm @@ -2,13 +2,13 @@ var/list/sounds_male = list() var/list/sounds_female = list() -/emote/sound/on_emote(var/atom/emoter,var/atom/target) +/emote/sound/on_emote(atom/emoter,atom/target) . = ..() if(.) var/sound_to_play = get_sound_to_play(emoter,target) if(sound_to_play) play_sound(sound_to_play,get_turf(emoter),range_max=VIEW_RANGE) -/emote/sound/proc/get_sound_to_play(var/atom/emoter,var/atom/target) +/emote/sound/proc/get_sound_to_play(atom/emoter,atom/target) if(is_living(emoter)) var/mob/living/L = emoter return L.get_emote_sound(id) diff --git a/code/_core/datum/emote/standard.dm b/code/_core/datum/emote/standard.dm index 125548d2cf..fb64ba4158 100644 --- a/code/_core/datum/emote/standard.dm +++ b/code/_core/datum/emote/standard.dm @@ -93,7 +93,7 @@ id = "inhale" action = "\The #USER inhales." -/emote/inhale/on_emote(var/atom/emoter,var/atom/target) +/emote/inhale/on_emote(atom/emoter,atom/target) if(is_advanced(emoter)) var/mob/living/advanced/A = emoter if(A.inventories_by_id[BODY_FACE]) @@ -108,7 +108,7 @@ id = "drag" action = "\The #USER takes a drag from their smoke." -/emote/drag/can_emote(var/atom/emoter,var/atom/target) +/emote/drag/can_emote(atom/emoter,atom/target) . = ..() if(!.) return FALSE if(is_advanced(emoter)) @@ -118,7 +118,7 @@ if(istype(I,/obj/item/container/cigarette)) return TRUE -/emote/drag/on_emote(var/atom/emoter,var/atom/target) +/emote/drag/on_emote(atom/emoter,atom/target) if(is_advanced(emoter)) var/mob/living/advanced/A = emoter if(A.inventories_by_id[BODY_FACE]) @@ -144,14 +144,14 @@ action = null action_target = null -/emote/spin/proc/spin(var/atom/emoter,var/spins_remaining=0) +/emote/spin/proc/spin(atom/emoter,spins_remaining=0) emoter.set_dir(turn(emoter.dir,90)) if(spins_remaining > 0) CALLBACK("\ref[emoter]_spin",1,src,src::spin(),emoter,spins_remaining-1) -/emote/spin/on_emote(var/atom/emoter,var/atom/target) +/emote/spin/on_emote(atom/emoter,atom/target) spin(emoter,11) return ..() @@ -161,7 +161,7 @@ action = null action_target = null -/emote/help/on_emote(var/atom/emoter,var/atom/target) +/emote/help/on_emote(atom/emoter,atom/target) var/mob/M = emoter M.view_emotes() return ..() \ No newline at end of file diff --git a/code/_core/datum/ench/_ench.dm b/code/_core/datum/ench/_ench.dm index b251abd64f..b3f1a04194 100644 --- a/code/_core/datum/ench/_ench.dm +++ b/code/_core/datum/ench/_ench.dm @@ -18,10 +18,10 @@ . = desc . = replacetextEx(.,"#M",magnitude) -/ench/proc/on_equipped(var/mob/living/L,var/obj/item/clothing/C) +/ench/proc/on_equipped(mob/living/L,obj/item/clothing/C) return TRUE -/ench/proc/on_unequipped(var/mob/living/L,var/obj/item/clothing/C) +/ench/proc/on_unequipped(mob/living/L,obj/item/clothing/C) return TRUE /ench/suffix/ diff --git a/code/_core/datum/ench/prefix_damage.dm b/code/_core/datum/ench/prefix_damage.dm index 31dc652eb9..9560c03ce9 100644 --- a/code/_core/datum/ench/prefix_damage.dm +++ b/code/_core/datum/ench/prefix_damage.dm @@ -4,10 +4,10 @@ magnitude_min = 1 magnitude_max = 10 -/ench/prefix/damage/on_equipped(var/mob/living/L,var/obj/item/clothing/C) +/ench/prefix/damage/on_equipped(mob/living/L,obj/item/clothing/C) . = ..() L.add_mob_value("[damage_id]","ench:\ref[src]",magnitude) -/ench/prefix/damage/on_unequipped(var/mob/living/L,var/obj/item/clothing/C) +/ench/prefix/damage/on_unequipped(mob/living/L,obj/item/clothing/C) . = ..() L.remove_mob_value("[damage_id]","ench:\ref[src]") \ No newline at end of file diff --git a/code/_core/datum/ench/prefix_resist.dm b/code/_core/datum/ench/prefix_resist.dm index 2bac8fc9b1..0e82e4d04b 100644 --- a/code/_core/datum/ench/prefix_resist.dm +++ b/code/_core/datum/ench/prefix_resist.dm @@ -4,11 +4,11 @@ magnitude_min = 1 magnitude_max = 5 -/ench/prefix/resist/on_equipped(var/mob/living/L,var/obj/item/clothing/C) +/ench/prefix/resist/on_equipped(mob/living/L,obj/item/clothing/C) . = ..() L.add_mob_value("[damage_id]_resist","ench:\ref[src]",magnitude) -/ench/prefix/resist/on_unequipped(var/mob/living/L,var/obj/item/clothing/C) +/ench/prefix/resist/on_unequipped(mob/living/L,obj/item/clothing/C) . = ..() L.remove_mob_value("[damage_id]_resist","ench:\ref[src]") diff --git a/code/_core/datum/ench/suffix_attribute.dm b/code/_core/datum/ench/suffix_attribute.dm index fa0dee8dda..d2959ba939 100644 --- a/code/_core/datum/ench/suffix_attribute.dm +++ b/code/_core/datum/ench/suffix_attribute.dm @@ -4,13 +4,13 @@ magnitude_min = 1 magnitude_max = 10 -/ench/suffix/attribute/on_equipped(var/mob/living/L,var/obj/item/clothing/C) +/ench/suffix/attribute/on_equipped(mob/living/L,obj/item/clothing/C) . = ..() L.add_mob_value("[attribute_id]","ench:\ref[src]",magnitude) if(L.health) L.health.update_health_stats() -/ench/suffix/attribute/on_unequipped(var/mob/living/L,var/obj/item/clothing/C) +/ench/suffix/attribute/on_unequipped(mob/living/L,obj/item/clothing/C) . = ..() L.remove_mob_value("[attribute_id]","ench:\ref[src]") if(L.health) diff --git a/code/_core/datum/ench/suffix_stat.dm b/code/_core/datum/ench/suffix_stat.dm index 68fba601e1..9f5ff02274 100644 --- a/code/_core/datum/ench/suffix_stat.dm +++ b/code/_core/datum/ench/suffix_stat.dm @@ -4,13 +4,13 @@ magnitude_min = 1 magnitude_max = 10 -/ench/suffix/stat/on_equipped(var/mob/living/L,var/obj/item/clothing/C) +/ench/suffix/stat/on_equipped(mob/living/L,obj/item/clothing/C) . = ..() L.add_mob_value("[stat_id]","ench:\ref[src]",magnitude) if(L.health) L.health.update_health_stats() -/ench/suffix/stat/on_unequipped(var/mob/living/L,var/obj/item/clothing/C) +/ench/suffix/stat/on_unequipped(mob/living/L,obj/item/clothing/C) . = ..() L.remove_mob_value("[stat_id]","ench:\ref[src]") if(L.health) diff --git a/code/_core/datum/enchantment/_enchantment.dm b/code/_core/datum/enchantment/_enchantment.dm index 76a5cf1ba9..eb0b1b700a 100644 --- a/code/_core/datum/enchantment/_enchantment.dm +++ b/code/_core/datum/enchantment/_enchantment.dm @@ -7,7 +7,7 @@ var/cost = 100 var/strength = 1 -/enchantment/proc/generate_stats(var/mob/living/caller,var/obj/item/weapon/desired_weapon,var/obj/item/soulgem/desired_soulgem) +/enchantment/proc/generate_stats(mob/living/caller,obj/item/weapon/desired_weapon,obj/item/soulgem/desired_soulgem) charge = desired_soulgem.total_charge max_charge = desired_soulgem.total_charge cost = initial(cost) * strength * (1 - caller.get_skill_power(SKILL_SUMMONING,0,1,1)*0.5) @@ -15,5 +15,5 @@ strength = CEILING(strength,1) return strength * cost * 0.1 -/enchantment/proc/on_hit(var/atom/attacker,var/atom/victim,var/obj/item/weapon/weapon,var/atom/hit_object,var/atom/blamed,var/total_damage_dealt=0) +/enchantment/proc/on_hit(atom/attacker,atom/victim,obj/item/weapon/weapon,atom/hit_object,atom/blamed,total_damage_dealt=0) return TRUE \ No newline at end of file diff --git a/code/_core/datum/enchantment/enchantment_types.dm b/code/_core/datum/enchantment/enchantment_types.dm index 57cdf61c06..91b87094a8 100644 --- a/code/_core/datum/enchantment/enchantment_types.dm +++ b/code/_core/datum/enchantment/enchantment_types.dm @@ -4,7 +4,7 @@ enchanting_phrase = "Woah Momma, Thats a spicy meatball!" cost = 75 -/enchantment/fire/on_hit(var/atom/attacker,var/atom/victim,var/obj/item/weapon/weapon,var/atom/hit_object,var/atom/blamed,var/total_damage_dealt=0) +/enchantment/fire/on_hit(atom/attacker,atom/victim,obj/item/weapon/weapon,atom/hit_object,atom/blamed,total_damage_dealt=0) if(is_living(victim)) var/mob/living/L = victim L.ignite(strength*5*(total_damage_dealt/80),attacker) @@ -17,7 +17,7 @@ enchanting_phrase = "Oh fuck I slipped! Fucking nerf soap!" cost = 100 -/enchantment/stagger/on_hit(var/atom/attacker,var/atom/victim,var/obj/item/weapon/weapon,var/atom/hit_object,var/atom/blamed,var/total_damage_dealt=0) +/enchantment/stagger/on_hit(atom/attacker,atom/victim,obj/item/weapon/weapon,atom/hit_object,atom/blamed,total_damage_dealt=0) if(is_living(victim) && prob(strength*5*min(1,total_damage_dealt/100))) var/mob/living/L = victim L.add_status_effect(STAGGER,3,3) @@ -30,7 +30,7 @@ enchanting_phrase = "Fucking stunlockers are fucking noobs, Im tired of this shit!" cost = 200 -/enchantment/stun/on_hit(var/atom/attacker,var/atom/victim,var/obj/item/weapon/weapon,var/atom/hit_object,var/atom/blamed,var/total_damage_dealt=0) +/enchantment/stun/on_hit(atom/attacker,atom/victim,obj/item/weapon/weapon,atom/hit_object,atom/blamed,total_damage_dealt=0) if(is_living(victim) && prob(strength*2.5*(total_damage_dealt/100))) var/mob/living/L = victim L.add_status_effect(STUN,10,10) @@ -43,7 +43,7 @@ enchanting_phrase = "Why are my fucking hands made of butter?" cost = 150 -/enchantment/disarm/on_hit(var/atom/attacker,var/atom/victim,var/obj/item/weapon/weapon,var/atom/hit_object,var/atom/blamed,var/total_damage_dealt=0) +/enchantment/disarm/on_hit(atom/attacker,atom/victim,obj/item/weapon/weapon,atom/hit_object,atom/blamed,total_damage_dealt=0) if(is_advanced(victim) && prob(strength*5*(total_damage_dealt/50))) var/mob/living/advanced/L = victim L.add_status_effect(DISARM,50,50) @@ -55,7 +55,7 @@ enchanting_phrase = "Blood for the blood god!" cost = 125 -/enchantment/blood_leech/on_hit(var/atom/attacker,var/atom/victim,var/obj/item/weapon/weapon,var/atom/hit_object,var/atom/blamed,var/total_damage_dealt=0) +/enchantment/blood_leech/on_hit(atom/attacker,atom/victim,obj/item/weapon/weapon,atom/hit_object,atom/blamed,total_damage_dealt=0) if(is_living(attacker) && is_living(victim)) var/mob/living/V = victim var/mob/living/A = attacker @@ -73,7 +73,7 @@ enchanting_phrase = "Gingers have souls!" cost = 50 -/enchantment/soul_trap/on_hit(var/atom/attacker,var/atom/victim,var/obj/item/weapon/weapon,var/atom/hit_object,var/atom/blamed,var/total_damage_dealt=0) +/enchantment/soul_trap/on_hit(atom/attacker,atom/victim,obj/item/weapon/weapon,atom/hit_object,atom/blamed,total_damage_dealt=0) if(is_living(victim)) var/mob/living/L = victim L.add_status_effect(SOULTRAP,10 + strength*30,10 + strength*30) diff --git a/code/_core/datum/event/_event.dm b/code/_core/datum/event/_event.dm index 7acd7c82ea..802a75ae1d 100644 --- a/code/_core/datum/event/_event.dm +++ b/code/_core/datum/event/_event.dm @@ -38,7 +38,7 @@ -/proc/find_safe_turf_for_event(var/desired_z=0,var/attempts=10) +/proc/find_safe_turf_for_event(desired_z=0,attempts=10) if(attempts <= 0) return null diff --git a/code/_core/datum/experience/_experience.dm b/code/_core/datum/experience/_experience.dm index 5e846275e8..b4b4d9da74 100644 --- a/code/_core/datum/experience/_experience.dm +++ b/code/_core/datum/experience/_experience.dm @@ -21,40 +21,40 @@ var/mob/living/owner -/experience/get_examine_list(var/mob/examiner) +/experience/get_examine_list(mob/examiner) return list(div("examine_title","[name]"),div("examine_description","[desc]"),div("examine_description","[desc]"),div("examine_description_long",src.desc_extended)) /experience/Destroy() owner = null return ..() -/experience/New(var/mob/M) +/experience/New(mob/M) if(!default_level) default_level = CONFIG("CHARGEN_DEFAULT_LEVEL",1) owner = M return ..() -/experience/proc/update_experience(var/desired_xp) +/experience/proc/update_experience(desired_xp) desired_xp = max(0,desired_xp) experience = desired_xp last_level = min(xp_to_level(experience),get_max_level()) return TRUE -/experience/proc/xp_to_level(var/xp) //Convert xp to level +/experience/proc/xp_to_level(xp) //Convert xp to level if(xp < 0) owner.to_chat(span("danger","Your [src.name] level is negative! Report this bug on discord!")) log_error("Warning: [src.name] xp was negative for [owner.get_debug_name()].") return 1 return FLOOR((xp ** (1/experience_power)) / (experience_multiplier * (1 + src.get_prestige_count()*0.1)), 1) -/experience/proc/level_to_xp(var/level) //Convert level to xp +/experience/proc/level_to_xp(level) //Convert level to xp if(level < 0) owner.to_chat(span("danger","Your [src.name] level is negative! Report this bug on discord!")) log_error("Warning: [src.name] xp was negative for [owner.get_debug_name()].") return 0 return CEILING((level*experience_multiplier*(1 + src.get_prestige_count()*0.1)) ** experience_power,1) -/experience/proc/set_level(var/level) +/experience/proc/set_level(level) if(!ENABLE_XP) return FALSE experience = level_to_xp(clamp(level,1,get_max_level())) @@ -67,7 +67,7 @@ /experience/proc/get_xp() return experience -/experience/proc/add_xp(var/xp_to_add,var/bypass_checks = FALSE,var/difficulty_multiplier=TRUE) +/experience/proc/add_xp(xp_to_add,bypass_checks = FALSE,difficulty_multiplier=TRUE) if(!ENABLE_XP) return FALSE @@ -95,20 +95,20 @@ return xp_to_add -/experience/proc/set_xp(var/new_xp) +/experience/proc/set_xp(new_xp) if(!ENABLE_XP) return FALSE experience = new_xp return experience // https://www.desmos.com/calculator/bwdfwyg3ae -/experience/proc/get_power(var/min_power = 0.25,var/max_power = 1,var/absolute_max_power,var/bonus_level=0) +/experience/proc/get_power(min_power = 0.25,max_power = 1,absolute_max_power,bonus_level=0) if(!absolute_max_power) absolute_max_power = max_power return min(absolute_max_power,(min_power + (bonus_level + get_current_level())*max_power*0.01)*(1-(min_power/max_power))) -/experience/proc/on_level_up(var/old_level,var/new_level) +/experience/proc/on_level_up(old_level,new_level) owner.on_level_up(src,old_level,new_level) return new_level diff --git a/code/_core/datum/experience/attributes.dm b/code/_core/datum/experience/attributes.dm index 2e4ce55319..cbd41f592d 100644 --- a/code/_core/datum/experience/attributes.dm +++ b/code/_core/datum/experience/attributes.dm @@ -41,7 +41,7 @@ experience_power = 1 experience_multiplier = 2 -/experience/attribute/vitality/on_level_up(var/old_level,var/new_level) +/experience/attribute/vitality/on_level_up(old_level,new_level) if(owner && owner.health) owner.health.update_health_stats() return ..() @@ -83,7 +83,7 @@ experience_power = 1 experience_multiplier = 2 -/experience/attribute/endurance/on_level_up(var/old_level,var/new_level) +/experience/attribute/endurance/on_level_up(old_level,new_level) if(owner && owner.health) owner.health.update_health_stats() return ..() @@ -126,7 +126,7 @@ experience_power = 1 experience_multiplier = 2 -/experience/attribute/wisdom/on_level_up(var/old_level,var/new_level) +/experience/attribute/wisdom/on_level_up(old_level,new_level) if(owner && owner.health) owner.health.update_health_stats() return ..() @@ -150,7 +150,7 @@ default_level = 50 counts_towards_level = FALSE -/experience/attribute/luck/set_level(var/level) +/experience/attribute/luck/set_level(level) . = ..() if(.) owner.luck = clamp(level,1,src.get_max_level()) diff --git a/code/_core/datum/factions/_faction.dm b/code/_core/datum/factions/_faction.dm index 744b031a39..af9779c623 100644 --- a/code/_core/datum/factions/_faction.dm +++ b/code/_core/datum/factions/_faction.dm @@ -15,13 +15,13 @@ var/friendly_fire = TRUE //Set to true if people can kill eachother in this faction. -/faction/proc/is_hostile_to(var/faction/F) +/faction/proc/is_hostile_to(faction/F) if(length(relationships) && relationships[F.id]) return relationships[F.id] <= aggressiveness else return FALSE -/faction/proc/is_hostile_to_mob(var/mob/living/L) +/faction/proc/is_hostile_to_mob(mob/living/L) for(var/id in L.factions) if(relationships[id] && relationships[id] <= aggressiveness) return TRUE diff --git a/code/_core/datum/fuckup/_fuckup.dm b/code/_core/datum/fuckup/_fuckup.dm index e10fc12ec7..93d3cd55f8 100644 --- a/code/_core/datum/fuckup/_fuckup.dm +++ b/code/_core/datum/fuckup/_fuckup.dm @@ -1,13 +1,13 @@ /fuckup/ var/name = "Cancel" //Failsafe. -/fuckup/proc/apply(var/list/file_contents) +/fuckup/proc/apply(list/file_contents) . = file_contents /fuckup/economy_broke name = "ECONOMY BROKE" -/fuckup/economy_broke/apply(var/list/file_contents) +/fuckup/economy_broke/apply(list/file_contents) . = ..() .["currency"] = 80000 .["revenue"] = 0 diff --git a/code/_core/datum/gamemode/_gamemode.dm b/code/_core/datum/gamemode/_gamemode.dm index 8d2645976a..2c6885f9d9 100644 --- a/code/_core/datum/gamemode/_gamemode.dm +++ b/code/_core/datum/gamemode/_gamemode.dm @@ -159,7 +159,7 @@ //Can we even continue? return TRUE -/gamemode/proc/on_object_sold(var/atom/movable/M) +/gamemode/proc/on_object_sold(atom/movable/M) for(var/k in crew_active_objectives) var/objective/O = k @@ -172,7 +172,7 @@ -/gamemode/proc/add_objective(var/objective/O) +/gamemode/proc/add_objective(objective/O) O = new O if(O.completion_state == IMPOSSIBLE) diff --git a/code/_core/datum/gamemode/horde.dm b/code/_core/datum/gamemode/horde.dm index 98ce44eb6b..2b50dcae36 100644 --- a/code/_core/datum/gamemode/horde.dm +++ b/code/_core/datum/gamemode/horde.dm @@ -33,7 +33,7 @@ else world.end(WORLD_END_NANOTRASEN_VICTORY) -/gamemode/horde/proc/create_horde_mob(var/desired_loc) +/gamemode/horde/proc/create_horde_mob(desired_loc) var/mob/living/L = pickweight(enemy_types_to_spawn) L = new L(desired_loc) INITIALIZE(L) @@ -301,7 +301,7 @@ /gamemode/horde/proc/get_enemy_types_to_spawn() return enemy_types_to_spawn -/gamemode/horde/proc/on_killed_enemy(var/mob/living/L,var/args) +/gamemode/horde/proc/on_killed_enemy(mob/living/L,args) for(var/k in SSholiday.holidays) var/holiday/H = SSholiday.holidays[k] diff --git a/code/_core/datum/gamemode/horde_types.dm b/code/_core/datum/gamemode/horde_types.dm index 546f186fba..5d11a7fa01 100644 --- a/code/_core/datum/gamemode/horde_types.dm +++ b/code/_core/datum/gamemode/horde_types.dm @@ -149,7 +149,7 @@ /gamemode/horde/boss_rush/get_wave_size() return 1 -/gamemode/horde/boss_rush/create_horde_mob(var/desired_loc) +/gamemode/horde/boss_rush/create_horde_mob(desired_loc) var/mob/living/L = ..() L.set_loyalty_tag("Boss") L.set_iff_tag("Boss") diff --git a/code/_core/datum/gamemode/nukies/_nukies.dm b/code/_core/datum/gamemode/nukies/_nukies.dm index ec8553e62f..28b26b4ea3 100644 --- a/code/_core/datum/gamemode/nukies/_nukies.dm +++ b/code/_core/datum/gamemode/nukies/_nukies.dm @@ -53,7 +53,7 @@ return TRUE -/gamemode/nuke_ops/proc/player_post_death(var/mob/living/advanced/player/virtual/P) +/gamemode/nuke_ops/proc/player_post_death(mob/living/advanced/player/virtual/P) . = ..() check_gamemode_win() @@ -62,7 +62,7 @@ QDEL_NULL(tracked_disk) return TRUE -/gamemode/nuke_ops/proc/set_winner(var/desired_team) +/gamemode/nuke_ops/proc/set_winner(desired_team) if(game_state == 6 || game_state == 7) return FALSE diff --git a/code/_core/datum/gamemode/nukies/nukies_setup.dm b/code/_core/datum/gamemode/nukies/nukies_setup.dm index d37ca1b11e..a49e0be0b2 100644 --- a/code/_core/datum/gamemode/nukies/nukies_setup.dm +++ b/code/_core/datum/gamemode/nukies/nukies_setup.dm @@ -1,4 +1,4 @@ -/gamemode/nuke_ops/proc/setup_player(var/mob/living/L,var/turf/T) +/gamemode/nuke_ops/proc/setup_player(mob/living/L,turf/T) L.force_move(T) L.rejuvenate() if(L.client) @@ -34,7 +34,7 @@ return TRUE -/gamemode/nuke_ops/proc/on_player_join(var/mob/living/L) //What happens when a player joins +/gamemode/nuke_ops/proc/on_player_join(mob/living/L) //What happens when a player joins active_players |= L if(base_loadout && is_advanced(L)) var/mob/living/advanced/A = L @@ -44,7 +44,7 @@ move_to_team(L,"Lobby") return TRUE -/gamemode/nuke_ops/proc/set_message(var/desired_message) //TODO: Make this better. +/gamemode/nuke_ops/proc/set_message(desired_message) //TODO: Make this better. for(var/mob/living/advanced/A in active_players) if(!A.client) @@ -53,7 +53,7 @@ M.set_text(desired_message) -/gamemode/nuke_ops/proc/on_player_leave(var/mob/living/L) //What happens when a player leaves virtual reality. +/gamemode/nuke_ops/proc/on_player_leave(mob/living/L) //What happens when a player leaves virtual reality. active_players -= L move_to_team(L,null) return TRUE diff --git a/code/_core/datum/gamemode/nukies/nukies_teams.dm b/code/_core/datum/gamemode/nukies/nukies_teams.dm index e2d4bb9e0d..1eff856389 100644 --- a/code/_core/datum/gamemode/nukies/nukies_teams.dm +++ b/code/_core/datum/gamemode/nukies/nukies_teams.dm @@ -48,7 +48,7 @@ else move_to_team(k,"Syndicate") -/gamemode/nuke_ops/proc/give_loadout(var/mob/living/advanced/A) +/gamemode/nuke_ops/proc/give_loadout(mob/living/advanced/A) if(length(team_loadouts[A.loyalty_tag])) var/loadout/L = pick(team_loadouts[A.loyalty_tag]) @@ -57,7 +57,7 @@ return FALSE -/gamemode/nuke_ops/proc/move_to_team(var/mob/living/L,var/desired_team) +/gamemode/nuke_ops/proc/move_to_team(mob/living/L,desired_team) if(L.loyalty_tag && teams[L.loyalty_tag]) teams[L.loyalty_tag] -= L diff --git a/code/_core/datum/hazard/_hazard.dm b/code/_core/datum/hazard/_hazard.dm index 8575f28231..402dc05f47 100644 --- a/code/_core/datum/hazard/_hazard.dm +++ b/code/_core/datum/hazard/_hazard.dm @@ -1,7 +1,7 @@ /hazard/ var/id = null -/hazard/proc/process_player_tick(var/mob/living/advanced/player/P) +/hazard/proc/process_player_tick(mob/living/advanced/player/P) return TRUE /hazard/cold @@ -15,7 +15,7 @@ ) /* rewrite -/hazard/cold/process_player_tick(var/mob/living/advanced/player/P) +/hazard/cold/process_player_tick(mob/living/advanced/player/P) var/total_damage = 0 var/list/all_damaged_organs = list() diff --git a/code/_core/datum/health/_health.dm b/code/_core/datum/health/_health.dm index c25722236d..1bc6a128fb 100644 --- a/code/_core/datum/health/_health.dm +++ b/code/_core/datum/health/_health.dm @@ -35,7 +35,7 @@ owner = null return ..() -/health/proc/get_damage_multiplier(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/health/proc/get_damage_multiplier(atom/attacker,atom/victim,atom/weapon,atom/hit_object) . = damage_multiplier @@ -48,7 +48,7 @@ return . -/health/New(var/desired_owner) +/health/New(desired_owner) owner = desired_owner return ..() @@ -75,7 +75,7 @@ update_health() return TRUE -/health/proc/adjust_loss_smart(var/brute,var/burn,var/tox,var/oxy,var/fatigue,var/pain,var/rad,var/sanity,var/mental,var/organic=TRUE,var/robotic=TRUE,var/update=TRUE) +/health/proc/adjust_loss_smart(brute,burn,tox,oxy,fatigue,pain,rad,sanity,mental,organic=TRUE,robotic=TRUE,update=TRUE) //Living beings don't use the code below. //They get their own custom thing. @@ -103,7 +103,7 @@ if(update && should_update) update_health() -/health/proc/adjust_loss(var/loss_type,var/value) +/health/proc/adjust_loss(loss_type,value) if(isnum(resistance[loss_type]) && value > 0) value *= resistance[loss_type] var/old_value = damage[loss_type] @@ -118,7 +118,7 @@ health_current = get_overall_health() return TRUE -/health/proc/get_defense(var/atom/attacker,var/atom/hit_object,var/ignore_luck=FALSE) +/health/proc/get_defense(atom/attacker,atom/hit_object,ignore_luck=FALSE) var/armor/A = ARMOR(armor) if(!A) return list() @@ -126,7 +126,7 @@ .["deflection"] = A.deflection return -/health/proc/adjust_mana(var/adjust_value) +/health/proc/adjust_mana(adjust_value) var/old_value = mana_current var/new_value = clamp(mana_current + adjust_value,0,mana_max) new_value = FLOOR(new_value,HEALTH_PRECISION) @@ -135,7 +135,7 @@ return new_value - old_value return 0 -/health/proc/adjust_stamina(var/adjust_value) +/health/proc/adjust_stamina(adjust_value) var/old_value = stamina_current var/new_value = clamp(stamina_current + adjust_value,0,stamina_max) new_value = FLOOR(new_value,HEALTH_PRECISION) @@ -145,5 +145,5 @@ return 0 -/health/proc/act_emp(var/atom/owner,var/atom/source,var/atom/epicenter,var/magnitude,var/desired_loyalty_tag) +/health/proc/act_emp(atom/owner,atom/source,atom/epicenter,magnitude,desired_loyalty_tag) return FALSE \ No newline at end of file diff --git a/code/_core/datum/health/construction.dm b/code/_core/datum/health/construction.dm index e19cd60ce6..ae54b6d5a9 100644 --- a/code/_core/datum/health/construction.dm +++ b/code/_core/datum/health/construction.dm @@ -18,7 +18,7 @@ ) */ -/health/construction/update_health(var/atom/attacker,var/damage_dealt=0,var/update_hud=TRUE,var/check_death=TRUE) +/health/construction/update_health(atom/attacker,damage_dealt=0,update_hud=TRUE,check_death=TRUE) . = ..() if(!owner) return . @@ -48,7 +48,7 @@ /health/construction/field_generator/ -/health/construction/field_generator/get_damage_multiplier(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/health/construction/field_generator/get_damage_multiplier(atom/attacker,atom/victim,atom/weapon,atom/hit_object) if(istype(weapon,/obj/structure/interactive/emitter)) return 0 diff --git a/code/_core/datum/health/mob/living/_living.dm b/code/_core/datum/health/mob/living/_living.dm index 90ababd71a..5c935b1402 100644 --- a/code/_core/datum/health/mob/living/_living.dm +++ b/code/_core/datum/health/mob/living/_living.dm @@ -8,7 +8,7 @@ QUEUE_HEALTH_UPDATE(L) return TRUE -/health/mob/living/get_damage_multiplier(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object) +/health/mob/living/get_damage_multiplier(atom/attacker,atom/victim,atom/weapon,atom/hit_object) . = ..() @@ -20,7 +20,7 @@ if(L.has_status_effect(STRESSED)) . += 0.5 -/health/mob/living/get_defense(var/atom/attacker,var/atom/hit_object,var/ignore_luck=FALSE) +/health/mob/living/get_defense(atom/attacker,atom/hit_object,ignore_luck=FALSE) . = ..() @@ -147,7 +147,7 @@ QUEUE_HEALTH_UPDATE(L) -/health/mob/living/adjust_loss(var/loss_type,var/value) +/health/mob/living/adjust_loss(loss_type,value) . = ..() if(. && is_living(owner)) var/mob/living/L = owner @@ -155,7 +155,7 @@ L.health_regen_delay = max(L.health_regen_delay,60 SECONDS) QUEUE_HEALTH_UPDATE(L) -/health/mob/living/adjust_mana(var/adjust_value) +/health/mob/living/adjust_mana(adjust_value) . = ..() if(.) var/mob/living/L = owner @@ -163,7 +163,7 @@ L.mana_regen_delay = max(L.mana_regen_delay,4 SECONDS) QUEUE_HEALTH_UPDATE(L) -/health/mob/living/adjust_stamina(var/adjust_value) +/health/mob/living/adjust_stamina(adjust_value) . = ..() if(.) var/mob/living/L = owner @@ -173,7 +173,7 @@ QUEUE_HEALTH_UPDATE(L) -/health/mob/living/adjust_loss_smart(var/brute,var/burn,var/tox,var/oxy,var/fatigue,var/pain,var/rad,var/sanity,var/mental,var/organic=TRUE,var/robotic=TRUE,var/update=TRUE) +/health/mob/living/adjust_loss_smart(brute,burn,tox,oxy,fatigue,pain,rad,sanity,mental,organic=TRUE,robotic=TRUE,update=TRUE) . = 0 diff --git a/code/_core/datum/health/mob/living/advanced/_advanced.dm b/code/_core/datum/health/mob/living/advanced/_advanced.dm index 58d396a373..d1f996ea1f 100644 --- a/code/_core/datum/health/mob/living/advanced/_advanced.dm +++ b/code/_core/datum/health/mob/living/advanced/_advanced.dm @@ -14,7 +14,7 @@ QUEUE_HEALTH_UPDATE(A) -/health/mob/living/advanced/adjust_loss_smart(var/brute,var/burn,var/tox,var/oxy,var/fatigue,var/pain,var/rad,var/sanity,var/mental,var/organic=TRUE,var/robotic=TRUE,var/update=TRUE) +/health/mob/living/advanced/adjust_loss_smart(brute,burn,tox,oxy,fatigue,pain,rad,sanity,mental,organic=TRUE,robotic=TRUE,update=TRUE) . = 0 @@ -201,7 +201,7 @@ if(A.is_player_controlled() && A.has_status_effect(CRITPROTECTION)) . = max(0,.) -/health/mob/living/advanced/get_defense(var/atom/attacker,var/atom/hit_object,var/ignore_luck=FALSE) +/health/mob/living/advanced/get_defense(atom/attacker,atom/hit_object,ignore_luck=FALSE) . = ..() diff --git a/code/_core/datum/health/mob/living/advanced/dummy.dm b/code/_core/datum/health/mob/living/advanced/dummy.dm index 78882c3b48..eaf9652209 100644 --- a/code/_core/datum/health/mob/living/advanced/dummy.dm +++ b/code/_core/datum/health/mob/living/advanced/dummy.dm @@ -2,5 +2,5 @@ organic = FALSE -/health/mob/living/advanced/dummy/adjust_loss_smart(var/brute,var/burn,var/tox,var/oxy,var/fatigue,var/pain,var/rad,var/sanity,var/mental,var/organic=TRUE,var/robotic=TRUE,var/update=TRUE) +/health/mob/living/advanced/dummy/adjust_loss_smart(brute,burn,tox,oxy,fatigue,pain,rad,sanity,mental,organic=TRUE,robotic=TRUE,update=TRUE) return brute + burn + tox + oxy + fatigue + pain + rad + sanity + mental // + L + plundered + no wenches + marooned + you have scurvy diff --git a/code/_core/datum/health/mob/living/vehicle/mech/modular/_modular.dm b/code/_core/datum/health/mob/living/vehicle/mech/modular/_modular.dm index d05f03044b..21020e78d2 100644 --- a/code/_core/datum/health/mob/living/vehicle/mech/modular/_modular.dm +++ b/code/_core/datum/health/mob/living/vehicle/mech/modular/_modular.dm @@ -1,4 +1,4 @@ -/health/mob/living/vehicle/mech/modular/get_defense(var/atom/attacker,var/atom/hit_object,var/ignore_luck=FALSE) +/health/mob/living/vehicle/mech/modular/get_defense(atom/attacker,atom/hit_object,ignore_luck=FALSE) . = ..() diff --git a/code/_core/datum/health/obj/item/mech_part/_mech_part.dm b/code/_core/datum/health/obj/item/mech_part/_mech_part.dm index b57dafb6af..b0b1b9ef9d 100644 --- a/code/_core/datum/health/obj/item/mech_part/_mech_part.dm +++ b/code/_core/datum/health/obj/item/mech_part/_mech_part.dm @@ -1,7 +1,7 @@ /health/obj/item/mech_part organic = FALSE -/health/obj/item/mech_part/adjust_loss_smart(var/brute,var/burn,var/tox,var/oxy,var/fatigue,var/pain,var/rad,var/sanity,var/mental,var/organic=TRUE,var/robotic=TRUE,var/update=TRUE) +/health/obj/item/mech_part/adjust_loss_smart(brute,burn,tox,oxy,fatigue,pain,rad,sanity,mental,organic=TRUE,robotic=TRUE,update=TRUE) tox = 0 oxy = 0 diff --git a/code/_core/datum/health/obj/item/organ/_organ.dm b/code/_core/datum/health/obj/item/organ/_organ.dm index ce8f1cc81d..9d322a11d7 100644 --- a/code/_core/datum/health/obj/item/organ/_organ.dm +++ b/code/_core/datum/health/obj/item/organ/_organ.dm @@ -7,7 +7,7 @@ var/mob/living/advanced/A = owner.loc A.queue_organ_health_update[owner] = TRUE -/health/obj/item/organ/adjust_loss(var/loss_type,var/value) +/health/obj/item/organ/adjust_loss(loss_type,value) . = ..() if(. && is_organ(owner) && is_advanced(owner.loc)) var/mob/living/advanced/A = owner.loc @@ -58,7 +58,7 @@ if(should_update_overlay) A.update_overlay_tracked("\ref[O]") -/health/obj/item/organ/adjust_loss_smart(var/brute,var/burn,var/tox,var/oxy,var/fatigue,var/pain,var/rad,var/sanity,var/mental,var/organic=TRUE,var/robotic=TRUE,var/update=TRUE) +/health/obj/item/organ/adjust_loss_smart(brute,burn,tox,oxy,fatigue,pain,rad,sanity,mental,organic=TRUE,robotic=TRUE,update=TRUE) if(src.organic && !organic) return 0 @@ -107,12 +107,12 @@ resistance = list(PAIN=0,TOX=0) organic = FALSE -/health/obj/item/organ/synthetic/act_emp(var/atom/owner,var/atom/source,var/atom/epicenter,var/magnitude,var/desired_loyalty_tag) +/health/obj/item/organ/synthetic/act_emp(atom/owner,atom/source,atom/epicenter,magnitude,desired_loyalty_tag) adjust_loss_smart(burn=magnitude,organic=FALSE,robotic=TRUE) return TRUE /health/obj/item/organ/dummy organic = FALSE -/health/obj/item/organ/dummy/adjust_loss_smart(var/brute,var/burn,var/tox,var/oxy,var/fatigue,var/pain,var/rad,var/sanity,var/mental,var/organic=TRUE,var/robotic=TRUE,var/update=TRUE) +/health/obj/item/organ/dummy/adjust_loss_smart(brute,burn,tox,oxy,fatigue,pain,rad,sanity,mental,organic=TRUE,robotic=TRUE,update=TRUE) return brute + burn + tox + oxy + fatigue + pain + rad + sanity + mental // + L + plundered + no wenches + marooned + you have scurvy diff --git a/code/_core/datum/health/turf/_turf.dm b/code/_core/datum/health/turf/_turf.dm index 8344a92cce..71f1a49580 100644 --- a/code/_core/datum/health/turf/_turf.dm +++ b/code/_core/datum/health/turf/_turf.dm @@ -11,7 +11,7 @@ var/material/M = MATERIAL(T.material_id) health_max += M.wall_health -/health/turf/New(var/desired_owner) +/health/turf/New(desired_owner) . = ..() diff --git a/code/_core/datum/holiday/_holiday.dm b/code/_core/datum/holiday/_holiday.dm index 525287653f..fe326c5e37 100644 --- a/code/_core/datum/holiday/_holiday.dm +++ b/code/_core/datum/holiday/_holiday.dm @@ -1,7 +1,7 @@ /holiday/ var/name = "Holiday Name" -/holiday/proc/horde_post_death(var/mob/living/L) +/holiday/proc/horde_post_death(mob/living/L) return TRUE @@ -10,7 +10,7 @@ -/holiday/halloween/horde_post_death(var/mob/living/L) +/holiday/halloween/horde_post_death(mob/living/L) if(prob(25)) var/turf/T = get_turf(L) diff --git a/code/_core/datum/job/_job.dm b/code/_core/datum/job/_job.dm index 72c79c1982..85f7b125fe 100644 --- a/code/_core/datum/job/_job.dm +++ b/code/_core/datum/job/_job.dm @@ -43,7 +43,7 @@ var/job_flags = 0x0 -/job/proc/get_rank_title(var/rank_level=1) +/job/proc/get_rank_title(rank_level=1) var/rank_length = length(ranks) if(!rank_length) return name diff --git a/code/_core/datum/karma_penalty/_karma_penalty.dm b/code/_core/datum/karma_penalty/_karma_penalty.dm index ab235cec26..e211159804 100644 --- a/code/_core/datum/karma_penalty/_karma_penalty.dm +++ b/code/_core/datum/karma_penalty/_karma_penalty.dm @@ -4,7 +4,7 @@ var/min_karma //Karma has to be above this amount to trigger. var/max_karma //Karma has to be below this amount to trigger. -/karma_penalty/proc/on_trigger(var/mob/attacker,var/mob/victim) +/karma_penalty/proc/on_trigger(mob/attacker,mob/victim) //Trigger stuff here. //Assassins diff --git a/code/_core/datum/language/_language.dm b/code/_core/datum/language/_language.dm index 73bfedd2f2..1c9ecb8085 100644 --- a/code/_core/datum/language/_language.dm +++ b/code/_core/datum/language/_language.dm @@ -5,5 +5,5 @@ var/name //Name of Language var/id //ID of language -/language/proc/process_text(var/mob/speaker,var/text) +/language/proc/process_text(mob/speaker,text) return text \ No newline at end of file diff --git a/code/_core/datum/language/binary.dm b/code/_core/datum/language/binary.dm index 660db554f0..f4df11de73 100644 --- a/code/_core/datum/language/binary.dm +++ b/code/_core/datum/language/binary.dm @@ -2,7 +2,7 @@ name = "Binary" id = LANGUAGE_BINARY -/language/binary/process_text(var/speaker,var/text) +/language/binary/process_text(speaker,text) var/regex/R = regex("\[!,.?\]","g") text = R.Replace(text,"") diff --git a/code/_core/datum/language/canuck.dm b/code/_core/datum/language/canuck.dm index b921fa0b1c..d078ff4882 100644 --- a/code/_core/datum/language/canuck.dm +++ b/code/_core/datum/language/canuck.dm @@ -50,7 +50,7 @@ . = ..() -/language/canuck/process_text(var/speaker,var/text) +/language/canuck/process_text(speaker,text) text = periodize(text) //Always add punctuation. diff --git a/code/_core/datum/language/clockwork.dm b/code/_core/datum/language/clockwork.dm index b2a0f1793a..94ecc037fa 100644 --- a/code/_core/datum/language/clockwork.dm +++ b/code/_core/datum/language/clockwork.dm @@ -2,7 +2,7 @@ name = "Ratvarian" id = LANGUAGE_CLOCKWORK -/language/clockwork/process_text(var/speaker,var/text) +/language/clockwork/process_text(speaker,text) var/static/list/vowels = make_associative(list( "á", "é", "í", "ó", "ú", "ẃ", "ý" diff --git a/code/_core/datum/language/codespeak.dm b/code/_core/datum/language/codespeak.dm index e933c0eb18..c75d7cf8fc 100644 --- a/code/_core/datum/language/codespeak.dm +++ b/code/_core/datum/language/codespeak.dm @@ -2,7 +2,7 @@ name = "Codespeak" id = LANGUAGE_CODESPEAK -/language/codespeak/process_text(var/speaker,var/text) +/language/codespeak/process_text(speaker,text) var/widsom_length = length(SStext.wisdoms) diff --git a/code/_core/datum/language/cult.dm b/code/_core/datum/language/cult.dm index 2bcac45e3c..34f4941b7b 100644 --- a/code/_core/datum/language/cult.dm +++ b/code/_core/datum/language/cult.dm @@ -2,7 +2,7 @@ name = "Cult" id = LANGUAGE_CULT -/language/cult/process_text(var/speaker,var/text) +/language/cult/process_text(speaker,text) var/static/list/vowels = make_associative(list( "y","'","u","x","v", diff --git a/code/_core/datum/language/lizard.dm b/code/_core/datum/language/lizard.dm index 9fcfafb50c..94d9de838b 100644 --- a/code/_core/datum/language/lizard.dm +++ b/code/_core/datum/language/lizard.dm @@ -2,7 +2,7 @@ name = "Draconic" id = LANGUAGE_LIZARD -/language/lizard/process_text(var/speaker,var/text) +/language/lizard/process_text(speaker,text) var/static/list/vowels = make_associative(list( "a","e","i","o" diff --git a/code/_core/datum/language/slavic.dm b/code/_core/datum/language/slavic.dm index 43fbf166ea..b70eb3cd86 100644 --- a/code/_core/datum/language/slavic.dm +++ b/code/_core/datum/language/slavic.dm @@ -19,7 +19,7 @@ "suda", "huyar", "odin", "dva", "tri", "holod", "granata", "ne", "re", "ru", "korabl" ) -/language/slavic/process_text(var/speaker,var/text) +/language/slavic/process_text(speaker,text) . = "" diff --git a/code/_core/datum/loadout/_loadout.dm b/code/_core/datum/loadout/_loadout.dm index fd32c938af..72ccbf1e0d 100644 --- a/code/_core/datum/loadout/_loadout.dm +++ b/code/_core/datum/loadout/_loadout.dm @@ -11,10 +11,10 @@ /loadout/proc/get_spawning_items() return spawning_items.Copy() //Copy is needed. -/loadout/proc/pre_add(var/mob/living/advanced/A,var/obj/item/I) //added before initialize and spawn +/loadout/proc/pre_add(mob/living/advanced/A,obj/item/I) //added before initialize and spawn return TRUE -/loadout/proc/on_add(var/mob/living/advanced/A,var/obj/item/I) //added after initialize and spawn +/loadout/proc/on_add(mob/living/advanced/A,obj/item/I) //added after initialize and spawn . = TRUE @@ -57,7 +57,7 @@ return . -/loadout/proc/post_add(var/mob/living/advanced/A,var/list/added_items = list()) //Added after everything is added. +/loadout/proc/post_add(mob/living/advanced/A,list/added_items = list()) //Added after everything is added. for(var/obj/item/weapon/ranged/W in added_items) //So bullet weapons don't spawn empty. if(SSbalance.weapon_to_bullet[W.type]) diff --git a/code/_core/datum/loadout/citizen.dm b/code/_core/datum/loadout/citizen.dm index f301416ba2..7731201cc9 100644 --- a/code/_core/datum/loadout/citizen.dm +++ b/code/_core/datum/loadout/citizen.dm @@ -46,7 +46,7 @@ quality_max = 100 quality_mod_min = 0.75 -/loadout/citizen/pre_add(var/mob/living/advanced/A,var/obj/item/I) //added before initialize and spawn +/loadout/citizen/pre_add(mob/living/advanced/A,obj/item/I) //added before initialize and spawn . = ..() if(is_clothing(I) && length(I.polymorphs) && !(I.item_slot_mod & (SLOT_MOD_LEFT | SLOT_MOD_RIGHT))) var/obj/item/clothing/C = I diff --git a/code/_core/datum/loadout/deathsquad/_deathsquad_OLD.dm b/code/_core/datum/loadout/deathsquad/_deathsquad_OLD.dm index 88849fc29d..7e761a6075 100644 --- a/code/_core/datum/loadout/deathsquad/_deathsquad_OLD.dm +++ b/code/_core/datum/loadout/deathsquad/_deathsquad_OLD.dm @@ -56,7 +56,7 @@ for(var/i=1,i<=4,i++) . += SSweapons.weapon_to_magazine[chosen_secondary] -/loadout/deathsquad/pre_add(var/mob/living/advanced/A,var/obj/item/I) +/loadout/deathsquad/pre_add(mob/living/advanced/A,obj/item/I) if(istype(I,/obj/item/weapon/ranged/)) var/obj/item/weapon/ranged/R = I diff --git a/code/_core/datum/loadout/mercenary/_mercenary.dm b/code/_core/datum/loadout/mercenary/_mercenary.dm index 3ad731a644..339f416591 100644 --- a/code/_core/datum/loadout/mercenary/_mercenary.dm +++ b/code/_core/datum/loadout/mercenary/_mercenary.dm @@ -16,7 +16,7 @@ /obj/item/supply_remote/ammo, -/loadout/mercenary/pre_add(var/mob/living/advanced/A,var/obj/item/I) +/loadout/mercenary/pre_add(mob/living/advanced/A,obj/item/I) if(!I.value_burgerbux) //Prevents antagonists from selling their own items. I.value_burgerbux = 1 diff --git a/code/_core/datum/loadout/slavic/_slavic.dm b/code/_core/datum/loadout/slavic/_slavic.dm index 4ade6b6a70..3f92e382a4 100644 --- a/code/_core/datum/loadout/slavic/_slavic.dm +++ b/code/_core/datum/loadout/slavic/_slavic.dm @@ -9,7 +9,7 @@ quality_max = 75 quality_mod_min = 0.5 -/loadout/slavic/pre_add(var/mob/living/advanced/A,var/obj/item/I) //added before initialize and spawn +/loadout/slavic/pre_add(mob/living/advanced/A,obj/item/I) //added before initialize and spawn . = ..() @@ -18,7 +18,7 @@ if(M.ammo_surplus) M.ammo = M.ammo_surplus -/loadout/slavic/on_add(var/mob/living/advanced/A,var/obj/item/I) //added after initialize and spawn +/loadout/slavic/on_add(mob/living/advanced/A,obj/item/I) //added after initialize and spawn . = ..() diff --git a/code/_core/datum/loadout/virtual_reality.dm b/code/_core/datum/loadout/virtual_reality.dm index 02cedfb9ba..8001e3b3fd 100644 --- a/code/_core/datum/loadout/virtual_reality.dm +++ b/code/_core/datum/loadout/virtual_reality.dm @@ -1,7 +1,7 @@ /loadout/virtual_reality/ -/loadout/virtual_reality/on_add(var/mob/living/advanced/A,var/obj/item/I) //added before initialize and spawn +/loadout/virtual_reality/on_add(mob/living/advanced/A,obj/item/I) //added before initialize and spawn . = ..() if(is_clothing(I)) var/obj/item/clothing/C = I diff --git a/code/_core/datum/loadout/zombie/zombie_civilian.dm b/code/_core/datum/loadout/zombie/zombie_civilian.dm index a86c565ba6..88afd42275 100644 --- a/code/_core/datum/loadout/zombie/zombie_civilian.dm +++ b/code/_core/datum/loadout/zombie/zombie_civilian.dm @@ -68,7 +68,7 @@ if(prob(20)) . += /obj/item/clothing/overwear/coat/polymorphic -/loadout/zombie/civilian/pre_add(var/mob/living/advanced/A,var/obj/item/I) +/loadout/zombie/civilian/pre_add(mob/living/advanced/A,obj/item/I) . = ..() var/p_length = length(I.polymorphs) if(p_length && I.item_slot_layer > SLOT_LAYER_UNDER) diff --git a/code/_core/datum/loot/_loot.dm b/code/_core/datum/loot/_loot.dm index 2c3d69e70f..471feaa6a0 100644 --- a/code/_core/datum/loot/_loot.dm +++ b/code/_core/datum/loot/_loot.dm @@ -81,7 +81,7 @@ -/loot/proc/do_spawn(var/atom/spawn_loc,var/rarity) //Use this to spawn the loot. rarity is optional. +/loot/proc/do_spawn(atom/spawn_loc,rarity) //Use this to spawn the loot. rarity is optional. if(!spawn_loc) CRASH("Invalid spawn_loc!") @@ -113,7 +113,7 @@ L.post_spawn(I) -/loot/proc/create_loot_single(var/type_to_spawn,var/spawn_loc,var/rarity) //Don't use this. Use do_spawn to spawn loot. Not providing a spawn_loc will just return the types. +/loot/proc/create_loot_single(type_to_spawn,spawn_loc,rarity) //Don't use this. Use do_spawn to spawn loot. Not providing a spawn_loc will just return the types. . = list() @@ -144,13 +144,13 @@ else . += type_to_spawn -/loot/proc/pre_spawn(var/atom/movable/M) +/loot/proc/pre_spawn(atom/movable/M) return TRUE -/loot/proc/post_spawn(var/atom/movable/M) +/loot/proc/post_spawn(atom/movable/M) return TRUE -/loot/proc/create_loot_table(var/atom/spawn_loc,var/rarity) //rarity is optional. +/loot/proc/create_loot_table(atom/spawn_loc,rarity) //rarity is optional. . = list() diff --git a/code/_core/datum/loot/bandit.dm b/code/_core/datum/loot/bandit.dm index cda603d73d..99ad33d2d5 100644 --- a/code/_core/datum/loot/bandit.dm +++ b/code/_core/datum/loot/bandit.dm @@ -7,7 +7,7 @@ quality_max = 75 quality_mod_min = 0.75 -/loot/bandit/pre_spawn(var/atom/movable/M) +/loot/bandit/pre_spawn(atom/movable/M) if(istype(M,/obj/item/clothing/)) var/obj/item/clothing/C = M @@ -182,7 +182,7 @@ apply_poly = TRUE chance_blood = 0 -/loot/bandit/back_storage/pre_spawn(var/atom/movable/M) +/loot/bandit/back_storage/pre_spawn(atom/movable/M) . = ..() if(is_item(M)) var/obj/item/I = M diff --git a/code/_core/datum/loot/currency.dm b/code/_core/datum/loot/currency.dm index f78fcb3baf..41ea2bb0e7 100644 --- a/code/_core/datum/loot/currency.dm +++ b/code/_core/datum/loot/currency.dm @@ -2,7 +2,7 @@ var/desired_value = 1000 //How much (on average) do we want to give to the player (if possible). This is per item. loot_count = 1 -/loot/currency/pre_spawn(var/atom/movable/M) +/loot/currency/pre_spawn(atom/movable/M) . = ..() if(desired_value > 0 && istype(M,/obj/item/)) var/obj/item/I = M diff --git a/code/_core/datum/loot/faction_rev.dm b/code/_core/datum/loot/faction_rev.dm index cfcb44fe96..dc89cda3ad 100644 --- a/code/_core/datum/loot/faction_rev.dm +++ b/code/_core/datum/loot/faction_rev.dm @@ -10,7 +10,7 @@ /obj/item/clothing/back/storage/backpack/explorer/black, ) -/loot/revolutionary/back_storage/pre_spawn(var/atom/movable/M) +/loot/revolutionary/back_storage/pre_spawn(atom/movable/M) . = ..() if(is_item(M)) var/obj/item/I = M diff --git a/code/_core/datum/loot/random_gun.dm b/code/_core/datum/loot/random_gun.dm index cf601e025f..3b363145d7 100644 --- a/code/_core/datum/loot/random_gun.dm +++ b/code/_core/datum/loot/random_gun.dm @@ -62,7 +62,7 @@ return TRUE -/loot/random/gun/create_loot_single(var/type_to_spawn,var/spawn_loc,var/rarity=0) +/loot/random/gun/create_loot_single(type_to_spawn,spawn_loc,rarity=0) . = ..() @@ -92,7 +92,7 @@ BC.amount = BC.amount_max . += BC -/loot/random/gun/pre_spawn(var/atom/movable/M) +/loot/random/gun/pre_spawn(atom/movable/M) if(istype(M,/obj/item/bullet_cartridge/)) var/obj/item/bullet_cartridge/B = M diff --git a/code/_core/datum/macros/_macros.dm b/code/_core/datum/macros/_macros.dm index d72be1af78..367e3ca3c0 100644 --- a/code/_core/datum/macros/_macros.dm +++ b/code/_core/datum/macros/_macros.dm @@ -33,7 +33,7 @@ owner = null . = ..() -/macros/New(var/client/spawning_owner) +/macros/New(client/spawning_owner) owner = spawning_owner . = ..() diff --git a/code/_core/datum/menu/_menu.dm b/code/_core/datum/menu/_menu.dm index 85878f07b1..bbdd29a335 100644 --- a/code/_core/datum/menu/_menu.dm +++ b/code/_core/datum/menu/_menu.dm @@ -10,7 +10,7 @@ var/can_minimize = TRUE var/show_titlebar = TRUE -/menu/proc/open(var/mob/user) +/menu/proc/open(mob/user) //Credit to Multiverse7 for providing the code for getting this to work. cache_resources(user) winclone(user, "window", type) @@ -18,18 +18,18 @@ winset(user, "browser([type])", "parent=[type];type=browser;size=0x0;anchor1=0,0;anchor2=100,100") //Onload is called by the client in another proc. -/menu/proc/close(var/mob/user) +/menu/proc/close(mob/user) winset(user, "browser([type])","is-visible:false") -/menu/proc/run_function(var/user, var/function_name,var/args) +/menu/proc/run_function(user, function_name,args) user << output("[function_name]([args]);", "browser([type]):eval") -/menu/proc/on_load(var/mob/user) +/menu/proc/on_load(mob/user) //When the browser sucessfully loaded. user << output(file, "browser([type])") winset(user, "browser([type])", "parent=[type];size=[size]") -/menu/proc/cache_resources(var/mob/user) +/menu/proc/cache_resources(mob/user) for(var/k in resources) var/v = resources[k] user << browse_rsc(v,k) diff --git a/code/_core/datum/menu/appearance.dm b/code/_core/datum/menu/appearance.dm index 0277a5d620..1e203b92ba 100644 --- a/code/_core/datum/menu/appearance.dm +++ b/code/_core/datum/menu/appearance.dm @@ -32,7 +32,7 @@ size = "800x800" -/menu/appearance/cache_resources(var/user) +/menu/appearance/cache_resources(user) ..() for(var/k in valid_hair_head_ids) @@ -54,7 +54,7 @@ user << browse_rsc(v,"[k].png") */ -/menu/appearance/open(var/mob/user) +/menu/appearance/open(mob/user) //Credit to Multiverse7 for providing the code for getting this to work. if(ENABLE_CHARGEN) cache_resources(user) @@ -68,7 +68,7 @@ stop_sound('sounds/music/menu/lobby.ogg',list(user)) A.chargen = FALSE -/menu/appearance/on_load(var/mob/user) +/menu/appearance/on_load(mob/user) run_function(usr,"set_reference","'\ref[src]'") @@ -170,7 +170,7 @@ -/proc/apply_javascript_to_mob(var/mob/living/advanced/player/A,var/forged_data) +/proc/apply_javascript_to_mob(mob/living/advanced/player/A,forged_data) A.real_name = forged_data["name"] A.sex = forged_data["sex"] == "m" ? MALE : FEMALE A.gender = forged_data["sex"] == "m" ? MALE : FEMALE @@ -183,7 +183,7 @@ A.change_organ_visual("lips", desired_color = forged_data["mouth"]["color"], desired_icon = forged_data["mouth"]["icon"], desired_icon_state = forged_data["mouth"]["icon_state"]) A.update_all_blends() -/proc/generate_character_icon(var/list/data,direction = SOUTH) +/proc/generate_character_icon(list/data,direction = SOUTH) var/icon/I = new /icon(data["head"]["icon"],data["head"]["icon_state"],direction) I.Blend(data["head"]["color"],ICON_MULTIPLY) diff --git a/code/_core/datum/menu/class.dm b/code/_core/datum/menu/class.dm index 5f84c6f9f4..c3c23ef47a 100644 --- a/code/_core/datum/menu/class.dm +++ b/code/_core/datum/menu/class.dm @@ -10,13 +10,13 @@ ) size = "800x800" -/menu/class/open(var/mob/user) +/menu/class/open(mob/user) cache_resources(user) winclone(user, "window", id) winset(user, "browser([id])", "parent=map;type=browser;size=0x0;anchor1=0,0;anchor2=100,100;is-visible=true") user << output(file, "browser([id])") -/menu/class/on_load(var/mob/user) +/menu/class/on_load(mob/user) if(!is_advanced(user)) return FALSE diff --git a/code/_core/datum/menu/color.dm b/code/_core/datum/menu/color.dm index 3ca68382ef..2c8d2c88e3 100644 --- a/code/_core/datum/menu/color.dm +++ b/code/_core/datum/menu/color.dm @@ -8,7 +8,7 @@ ) size = "800x800" -/menu/color/on_load(var/mob/user) +/menu/color/on_load(mob/user) run_function(usr,"set_reference","'\ref[src]'") /menu/color/chargen/Topic(href,href_list) diff --git a/code/_core/datum/menu/control_customization.dm b/code/_core/datum/menu/control_customization.dm index 0c9d9309df..8524f967ee 100644 --- a/code/_core/datum/menu/control_customization.dm +++ b/code/_core/datum/menu/control_customization.dm @@ -2,13 +2,13 @@ id = "paper" file = 'html/control_customization.html' -/menu/controls/open(var/user) +/menu/controls/open(user) cache_resources(user) winset(user, "map.paper","is-visible=true") sleep(1) user << output(file, "map.paper") -/menu/controls/on_load(var/user) +/menu/controls/on_load(user) run_function(usr,"set_reference","'\ref[src]'") @@ -20,12 +20,12 @@ if(P.active_paper && length(P.active_paper.data)) set_text(P,P.active_paper.data[1],P.active_paper.name,P.active_paper.last_page,length(P.active_paper.data)) -/menu/controls/close(var/user) +/menu/controls/close(user) winset(user, "map.paper","is-visible=false") winset(user,"map.map","focus=true") winset(user,"main.input","focus=false") -/menu/controls/proc/set_text(var/user,var/text,var/title,var/page_current,var/page_max) +/menu/controls/proc/set_text(user,text,title,page_current,page_max) var/function_name = "set_text" var/function_args = "\"[proper_url_encode(text)]\",\"[proper_url_encode(title)]\",[page_current],[page_max]" @@ -36,7 +36,7 @@ if(P.active_paper) P.active_paper.last_page = page_current -/menu/controls/run_function(var/user, var/function_name,var/args) +/menu/controls/run_function(user, function_name,args) user << output("[function_name]([args]);", "map.paper:eval") /menu/controls/Topic(href,href_list) diff --git a/code/_core/datum/menu/dialogue.dm b/code/_core/datum/menu/dialogue.dm index 8118ba37e6..19f47d1f6d 100644 --- a/code/_core/datum/menu/dialogue.dm +++ b/code/_core/datum/menu/dialogue.dm @@ -2,7 +2,7 @@ file = 'html/dialogue.html' resources = list() -/menu/dialogue/open(var/mob/user) +/menu/dialogue/open(mob/user) if(!is_player(user)) return FALSE @@ -27,7 +27,7 @@ user << output(file_text, "map.dialogue") -/menu/dialogue/on_load(var/mob/user) +/menu/dialogue/on_load(mob/user) if(!is_player(user)) return FALSE @@ -53,12 +53,12 @@ P.dialogue_loading = FALSE -/menu/dialogue/close(var/mob/user) +/menu/dialogue/close(mob/user) winset(user, "map.dialogue","is-visible=false") winset(user,"map.map","focus=true") winset(user,"control.input","focus=false") -/menu/dialogue/run_function(var/mob/user, var/function_name,var/args) +/menu/dialogue/run_function(mob/user, function_name,args) user << output("[function_name]([args]);", "map.dialogue:eval") /menu/dialogue/Topic(href,href_list) diff --git a/code/_core/datum/menu/examine.dm b/code/_core/datum/menu/examine.dm index c2e5c9b8d8..0c7660a092 100644 --- a/code/_core/datum/menu/examine.dm +++ b/code/_core/datum/menu/examine.dm @@ -7,17 +7,17 @@ "tile.png" = 'html/tile.png', ) -/menu/examine/open(var/user) +/menu/examine/open(user) user << output(file, "info.browser") -/menu/examine/close(var/user) +/menu/examine/close(user) -/menu/examine/on_load(var/user) +/menu/examine/on_load(user) if(!is_player(user)) return FALSE -/menu/examine/run_function(var/user, var/function_name,var/args) +/menu/examine/run_function(user, function_name,args) user << output("[function_name]([args]);", "info.browser:eval") /menu/examine/Topic(href,href_list) diff --git a/code/_core/datum/menu/paper.dm b/code/_core/datum/menu/paper.dm index 4cb9de0b78..c07a8866c1 100644 --- a/code/_core/datum/menu/paper.dm +++ b/code/_core/datum/menu/paper.dm @@ -4,7 +4,7 @@ "markdown.js" = 'html/markdown.js' ) -/menu/paper/open(var/mob/user) +/menu/paper/open(mob/user) cache_resources(user) winset(user, "map.paper","is-visible=true") @@ -12,7 +12,7 @@ user << output(file_text, "map.paper") -/menu/paper/on_load(var/mob/user) +/menu/paper/on_load(mob/user) if(!is_player(user)) return FALSE @@ -31,12 +31,12 @@ set_text(P,P.active_paper.data[P.active_paper.last_page],P.active_paper.name,P.active_paper.last_page,length(P.active_paper.data),P.active_paper.editable) -/menu/paper/close(var/mob/user) +/menu/paper/close(mob/user) winset(user,"map.paper","is-visible=false") winset(user,"map.map","focus=true") winset(user,"control.input","focus=false") -/menu/paper/proc/set_text(var/mob/user,var/text,var/title,var/page_current,var/page_max,var/editable=FALSE) +/menu/paper/proc/set_text(mob/user,text,title,page_current,page_max,editable=FALSE) var/function_name = "set_text" var/function_args = list2params(list(text,title,page_current,page_max,editable)) @@ -47,7 +47,7 @@ if(P.active_paper) P.active_paper.last_page = page_current -/menu/paper/run_function(var/mob/user, var/function_name,var/args) +/menu/paper/run_function(mob/user, function_name,args) user << output(args, "map.paper:[function_name]") /menu/paper/Topic(href,href_list) diff --git a/code/_core/datum/objective/_objective.dm b/code/_core/datum/objective/_objective.dm index a8e11240db..5994050e79 100644 --- a/code/_core/datum/objective/_objective.dm +++ b/code/_core/datum/objective/_objective.dm @@ -15,7 +15,7 @@ var/is_new = TRUE -/objective/proc/on_object_sold(var/atom/movable/object) +/objective/proc/on_object_sold(atom/movable/object) return TRUE /objective/New() @@ -76,7 +76,7 @@ /objective/proc/get_description() return "[initial(desc)] ([completion_state])" -/objective/proc/update(var/update_gamemode = TRUE) +/objective/proc/update(update_gamemode = TRUE) var/gamemode/G = SSgamemode.active_gamemode diff --git a/code/_core/datum/objective/abnormality.dm b/code/_core/datum/objective/abnormality.dm index 674c57dc60..84a0be2d02 100644 --- a/code/_core/datum/objective/abnormality.dm +++ b/code/_core/datum/objective/abnormality.dm @@ -55,7 +55,7 @@ var/global/list/atom/movable/possible_abnormalities = list( return COMPLETED return ..() -/objective/abnormality/proc/abnormality_post_move(var/atom/movable/M,args) +/objective/abnormality/proc/abnormality_post_move(atom/movable/M,args) if(!completed) var/area/A = get_area(M) if(istype(A,/area/burgerstation/science/containment)) @@ -65,7 +65,7 @@ var/global/list/atom/movable/possible_abnormalities = list( return TRUE -/objective/abnormality/proc/abnormality_Destroy(var/atom/movable/M,args) +/objective/abnormality/proc/abnormality_Destroy(atom/movable/M,args) if(!completed) failed = TRUE update() diff --git a/code/_core/datum/objective/defense.dm b/code/_core/datum/objective/defense.dm index c518470d7e..5e6e40084f 100644 --- a/code/_core/datum/objective/defense.dm +++ b/code/_core/datum/objective/defense.dm @@ -64,7 +64,7 @@ return ..() -/objective/defense/proc/defense_Destroy(var/obj/structure/interactive/supermatter/S,args) +/objective/defense/proc/defense_Destroy(obj/structure/interactive/supermatter/S,args) update() return TRUE diff --git a/code/_core/datum/objective/kill_blob.dm b/code/_core/datum/objective/kill_blob.dm index 7e9b844f90..cc43c4f62d 100644 --- a/code/_core/datum/objective/kill_blob.dm +++ b/code/_core/datum/objective/kill_blob.dm @@ -28,7 +28,7 @@ update() return ..() -/objective/kill_blob/proc/kill_blob_destroy(var/obj/structure/interactive/blob/core/B,args) +/objective/kill_blob/proc/kill_blob_destroy(obj/structure/interactive/blob/core/B,args) update() return TRUE diff --git a/code/_core/datum/objective/kill_boss.dm b/code/_core/datum/objective/kill_boss.dm index 11eda14b28..c5ae960dce 100644 --- a/code/_core/datum/objective/kill_boss.dm +++ b/code/_core/datum/objective/kill_boss.dm @@ -53,11 +53,11 @@ update() return ..() -/objective/kill_boss/proc/kill_boss_destroy(var/mob/living/L,args) +/objective/kill_boss/proc/kill_boss_destroy(mob/living/L,args) update() return TRUE -/objective/kill_boss/proc/kill_boss_post_death(var/mob/living/L,args) +/objective/kill_boss/proc/kill_boss_post_death(mob/living/L,args) if(L.dead || L.qdeleting) update() diff --git a/code/_core/datum/objective/kill_ghost.dm b/code/_core/datum/objective/kill_ghost.dm index de0704959d..990c85e7b4 100644 --- a/code/_core/datum/objective/kill_ghost.dm +++ b/code/_core/datum/objective/kill_ghost.dm @@ -45,7 +45,7 @@ update() return ..() -/objective/kill_ghost/proc/kill_ghost_post_death(var/mob/living/L,args) +/objective/kill_ghost/proc/kill_ghost_post_death(mob/living/L,args) if(L.dead || L.qdeleting) update() diff --git a/code/_core/datum/objective/kill_rogue.dm b/code/_core/datum/objective/kill_rogue.dm index 96c53ed2cf..bee3a5ac9c 100644 --- a/code/_core/datum/objective/kill_rogue.dm +++ b/code/_core/datum/objective/kill_rogue.dm @@ -53,11 +53,11 @@ update() return ..() -/objective/kill_rogue/proc/kill_boss_destroy(var/mob/living/L,args) +/objective/kill_rogue/proc/kill_boss_destroy(mob/living/L,args) update() return TRUE -/objective/kill_rogue/proc/kill_boss_post_death(var/mob/living/L,args) +/objective/kill_rogue/proc/kill_boss_post_death(mob/living/L,args) if(L.dead || L.qdeleting) update() diff --git a/code/_core/datum/objective/obtain_artifact.dm b/code/_core/datum/objective/obtain_artifact.dm index f924829749..3903923e0e 100644 --- a/code/_core/datum/objective/obtain_artifact.dm +++ b/code/_core/datum/objective/obtain_artifact.dm @@ -44,7 +44,7 @@ return COMPLETED return ..() -/objective/artifact/proc/artifact_post_move(var/obj/structure/interactive/artifact/H,args) +/objective/artifact/proc/artifact_post_move(obj/structure/interactive/artifact/H,args) if(!completed) var/area/A = get_area(H) if(istype(A,/area/burgerstation)) @@ -53,7 +53,7 @@ return TRUE -/objective/artifact/proc/artifact_Destroy(var/obj/structure/interactive/artifact/A,args) +/objective/artifact/proc/artifact_Destroy(obj/structure/interactive/artifact/A,args) completed = TRUE update() return TRUE diff --git a/code/_core/datum/objective/rescue_hostage.dm b/code/_core/datum/objective/rescue_hostage.dm index 39ab9f84a5..557a540d9a 100644 --- a/code/_core/datum/objective/rescue_hostage.dm +++ b/code/_core/datum/objective/rescue_hostage.dm @@ -56,7 +56,7 @@ return ACTIVE -/objective/hostage/proc/hostage_post_move(var/mob/living/advanced/npc/hostage/H,args) +/objective/hostage/proc/hostage_post_move(mob/living/advanced/npc/hostage/H,args) if(!completed && !H.dead) var/area/A = get_area(H) @@ -69,11 +69,11 @@ return TRUE -/objective/hostage/proc/hostage_Destroy(var/mob/living/advanced/npc/hostage/H,args) +/objective/hostage/proc/hostage_Destroy(mob/living/advanced/npc/hostage/H,args) update() return TRUE -/objective/hostage/proc/hostage_post_death(var/mob/living/advanced/npc/hostage/H,args) +/objective/hostage/proc/hostage_post_death(mob/living/advanced/npc/hostage/H,args) update() return TRUE diff --git a/code/_core/datum/objective/sell_ore.dm b/code/_core/datum/objective/sell_ore.dm index 8519601265..dc85bf8820 100644 --- a/code/_core/datum/objective/sell_ore.dm +++ b/code/_core/datum/objective/sell_ore.dm @@ -11,7 +11,7 @@ /objective/sell_ore/get_description() return "Sell [desired_quota]u of ore or material (any type) to cargo." -/objective/sell_ore/on_object_sold(var/atom/movable/object) +/objective/sell_ore/on_object_sold(atom/movable/object) if(istype(object,/obj/item/material/)) var/obj/item/material/M = object diff --git a/code/_core/datum/power/_power.dm b/code/_core/datum/power/_power.dm index 6ee2482570..a486841097 100644 --- a/code/_core/datum/power/_power.dm +++ b/code/_core/datum/power/_power.dm @@ -6,23 +6,23 @@ var/add_message var/remove_message -/power/proc/on_add(var/mob/living/owner) +/power/proc/on_add(mob/living/owner) if(add_message) owner.to_chat(add_message) return TRUE -/power/proc/on_remove(var/mob/living/owner) +/power/proc/on_remove(mob/living/owner) if(remove_message) owner.to_chat(remove_message) return TRUE /power/resist/ var/list/bonus_defense = list() -/power/resist/on_add(var/mob/living/owner) +/power/resist/on_add(mob/living/owner) owner.defense_bonuses["\ref[src]"] = bonus_defense return ..() -/power/resist/on_remove(var/mob/living/owner) +/power/resist/on_remove(mob/living/owner) owner.defense_bonuses -= "\ref[src]" return ..() diff --git a/code/_core/datum/power_network/_power_network.dm b/code/_core/datum/power_network/_power_network.dm index b429824979..925eb75159 100644 --- a/code/_core/datum/power_network/_power_network.dm +++ b/code/_core/datum/power_network/_power_network.dm @@ -7,7 +7,7 @@ var/power_draw = 0 var/id = 0 -/power_network/New(var/desired_loc) +/power_network/New(desired_loc) . = ..() SSpower.all_power_networks += src id = SSpower.power_id @@ -38,7 +38,7 @@ W.connected_machine.power_process(power_multiplier) //Handling wires. -/power_network/proc/add_wire(var/obj/structure/interactive/wire/wire) +/power_network/proc/add_wire(obj/structure/interactive/wire/wire) if(src.qdeleting) CRASH("Tried adding a wire to a qdeleting power network!") @@ -58,7 +58,7 @@ return TRUE -/power_network/proc/remove_wire(var/obj/structure/interactive/wire/wire) +/power_network/proc/remove_wire(obj/structure/interactive/wire/wire) if(wire.connected_machine) wire.connected_machine.update_power_draw(0) diff --git a/code/_core/datum/quest/_quest.dm b/code/_core/datum/quest/_quest.dm index 17ad2baab1..5b19b3ca72 100644 --- a/code/_core/datum/quest/_quest.dm +++ b/code/_core/datum/quest/_quest.dm @@ -25,10 +25,10 @@ /quest/proc/on_death() return FALSE -/quest/proc/can_change_stage(var/desired_stage) +/quest/proc/can_change_stage(desired_stage) return TRUE -/quest/proc/set_stage(var/desired_stage,var/force=FALSE) +/quest/proc/set_stage(desired_stage,force=FALSE) if(!force && !can_change_stage(desired_stage)) return FALSE var/old_stage = stage @@ -47,15 +47,15 @@ return returning -/quest/proc/set_objective_displayed(var/objective_id) +/quest/proc/set_objective_displayed(objective_id) objectives_displayed += objective_id -/quest/proc/set_objective_completed(var/objective_id) +/quest/proc/set_objective_completed(objective_id) objectives_completed += objective_id -/quest/proc/on_stage_changed(var/previous_stage) +/quest/proc/on_stage_changed(previous_stage) return TRUE -/quest/proc/on_load(var/loaded_stage) //Quest was loaded from a save file and applied to a mob. +/quest/proc/on_load(loaded_stage) //Quest was loaded from a save file and applied to a mob. set_stage(loaded_stage) return TRUE \ No newline at end of file diff --git a/code/_core/datum/quest/main/tutorial.dm b/code/_core/datum/quest/main/tutorial.dm index 131ffe4ab7..920ea57e99 100644 --- a/code/_core/datum/quest/main/tutorial.dm +++ b/code/_core/datum/quest/main/tutorial.dm @@ -12,7 +12,7 @@ "cult" = "Defeat the cultists." ) -/quest/main/tutorial/on_stage_changed(var/previous_stage) +/quest/main/tutorial/on_stage_changed(previous_stage) switch(stage) if(1) set_objective_displayed("clothes") diff --git a/code/_core/datum/reagent/_reagent.dm b/code/_core/datum/reagent/_reagent.dm index fa244e5585..e8db83355e 100644 --- a/code/_core/datum/reagent/_reagent.dm +++ b/code/_core/datum/reagent/_reagent.dm @@ -63,7 +63,7 @@ return 0 -/reagent/New(var/desired_loc) +/reagent/New(desired_loc) if(metabolism_stomach > 0 && metabolism_stomach < REAGENT_ROUNDING) log_error("Warning: [src.type] had too low of a metabolism_stomach value ([metabolism_stomach]) and was adjusted to [REAGENT_ROUNDING].") @@ -79,10 +79,10 @@ . = ..() -/reagent/proc/on_add(var/reagent_container/container,var/amount_added=0,var/current_volume=0,var/mob/living/caller) +/reagent/proc/on_add(reagent_container/container,amount_added=0,current_volume=0,mob/living/caller) return amount_added -/reagent/proc/on_add_living(var/mob/living/L,var/reagent_container/container,var/amount_added=0,var/current_volume=0,var/mob/living/caller) +/reagent/proc/on_add_living(mob/living/L,reagent_container/container,amount_added=0,current_volume=0,mob/living/caller) if(addiction && is_advanced(L)) var/mob/living/advanced/A = L @@ -102,32 +102,32 @@ return amount_added -/reagent/proc/on_remove(var/reagent_container/container) +/reagent/proc/on_remove(reagent_container/container) return TRUE -/reagent/proc/on_remove_living(var/mob/living/L,var/reagent_container/container) +/reagent/proc/on_remove_living(mob/living/L,reagent_container/container) return TRUE -/reagent/proc/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/proc/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) return amount_to_metabolize -/reagent/proc/on_metabolize_plant(var/obj/structure/interactive/plant/plant,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/proc/on_metabolize_plant(obj/structure/interactive/plant/plant,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) return amount_to_metabolize -/reagent/proc/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/proc/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) return amount_to_metabolize -/reagent/proc/on_metabolize_skin(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/proc/on_metabolize_skin(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) return amount_to_metabolize -/reagent/proc/on_overdose(var/mob/living/owner,var/reagent_container/container,var/metabolism_amount=0,var/starting_volume=0,var/multiplier=1) +/reagent/proc/on_overdose(mob/living/owner,reagent_container/container,metabolism_amount=0,starting_volume=0,multiplier=1) return 0 //This is the amount to actually remove. -/reagent/proc/on_splash(var/reagent_container/container,var/mob/caller,var/atom/target,var/volume_to_splash,var/strength_mod=1) +/reagent/proc/on_splash(reagent_container/container,mob/caller,atom/target,volume_to_splash,strength_mod=1) return TRUE -/reagent/proc/act_explode(var/reagent_container/container,var/atom/owner,var/atom/source,var/atom/epicenter,var/magnitude,var/desired_loyalty_tag) //What happens when this reagent is hit by an explosive. +/reagent/proc/act_explode(reagent_container/container,atom/owner,atom/source,atom/epicenter,magnitude,desired_loyalty_tag) //What happens when this reagent is hit by an explosive. return TRUE -/reagent/proc/on_temperature_change(var/reagent_container/container,var/atom/owner) +/reagent/proc/on_temperature_change(reagent_container/container,atom/owner) return TRUE \ No newline at end of file diff --git a/code/_core/datum/reagent/reagent_blood.dm b/code/_core/datum/reagent/reagent_blood.dm index f0a70cc01b..08c382b82d 100644 --- a/code/_core/datum/reagent/reagent_blood.dm +++ b/code/_core/datum/reagent/reagent_blood.dm @@ -26,11 +26,11 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/blood/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/blood/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.add_nutrition_normal(2*.) //Blood is actually nutritious. -/reagent/blood/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/blood/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() @@ -175,7 +175,7 @@ color = "#AE0000" -/reagent/blood/ancient/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/blood/ancient/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) .=..() owner.add_status_effect(DRUGGY) owner.add_status_effect(CONFUSED) diff --git a/code/_core/datum/reagent/reagent_core.dm b/code/_core/datum/reagent/reagent_core.dm index d9fc0c24c8..26c4f3cb6a 100644 --- a/code/_core/datum/reagent/reagent_core.dm +++ b/code/_core/datum/reagent/reagent_core.dm @@ -14,7 +14,7 @@ particle_size = 0.1 -/reagent/lube/on_splash(var/reagent_container/container,var/mob/caller,var/atom/target,var/volume_to_splash,var/strength_mod=1) +/reagent/lube/on_splash(reagent_container/container,mob/caller,atom/target,volume_to_splash,strength_mod=1) . = ..() @@ -67,7 +67,7 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/iron/act_explode(var/reagent_container/container,var/atom/owner,var/atom/source,var/atom/epicenter,var/magnitude,var/desired_loyalty_tag) //What happens when this reagent is hit by an explosive. +/reagent/iron/act_explode(reagent_container/container,atom/owner,atom/source,atom/epicenter,magnitude,desired_loyalty_tag) //What happens when this reagent is hit by an explosive. var/volume_amount = -container.add_reagent(src.type,-container.volume_current,caller = owner) //Can't be bothered to get the exact amount needed to be removed as it is handled in the proc anyways. var/shrapnel_amount = min(20,CEILING(volume_amount/3,1)) container.owner.shoot_projectile( @@ -92,7 +92,7 @@ ) -/reagent/iron/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/iron/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() @@ -101,7 +101,7 @@ owner.tox_regen_buffer -= . * 0.5 QUEUE_HEALTH_UPDATE(owner) -/reagent/iron/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/iron/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() @@ -257,7 +257,7 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH -/reagent/salt/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/salt/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.add_hydration(.*-5*multiplier) @@ -340,19 +340,19 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD | REAGENT_METABOLISM_SKIN -/reagent/space_cleaner/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/space_cleaner/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.tox_regen_buffer -= .*2*multiplier -/reagent/space_cleaner/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/space_cleaner/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.tox_regen_buffer -= .*4*multiplier -/reagent/space_cleaner/on_splash(var/reagent_container/container,var/mob/caller,var/atom/target,var/volume_to_splash,var/strength_mod=1) +/reagent/space_cleaner/on_splash(reagent_container/container,mob/caller,atom/target,volume_to_splash,strength_mod=1) . = ..() diff --git a/code/_core/datum/reagent/reagent_drug.dm b/code/_core/datum/reagent/reagent_drug.dm index 70909d6858..0999106106 100644 --- a/code/_core/datum/reagent/reagent_drug.dm +++ b/code/_core/datum/reagent/reagent_drug.dm @@ -17,7 +17,7 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/drug/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/drug/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() @@ -27,7 +27,7 @@ duration = . * duration_mod*multiplier //Every 20 units should last 5 minutes. ) -/reagent/drug/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/drug/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() diff --git a/code/_core/datum/reagent/reagent_fuel.dm b/code/_core/datum/reagent/reagent_fuel.dm index d4c2c4b79d..f4b7c2961c 100644 --- a/code/_core/datum/reagent/reagent_fuel.dm +++ b/code/_core/datum/reagent/reagent_fuel.dm @@ -19,7 +19,7 @@ /reagent/fuel/get_flammability() return fire_strength_per_unit -/reagent/fuel/on_temperature_change(var/reagent_container/container) +/reagent/fuel/on_temperature_change(reagent_container/container) . = ..() @@ -50,14 +50,14 @@ src.act_explode(container,I.last_interacted,container.owner,T,1,loyalty_tag) -/reagent/fuel/New(var/desired_loc) +/reagent/fuel/New(desired_loc) //Automatically set value. value = (explosion_strength_per_unit + flash_strength_per_unit*0.1 + bang_strength_per_unit*0.1 + fire_strength_per_unit*0.5)*0.3 . = ..() value = CEILING(value,0.01) -/reagent/fuel/act_explode(var/reagent_container/container,var/atom/owner,var/atom/source,var/atom/epicenter,var/magnitude,var/desired_loyalty_tag) //What happens when this reagent is hit by an explosive. +/reagent/fuel/act_explode(reagent_container/container,atom/owner,atom/source,atom/epicenter,magnitude,desired_loyalty_tag) //What happens when this reagent is hit by an explosive. var/turf/T = get_turf(container.owner) diff --git a/code/_core/datum/reagent/reagent_magic.dm b/code/_core/datum/reagent/reagent_magic.dm index bd7f03467e..5ed5016323 100644 --- a/code/_core/datum/reagent/reagent_magic.dm +++ b/code/_core/datum/reagent/reagent_magic.dm @@ -16,7 +16,7 @@ liquid = 0.6 -/reagent/magic/stand_juice/on_add_living(var/mob/living/L,var/reagent_container/container,var/amount_added=0,var/current_volume=0) +/reagent/magic/stand_juice/on_add_living(mob/living/L,reagent_container/container,amount_added=0,current_volume=0) . = ..() diff --git a/code/_core/datum/reagent/reagent_medicine.dm b/code/_core/datum/reagent/reagent_medicine.dm index 7fa2515e06..fc38b7f6a9 100644 --- a/code/_core/datum/reagent/reagent_medicine.dm +++ b/code/_core/datum/reagent/reagent_medicine.dm @@ -10,14 +10,14 @@ blood_toxicity_multiplier = 1 -/reagent/medicine/on_add_living(var/mob/living/L,var/reagent_container/container,var/amount_added=0,var/current_volume=0,var/mob/living/caller) +/reagent/medicine/on_add_living(mob/living/L,reagent_container/container,amount_added=0,current_volume=0,mob/living/caller) . = ..() if(!L.dead && experience_per_unit*. > 0 && is_player(caller) && caller.client) caller.add_skill_xp(SKILL_MEDICINE,CEILING(experience_per_unit*.,1)) -/reagent/medicine/on_overdose(var/mob/living/owner,var/reagent_container/container,var/metabolism_amount=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/on_overdose(mob/living/owner,reagent_container/container,metabolism_amount=0,starting_volume=0,multiplier=1) . = ..() @@ -44,14 +44,14 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/medicine/adrenaline/on_add_living(var/mob/living/L,var/reagent_container/container,var/amount_added=0,var/current_volume=0) +/reagent/medicine/adrenaline/on_add_living(mob/living/L,reagent_container/container,amount_added=0,current_volume=0) . = ..() if((container.flags_metabolism & (REAGENT_METABOLISM_BLOOD | REAGENT_METABOLISM_STOMACH)) && STATUS_EFFECT_MAGNITUDE(L,ADRENALINE) <= strength) L.add_status_effect(ADRENALINE,strength,-1) -/reagent/medicine/adrenaline/on_remove_living(var/mob/living/L,var/reagent_container/container) +/reagent/medicine/adrenaline/on_remove_living(mob/living/L,reagent_container/container) . = ..() @@ -73,7 +73,7 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/medicine/adrenaline/epinephrine/on_add_living(var/mob/living/L,var/reagent_container/container,var/amount_added=0,var/current_volume=0) +/reagent/medicine/adrenaline/epinephrine/on_add_living(mob/living/L,reagent_container/container,amount_added=0,current_volume=0) . = ..() @@ -104,13 +104,13 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/medicine/health_potion/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/health_potion/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.brute_regen_buffer += 2*.*multiplier owner.burn_regen_buffer += 2*.*multiplier owner.tox_regen_buffer += 2*.*multiplier -/reagent/medicine/health_potion/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/health_potion/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.brute_regen_buffer += 3*.*multiplier owner.burn_regen_buffer += 3*.*multiplier @@ -136,13 +136,13 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/medicine/stamina_potion/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/stamina_potion/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() if(owner && owner.health) owner.stamina_regen_buffer += .*2*multiplier -/reagent/medicine/stamina_potion/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/stamina_potion/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() if(owner && owner.health) @@ -168,13 +168,13 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/medicine/mana_potion/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/mana_potion/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() if(owner && owner.health) owner.mana_regen_buffer += .*2*multiplier -/reagent/medicine/mana_potion/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/mana_potion/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() if(owner && owner.health) @@ -201,7 +201,7 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/medicine/antihol/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/antihol/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() @@ -216,7 +216,7 @@ if(istype(R,/reagent/nutrition/ethanol)) container.add_reagent(reagent_id,-.*3*multiplier) -/reagent/medicine/antihol/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/antihol/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() @@ -248,7 +248,7 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/medicine/purge/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/purge/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() @@ -260,7 +260,7 @@ continue owner.tox_regen_buffer += container.add_reagent(reagent_id,-.*4*multiplier) -/reagent/medicine/purge/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/purge/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() @@ -289,7 +289,7 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/medicine/charcoal/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/charcoal/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() @@ -302,7 +302,7 @@ container.add_reagent(reagent_id,-.) owner.tox_regen_buffer += 3*.*multiplier -/reagent/medicine/charcoal/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/charcoal/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() @@ -336,7 +336,7 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/medicine/mitogen/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/mitogen/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() @@ -344,7 +344,7 @@ owner.brute_regen_buffer += 10*.*clamp(1 - owner.health.health_current/owner.health.health_max,0,1)*multiplier owner.tox_regen_buffer -= 0.1*.*multiplier -/reagent/medicine/mitogen/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/mitogen/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() @@ -395,7 +395,7 @@ flags_metabolism = REAGENT_METABOLISM_BLOOD -/reagent/medicine/synthblood/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/synthblood/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() if(owner.blood_type && owner.health.organic) owner.blood_volume += .*0.75*multiplier @@ -417,7 +417,7 @@ flags_metabolism = REAGENT_METABOLISM_BLOOD -/reagent/medicine/rad_b_gone/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/rad_b_gone/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.rad_regen_buffer += .*2*multiplier @@ -440,7 +440,7 @@ flags_metabolism = REAGENT_METABOLISM_BLOOD -/reagent/medicine/potassium_iodide/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/potassium_iodide/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() if(owner.rad_regen_buffer < 0) owner.rad_regen_buffer = min(0,owner.rad_regen_buffer + 3*.*multiplier) @@ -464,7 +464,7 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH -/reagent/medicine/space_prussian_blue/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/space_prussian_blue/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() diff --git a/code/_core/datum/reagent/reagent_medicine_core.dm b/code/_core/datum/reagent/reagent_medicine_core.dm index 6e6a5a74a7..e7ae44c288 100644 --- a/code/_core/datum/reagent/reagent_medicine_core.dm +++ b/code/_core/datum/reagent/reagent_medicine_core.dm @@ -18,11 +18,11 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/medicine/bicaridine/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/bicaridine/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.brute_regen_buffer += 10*.*multiplier -/reagent/medicine/bicaridine/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/bicaridine/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.brute_regen_buffer += 8*.*multiplier @@ -41,11 +41,11 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/medicine/bicaridine_plus/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/bicaridine_plus/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.brute_regen_buffer += 15*.*multiplier -/reagent/medicine/bicaridine_plus/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/bicaridine_plus/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.brute_regen_buffer += 12*.*multiplier @@ -69,11 +69,11 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/medicine/caridone/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/caridone/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.brute_regen_buffer += rand(10,20)*.*multiplier -/reagent/medicine/caridone/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/caridone/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.brute_regen_buffer += rand(10,15)*.*multiplier @@ -97,12 +97,12 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/medicine/percardone/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/percardone/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() if(owner.health) owner.brute_regen_buffer += CEILING(1 + owner.health.damage[BRUTE]*0.01,1)*.*multiplier -/reagent/medicine/percardone/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/percardone/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() if(owner.health) owner.brute_regen_buffer += CEILING(1 + owner.health.damage[BRUTE]*0.01,1)*.*multiplier @@ -127,12 +127,12 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/medicine/dicarditane/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/dicarditane/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.brute_regen_buffer += 12*.*multiplier owner.burn_regen_buffer += 6*.*multiplier -/reagent/medicine/dicarditane/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/dicarditane/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.brute_regen_buffer += 8*. owner.burn_regen_buffer += 4*. @@ -156,11 +156,11 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/medicine/kelotane/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/kelotane/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.burn_regen_buffer += 5*.*multiplier -/reagent/medicine/kelotane/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/kelotane/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.burn_regen_buffer += 4*.*multiplier @@ -184,11 +184,11 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/medicine/arentane/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/arentane/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.burn_regen_buffer += rand(5,10)*.*multiplier -/reagent/medicine/arentane/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/arentane/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.burn_regen_buffer += rand(5,10)*.*multiplier @@ -212,13 +212,13 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/medicine/kenotone/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/kenotone/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.burn_regen_buffer += rand(10,20)*.*multiplier owner.tox_regen_buffer -= rand(1,10)*.*multiplier owner.stamina_regen_buffer -= rand(1,10)*.*multiplier -/reagent/medicine/kenotone/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/kenotone/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.burn_regen_buffer += rand(5,20)*.*multiplier owner.tox_regen_buffer -= rand(1,10)*.*multiplier @@ -245,7 +245,7 @@ flags_metabolism = REAGENT_METABOLISM_SKIN -/reagent/medicine/extinatane/on_metabolize_skin(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/extinatane/on_metabolize_skin(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() if(container.owner.health && container.owner.health.organic) container.owner.health.adjust_loss_smart(burn=.*-2*multiplier,robotic=FALSE) @@ -272,13 +272,13 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/medicine/carotane/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/carotane/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() var/mul = (container.stored_reagents[type]/starting_volume) owner.brute_regen_buffer += 5*.*mul*multiplier owner.burn_regen_buffer += 5*.*mul*multiplier -/reagent/medicine/carotane/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/carotane/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() var/mul = (container.stored_reagents[type]/starting_volume) owner.brute_regen_buffer += 5*.*mul*multiplier @@ -302,11 +302,11 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/medicine/dylovene/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/dylovene/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.tox_regen_buffer += ((owner.health ? owner.health.damage[TOX]*0.05 : 0) + 5)*.*multiplier -/reagent/medicine/dylovene/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/dylovene/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.tox_regen_buffer += ((owner.health ? owner.health.damage[TOX]*0.04 : 0) + 4)*.*multiplier @@ -327,12 +327,12 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/medicine/dexalin/on_add_living(var/mob/living/L,var/reagent_container/container,var/amount_added=0,var/current_volume=0) +/reagent/medicine/dexalin/on_add_living(mob/living/L,reagent_container/container,amount_added=0,current_volume=0) . = ..() if(container.flags_metabolism & (REAGENT_METABOLISM_BLOOD | REAGENT_METABOLISM_STOMACH)) L.blood_oxygen += 0.2 * . -/reagent/medicine/dexalin/on_remove_living(var/mob/living/L,var/reagent_container/container) +/reagent/medicine/dexalin/on_remove_living(mob/living/L,reagent_container/container) . = ..() if(container.flags_metabolism & (REAGENT_METABOLISM_BLOOD | REAGENT_METABOLISM_STOMACH)) L.blood_oxygen -= 0.2 * . @@ -355,13 +355,13 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/medicine/tricordrazine/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/tricordrazine/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.brute_regen_buffer += 4*.*multiplier owner.burn_regen_buffer += 4*.*multiplier owner.tox_regen_buffer += 4*.*multiplier -/reagent/medicine/tricordrazine/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/tricordrazine/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.brute_regen_buffer += 3*.*multiplier owner.burn_regen_buffer += 3*.*multiplier @@ -386,13 +386,13 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/medicine/omnizine/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/omnizine/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.brute_regen_buffer += 3*.*multiplier owner.burn_regen_buffer += 3*.*multiplier owner.tox_regen_buffer += 3*.*multiplier -/reagent/medicine/omnizine/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/omnizine/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.brute_regen_buffer += 3*.*multiplier owner.burn_regen_buffer += 3*.*multiplier @@ -419,14 +419,14 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/medicine/adminomnizine/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/adminomnizine/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.brute_regen_buffer = max(owner.brute_regen_buffer,100*.*multiplier*(1/metabolism_blood)) owner.burn_regen_buffer = max(owner.burn_regen_buffer,100*.*multiplier*(1/metabolism_blood)) owner.tox_regen_buffer = max(owner.tox_regen_buffer,100*.*multiplier*(1/metabolism_blood)) owner.health_regen_delay = 0 -/reagent/medicine/adminomnizine/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/adminomnizine/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.brute_regen_buffer = max(owner.brute_regen_buffer,100*.*multiplier*(1/metabolism_stomach)) owner.burn_regen_buffer = max(owner.burn_regen_buffer,100*.*multiplier*(1/metabolism_stomach)) @@ -454,12 +454,12 @@ flags_metabolism = REAGENT_METABOLISM_SKIN -/reagent/medicine/silver_sulfadiazine/on_splash(var/reagent_container/container,var/mob/caller,var/atom/target,var/volume_to_splash,var/strength_mod=1) +/reagent/medicine/silver_sulfadiazine/on_splash(reagent_container/container,mob/caller,atom/target,volume_to_splash,strength_mod=1) . = ..() if(.) on_add(container,volume_to_splash*strength_mod,0) -/reagent/medicine/silver_sulfadiazine/on_add(var/reagent_container/container,var/amount_added=0,var/current_volume=0) +/reagent/medicine/silver_sulfadiazine/on_add(reagent_container/container,amount_added=0,current_volume=0) . = ..() if(current_volume == 0 && container.owner && container.owner.health && container.owner.health.organic) //Added for the first time. . *= 0.5 @@ -468,7 +468,7 @@ var/obj/item/organ/O = container.owner O.send_pain_response(50) -/reagent/medicine/silver_sulfadiazine/on_metabolize_skin(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/silver_sulfadiazine/on_metabolize_skin(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() if(container.owner.health && container.owner.health.organic) container.owner.health.adjust_loss_smart(burn=.*-5*multiplier,robotic=FALSE) @@ -495,12 +495,12 @@ flags_metabolism = REAGENT_METABOLISM_SKIN -/reagent/medicine/styptic_powder/on_splash(var/reagent_container/container,var/mob/caller,var/atom/target,var/volume_to_splash,var/strength_mod=1) +/reagent/medicine/styptic_powder/on_splash(reagent_container/container,mob/caller,atom/target,volume_to_splash,strength_mod=1) . = ..() if(. && is_living(target)) on_add(container,volume_to_splash*strength_mod,0) -/reagent/medicine/styptic_powder/on_add(var/reagent_container/container,var/amount_added=0,var/current_volume=0) +/reagent/medicine/styptic_powder/on_add(reagent_container/container,amount_added=0,current_volume=0) . = ..() if(current_volume == 0 && container.owner && container.owner.health && container.owner.health.organic) //Added for the first time. . *= 0.5 @@ -509,7 +509,7 @@ var/obj/item/organ/O = container.owner O.send_pain_response(50) -/reagent/medicine/styptic_powder/on_metabolize_skin(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/styptic_powder/on_metabolize_skin(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() if(container.owner.health && container.owner.health.organic) container.owner.health.adjust_loss_smart(brute=.*-5*multiplier,robotic=FALSE) @@ -532,14 +532,14 @@ flags_metabolism = REAGENT_METABOLISM_SKIN -/reagent/medicine/synthflesh/on_splash(var/reagent_container/container,var/mob/caller,var/atom/target,var/volume_to_splash,var/strength_mod=1) +/reagent/medicine/synthflesh/on_splash(reagent_container/container,mob/caller,atom/target,volume_to_splash,strength_mod=1) . = ..() if(.) on_add(container,volume_to_splash*strength_mod,0) -/reagent/medicine/synthflesh/on_add(var/reagent_container/container,var/amount_added=0,var/current_volume=0) +/reagent/medicine/synthflesh/on_add(reagent_container/container,amount_added=0,current_volume=0) . = ..() @@ -554,7 +554,7 @@ O.send_pain_response(100) container.owner.health.adjust_loss_smart(brute=.*-10,burn=.*-10,tox=tox_to_adjust,robotic=FALSE) -/reagent/medicine/synthflesh/on_metabolize_skin(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/synthflesh/on_metabolize_skin(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.brute_regen_buffer += .*2*multiplier owner.burn_regen_buffer += .*2*multiplier @@ -587,12 +587,12 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/medicine/vitamins/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/vitamins/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() //Injecting these vitamins is pretty bad and does nothing for you. owner.tox_regen_buffer -= .*2*multiplier -/reagent/medicine/vitamins/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/vitamins/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.brute_regen_buffer += 0.5*.*multiplier owner.burn_regen_buffer += 0.5*.*multiplier @@ -617,14 +617,14 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/medicine/inaprovaline/on_add_living(var/mob/living/L,var/reagent_container/container,var/amount_added=0,var/current_volume=0) +/reagent/medicine/inaprovaline/on_add_living(mob/living/L,reagent_container/container,amount_added=0,current_volume=0) . = ..() if( (container.flags_metabolism & (REAGENT_METABOLISM_BLOOD | REAGENT_METABOLISM_STOMACH)) && STATUS_EFFECT_MAGNITUDE(L,UNDYING) <= strength) L.add_status_effect(UNDYING,strength,-1) -/reagent/medicine/inaprovaline/on_remove_living(var/mob/living/L,var/reagent_container/container) +/reagent/medicine/inaprovaline/on_remove_living(mob/living/L,reagent_container/container) . = ..() diff --git a/code/_core/datum/reagent/reagent_medicine_painkiller.dm b/code/_core/datum/reagent/reagent_medicine_painkiller.dm index 65feacae90..61c3239455 100644 --- a/code/_core/datum/reagent/reagent_medicine_painkiller.dm +++ b/code/_core/datum/reagent/reagent_medicine_painkiller.dm @@ -20,7 +20,7 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/medicine/painkiller/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/painkiller/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() @@ -31,7 +31,7 @@ else owner.pain_regen_buffer += .*multiplier -/reagent/medicine/painkiller/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/painkiller/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() @@ -42,7 +42,7 @@ else owner.pain_regen_buffer += .*multiplier -/reagent/medicine/painkiller/on_overdose(var/mob/living/owner,var/reagent_container/container,var/metabolism_amount=0,var/starting_volume=0,var/multiplier=1) +/reagent/medicine/painkiller/on_overdose(mob/living/owner,reagent_container/container,metabolism_amount=0,starting_volume=0,multiplier=1) . = ..() diff --git a/code/_core/datum/reagent/reagent_misc.dm b/code/_core/datum/reagent/reagent_misc.dm index 3cd254e862..c7301c98aa 100644 --- a/code/_core/datum/reagent/reagent_misc.dm +++ b/code/_core/datum/reagent/reagent_misc.dm @@ -6,7 +6,7 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/tinea_luxor/on_add_living(var/mob/living/L,var/reagent_container/container,var/amount_added=0,var/current_volume=0,var/mob/living/caller) +/reagent/tinea_luxor/on_add_living(mob/living/L,reagent_container/container,amount_added=0,current_volume=0,mob/living/caller) var/obj/item/weapon/melee/torch/tinea_luxor/TL = locate() in L.contents if(!TL) TL = new(L) @@ -15,7 +15,7 @@ FINALIZE(TL) . = ..() -/reagent/tinea_luxor/on_remove_living(var/mob/living/L,var/reagent_container/container) +/reagent/tinea_luxor/on_remove_living(mob/living/L,reagent_container/container) var/obj/item/weapon/melee/torch/tinea_luxor/TL = locate() in L.contents if(TL) qdel(TL) . = ..() \ No newline at end of file diff --git a/code/_core/datum/reagent/reagent_nutrition.dm b/code/_core/datum/reagent/reagent_nutrition.dm index e29ea7b167..63b8af46f6 100644 --- a/code/_core/datum/reagent/reagent_nutrition.dm +++ b/code/_core/datum/reagent/reagent_nutrition.dm @@ -37,7 +37,7 @@ return max(0,((nutrition_normal_amount+nutrition_quality_amount*2+nutrition_fast_amount*4)/40)*0.1 - (hydration_amount/10)*0.1) -/reagent/nutrition/New(var/desired_loc) +/reagent/nutrition/New(desired_loc) //Automatically set value. if(nutrition_normal_amount + nutrition_fast_amount + nutrition_quality_amount < 0) @@ -50,7 +50,7 @@ . = ..() value = CEILING(value,0.01) -/reagent/nutrition/on_splash(var/reagent_container/container,var/mob/caller,var/atom/target,var/volume_to_splash,var/strength_mod=1) +/reagent/nutrition/on_splash(reagent_container/container,mob/caller,atom/target,volume_to_splash,strength_mod=1) . = ..() @@ -58,7 +58,7 @@ var/mob/living/L = target L.adjust_fire_stacks(-hydration_amount*volume_to_splash*0.01*strength_mod) -/reagent/nutrition/on_add_living(var/mob/living/L,var/reagent_container/container,var/amount_added=0,var/current_volume=0) +/reagent/nutrition/on_add_living(mob/living/L,reagent_container/container,amount_added=0,current_volume=0) . = ..() @@ -71,7 +71,7 @@ L.add_nutrition_normal(nutrition_normal_amount*.*0.5) //Fast nutrition not included here people people stuff their face easier. -/reagent/nutrition/on_metabolize_plant(var/obj/structure/interactive/plant/plant,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/nutrition/on_metabolize_plant(obj/structure/interactive/plant/plant,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() @@ -81,7 +81,7 @@ if(hydration_amount) plant.add_hydration(.*(hydration_amount/25)*multiplier*3) //water has 25 hydration, and we want 10u water = 30 hydration point -/reagent/nutrition/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/nutrition/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() @@ -128,7 +128,7 @@ if(owner.health && (nutrition_normal_amount + nutrition_quality_amount + hydration_amount) != 0 && (owner.move_mod < 3 || owner.next_move <= 0)) //Not sprinting owner.stamina_regen_buffer += (nutrition_normal_amount + nutrition_quality_amount + hydration_amount) * . *multiplier -/reagent/nutrition/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/nutrition/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.blood_toxicity += . on_metabolize_stomach(owner,container,.,starting_volume,multiplier*0.5) diff --git a/code/_core/datum/reagent/reagent_nutrition_alcohol.dm b/code/_core/datum/reagent/reagent_nutrition_alcohol.dm index daf65ccab0..0b07cd7c01 100644 --- a/code/_core/datum/reagent/reagent_nutrition_alcohol.dm +++ b/code/_core/datum/reagent/reagent_nutrition_alcohol.dm @@ -23,7 +23,7 @@ blood_toxicity_multiplier = 3 -/reagent/nutrition/ethanol/New(var/desired_loc) +/reagent/nutrition/ethanol/New(desired_loc) var/power_mod = power*0.01 hydration_amount = max(0,(1-power_mod)*5) nutrition_fast_amount = power_mod*10 @@ -34,7 +34,7 @@ /reagent/nutrition/ethanol/get_flammability() return power*0.001 //100 means it would be 0.1 -/reagent/nutrition/ethanol/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/nutrition/ethanol/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() @@ -42,7 +42,7 @@ owner.intoxication += power*. owner.sanity_regen_buffer += power*. -/reagent/nutrition/ethanol/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/nutrition/ethanol/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() diff --git a/code/_core/datum/reagent/reagent_nutrition_drink.dm b/code/_core/datum/reagent/reagent_nutrition_drink.dm index d48d1b7dac..535ed1b09f 100644 --- a/code/_core/datum/reagent/reagent_nutrition_drink.dm +++ b/code/_core/datum/reagent/reagent_nutrition_drink.dm @@ -20,7 +20,7 @@ value = 0.75 -/reagent/nutrition/water/on_splash(var/reagent_container/container,var/mob/caller,var/atom/target,var/volume_to_splash,var/strength_mod=1) +/reagent/nutrition/water/on_splash(reagent_container/container,mob/caller,atom/target,volume_to_splash,strength_mod=1) . = ..() diff --git a/code/_core/datum/reagent/reagent_nutrition_energy.dm b/code/_core/datum/reagent/reagent_nutrition_energy.dm index 2f40be48d5..7ade0756fe 100644 --- a/code/_core/datum/reagent/reagent_nutrition_energy.dm +++ b/code/_core/datum/reagent/reagent_nutrition_energy.dm @@ -15,20 +15,20 @@ heal_factor = 0 -/reagent/nutrition/energy/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/nutrition/energy/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() if(owner && owner.health) owner.stamina_regen_buffer += .*stamina_strength*multiplier -/reagent/nutrition/energy/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/nutrition/energy/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() if(owner && owner.health) owner.stamina_regen_buffer += .*stamina_strength*0.5*multiplier -/reagent/nutrition/energy/on_add_living(var/mob/living/L,var/reagent_container/container,var/amount_added=0,var/current_volume=0) +/reagent/nutrition/energy/on_add_living(mob/living/L,reagent_container/container,amount_added=0,current_volume=0) . = ..() @@ -37,7 +37,7 @@ if(STATUS_EFFECT_MAGNITUDE(L,ADRENALINE) <= local_strength) L.add_status_effect(ADRENALINE,local_strength,-1) -/reagent/nutrition/energy/on_remove_living(var/mob/living/L,var/reagent_container/container) +/reagent/nutrition/energy/on_remove_living(mob/living/L,reagent_container/container) . = ..() diff --git a/code/_core/datum/reagent/reagent_nutrition_plants.dm b/code/_core/datum/reagent/reagent_nutrition_plants.dm index 9387ed9fd3..822ac2a640 100644 --- a/code/_core/datum/reagent/reagent_nutrition_plants.dm +++ b/code/_core/datum/reagent/reagent_nutrition_plants.dm @@ -193,7 +193,7 @@ lethal = TRUE -/reagent/nutrition/poppy_seed/raw/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/nutrition/poppy_seed/raw/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() @@ -201,7 +201,7 @@ . *= 0.5 container.add_reagent(processed_reagent,.) -/reagent/nutrition/poppy_seed/raw/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/nutrition/poppy_seed/raw/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() @@ -277,19 +277,19 @@ metabolism_skin = 10 -/reagent/nutrition/capsaicin/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/nutrition/capsaicin/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.pain_regen_buffer += -.*multiplier owner.send_pain_response(.*multiplier) -/reagent/nutrition/capsaicin/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/nutrition/capsaicin/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.pain_regen_buffer += -. * 0.5*multiplier owner.send_pain_response(. * 0.5*multiplier) -/reagent/nutrition/capsaicin/on_metabolize_skin(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/nutrition/capsaicin/on_metabolize_skin(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.pain_regen_buffer += -.*multiplier diff --git a/code/_core/datum/reagent/reagent_tobacco.dm b/code/_core/datum/reagent/reagent_tobacco.dm index 65b9c62493..9adf9df450 100644 --- a/code/_core/datum/reagent/reagent_tobacco.dm +++ b/code/_core/datum/reagent/reagent_tobacco.dm @@ -19,7 +19,7 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD -/reagent/tobacco/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/tobacco/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() diff --git a/code/_core/datum/reagent/reagent_toxin.dm b/code/_core/datum/reagent/reagent_toxin.dm index 8871c87b22..eeef628f72 100644 --- a/code/_core/datum/reagent/reagent_toxin.dm +++ b/code/_core/datum/reagent/reagent_toxin.dm @@ -14,20 +14,20 @@ flags_metabolism = REAGENT_METABOLISM_STOMACH | REAGENT_METABOLISM_BLOOD | REAGENT_METABOLISM_PLANT -/reagent/toxin/New(var/desired_loc) +/reagent/toxin/New(desired_loc) blood_toxicity_multiplier = damage_per_unit*5 value *= 1+(damage_per_unit*3) return ..() -/reagent/toxin/on_metabolize_plant(var/obj/structure/interactive/plant/plant,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/toxin/on_metabolize_plant(obj/structure/interactive/plant/plant,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() plant?.health?.adjust_loss_smart(tox=-.*damage_per_unit*2*multiplier) -/reagent/toxin/on_metabolize_stomach(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/toxin/on_metabolize_stomach(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.tox_regen_buffer -= .*damage_per_unit*0.75*multiplier -/reagent/toxin/on_metabolize_blood(var/mob/living/owner,var/reagent_container/container,var/amount_to_metabolize=0,var/starting_volume=0,var/multiplier=1) +/reagent/toxin/on_metabolize_blood(mob/living/owner,reagent_container/container,amount_to_metabolize=0,starting_volume=0,multiplier=1) . = ..() owner.tox_regen_buffer -= .*damage_per_unit*multiplier diff --git a/code/_core/datum/reagent_container/_reagent_container.dm b/code/_core/datum/reagent_container/_reagent_container.dm index 8fbf5d3a6f..a81824acb9 100644 --- a/code/_core/datum/reagent_container/_reagent_container.dm +++ b/code/_core/datum/reagent_container/_reagent_container.dm @@ -61,7 +61,7 @@ return "It contains [english_list(formatted_list)]. The temperature reads [average_temperature] kelvin." -/reagent_container/New(var/atom/desired_owner,var/desired_volume_max) +/reagent_container/New(atom/desired_owner,desired_volume_max) if(desired_owner) owner = desired_owner @@ -76,14 +76,14 @@ if(!(flags_temperature & REAGENT_TEMPERATURE_NO_AMBIENT) && volume_current) SSreagent.all_temperature_reagent_containers += src -/reagent_container/proc/act_explode(var/atom/owner,var/atom/source,var/atom/epicenter,var/magnitude,var/desired_loyalty_tag) //What happens when this reagent is hit by an explosive. +/reagent_container/proc/act_explode(atom/owner,atom/source,atom/epicenter,magnitude,desired_loyalty_tag) //What happens when this reagent is hit by an explosive. . = FALSE for(var/r_id in stored_reagents) var/reagent/R = REAGENT(r_id) if(R.act_explode(src,owner,source,epicenter,magnitude,desired_loyalty_tag)) . = TRUE -/reagent_container/proc/metabolize(var/atom/movable/owner,var/multiplier=1) //Assumed that it is metabolism per second. +/reagent_container/proc/metabolize(atom/movable/owner,multiplier=1) //Assumed that it is metabolism per second. if(!volume_current) return @@ -203,7 +203,7 @@ else . += T0C + 20 -/reagent_container/proc/process_temperature(var/debug=FALSE) +/reagent_container/proc/process_temperature(debug=FALSE) . = FALSE @@ -299,7 +299,7 @@ return TRUE -/reagent_container/proc/update_container(var/mob/caller,var/update_owner = TRUE,var/force=FALSE) +/reagent_container/proc/update_container(mob/caller,update_owner = TRUE,force=FALSE) if(!owner) return FALSE @@ -392,7 +392,7 @@ return TRUE -/reagent_container/proc/process_recipes(var/mob/caller,var/from_temperature_change=FALSE) +/reagent_container/proc/process_recipes(mob/caller,from_temperature_change=FALSE) if(!allow_recipe_processing) return FALSE @@ -521,7 +521,7 @@ return TRUE -/reagent_container/proc/add_reagent(var/reagent_type, var/amount=0, var/temperature = TNULL, var/should_update = TRUE,var/check_recipes = TRUE,var/mob/living/caller) +/reagent_container/proc/add_reagent(reagent_type, amount=0, temperature = TNULL, should_update = TRUE,check_recipes = TRUE,mob/living/caller) if(abs(amount) < REAGENT_ROUNDING) if(amount > 0) @@ -588,7 +588,7 @@ if(check_recipes) process_recipes(caller) -/reagent_container/proc/remove_reagents(var/amount=volume_current,var/should_update = TRUE,var/check_recipes = TRUE,var/mob/living/caller) +/reagent_container/proc/remove_reagents(amount=volume_current,should_update = TRUE,check_recipes = TRUE,mob/living/caller) var/total_volume = volume_current @@ -611,7 +611,7 @@ update_container() return TRUE -/reagent_container/proc/transfer_reagents_to(var/reagent_container/target_container,var/amount=src.volume_current,var/should_update=TRUE,var/check_recipes = TRUE,var/mob/living/caller,var/include_abstract=FALSE) //Transfer all the reagents. +/reagent_container/proc/transfer_reagents_to(reagent_container/target_container,amount=src.volume_current,should_update=TRUE,check_recipes = TRUE,mob/living/caller,include_abstract=FALSE) //Transfer all the reagents. if(!target_container) CRASH("Tried to transfer reagents from [owner], but there was no target_container!") @@ -671,7 +671,7 @@ return total_amount_transfered -/reagent_container/proc/get_reagent_volume(var/reagent_type) +/reagent_container/proc/get_reagent_volume(reagent_type) return stored_reagents[reagent_type] ? stored_reagents[reagent_type] : 0 /reagent_container/proc/get_flavor() @@ -715,7 +715,7 @@ return list(english_list(english_flavor_profile),flavor_flags,flavor_count) -/reagent_container/proc/splash(var/mob/caller,var/atom/target,var/splash_amount = volume_current,var/silent = FALSE,var/strength_mod=1) +/reagent_container/proc/splash(mob/caller,atom/target,splash_amount = volume_current,silent = FALSE,strength_mod=1) if(!splash_amount || !volume_current) if(!silent) caller?.to_chat(span("warning","There is nothing to splash!")) @@ -731,7 +731,7 @@ return target.on_splash(caller,src,splash_amount,silent,strength_mod) -/atom/proc/on_splash(var/mob/caller,var/reagent_container/source,var/splash_amount,var/silent = FALSE,var/strength_mod=1) +/atom/proc/on_splash(mob/caller,reagent_container/source,splash_amount,silent = FALSE,strength_mod=1) splash_amount = min(splash_amount,source.volume_current) @@ -747,7 +747,7 @@ return FALSE -/mob/living/on_splash(var/mob/caller,var/reagent_container/source,var/splash_amount,var/silent = FALSE,var/strength_mod=1) +/mob/living/on_splash(mob/caller,reagent_container/source,splash_amount,silent = FALSE,strength_mod=1) if(source.contains_lethal && caller != src && is_living(caller)) var/mob/living/L = caller @@ -756,7 +756,7 @@ . = ..() -/reagent_container/proc/consume(var/mob/caller,var/mob/living/consumer) +/reagent_container/proc/consume(mob/caller,mob/living/consumer) if(!owner) CRASH("[src.get_debug_name()] had no owner!") diff --git a/code/_core/datum/reagent_container/temp.dm b/code/_core/datum/reagent_container/temp.dm index a2657b2df7..1c5fb7bcb9 100644 --- a/code/_core/datum/reagent_container/temp.dm +++ b/code/_core/datum/reagent_container/temp.dm @@ -5,7 +5,7 @@ should_update_owner = FALSE -/reagent_container/temp/update_container(var/mob/caller,var/update_owner = TRUE,var/force=FALSE) +/reagent_container/temp/update_container(mob/caller,update_owner = TRUE,force=FALSE) . = ..() diff --git a/code/_core/datum/reagent_container/turf.dm b/code/_core/datum/reagent_container/turf.dm index 2691393352..0f9ace790a 100644 --- a/code/_core/datum/reagent_container/turf.dm +++ b/code/_core/datum/reagent_container/turf.dm @@ -7,7 +7,7 @@ var/desired_reagent -/reagent_container/turf/update_container(var/mob/caller,var/update_owner = TRUE,var/force=FALSE) +/reagent_container/turf/update_container(mob/caller,update_owner = TRUE,force=FALSE) . = ..() diff --git a/code/_core/datum/reagent_container/water_tank.dm b/code/_core/datum/reagent_container/water_tank.dm index f2f7632f78..2ceac7b447 100644 --- a/code/_core/datum/reagent_container/water_tank.dm +++ b/code/_core/datum/reagent_container/water_tank.dm @@ -6,7 +6,7 @@ should_update_owner = FALSE -/reagent_container/big_tank/color/update_container(var/mob/caller,var/update_owner = TRUE,var/force=FALSE) +/reagent_container/big_tank/color/update_container(mob/caller,update_owner = TRUE,force=FALSE) . = ..() if(update_owner) owner.color = color \ No newline at end of file diff --git a/code/_core/datum/reagent_recipe/_reagent_recipe.dm b/code/_core/datum/reagent_recipe/_reagent_recipe.dm index 13c0b7212d..efc82ae761 100644 --- a/code/_core/datum/reagent_recipe/_reagent_recipe.dm +++ b/code/_core/datum/reagent_recipe/_reagent_recipe.dm @@ -21,5 +21,5 @@ var/priority = 0 //Higher numbers means higher priority. -/reagent_recipe/proc/on_react(var/mob/caller,var/reagent_container/container,var/magnitude) +/reagent_recipe/proc/on_react(mob/caller,reagent_container/container,magnitude) return TRUE \ No newline at end of file diff --git a/code/_core/datum/reagent_recipe/explosives.dm b/code/_core/datum/reagent_recipe/explosives.dm index 9f7b81943b..8e1bc0810a 100644 --- a/code/_core/datum/reagent_recipe/explosives.dm +++ b/code/_core/datum/reagent_recipe/explosives.dm @@ -13,7 +13,7 @@ results = list() -/reagent_recipe/explosion/emp/on_react(var/mob/caller,var/reagent_container/container,var/magnitude) +/reagent_recipe/explosion/emp/on_react(mob/caller,reagent_container/container,magnitude) var/tag_to_use if(is_living(caller)) @@ -38,7 +38,7 @@ secret = TRUE -/reagent_recipe/explosion/holy_water_potassium/on_react(var/mob/caller,var/reagent_container/container,var/magnitude) +/reagent_recipe/explosion/holy_water_potassium/on_react(mob/caller,reagent_container/container,magnitude) var/turf/explosion_location = get_turf(container.owner) @@ -78,7 +78,7 @@ results = list() -/reagent_recipe/explosion/water_potassium/on_react(var/mob/caller,var/reagent_container/container,var/magnitude) +/reagent_recipe/explosion/water_potassium/on_react(mob/caller,reagent_container/container,magnitude) var/turf/explosion_location = get_turf(container.owner) @@ -115,7 +115,7 @@ ) results = list() -/reagent_recipe/explosion/smoke/on_react(var/mob/caller,var/reagent_container/container,var/magnitude) +/reagent_recipe/explosion/smoke/on_react(mob/caller,reagent_container/container,magnitude) var/turf/T = get_turf(container.owner) smoke( T, @@ -162,7 +162,7 @@ ) results = list() -/reagent_recipe/explosion/oxygen_phoron_reaction/on_react(var/mob/caller,var/reagent_container/container,var/magnitude) +/reagent_recipe/explosion/oxygen_phoron_reaction/on_react(mob/caller,reagent_container/container,magnitude) container.average_temperature += 1000 //1000 regardless. container.process_temperature() //Will turn it into a fireball. return TRUE diff --git a/code/_core/datum/recipe/_recipe.dm b/code/_core/datum/recipe/_recipe.dm index 8880b7b6de..462d44b803 100644 --- a/code/_core/datum/recipe/_recipe.dm +++ b/code/_core/datum/recipe/_recipe.dm @@ -54,7 +54,7 @@ And the code would look like this: var/secret = FALSE //Its a secret to everybody. Won't show up in "recipe" loot items. -/recipe/proc/on_create(var/mob/living/advanced/caller,var/obj/item/crafting/crafting_table,var/obj/item/created_item,var/list/item_table) +/recipe/proc/on_create(mob/living/advanced/caller,obj/item/crafting/crafting_table,obj/item/created_item,list/item_table) //By default, remove all the items. @@ -68,7 +68,7 @@ And the code would look like this: return TRUE -/recipe/proc/check_recipe(var/list/item_table,var/obj/item/crafting/crafting_table) //Returns items that were used in creation. Return null if fail. +/recipe/proc/check_recipe(list/item_table,obj/item/crafting/crafting_table) //Returns items that were used in creation. Return null if fail. if(!length(item_table)) return null diff --git a/code/_core/datum/reward/_reward.dm b/code/_core/datum/reward/_reward.dm index 19e830e7ba..98f512e7a6 100644 --- a/code/_core/datum/reward/_reward.dm +++ b/code/_core/datum/reward/_reward.dm @@ -8,7 +8,7 @@ var/flags_reward = FLAG_REWARD_NONE -/reward/proc/can_reward(var/client/C) +/reward/proc/can_reward(client/C) if(flags_reward & FLAG_REWARD_ONCE) var/savedata/client/globals/GD = GLOBALDATA(C.ckey) @@ -23,7 +23,7 @@ return TRUE -/reward/proc/on_reward(var/client/C) +/reward/proc/on_reward(client/C) if(flags_reward & FLAG_REWARD_ONCE) var/savedata/client/globals/GD = GLOBALDATA(C.ckey) @@ -38,7 +38,7 @@ return TRUE -/reward/proc/on_fail(var/client/C) +/reward/proc/on_fail(client/C) return TRUE /reward/credits/ @@ -47,7 +47,7 @@ var/credits_to_give = 0 -/reward/credits/can_reward(var/client/C) +/reward/credits/can_reward(client/C) if(is_player(C.mob)) var/mob/living/advanced/player/P = C.mob if(P.allow_save) @@ -56,7 +56,7 @@ return FALSE -/reward/credits/on_reward(var/client/C) +/reward/credits/on_reward(client/C) var/mob/living/advanced/player/P = C.mob P.adjust_currency(credits_to_give) return ..() @@ -68,7 +68,7 @@ var/burgerbux_to_give = 0 -/reward/burgerbux/can_reward(var/client/C) +/reward/burgerbux/can_reward(client/C) if(is_player(C.mob)) var/mob/living/advanced/player/P = C.mob if(P.allow_save) @@ -76,7 +76,7 @@ C.to_chat(span("danger","You cannot receive this reward as a non-player! Redeem this reward as a player to receive it!")) return FALSE -/reward/burgerbux/on_reward(var/client/C) +/reward/burgerbux/on_reward(client/C) var/mob/living/advanced/player/P = C.mob P.adjust_burgerbux(burgerbux_to_give) return ..() diff --git a/code/_core/datum/savedata/_savedata.dm b/code/_core/datum/savedata/_savedata.dm index b9700ad677..86345dd5a9 100644 --- a/code/_core/datum/savedata/_savedata.dm +++ b/code/_core/datum/savedata/_savedata.dm @@ -4,10 +4,10 @@ /savedata/proc/reset_data() loaded_data = list() -/savedata/proc/get_folder(var/folder_id) +/savedata/proc/get_folder(folder_id) return "" -/savedata/proc/get_file(var/file_id) +/savedata/proc/get_file(file_id) return "" /savedata/proc/get_files() diff --git a/code/_core/datum/savedata/client/_client.dm b/code/_core/datum/savedata/client/_client.dm index 638ec84979..a0f2a14e95 100644 --- a/code/_core/datum/savedata/client/_client.dm +++ b/code/_core/datum/savedata/client/_client.dm @@ -2,7 +2,7 @@ var/ckey var/bot_controlled = FALSE -/savedata/client/New(var/desired_ckey) +/savedata/client/New(desired_ckey) var/client/owner = CLIENT(desired_ckey) @@ -13,7 +13,7 @@ return ..() -/savedata/client/get_folder(var/folder_id) +/savedata/client/get_folder(folder_id) return replacetext(CKEY_PATH_FORMAT,"%CKEY",folder_id) /savedata/client/get_files() diff --git a/code/_core/datum/savedata/client/bank/_bank.dm b/code/_core/datum/savedata/client/bank/_bank.dm index 6b17975018..320b888f50 100644 --- a/code/_core/datum/savedata/client/bank/_bank.dm +++ b/code/_core/datum/savedata/client/bank/_bank.dm @@ -3,10 +3,10 @@ /savedata/client/bank loaded_data = list() -/savedata/client/bank/get_file(var/file_id) +/savedata/client/bank/get_file(file_id) return "bank.json" -/savedata/client/bank/New(var/desired_ckey) +/savedata/client/bank/New(desired_ckey) . = ..() diff --git a/code/_core/datum/savedata/client/connection_history/_connection_history.dm b/code/_core/datum/savedata/client/connection_history/_connection_history.dm index 91016a31ca..c4fe9398ef 100644 --- a/code/_core/datum/savedata/client/connection_history/_connection_history.dm +++ b/code/_core/datum/savedata/client/connection_history/_connection_history.dm @@ -15,7 +15,7 @@ "connection_time" = get_time() ) -/savedata/client/connection_history/New(var/desired_ckey) +/savedata/client/connection_history/New(desired_ckey) . = ..() @@ -34,7 +34,7 @@ rustg_file_write(new_file_data,new_file_name) -/savedata/client/connection_history/get_folder(var/folder_id) +/savedata/client/connection_history/get_folder(folder_id) return replacetext(CONNECTION_PATH_FORMAT,"%CKEY",folder_id) /savedata/client/connection_history/get_files() diff --git a/code/_core/datum/savedata/client/controls/_controls.dm b/code/_core/datum/savedata/client/controls/_controls.dm index 46eba2d313..887086a431 100644 --- a/code/_core/datum/savedata/client/controls/_controls.dm +++ b/code/_core/datum/savedata/client/controls/_controls.dm @@ -3,10 +3,10 @@ //this is stored twice for a reason so players can confirm these are the settings they want with the new keys //prevents situations where people unbind escape or something and they can't quit out -/savedata/client/controls/get_file(var/file_id) +/savedata/client/controls/get_file(file_id) return "controls.json" -/savedata/client/controls/New(var/desired_ckey) +/savedata/client/controls/New(desired_ckey) . = ..() diff --git a/code/_core/datum/savedata/client/death_box/_death_box.dm b/code/_core/datum/savedata/client/death_box/_death_box.dm index 589b92f12c..aa47b023db 100644 --- a/code/_core/datum/savedata/client/death_box/_death_box.dm +++ b/code/_core/datum/savedata/client/death_box/_death_box.dm @@ -65,7 +65,7 @@ var/savedata/client/death_box/DB = k DB.save() -/proc/load_deathbox(var/mob/living/advanced/player/P,var/atom/A) +/proc/load_deathbox(mob/living/advanced/player/P,atom/A) if(!P || P.dead || P.qdeleting) P?.to_chat(span("warning","You can't do this while dead!")) @@ -153,10 +153,10 @@ /savedata/client/death_box loaded_data = list() -/savedata/client/death_box/get_file(var/file_id) +/savedata/client/death_box/get_file(file_id) return "death_box.json" -/savedata/client/death_box/New(var/desired_ckey) +/savedata/client/death_box/New(desired_ckey) . = ..() diff --git a/code/_core/datum/savedata/client/globals/_globals.dm b/code/_core/datum/savedata/client/globals/_globals.dm index f06b602600..468d7c9351 100644 --- a/code/_core/datum/savedata/client/globals/_globals.dm +++ b/code/_core/datum/savedata/client/globals/_globals.dm @@ -12,10 +12,10 @@ "achievements" = list() ) -/savedata/client/globals/get_file(var/file_id) +/savedata/client/globals/get_file(file_id) return "global_stats.json" -/savedata/client/globals/New(var/desired_ckey) +/savedata/client/globals/New(desired_ckey) . = ..() diff --git a/code/_core/datum/savedata/client/loadout/_loadout.dm b/code/_core/datum/savedata/client/loadout/_loadout.dm index d07f755d74..6047c82ab9 100644 --- a/code/_core/datum/savedata/client/loadout/_loadout.dm +++ b/code/_core/datum/savedata/client/loadout/_loadout.dm @@ -3,11 +3,11 @@ /savedata/client/loadout loaded_data = list() -/savedata/client/loadout/get_file(var/file_id) +/savedata/client/loadout/get_file(file_id) return "loadout.json" -/savedata/client/loadout/New(var/desired_ckey) +/savedata/client/loadout/New(desired_ckey) . = ..() @@ -33,7 +33,7 @@ loaded_data = json_decode(rustg_file_read(full_path)) return TRUE -/proc/delete_loadout_of_mob(var/mob/living/advanced/player/P,var/name="Default") +/proc/delete_loadout_of_mob(mob/living/advanced/player/P,name="Default") if(!P.ckey || !name) return FALSE @@ -53,7 +53,7 @@ L.save() SSclient.ckey_to_loadout_cooldown[P.ckey] = world.time + 10 SECONDS -/proc/save_loadout_of_mob(var/mob/living/advanced/player/P,var/name="Default") +/proc/save_loadout_of_mob(mob/living/advanced/player/P,name="Default") if(!P.ckey || !name) return FALSE @@ -103,7 +103,7 @@ return TRUE -/proc/apply_loadout_to_mob(var/mob/living/advanced/player/P,var/name="Default") +/proc/apply_loadout_to_mob(mob/living/advanced/player/P,name="Default") if(!P || !P.ckey || !name) return FALSE diff --git a/code/_core/datum/savedata/client/mob/_mob.dm b/code/_core/datum/savedata/client/mob/_mob.dm index 2ad58df712..357ac58c39 100644 --- a/code/_core/datum/savedata/client/mob/_mob.dm +++ b/code/_core/datum/savedata/client/mob/_mob.dm @@ -2,7 +2,7 @@ /savedata/client/mob -/savedata/client/mob/get_folder(var/folder_id) +/savedata/client/mob/get_folder(folder_id) . = replacetext(CHARACTER_PATH_FORMAT,"%CKEY",folder_id) return @@ -24,7 +24,7 @@ "stored_mechs" = list() ) -/savedata/client/mob/New(var/desired_ckey) +/savedata/client/mob/New(desired_ckey) ..() reset_data() var/client/owner = CLIENT(ckey) @@ -35,7 +35,7 @@ log_error("SERIOUS ERROR: Mobdata for [ckey] was destroyed!") return FALSE -/savedata/client/mob/get_file(var/file_id) +/savedata/client/mob/get_file(file_id) var/returning = "[get_folder(ckey)][CHARACTER_FILE_FORMAT]" returning = replacetext(returning,"%CKEY",bot_controlled ? "BOT" : ckey) returning = replacetext(returning,"%CID",file_id) diff --git a/code/_core/datum/savedata/client/mob/helpers.dm b/code/_core/datum/savedata/client/mob/helpers.dm index 461dc53560..32bec64d9c 100644 --- a/code/_core/datum/savedata/client/mob/helpers.dm +++ b/code/_core/datum/savedata/client/mob/helpers.dm @@ -1,12 +1,12 @@ var/global/allow_loading = TRUE -/savedata/client/mob/proc/get_proper_id_from_filepath(var/file_string) +/savedata/client/mob/proc/get_proper_id_from_filepath(file_string) var/file_name = get_filename(file_string) return replacetext(replacetext(file_name,"character_",""),".json","") -/savedata/client/mob/proc/get_proper_id_from_filename(var/file_string) +/savedata/client/mob/proc/get_proper_id_from_filename(file_string) return replacetext(replacetext(file_string,"character_",""),".json","") @@ -49,7 +49,7 @@ var/global/allow_loading = TRUE return "[best_number]" -/savedata/client/mob/proc/load_json_data_from_id(var/character_id) +/savedata/client/mob/proc/load_json_data_from_id(character_id) var/filename = get_file(character_id) var/data = rustg_file_read(filename) @@ -61,7 +61,7 @@ var/global/allow_loading = TRUE return json_decode(data) -/savedata/client/mob/proc/write_json_data_to_id(var/character_id,var/json_data) +/savedata/client/mob/proc/write_json_data_to_id(character_id,json_data) json_data["id"] = character_id json_data["last_saved_date"] = get_date() json_data["last_saved_time"] = get_time() @@ -71,7 +71,7 @@ var/global/allow_loading = TRUE return TRUE -/savedata/client/mob/proc/create_new_character(var/character_id) +/savedata/client/mob/proc/create_new_character(character_id) var/client/owner = CLIENT(ckey) @@ -98,7 +98,7 @@ var/global/allow_loading = TRUE return TRUE -/savedata/client/mob/proc/save_character(var/mob/living/advanced/player/A,var/save_inventory = TRUE,var/died=FALSE) +/savedata/client/mob/proc/save_character(mob/living/advanced/player/A,save_inventory = TRUE,died=FALSE) if(!A) usr?.to_chat(span("danger","

Save failed. Tried to save NULL. Please contact the server owner with error code: 1000.

")) @@ -157,7 +157,7 @@ var/global/allow_loading = TRUE A.is_saving = FALSE -/savedata/client/mob/proc/delete_character(var/mob/living/advanced/player/A) +/savedata/client/mob/proc/delete_character(mob/living/advanced/player/A) if(!A || !A.ckey || !A.client) return diff --git a/code/_core/datum/savedata/client/mob/helpers_OLD.dm b/code/_core/datum/savedata/client/mob/helpers_OLD.dm index a4c76abfbc..452d60dc98 100644 --- a/code/_core/datum/savedata/client/mob/helpers_OLD.dm +++ b/code/_core/datum/savedata/client/mob/helpers_OLD.dm @@ -1,4 +1,4 @@ -/savedata/client/mob/proc/apply_data_to_mob(var/mob/living/advanced/player/A,var/do_teleport = TRUE,var/update_blends=TRUE) +/savedata/client/mob/proc/apply_data_to_mob(mob/living/advanced/player/A,do_teleport = TRUE,update_blends=TRUE) //Name A.real_name = loaded_data["name"] @@ -64,7 +64,7 @@ LOG_DEBUG("[owner] is done loading their character [A.get_debug_name()].") -/savedata/client/mob/proc/apply_blend_data(var/obj/O, var/list/blend_data) +/savedata/client/mob/proc/apply_blend_data(obj/O, list/blend_data) for(var/id in blend_data) var/list/blend_list = blend_data[id] var/desired_id = value_or_null(blend_list,"id") @@ -78,7 +78,7 @@ var/desired_layer = value_or_null(blend_list,"layer") O.add_blend(desired_id,desired_icon,desired_icon_state,desired_color,desired_blend,desired_type,TRUE,desired_layer) -/savedata/client/mob/proc/save_current_character(var/save_inventory = TRUE,var/force=FALSE) +/savedata/client/mob/proc/save_current_character(save_inventory = TRUE,force=FALSE) if(!owner) log_error("FATAL ERROR: Could not save a character because there was no owner attached! Usr: [usr].") diff --git a/code/_core/datum/savedata/client/roles/_roles.dm b/code/_core/datum/savedata/client/roles/_roles.dm index 19e56fc3db..e08c777383 100644 --- a/code/_core/datum/savedata/client/roles/_roles.dm +++ b/code/_core/datum/savedata/client/roles/_roles.dm @@ -1,10 +1,10 @@ /savedata/client/roles loaded_data = list("role" = FLAG_PERMISSION_NONE) -/savedata/client/roles/get_file(var/file_id) +/savedata/client/roles/get_file(file_id) return "roles.json" -/savedata/client/roles/New(var/desired_ckey) +/savedata/client/roles/New(desired_ckey) ..() @@ -19,13 +19,13 @@ loaded_data = json_decode(file_contents) update() -/savedata/client/roles/proc/add_role(var/role_to_add) +/savedata/client/roles/proc/add_role(role_to_add) loaded_data["role"] |= role_to_add update() save() return TRUE -/savedata/client/roles/proc/remove_role(var/role_to_add) +/savedata/client/roles/proc/remove_role(role_to_add) loaded_data["role"] &= ~role_to_add update() save() diff --git a/code/_core/datum/savedata/client/settings/_settings.dm b/code/_core/datum/savedata/client/settings/_settings.dm index f670ca0ba9..0815310e6b 100644 --- a/code/_core/datum/savedata/client/settings/_settings.dm +++ b/code/_core/datum/savedata/client/settings/_settings.dm @@ -18,10 +18,10 @@ "show_debug_messages" = 1 ) -/savedata/client/settings/get_file(var/file_id) +/savedata/client/settings/get_file(file_id) return "settings.json" -/savedata/client/settings/New(var/desired_ckey) +/savedata/client/settings/New(desired_ckey) . = ..() @@ -63,7 +63,7 @@ owner.update_window() -/savedata/client/settings/proc/change_setting(var/setting_id,var/setting_value) +/savedata/client/settings/proc/change_setting(setting_id,setting_value) loaded_data[setting_id] = setting_value save() return TRUE diff --git a/code/_core/datum/savedata/objects.dm b/code/_core/datum/savedata/objects.dm index 8e56316fea..e32de8f3e2 100644 --- a/code/_core/datum/savedata/objects.dm +++ b/code/_core/datum/savedata/objects.dm @@ -1,4 +1,4 @@ -/proc/load_and_create_object(var/list/object_data,var/atom/loc) +/proc/load_and_create_object(list/object_data,atom/loc) if(!object_data) log_error("Tried to create an object with a blank object_data list!") @@ -169,7 +169,7 @@ return O -/proc/get_inventory_data(var/obj/hud/inventory/I) +/proc/get_inventory_data(obj/hud/inventory/I) if(!I) return list() @@ -189,7 +189,7 @@ return returning_list -/proc/get_item_data(var/obj/I,var/save_inventory = TRUE) +/proc/get_item_data(obj/I,save_inventory = TRUE) try if(!I || !I.should_save) diff --git a/code/_core/datum/savedata/server/soapstone.dm b/code/_core/datum/savedata/server/soapstone.dm index 991701991a..988e6ba5d8 100644 --- a/code/_core/datum/savedata/server/soapstone.dm +++ b/code/_core/datum/savedata/server/soapstone.dm @@ -1,9 +1,9 @@ /savedata/server/soapstone -/savedata/server/soapstone/get_file(var/file_id) +/savedata/server/soapstone/get_file(file_id) return replacetext(SOAPSTONE_FILE_FORMAT,"%MAP",file_id) -/savedata/server/soapstone/proc/quick_write(var/list/data_to_write) +/savedata/server/soapstone/proc/quick_write(list/data_to_write) if(!data_to_write || !length(data_to_write)) return FALSE diff --git a/code/_core/datum/song/_song.dm b/code/_core/datum/song/_song.dm index 2f9821a49d..324796c4da 100644 --- a/code/_core/datum/song/_song.dm +++ b/code/_core/datum/song/_song.dm @@ -25,11 +25,11 @@ //Base code stolen from Fulpstation //A lot of it has been reworked. About 50% of this code is new. -/song/New(var/desired_loc) +/song/New(desired_loc) instrument_atom = desired_loc return ..() -/song/proc/interact(var/mob/caller) +/song/proc/interact(mob/caller) if(!is_playing) var/desired_song = input(caller,"What song would you like to play?","Song Selection") as message|null @@ -60,7 +60,7 @@ return -/song/proc/play_note(var/mob/caller,var/note,var/acc,var/oct) +/song/proc/play_note(mob/caller,note,acc,oct) // handle accidental -> B<>C of E<>F if(acc == "b" && (note == 3 || note == 6)) // C or F @@ -97,11 +97,11 @@ return TRUE -/song/proc/sanitize_tempo(var/desired_tempo) +/song/proc/sanitize_tempo(desired_tempo) desired_tempo = abs(desired_tempo) return max(round(desired_tempo, 1 TICKS), 1 TICKS) -/song/proc/play_song(var/mob/caller) +/song/proc/play_song(mob/caller) var/cur_oct[7] var/cur_acc[7] @@ -142,7 +142,7 @@ is_playing = FALSE repeat = 0 -/song/proc/parse_song(var/mob/caller,var/text) +/song/proc/parse_song(mob/caller,text) text = lowertext(text) var/list/lines = splittext(text,"\n") diff --git a/code/_core/datum/species/_species.dm b/code/_core/datum/species/_species.dm index c332d9a9b3..f4d4ca21f8 100644 --- a/code/_core/datum/species/_species.dm +++ b/code/_core/datum/species/_species.dm @@ -132,7 +132,7 @@ var/has_blood_toxicity = TRUE -/species/proc/process_accent(var/atom/speaker, var/atom/source, var/text_to_say, var/raw_text_to_say, var/text_type, var/frequency, var/language = LANGUAGE_BASIC,var/talk_range=TALK_RANGE) +/species/proc/process_accent(atom/speaker, atom/source, text_to_say, raw_text_to_say, text_type, frequency, language = LANGUAGE_BASIC,talk_range=TALK_RANGE) if(!accent || !length(accent)) return text_to_say diff --git a/code/_core/datum/spell/_spell.dm b/code/_core/datum/spell/_spell.dm index 3991cf968b..66972c88fb 100644 --- a/code/_core/datum/spell/_spell.dm +++ b/code/_core/datum/spell/_spell.dm @@ -7,12 +7,12 @@ var/cast_delay = 0.5 SECONDS var/cast_sound -/spell/proc/on_cast(var/mob/caller,var/atom/target,location,control,params) +/spell/proc/on_cast(mob/caller,atom/target,location,control,params) if(cast_sound) play_sound(cast_sound,get_turf(caller)) return TRUE -/spell/proc/can_cast(var/mob/caller,var/atom/target,location,control,params) +/spell/proc/can_cast(mob/caller,atom/target,location,control,params) return TRUE @@ -29,7 +29,7 @@ var/base_spread = 0 var/base_penetrations = 0 -/spell/projectile/on_cast(var/mob/caller,var/atom/target,location,control,params) +/spell/projectile/on_cast(mob/caller,atom/target,location,control,params) var/icon_pos_x = text2num(params[PARAM_ICON_X]) var/icon_pos_y = text2num(params[PARAM_ICON_Y]) diff --git a/code/_core/datum/spellcraft/effect/_effect.dm b/code/_core/datum/spellcraft/effect/_effect.dm index c1e6f80079..e21e5d7bd0 100644 --- a/code/_core/datum/spellcraft/effect/_effect.dm +++ b/code/_core/datum/spellcraft/effect/_effect.dm @@ -5,8 +5,8 @@ icon_state = "cult_1" var/can_be_held = FALSE -/spellcraft/effect/proc/on_cast(var/turf/cast_loc,var/mob/living/caster,var/atom/target,var/effect_color,var/spell_mod_id,var/spell_buff_id) +/spellcraft/effect/proc/on_cast(turf/cast_loc,mob/living/caster,atom/target,effect_color,spell_mod_id,spell_buff_id) return TRUE -/spellcraft/effect/proc/clicked_on_by_object(var/mob/caller as mob,var/atom/object,location,control,params,var/obj/item/weapon/ranged/magic/rune/R) +/spellcraft/effect/proc/clicked_on_by_object(mob/caller as mob,atom/object,location,control,params,obj/item/weapon/ranged/magic/rune/R) return TRUE \ No newline at end of file diff --git a/code/_core/datum/spellcraft/effect/damage.dm b/code/_core/datum/spellcraft/effect/damage.dm index 0225a7d8bc..5fae11c52e 100644 --- a/code/_core/datum/spellcraft/effect/damage.dm +++ b/code/_core/datum/spellcraft/effect/damage.dm @@ -5,7 +5,7 @@ var/base_damage = 20 //TODO: REDO THIS -/spellcraft/effect/damage/on_cast(var/turf/cast_loc,var/mob/living/caster,var/atom/target,var/effect_color,var/spell_mod_id,var/spell_buff_id) +/spellcraft/effect/damage/on_cast(turf/cast_loc,mob/living/caster,atom/target,effect_color,spell_mod_id,spell_buff_id) /* var/spellcraft/modifier/M = all_modifiers[spell_mod_id] var/damage_type = M.damage_type diff --git a/code/_core/datum/spellcraft/effect/teleport.dm b/code/_core/datum/spellcraft/effect/teleport.dm index 56face8399..f9d492719f 100644 --- a/code/_core/datum/spellcraft/effect/teleport.dm +++ b/code/_core/datum/spellcraft/effect/teleport.dm @@ -3,7 +3,7 @@ id = "effect_teleport" icon_state = "cult_teleport" -/spellcraft/effect/teleport/on_cast(var/turf/cast_loc,var/mob/living/caster,var/atom/target,var/effect_color,var/spell_mod_id,var/spell_buff_id) +/spellcraft/effect/teleport/on_cast(turf/cast_loc,mob/living/caster,atom/target,effect_color,spell_mod_id,spell_buff_id) if(!is_advanced(caster)) return FALSE @@ -34,7 +34,7 @@ return ..() -/spellcraft/effect/teleport/clicked_on_by_object(var/mob/caller as mob,var/atom/object,location,control,params,var/obj/item/weapon/ranged/magic/rune/R) +/spellcraft/effect/teleport/clicked_on_by_object(mob/caller as mob,atom/object,location,control,params,obj/item/weapon/ranged/magic/rune/R) if(caller.loc != R.loc) caller.to_chat(span("notice","\The [R] doesn't seem to react.")) diff --git a/code/_core/datum/squad/_squad.dm b/code/_core/datum/squad/_squad.dm index fb5aee2929..ef4c541ae8 100644 --- a/code/_core/datum/squad/_squad.dm +++ b/code/_core/datum/squad/_squad.dm @@ -15,7 +15,7 @@ var/never_delete = FALSE -/squad/New(var/desired_loc) +/squad/New(desired_loc) SSsquad.all_squads += src @@ -35,7 +35,7 @@ -/squad/proc/add_member(var/mob/living/advanced/player/P) +/squad/proc/add_member(mob/living/advanced/player/P) if(members[P]) return FALSE @@ -61,7 +61,7 @@ return TRUE -/squad/proc/remove_member(var/mob/living/advanced/player/P) +/squad/proc/remove_member(mob/living/advanced/player/P) if(!members[P]) return FALSE @@ -84,7 +84,7 @@ return TRUE -/squad/proc/set_leader(var/mob/living/advanced/player/P) +/squad/proc/set_leader(mob/living/advanced/player/P) if(!members[P]) return FALSE diff --git a/code/_core/datum/stand/_stand.dm b/code/_core/datum/stand/_stand.dm index d1d896573e..d3501df5c7 100644 --- a/code/_core/datum/stand/_stand.dm +++ b/code/_core/datum/stand/_stand.dm @@ -22,7 +22,7 @@ var/mob/living/advanced/stand/linked_stand -/stand/proc/on_move(var/success,var/new_loc,var/new_dir) +/stand/proc/on_move(success,new_loc,new_dir) if(success && (!linked_stand.ai || !linked_stand.ai.objective_attack)) linked_stand.glide_size = stand_user.glide_size @@ -34,7 +34,7 @@ return TRUE -/stand/New(var/desired_owner) +/stand/New(desired_owner) if(desired_owner) stand_user = desired_owner @@ -119,7 +119,7 @@ INITIALIZE(linked_stand) FINALIZE(linked_stand) -/stand/proc/display_stand(var/mob/caller) +/stand/proc/display_stand(mob/caller) caller.to_chat("Stand Name: [name]") caller.to_chat("Stand User: [stand_user.name]") caller.to_chat("Stand Cry: \"[stand_cry]\"") diff --git a/code/_core/datum/status_effect/_status_effect.dm b/code/_core/datum/status_effect/_status_effect.dm index 9eb50e7026..953ec7ef32 100644 --- a/code/_core/datum/status_effect/_status_effect.dm +++ b/code/_core/datum/status_effect/_status_effect.dm @@ -10,20 +10,20 @@ var/affects_dead = TRUE -/status_effect/proc/modify_duration(var/atom/attacker,var/mob/living/owner,var/duration) +/status_effect/proc/modify_duration(atom/attacker,mob/living/owner,duration) return duration -/status_effect/proc/modify_magnitude(var/atom/attacker,var/mob/living/owner,var/magnitude) +/status_effect/proc/modify_magnitude(atom/attacker,mob/living/owner,magnitude) return magnitude -/status_effect/proc/can_add_status_effect(var/atom/attacker,var/mob/living/victim) +/status_effect/proc/can_add_status_effect(atom/attacker,mob/living/victim) if(victim.dead && !affects_dead) return FALSE return TRUE -/status_effect/proc/on_effect_added(var/mob/living/owner,var/atom/source,var/magnitude,var/duration,var/stealthy) +/status_effect/proc/on_effect_added(mob/living/owner,atom/source,magnitude,duration,stealthy) if(!stealthy) var/turf/T = get_turf(owner) @@ -31,8 +31,8 @@ return TRUE -/status_effect/proc/on_effect_removed(var/mob/living/owner,var/magnitude,var/duration) +/status_effect/proc/on_effect_removed(mob/living/owner,magnitude,duration) return TRUE -/status_effect/proc/on_effect_life(var/mob/living/owner,var/magnitude,var/duration) +/status_effect/proc/on_effect_life(mob/living/owner,magnitude,duration) return TRUE \ No newline at end of file diff --git a/code/_core/datum/status_effect/adrenaline.dm b/code/_core/datum/status_effect/adrenaline.dm index 836666a407..eb01fd23ac 100644 --- a/code/_core/datum/status_effect/adrenaline.dm +++ b/code/_core/datum/status_effect/adrenaline.dm @@ -7,7 +7,7 @@ maximum = 300 SECONDS default_duration = 30 SECONDS -/status_effect/adrenaline/on_effect_added(var/mob/living/owner,var/atom/source,var/magnitude,var/duration,var/stealthy) +/status_effect/adrenaline/on_effect_added(mob/living/owner,atom/source,magnitude,duration,stealthy) . = ..() owner.remove_status_effect(STAMCRIT) owner.stamina_regen_delay = 0 diff --git a/code/_core/datum/status_effect/blighted.dm b/code/_core/datum/status_effect/blighted.dm index cb78b30818..e5f8770f28 100644 --- a/code/_core/datum/status_effect/blighted.dm +++ b/code/_core/datum/status_effect/blighted.dm @@ -7,7 +7,7 @@ maximum = 300 SECONDS default_duration = 60 SECONDS -/status_effect/blighted/on_effect_life(var/mob/living/owner,var/magnitude,var/duration) +/status_effect/blighted/on_effect_life(mob/living/owner,magnitude,duration) . = ..() //Force all regenerations to be 0 or lower. owner.brute_regen_buffer = min(owner.brute_regen_buffer,0) diff --git a/code/_core/datum/status_effect/blind.dm b/code/_core/datum/status_effect/blind.dm index f3d7c23d1e..a297546781 100644 --- a/code/_core/datum/status_effect/blind.dm +++ b/code/_core/datum/status_effect/blind.dm @@ -9,12 +9,12 @@ affects_dead = FALSE -/status_effect/blind/on_effect_added(var/mob/living/owner,var/atom/source,var/magnitude,var/duration,var/stealthy) +/status_effect/blind/on_effect_added(mob/living/owner,atom/source,magnitude,duration,stealthy) . = ..() if(.) owner.update_eyes() -/status_effect/blind/on_effect_removed(var/mob/living/owner,var/magnitude,var/duration) +/status_effect/blind/on_effect_removed(mob/living/owner,magnitude,duration) . = ..() if(.) owner.update_eyes() diff --git a/code/_core/datum/status_effect/buff.dm b/code/_core/datum/status_effect/buff.dm index 1ea4da4e91..e94d72ce00 100644 --- a/code/_core/datum/status_effect/buff.dm +++ b/code/_core/datum/status_effect/buff.dm @@ -10,7 +10,7 @@ affects_dead = TRUE -/status_effect/buff/on_effect_added(var/mob/living/owner,var/atom/source,var/magnitude,var/duration,var/stealthy) +/status_effect/buff/on_effect_added(mob/living/owner,atom/source,magnitude,duration,stealthy) . = ..() @@ -31,7 +31,7 @@ T.icon_state = "[initial(T.icon_state)]_buff" T.handle_overlays(A,worn=TRUE,update=TRUE,icon_state_override=T.icon_state) -/status_effect/buff/on_effect_removed(var/mob/living/owner,var/magnitude,var/duration) +/status_effect/buff/on_effect_removed(mob/living/owner,magnitude,duration) . = ..() diff --git a/code/_core/datum/status_effect/consencrated.dm b/code/_core/datum/status_effect/consencrated.dm index 176d49f87f..5e1fd4b361 100644 --- a/code/_core/datum/status_effect/consencrated.dm +++ b/code/_core/datum/status_effect/consencrated.dm @@ -8,7 +8,7 @@ default_duration = 60 SECONDS -/status_effect/consencrated/can_add_status_effect(var/atom/attacker,var/mob/living/victim) +/status_effect/consencrated/can_add_status_effect(atom/attacker,mob/living/victim) . = ..() @@ -25,6 +25,6 @@ return TRUE -/status_effect/consencrated/on_effect_life(var/mob/living/owner,var/magnitude,var/duration) +/status_effect/consencrated/on_effect_life(mob/living/owner,magnitude,duration) . = ..() owner.burn_regen_buffer -= 1 * TICKS_TO_SECONDS(LIFE_TICK) diff --git a/code/_core/datum/status_effect/critical.dm b/code/_core/datum/status_effect/critical.dm index 75822c0511..16cdcf84ed 100644 --- a/code/_core/datum/status_effect/critical.dm +++ b/code/_core/datum/status_effect/critical.dm @@ -8,7 +8,7 @@ affects_dead = FALSE -/status_effect/critical/on_effect_added(var/mob/living/owner,var/atom/source,var/magnitude,var/duration,var/stealthy) +/status_effect/critical/on_effect_added(mob/living/owner,atom/source,magnitude,duration,stealthy) owner.remove_status_effect(ADRENALINE) if(is_advanced(owner) && !owner.horizontal) owner.add_status_effect(DISARM,5,5,source = source,stealthy = TRUE) @@ -24,7 +24,7 @@ affects_dead = FALSE -/status_effect/paincrit/on_effect_added(var/mob/living/owner,var/atom/source,var/magnitude,var/duration,var/stealthy) +/status_effect/paincrit/on_effect_added(mob/living/owner,atom/source,magnitude,duration,stealthy) if(is_advanced(owner) && !owner.horizontal) owner.add_status_effect(DISARM,5,5,source = source,stealthy = TRUE) return ..() @@ -39,7 +39,7 @@ affects_dead = FALSE -/status_effect/stamcrit/on_effect_added(var/mob/living/owner,var/atom/source,var/magnitude,var/duration,var/stealthy) +/status_effect/stamcrit/on_effect_added(mob/living/owner,atom/source,magnitude,duration,stealthy) if(is_advanced(owner) && !owner.horizontal) owner.add_status_effect(DISARM,5,5,source = source,stealthy = TRUE) owner.remove_status_effect(ADRENALINE) diff --git a/code/_core/datum/status_effect/cursed.dm b/code/_core/datum/status_effect/cursed.dm index 4c3ad02d7b..74f6918403 100644 --- a/code/_core/datum/status_effect/cursed.dm +++ b/code/_core/datum/status_effect/cursed.dm @@ -7,7 +7,7 @@ maximum = 300 SECONDS default_duration = 60 SECONDS -/status_effect/cursed/can_add_status_effect(var/atom/attacker,var/mob/living/victim) +/status_effect/cursed/can_add_status_effect(atom/attacker,mob/living/victim) . = ..() @@ -24,7 +24,7 @@ return TRUE -/status_effect/cursed/on_effect_life(var/mob/living/owner,var/magnitude,var/duration) +/status_effect/cursed/on_effect_life(mob/living/owner,magnitude,duration) . = ..() owner.brute_regen_buffer -= 5 * TICKS_TO_SECONDS(LIFE_TICK) diff --git a/code/_core/datum/status_effect/disarmed.dm b/code/_core/datum/status_effect/disarmed.dm index 622bc90410..ada8794c3b 100644 --- a/code/_core/datum/status_effect/disarmed.dm +++ b/code/_core/datum/status_effect/disarmed.dm @@ -6,7 +6,7 @@ maximum = 0 default_duration = 0 -/status_effect/disarm/on_effect_added(var/mob/living/owner,var/atom/source,var/magnitude,var/duration,var/stealthy) +/status_effect/disarm/on_effect_added(mob/living/owner,atom/source,magnitude,duration,stealthy) stealthy = TRUE diff --git a/code/_core/datum/status_effect/druggy.dm b/code/_core/datum/status_effect/druggy.dm index df45009dba..d5ca9db21e 100644 --- a/code/_core/datum/status_effect/druggy.dm +++ b/code/_core/datum/status_effect/druggy.dm @@ -9,12 +9,12 @@ affects_dead = FALSE -/status_effect/druggy/on_effect_added(var/mob/living/owner,var/atom/source,var/magnitude,var/duration,var/stealthy) +/status_effect/druggy/on_effect_added(mob/living/owner,atom/source,magnitude,duration,stealthy) . = ..() if(.) owner.update_eyes() -/status_effect/druggy/on_effect_removed(var/mob/living/owner,var/magnitude,var/duration) +/status_effect/druggy/on_effect_removed(mob/living/owner,magnitude,duration) . = ..() if(.) owner.update_eyes() diff --git a/code/_core/datum/status_effect/fat.dm b/code/_core/datum/status_effect/fat.dm index 08802adc25..61c52f0c7c 100644 --- a/code/_core/datum/status_effect/fat.dm +++ b/code/_core/datum/status_effect/fat.dm @@ -10,7 +10,7 @@ affects_dead = TRUE -/status_effect/fat/on_effect_added(var/mob/living/owner,var/atom/source,var/magnitude,var/duration,var/stealthy) +/status_effect/fat/on_effect_added(mob/living/owner,atom/source,magnitude,duration,stealthy) . = ..() @@ -21,7 +21,7 @@ T.handle_overlays(A,worn=TRUE,update=TRUE) -/status_effect/fat/on_effect_removed(var/mob/living/owner,var/magnitude,var/duration) +/status_effect/fat/on_effect_removed(mob/living/owner,magnitude,duration) . = ..() diff --git a/code/_core/datum/status_effect/fire_cosmetic.dm b/code/_core/datum/status_effect/fire_cosmetic.dm index fd504c5de3..be181ab6b7 100644 --- a/code/_core/datum/status_effect/fire_cosmetic.dm +++ b/code/_core/datum/status_effect/fire_cosmetic.dm @@ -9,7 +9,7 @@ maximum = 5 SECONDS default_duration = 5 SECONDS -/status_effect/fire/on_effect_added(var/mob/living/owner,var/atom/source,var/magnitude,var/duration,var/stealthy) +/status_effect/fire/on_effect_added(mob/living/owner,atom/source,magnitude,duration,stealthy) . = ..() diff --git a/code/_core/datum/status_effect/grab.dm b/code/_core/datum/status_effect/grab.dm index ecadd6d93c..d2328cef98 100644 --- a/code/_core/datum/status_effect/grab.dm +++ b/code/_core/datum/status_effect/grab.dm @@ -6,14 +6,14 @@ maximum = 20 default_duration = 20 -/status_effect/grab/can_add_status_effect(var/atom/attacker,var/mob/living/victim) +/status_effect/grab/can_add_status_effect(atom/attacker,mob/living/victim) if(victim.has_status_effect(GRAB)) return FALSE . = ..() -/status_effect/grab/on_effect_added(var/mob/living/owner,var/atom/source,var/magnitude,var/duration,var/stealthy) +/status_effect/grab/on_effect_added(mob/living/owner,atom/source,magnitude,duration,stealthy) if(is_living(source)) var/mob/living/L = source diff --git a/code/_core/datum/status_effect/mana_void.dm b/code/_core/datum/status_effect/mana_void.dm index 2ca06619dc..7deb256f5a 100644 --- a/code/_core/datum/status_effect/mana_void.dm +++ b/code/_core/datum/status_effect/mana_void.dm @@ -6,8 +6,8 @@ maximum = 0 default_duration = 0 -/status_effect/mana_void/on_effect_added(var/mob/living/owner,var/atom/source,var/magnitude,var/duration,var/stealthy) +/status_effect/mana_void/on_effect_added(mob/living/owner,atom/source,magnitude,duration,stealthy) owner.mana_regen_buffer = -1000 -/status_effect/stressed/on_effect_removed(var/mob/living/owner,var/magnitude,var/duration) +/status_effect/stressed/on_effect_removed(mob/living/owner,magnitude,duration) owner.mana_regen_buffer = max(0,owner.mana_regen_buffer) diff --git a/code/_core/datum/status_effect/paralyzed.dm b/code/_core/datum/status_effect/paralyzed.dm index cd41def2a0..8161ce9d00 100644 --- a/code/_core/datum/status_effect/paralyzed.dm +++ b/code/_core/datum/status_effect/paralyzed.dm @@ -8,17 +8,17 @@ affects_dead = FALSE -/status_effect/paralyzed/modify_duration(var/atom/attacker,var/mob/living/owner,var/duration) +/status_effect/paralyzed/modify_duration(atom/attacker,mob/living/owner,duration) if(owner.stun_immunity > 0) duration *= 0.25 return duration -/status_effect/paralyzed/modify_magnitude(var/atom/attacker,var/mob/living/owner,var/magnitude) +/status_effect/paralyzed/modify_magnitude(atom/attacker,mob/living/owner,magnitude) if(owner.stun_immunity > 0) magnitude *= 0.25 return magnitude -/status_effect/paralyzed/on_effect_added(var/mob/living/owner,var/atom/source,var/magnitude,var/duration,var/stealthy) +/status_effect/paralyzed/on_effect_added(mob/living/owner,atom/source,magnitude,duration,stealthy) . = ..() if(duration > 0 && magnitude > 0) owner.stun_immunity = max(owner.stun_immunity,owner.stun_immunity + duration*1.25 + 1 SECONDS) diff --git a/code/_core/datum/status_effect/parried.dm b/code/_core/datum/status_effect/parried.dm index 6702c49538..85ea2854ea 100644 --- a/code/_core/datum/status_effect/parried.dm +++ b/code/_core/datum/status_effect/parried.dm @@ -9,14 +9,14 @@ affects_dead = FALSE -/status_effect/parried/can_add_status_effect(var/atom/attacker,var/mob/living/victim) +/status_effect/parried/can_add_status_effect(atom/attacker,mob/living/victim) if(!attacker || victim.horizontal || victim.anchored) return FALSE . = ..() -/status_effect/parried/on_effect_added(var/mob/living/owner,var/atom/source,var/magnitude,var/duration,var/stealthy) +/status_effect/parried/on_effect_added(mob/living/owner,atom/source,magnitude,duration,stealthy) . = ..() diff --git a/code/_core/datum/status_effect/rage.dm b/code/_core/datum/status_effect/rage.dm index 9d6f01d84d..cc08376714 100644 --- a/code/_core/datum/status_effect/rage.dm +++ b/code/_core/datum/status_effect/rage.dm @@ -11,7 +11,7 @@ affects_dead = FALSE -/status_effect/rage/on_effect_added(var/mob/living/owner,var/atom/source,var/magnitude,var/duration,var/stealthy) +/status_effect/rage/on_effect_added(mob/living/owner,atom/source,magnitude,duration,stealthy) . = ..() owner.add_status_effect(UNDYING,magnitude,duration,stealthy=TRUE) owner.add_status_effect(ADRENALINE,magnitude,duration,stealthy=TRUE) diff --git a/code/_core/datum/status_effect/shoved.dm b/code/_core/datum/status_effect/shoved.dm index 42349ac9f1..77ab7a63a4 100644 --- a/code/_core/datum/status_effect/shoved.dm +++ b/code/_core/datum/status_effect/shoved.dm @@ -8,14 +8,14 @@ affects_dead = FALSE -/status_effect/shoved/can_add_status_effect(var/atom/attacker,var/mob/living/victim) +/status_effect/shoved/can_add_status_effect(atom/attacker,mob/living/victim) if(!attacker || victim.horizontal || victim.anchored) return FALSE . = ..() -/status_effect/shoved/on_effect_added(var/mob/living/owner,var/atom/source,var/magnitude,var/duration,var/stealthy) +/status_effect/shoved/on_effect_added(mob/living/owner,atom/source,magnitude,duration,stealthy) . = ..() diff --git a/code/_core/datum/status_effect/sleeping.dm b/code/_core/datum/status_effect/sleeping.dm index 634022f5d0..56cfa55efe 100644 --- a/code/_core/datum/status_effect/sleeping.dm +++ b/code/_core/datum/status_effect/sleeping.dm @@ -8,17 +8,17 @@ affects_dead = FALSE -/status_effect/sleeping/on_effect_added(var/mob/living/owner,var/atom/source,var/magnitude,var/duration,var/stealthy) +/status_effect/sleeping/on_effect_added(mob/living/owner,atom/source,magnitude,duration,stealthy) . = ..() if(duration > 0 && magnitude > 0) owner.stun_immunity = max(owner.stun_immunity,owner.stun_immunity + duration*1.25 + 1 SECONDS) -/status_effect/sleeping/modify_duration(var/atom/attacker,var/mob/living/owner,var/duration) +/status_effect/sleeping/modify_duration(atom/attacker,mob/living/owner,duration) if(owner.stun_immunity > 0) duration *= 0.25 return duration -/status_effect/sleeping/modify_magnitude(var/atom/attacker,var/mob/living/owner,var/magnitude) +/status_effect/sleeping/modify_magnitude(atom/attacker,mob/living/owner,magnitude) if(owner.stun_immunity > 0) magnitude *= 0.25 return magnitude diff --git a/code/_core/datum/status_effect/slipped.dm b/code/_core/datum/status_effect/slipped.dm index 867c911ea0..3ad5592467 100644 --- a/code/_core/datum/status_effect/slipped.dm +++ b/code/_core/datum/status_effect/slipped.dm @@ -8,7 +8,7 @@ affects_dead = FALSE -/status_effect/slip/on_effect_added(var/mob/living/owner,var/atom/source,var/magnitude,var/duration,var/stealthy) +/status_effect/slip/on_effect_added(mob/living/owner,atom/source,magnitude,duration,stealthy) . = ..() play_sound('sound/effects/slip.ogg',get_turf(owner),range_max=VIEW_RANGE) owner.add_status_effect(STUN,30,30,source = source,stealthy = TRUE) diff --git a/code/_core/datum/status_effect/soul_trap.dm b/code/_core/datum/status_effect/soul_trap.dm index ec523ce008..4623c8815a 100644 --- a/code/_core/datum/status_effect/soul_trap.dm +++ b/code/_core/datum/status_effect/soul_trap.dm @@ -8,7 +8,7 @@ affects_dead = FALSE -/status_effect/soul_trap/can_add_status_effect(var/atom/attacker,var/mob/living/victim) +/status_effect/soul_trap/can_add_status_effect(atom/attacker,mob/living/victim) if(victim.is_player_controlled()) return FALSE diff --git a/code/_core/datum/status_effect/staggered.dm b/code/_core/datum/status_effect/staggered.dm index 222c089172..582a075993 100644 --- a/code/_core/datum/status_effect/staggered.dm +++ b/code/_core/datum/status_effect/staggered.dm @@ -7,13 +7,13 @@ default_duration = 1 SECONDS affects_dead = FALSE -/status_effect/staggered/can_add_status_effect(var/atom/attacker,var/mob/living/victim) +/status_effect/staggered/can_add_status_effect(atom/attacker,mob/living/victim) if(victim.horizontal) return FALSE return ..() -/status_effect/staggered/on_effect_added(var/mob/living/owner,var/atom/source,var/magnitude,var/duration,var/stealthy) +/status_effect/staggered/on_effect_added(mob/living/owner,atom/source,magnitude,duration,stealthy) . = ..() owner.next_move = max(owner.next_move,DS2TICKS(duration)) diff --git a/code/_core/datum/status_effect/stun.dm b/code/_core/datum/status_effect/stun.dm index 926a0fa850..1ed2f91460 100644 --- a/code/_core/datum/status_effect/stun.dm +++ b/code/_core/datum/status_effect/stun.dm @@ -8,17 +8,17 @@ affects_dead = FALSE -/status_effect/stun/modify_duration(var/atom/attacker,var/mob/living/owner,var/duration) +/status_effect/stun/modify_duration(atom/attacker,mob/living/owner,duration) if(owner.stun_immunity > 0) duration *= 0.25 return duration -/status_effect/stun/modify_magnitude(var/atom/attacker,var/mob/living/owner,var/magnitude) +/status_effect/stun/modify_magnitude(atom/attacker,mob/living/owner,magnitude) if(owner.stun_immunity > 0) magnitude *= 0.25 return magnitude -/status_effect/stun/on_effect_added(var/mob/living/owner,var/atom/source,var/magnitude,var/duration,var/stealthy) +/status_effect/stun/on_effect_added(mob/living/owner,atom/source,magnitude,duration,stealthy) . = ..() owner.remove_status_effect(STAGGER) owner.remove_status_effect(PARRIED) diff --git a/code/_core/datum/status_effect/undying.dm b/code/_core/datum/status_effect/undying.dm index 3b55d6a9c3..8999b436c5 100644 --- a/code/_core/datum/status_effect/undying.dm +++ b/code/_core/datum/status_effect/undying.dm @@ -7,6 +7,6 @@ maximum = 30 SECONDS default_duration = 10 SECONDS -/status_effect/undying/on_effect_added(var/mob/living/owner,var/atom/source,var/magnitude,var/duration,var/stealthy) +/status_effect/undying/on_effect_added(mob/living/owner,atom/source,magnitude,duration,stealthy) . = ..() QUEUE_HEALTH_UPDATE(owner) diff --git a/code/_core/datum/status_effect/zombie.dm b/code/_core/datum/status_effect/zombie.dm index b1815c4fd9..a213c6b9c4 100644 --- a/code/_core/datum/status_effect/zombie.dm +++ b/code/_core/datum/status_effect/zombie.dm @@ -5,7 +5,7 @@ affects_dead = TRUE -/status_effect/zombie/can_add_status_effect(var/atom/attacker,var/mob/living/victim) +/status_effect/zombie/can_add_status_effect(atom/attacker,mob/living/victim) if(!is_advanced(victim)) return FALSE var/mob/living/advanced/A = victim @@ -17,7 +17,7 @@ return FALSE . = ..() -/status_effect/zombie/on_effect_removed(var/mob/living/owner,var/magnitude,var/duration) +/status_effect/zombie/on_effect_removed(mob/living/owner,magnitude,duration) . = ..() @@ -33,7 +33,7 @@ HOOK_REMOVE("on_damage_received","\ref[owner]_zombie_on_damage_received",owner) -/status_effect/zombie/on_effect_added(var/mob/living/owner,var/atom/source,var/magnitude,var/duration,var/stealthy) +/status_effect/zombie/on_effect_added(mob/living/owner,atom/source,magnitude,duration,stealthy) stealthy = TRUE . = ..() var/mob/living/advanced/A = owner @@ -111,7 +111,7 @@ A.revive() -/status_effect/zombie/on_effect_life(var/mob/living/owner,var/magnitude,var/duration) +/status_effect/zombie/on_effect_life(mob/living/owner,magnitude,duration) . = ..() if(. && !owner.dead && owner.ai && owner.ai.active && !owner.has_status_effect(REST) && prob(1)) var/sound_to_play @@ -135,7 +135,7 @@ if(sound_to_play) play_sound(sound_to_play,get_turf(owner),range_max=VIEW_RANGE) -/status_effect/zombie/proc/post_death(var/mob/living/L,args) +/status_effect/zombie/proc/post_death(mob/living/L,args) if(prob(50)) var/list/valid_sounds = list( @@ -146,7 +146,7 @@ CALLBACK("zombie_revive_\ref[L]",(rand(4,10)) SECONDS,src,src::zombie_revive(),L) return TRUE -/status_effect/zombie/proc/zombie_revive(var/mob/living/advanced/L) //Stolen from meatmen. +/status_effect/zombie/proc/zombie_revive(mob/living/advanced/L) //Stolen from meatmen. if(L.qdeleting || !L.health) return FALSE @@ -170,7 +170,7 @@ return TRUE -/status_effect/zombie/proc/attack(var/mob/living/advanced/L,var/args) +/status_effect/zombie/proc/attack(mob/living/advanced/L,args) if(prob(25)) var/list/valid_sounds = list( @@ -184,7 +184,7 @@ return TRUE -/status_effect/zombie/proc/on_damage_received(var/mob/living/advanced/L,var/args) +/status_effect/zombie/proc/on_damage_received(mob/living/advanced/L,args) if(length(args) && !args[8] && !L.dead && args[6] > 20 && prob(50)) var/list/valid_sounds = list( @@ -199,7 +199,7 @@ return TRUE -/status_effect/zombie/proc/on_headshot(var/obj/item/organ/O,var/args) //When the zombie gets shot in the head. +/status_effect/zombie/proc/on_headshot(obj/item/organ/O,args) //When the zombie gets shot in the head. var/mob/living/advanced/A = O.loc diff --git a/code/_core/datum/telecomm_trigger/_telecomm_trigger.dm b/code/_core/datum/telecomm_trigger/_telecomm_trigger.dm index f88f9e93f0..8f876a52ce 100644 --- a/code/_core/datum/telecomm_trigger/_telecomm_trigger.dm +++ b/code/_core/datum/telecomm_trigger/_telecomm_trigger.dm @@ -5,7 +5,7 @@ var/selected_trigger_name var/regex/selected_trigger_regex -/telecomm_trigger/proc/check_trigger(var/text_to_search) +/telecomm_trigger/proc/check_trigger(text_to_search) return selected_trigger_regex.Find(text_to_search) /telecomm_trigger/proc/trigger() diff --git a/code/_core/datum/ticket/_ticket.dm b/code/_core/datum/ticket/_ticket.dm index 025d151cd0..642e69287d 100644 --- a/code/_core/datum/ticket/_ticket.dm +++ b/code/_core/datum/ticket/_ticket.dm @@ -22,13 +22,13 @@ . = ..() -/ticket/New(var/desired_loc) +/ticket/New(desired_loc) ticket_number = SSclient.ticket_number_counter SSclient.ticket_number_counter++ password = rand(1,1000000) . = ..() -/ticket/proc/open(var/client/C,var/desired_message,var/is_victim) +/ticket/proc/open(client/C,desired_message,is_victim) for(var/k in involved_ckeys) var/client/C2 = CLIENT(k) @@ -53,7 +53,7 @@ else message_log += "[C.ckey] has reopened the ticket." -/ticket/proc/close(var/client/C) +/ticket/proc/close(client/C) for(var/k in involved_ckeys) var/client/C2 = CLIENT(k) C2.to_chat(span("ahelp bold","Ticket (#[ticket_number]) has been closed by [C.ckey].")) @@ -61,7 +61,7 @@ message_log += "[C.ckey] has closed the ticket." log_admin("[C.ckey] closed ticket (#[ticket_number]).") -/ticket/proc/send_message(var/client/C,var/message) +/ticket/proc/send_message(client/C,message) if(!involved_ckeys[C.ckey]) return FALSE @@ -96,7 +96,7 @@ message_log += "[C.ckey]: [message]" -/ticket/proc/join(var/client/C,var/is_victim=FALSE) +/ticket/proc/join(client/C,is_victim=FALSE) if(involved_ckeys[C.ckey]) C.to_chat(span("ahelp bold","You are already in this ticket (#[ticket_number])!")) diff --git a/code/_core/datum/trait/_trait.dm b/code/_core/datum/trait/_trait.dm index 97f9097575..5beca90b75 100644 --- a/code/_core/datum/trait/_trait.dm +++ b/code/_core/datum/trait/_trait.dm @@ -11,7 +11,7 @@ var/trait_tag = TRAIT_NEUTRAL -/trait/proc/on_add(var/mob/living/L,var/messages=TRUE) +/trait/proc/on_add(mob/living/L,messages=TRUE) if(messages) if(add_message) @@ -22,7 +22,7 @@ return TRUE -/trait/proc/on_remove(var/mob/living/L,var/messages=TRUE) +/trait/proc/on_remove(mob/living/L,messages=TRUE) if(messages) diff --git a/code/_core/datum/vector.dm b/code/_core/datum/vector.dm index a14d6b1557..727e6bfeb0 100644 --- a/code/_core/datum/vector.dm +++ b/code/_core/datum/vector.dm @@ -2,7 +2,7 @@ var/x var/y -/Vector2D/New(var/desired_x,var/desired_y) +/Vector2D/New(desired_x,desired_y) x = desired_x y = desired_y @@ -11,7 +11,7 @@ var/y var/z -/Vector3D/New(var/desired_x,var/desired_y,var/desired_z) +/Vector3D/New(desired_x,desired_y,desired_z) x = desired_x y = desired_y z = desired_y diff --git a/code/_core/datum/virtual_reality/_virtual_reality.dm b/code/_core/datum/virtual_reality/_virtual_reality.dm index ca8c1f1aca..f5cdd5d215 100644 --- a/code/_core/datum/virtual_reality/_virtual_reality.dm +++ b/code/_core/datum/virtual_reality/_virtual_reality.dm @@ -10,7 +10,7 @@ -/virtual_reality/proc/on_player_join(var/mob/living/L) //What happens when a player joins virtual reality. +/virtual_reality/proc/on_player_join(mob/living/L) //What happens when a player joins virtual reality. active_players |= L if(base_loadout && is_advanced(L)) var/mob/living/advanced/A = L @@ -20,7 +20,7 @@ move_to_team(L,"Lobby") return TRUE -/virtual_reality/proc/on_player_leave(var/mob/living/L) //What happens when a player leaves virtual reality. +/virtual_reality/proc/on_player_leave(mob/living/L) //What happens when a player leaves virtual reality. active_players -= L move_to_team(L,null) return TRUE @@ -34,7 +34,7 @@ /virtual_reality/proc/on_life() return TRUE -/virtual_reality/proc/set_message(var/desired_message) +/virtual_reality/proc/set_message(desired_message) for(var/mob/living/advanced/A in active_players) if(!A.client) @@ -43,7 +43,7 @@ M.set_text(desired_message) -/virtual_reality/proc/move_to_team(var/mob/living/L,var/desired_team) +/virtual_reality/proc/move_to_team(mob/living/L,desired_team) if(L.loyalty_tag && teams[L.loyalty_tag]) teams[L.loyalty_tag] -= L @@ -55,5 +55,5 @@ return TRUE -/virtual_reality/proc/player_post_death(var/mob/living/advanced/player/virtual/P) +/virtual_reality/proc/player_post_death(mob/living/advanced/player/virtual/P) return TRUE \ No newline at end of file diff --git a/code/_core/datum/virtual_reality/nuke_ops.dm b/code/_core/datum/virtual_reality/nuke_ops.dm index 0ed807dde6..e706a843fe 100644 --- a/code/_core/datum/virtual_reality/nuke_ops.dm +++ b/code/_core/datum/virtual_reality/nuke_ops.dm @@ -58,21 +58,21 @@ var/list/obj/effect/fog_of_war/tracked_fogs = list() -/virtual_reality/team/nuke_ops/proc/on_kill_player(var/mob/living/advanced/player/owner,args) +/virtual_reality/team/nuke_ops/proc/on_kill_player(mob/living/advanced/player/owner,args) owner.adjust_currency(1000) return TRUE -/virtual_reality/team/nuke_ops/on_player_join(var/mob/living/L) //What happens when a player joins virtual reality. +/virtual_reality/team/nuke_ops/on_player_join(mob/living/L) //What happens when a player joins virtual reality. . = ..() if(is_player(L)) HOOK_ADD("on_kill_player","\ref[L]_on_kill_player",L,src,src::on_kill_player()) -/virtual_reality/team/nuke_ops/on_player_leave(var/mob/living/L) //What happens when a player leaves virtual reality. +/virtual_reality/team/nuke_ops/on_player_leave(mob/living/L) //What happens when a player leaves virtual reality. . = ..() if(is_player(L)) HOOK_REMOVE("on_kill_player","\ref[L]_on_kill_player",L) -/virtual_reality/team/nuke_ops/proc/give_loadout(var/mob/living/advanced/A) +/virtual_reality/team/nuke_ops/proc/give_loadout(mob/living/advanced/A) if(length(team_loadouts[A.loyalty_tag])) var/loadout/L = pick(team_loadouts[A.loyalty_tag]) @@ -98,7 +98,7 @@ var/obj/item/I = k qdel(I) -/virtual_reality/team/nuke_ops/proc/setup_player(var/mob/living/L,var/turf/T) +/virtual_reality/team/nuke_ops/proc/setup_player(mob/living/L,turf/T) L.force_move(T) L.rejuvenate() if(L.client) @@ -155,7 +155,7 @@ setup_player(L,T) -/virtual_reality/team/nuke_ops/move_to_team(var/mob/living/L,var/desired_team) +/virtual_reality/team/nuke_ops/move_to_team(mob/living/L,desired_team) . = ..() @@ -371,7 +371,7 @@ . = ..() -/virtual_reality/team/nuke_ops/proc/set_winner(var/desired_team) +/virtual_reality/team/nuke_ops/proc/set_winner(desired_team) if(state == 6 || state == 7) return FALSE @@ -433,6 +433,6 @@ return TRUE -/virtual_reality/team/nuke_ops/player_post_death(var/mob/living/advanced/player/virtual/P) +/virtual_reality/team/nuke_ops/player_post_death(mob/living/advanced/player/virtual/P) . = ..() check_gamemode_win() diff --git a/code/_core/datum/vote/_vote.dm b/code/_core/datum/vote/_vote.dm index b8b1006a7e..aeb0da4870 100644 --- a/code/_core/datum/vote/_vote.dm +++ b/code/_core/datum/vote/_vote.dm @@ -12,7 +12,7 @@ //New is called when the vote is created. //Destroy is called when the vote is destroyed. -/vote/proc/show(var/client/C) +/vote/proc/show(client/C) . = "

Vote

[name]

" @@ -45,23 +45,23 @@ return ..() -/vote/proc/add_option(var/text) +/vote/proc/add_option(text) options += text return TRUE -/vote/proc/remove_option(var/text) +/vote/proc/remove_option(text) options -= text return TRUE -/vote/proc/set_vote(var/ckey,var/number) +/vote/proc/set_vote(ckey,number) votes[ckey] = number return TRUE -/vote/proc/unset_vote(var/ckey) +/vote/proc/unset_vote(ckey) votes -= ckey return TRUE -/vote/proc/on_result(var/winner,var/list/results) +/vote/proc/on_result(winner,list/results) return TRUE /vote/PreDestroy() diff --git a/code/_core/datum/vote/continue.dm b/code/_core/datum/vote/continue.dm index a43fde75f5..73c55e3e44 100644 --- a/code/_core/datum/vote/continue.dm +++ b/code/_core/datum/vote/continue.dm @@ -4,7 +4,7 @@ time_limit = 60 //In seconds. -/vote/continue_round/on_result(var/winner,var/list/results) +/vote/continue_round/on_result(winner,list/results) if(winner == "No") world.end(WORLD_END_NANOTRASEN_VICTORY) diff --git a/code/_core/datum/vote/gamemode.dm b/code/_core/datum/vote/gamemode.dm index 331fad943f..4473b102a1 100644 --- a/code/_core/datum/vote/gamemode.dm +++ b/code/_core/datum/vote/gamemode.dm @@ -19,7 +19,7 @@ return ..() -/vote/gamemode/on_result(var/winner,var/list/results) +/vote/gamemode/on_result(winner,list/results) if(winner) SSgamemode.set_active_gamemode(gamemode_name_to_type[winner],"voting on_result") diff --git a/code/_core/datum/vote/map.dm b/code/_core/datum/vote/map.dm index 202c3ceaf7..22f5ab070c 100644 --- a/code/_core/datum/vote/map.dm +++ b/code/_core/datum/vote/map.dm @@ -11,7 +11,7 @@ return ..() -/vote/map/on_result(var/winner,var/list/results) +/vote/map/on_result(winner,list/results) if(!winner) broadcast_to_clients(span("danger","Vote failed! Defaulting to Island...")) diff --git a/code/_core/datum/vote/mission.dm b/code/_core/datum/vote/mission.dm index 6591e2b699..c7e54c4642 100644 --- a/code/_core/datum/vote/mission.dm +++ b/code/_core/datum/vote/mission.dm @@ -19,7 +19,7 @@ return ..() -/vote/mission/on_result(var/winner,var/list/results) +/vote/mission/on_result(winner,list/results) if(winner) SSgamemode.set_active_gamemode(gamemode_name_to_type[winner],"voting on_result") diff --git a/code/_core/datum/vote/virtual_reality.dm b/code/_core/datum/vote/virtual_reality.dm index 8c532f13ed..a462f17408 100644 --- a/code/_core/datum/vote/virtual_reality.dm +++ b/code/_core/datum/vote/virtual_reality.dm @@ -18,7 +18,7 @@ . = ..() -/vote/virtual_reality/on_result(var/winner,var/list/results) +/vote/virtual_reality/on_result(winner,list/results) if(winner) SSvirtual_reality.set_virtual_reality(vr_name_to_type[winner]) diff --git a/code/_core/datum/wound/_wound.dm b/code/_core/datum/wound/_wound.dm index ba84af95da..106ab73fc9 100644 --- a/code/_core/datum/wound/_wound.dm +++ b/code/_core/datum/wound/_wound.dm @@ -30,7 +30,7 @@ location = null return ..() -/wound/New(var/mob/living/desired_owner,var/obj/item/organ/desired_location,var/atom/desired_inflictor,var/atom/desired_weapon,var/severity=1) +/wound/New(mob/living/desired_owner,obj/item/organ/desired_location,atom/desired_inflictor,atom/desired_weapon,severity=1) . = ..() @@ -71,10 +71,10 @@ name = replacetext(get_infection_name(),"%",name) name = replacetext(get_bleed_name(),"%",name) -/wound/proc/get_examine_text(var/mob/examiner) +/wound/proc/get_examine_text(mob/examiner) span("warning","It has \a [src]...") -/wound/proc/get_simple_examine_text(var/mob/examiner) +/wound/proc/get_simple_examine_text(mob/examiner) var/returning = src.name diff --git a/code/_core/datum/wound/wound_types.dm b/code/_core/datum/wound/wound_types.dm index 31ffda50a1..48bc09c2f3 100644 --- a/code/_core/datum/wound/wound_types.dm +++ b/code/_core/datum/wound/wound_types.dm @@ -23,7 +23,7 @@ id = "bruise" desc = "" -/wound/bruise/New(var/mob/living/desired_owner,var/obj/item/organ/desired_location,var/atom/desired_inflictor,var/atom/desired_weapon,var/severity=1) +/wound/bruise/New(mob/living/desired_owner,obj/item/organ/desired_location,atom/desired_inflictor,atom/desired_weapon,severity=1) . = ..() diff --git a/code/_core/image/_image.dm b/code/_core/image/_image.dm index f377dd6955..e31120ab85 100644 --- a/code/_core/image/_image.dm +++ b/code/_core/image/_image.dm @@ -19,7 +19,7 @@ attached_object = null . = ..() -/image/overlay/proc/add_overlay(var/datum/overlay_to_add) +/image/overlay/proc/add_overlay(datum/overlay_to_add) overlays += overlay_to_add return TRUE diff --git a/code/_core/mob/_mob.dm b/code/_core/mob/_mob.dm index c026523ee8..f870f796cf 100644 --- a/code/_core/mob/_mob.dm +++ b/code/_core/mob/_mob.dm @@ -311,7 +311,7 @@ update_z_position() handle_lighting_alpha() -/mob/New(var/desired_loc,var/client/C) +/mob/New(desired_loc,client/C) parallax = list() buttons = list() diff --git a/code/_core/mob/abstract/_abstract.dm b/code/_core/mob/abstract/_abstract.dm index 1e469686c9..73292bba9e 100644 --- a/code/_core/mob/abstract/_abstract.dm +++ b/code/_core/mob/abstract/_abstract.dm @@ -19,7 +19,7 @@ var/global/mob/abstract/melee_checker see_in_dark = 1e6 // Literally arbitrary. density = TRUE -/mob/abstract/melee_checker/New(var/desired_loc) +/mob/abstract/melee_checker/New(desired_loc) melee_checker = src return ..() diff --git a/code/_core/mob/abstract/observer/_observer.dm b/code/_core/mob/abstract/observer/_observer.dm index 6e42fa42c5..7d70312f21 100644 --- a/code/_core/mob/abstract/observer/_observer.dm +++ b/code/_core/mob/abstract/observer/_observer.dm @@ -21,26 +21,26 @@ sight = SEE_THRU | SEE_PIXELS -/mob/abstract/observer/on_left_click(var/atom/object,location,control,params) +/mob/abstract/observer/on_left_click(atom/object,location,control,params) if(src.click_on_object(src,object,location,control,params)) return TRUE if(object.clicked_on_by_object(src,src,location,control,params)) return TRUE return ..() -/mob/abstract/observer/on_right_click(var/atom/object,location,control,params) +/mob/abstract/observer/on_right_click(atom/object,location,control,params) return on_left_click(object,location,control,params) -/mob/abstract/observer/on_right_down(var/atom/object,location,control,params) +/mob/abstract/observer/on_right_down(atom/object,location,control,params) return on_left_click(object,location,control,params) -/mob/abstract/observer/on_left_down(var/atom/object,location,control,params) +/mob/abstract/observer/on_left_down(atom/object,location,control,params) return on_left_click(object,location,control,params) -/mob/abstract/observer/can_attack(var/atom/attacker,var/atom/victim,var/atom/weapon,var/params,var/damagetype/damage_type) +/mob/abstract/observer/can_attack(atom/attacker,atom/victim,atom/weapon,params,damagetype/damage_type) return FALSE -/mob/abstract/observer/can_be_attacked(var/atom/attacker,var/atom/weapon,var/params,var/damagetype/damage_type) +/mob/abstract/observer/can_be_attacked(atom/attacker,atom/weapon,params,damagetype/damage_type) return FALSE /mob/abstract/observer/Logout() diff --git a/code/_core/mob/abstract/observer/ghost.dm b/code/_core/mob/abstract/observer/ghost.dm index 06e85b671d..502a7ee457 100644 --- a/code/_core/mob/abstract/observer/ghost.dm +++ b/code/_core/mob/abstract/observer/ghost.dm @@ -18,7 +18,7 @@ /mob/abstract/observer/ghost/get_lighting_alpha() return 100 -/mob/abstract/observer/ghost/do_say(var/text_to_say, var/should_sanitize = TRUE, var/talk_type_to_use = TEXT_TALK,var/talk_range=TALK_RANGE,var/language_to_use=null) +/mob/abstract/observer/ghost/do_say(text_to_say, should_sanitize = TRUE, talk_type_to_use = TEXT_TALK,talk_range=TALK_RANGE,language_to_use=null) talk_type_to_use = TEXT_GHOST return ..() diff --git a/code/_core/mob/abstract/observer/menu.dm b/code/_core/mob/abstract/observer/menu.dm index 61d5ecd711..e8f9826500 100644 --- a/code/_core/mob/abstract/observer/menu.dm +++ b/code/_core/mob/abstract/observer/menu.dm @@ -18,11 +18,11 @@ invisibility = INVISIBILITY_ALWAYS -/mob/abstract/observer/menu/do_say(var/text_to_say, var/should_sanitize = TRUE, var/talk_type_to_use = TEXT_TALK,var/talk_range=TALK_RANGE,var/language_to_use=null) +/mob/abstract/observer/menu/do_say(text_to_say, should_sanitize = TRUE, talk_type_to_use = TEXT_TALK,talk_range=TALK_RANGE,language_to_use=null) return FALSE -/mob/abstract/observer/menu/New(var/desired_loc,var/client/C) +/mob/abstract/observer/menu/New(desired_loc,client/C) . = ..() diff --git a/code/_core/mob/buttons.dm b/code/_core/mob/buttons.dm index fb9e0c792c..6ba788607f 100644 --- a/code/_core/mob/buttons.dm +++ b/code/_core/mob/buttons.dm @@ -1,10 +1,10 @@ -/mob/proc/add_button(var/obj/hud/button/B) //This should never actually be used to add buttons. Call update_owner(M) instead on the button. +/mob/proc/add_button(obj/hud/button/B) //This should never actually be used to add buttons. Call update_owner(M) instead on the button. buttons += B if(client) client.screen += B sync_buttons() -/mob/proc/remove_button(var/obj/hud/button/B) //This should never actually be used to remove buttons. Call update_owner(null) instead on the button. +/mob/proc/remove_button(obj/hud/button/B) //This should never actually be used to remove buttons. Call update_owner(null) instead on the button. buttons -= B if(client) client.screen -= B @@ -26,29 +26,29 @@ client.known_buttons = buttons.Copy() //Health -/mob/proc/toggle_health(var/show_flags_whitelist=FLAG_HUD_ALL,var/show_flags_blacklist=FLAG_HUD_NONE,var/speed = 1 SECONDS) +/mob/proc/toggle_health(show_flags_whitelist=FLAG_HUD_ALL,show_flags_blacklist=FLAG_HUD_NONE,speed = 1 SECONDS) draw_health = !draw_health show_health(draw_health,show_flags_whitelist,show_flags_blacklist,speed) -/mob/proc/show_health(var/show=TRUE,var/show_flags_whitelist,var/show_flags_blacklist,var/speed=1 SECONDS) +/mob/proc/show_health(show=TRUE,show_flags_whitelist,show_flags_blacklist,speed=1 SECONDS) for(var/k in health_elements) var/obj/hud/button/H = health_elements[k] if(H.flags_hud & show_flags_whitelist && !(H.flags_hud & show_flags_blacklist)) H.show(show,speed) //Buttons -/mob/proc/toggle_buttons(var/show_flags_whitelist=FLAG_HUD_ALL,var/show_flags_blacklist=FLAG_HUD_NONE,var/speed = 1 SECONDS) +/mob/proc/toggle_buttons(show_flags_whitelist=FLAG_HUD_ALL,show_flags_blacklist=FLAG_HUD_NONE,speed = 1 SECONDS) draw_buttons = !draw_buttons show_buttons(draw_buttons,show_flags_whitelist,show_flags_blacklist,speed) -/mob/proc/show_buttons(var/show=TRUE,var/show_flags_whitelist,var/show_flags_blacklist,var/speed=1 SECONDS) +/mob/proc/show_buttons(show=TRUE,show_flags_whitelist,show_flags_blacklist,speed=1 SECONDS) for(var/k in buttons) var/obj/hud/button/B = k if(B.flags_hud & show_flags_whitelist && !(B.flags_hud & show_flags_blacklist)) B.show(show,speed) //HUD -/mob/proc/show_hud(var/show,var/show_flags_whitelist=FLAG_HUD_ALL,var/show_flags_blacklist=FLAG_HUD_NONE,var/speed=1 SECONDS) +/mob/proc/show_hud(show,show_flags_whitelist=FLAG_HUD_ALL,show_flags_blacklist=FLAG_HUD_NONE,speed=1 SECONDS) show_buttons(show,show_flags_whitelist,show_flags_blacklist,speed) show_health(show,show_flags_whitelist,show_flags_blacklist,speed) @@ -62,7 +62,7 @@ displaying_turf_contents = FALSE return TRUE -/mob/proc/display_turf_contents(var/turf/T) +/mob/proc/display_turf_contents(turf/T) close_turf_contents() diff --git a/code/_core/mob/chat.dm b/code/_core/mob/chat.dm index a9013a18fd..7720fa8a8f 100644 --- a/code/_core/mob/chat.dm +++ b/code/_core/mob/chat.dm @@ -1,4 +1,4 @@ -/proc/check_spam(var/client/C,var/text_to_check) +/proc/check_spam(client/C,text_to_check) if(!text_to_check) C.spam_protection_chat += 1 @@ -13,12 +13,12 @@ return TRUE -/mob/proc/mod_speech(var/text) +/mob/proc/mod_speech(text) return text var/regex/vowels = new("\[aeiou\]", "ig") -/mob/living/mod_speech(var/text) +/mob/living/mod_speech(text) if(intoxication >= 200) var/list/exploded_words = splittext(text," ") @@ -47,7 +47,7 @@ var/regex/vowels = new("\[aeiou\]", "ig") return ..() -/mob/proc/to_chat(var/text,var/chat_type = CHAT_TYPE_INFO) +/mob/proc/to_chat(text,chat_type = CHAT_TYPE_INFO) if(client) client.to_chat(text,chat_type) @@ -55,20 +55,20 @@ var/regex/vowels = new("\[aeiou\]", "ig") return FALSE -/proc/tooltip(var/text,var/tooltip) +/proc/tooltip(text,tooltip) if(!tooltip) return text return div("tooltip","[text][div("tooltip_text",tooltip)]") /* -/mob/proc/to_chat_language(var/text, var/chat_type=CHAT_TYPE_INFO, var/language = LANGUAGE_BASIC, var/language_text = "Blah blah blah.") +/mob/proc/to_chat_language(text, chat_type=CHAT_TYPE_INFO, language = LANGUAGE_BASIC, language_text = "Blah blah blah.") if(!length(known_languages) || !known_languages[language]) return to_chat(language_text,chat_type) return to_chat(tooltip(text,language_text),chat_type) */ -/mob/do_say(var/text_to_say, var/should_sanitize = TRUE, var/talk_type_to_use = TEXT_TALK,var/talk_range=TALK_RANGE,var/language_to_use=null) +/mob/do_say(text_to_say, should_sanitize = TRUE, talk_type_to_use = TEXT_TALK,talk_range=TALK_RANGE,language_to_use=null) if(!text_to_say) return FALSE @@ -166,7 +166,7 @@ var/regex/vowels = new("\[aeiou\]", "ig") return text_to_say -/mob/proc/do_emote(var/emote_text,var/atom/target,var/messages = TRUE) +/mob/proc/do_emote(emote_text,atom/target,messages = TRUE) if(world.time <= next_emote) return FALSE @@ -193,7 +193,7 @@ var/regex/vowels = new("\[aeiou\]", "ig") return TRUE -/mob/living/do_emote(var/emote_text,var/atom/target) +/mob/living/do_emote(emote_text,atom/target) if(dead) return FALSE @@ -201,7 +201,7 @@ var/regex/vowels = new("\[aeiou\]", "ig") return ..() -/mob/on_listen(var/atom/speaker,var/datum/source,var/text,var/raw_text,var/language_text,var/talk_type,var/frequency, var/language = LANGUAGE_BASIC,var/talk_range=TALK_RANGE) +/mob/on_listen(atom/speaker,datum/source,text,raw_text,language_text,talk_type,frequency, language = LANGUAGE_BASIC,talk_range=TALK_RANGE) if(client) var/knows_language = length(known_languages) && known_languages[language] diff --git a/code/_core/mob/color_mods.dm b/code/_core/mob/color_mods.dm index 24cc3ce96a..874a28e59c 100644 --- a/code/_core/mob/color_mods.dm +++ b/code/_core/mob/color_mods.dm @@ -1,16 +1,16 @@ -/mob/proc/add_color_mod(var/id,var/list/color_mod) +/mob/proc/add_color_mod(id,list/color_mod) color_mods[id] = color_mod -/mob/proc/remove_color_mod(var/id) +/mob/proc/remove_color_mod(id) color_mods -= id /mob/proc/clear_color_mods() color_mods = list() -/mob/proc/add_lighting_mod(var/id,var/lighting_mod) +/mob/proc/add_lighting_mod(id,lighting_mod) lighting_mods[id] = lighting_mod -/mob/proc/remove_lighting_mod(var/id) +/mob/proc/remove_lighting_mod(id) lighting_mods -= id /mob/proc/clear_lighting_mods() diff --git a/code/_core/mob/living/_living.dm b/code/_core/mob/living/_living.dm index 46438e5be9..2f84433f81 100644 --- a/code/_core/mob/living/_living.dm +++ b/code/_core/mob/living/_living.dm @@ -409,7 +409,7 @@ return TRUE */ -/mob/living/proc/bang(var/duration=100) +/mob/living/proc/bang(duration=100) if(!client) return FALSE @@ -429,7 +429,7 @@ . = ..() -/mob/living/get_sound_volume(var/volume=100,var/channel=1) +/mob/living/get_sound_volume(volume=100,channel=1) . = ..() @@ -437,7 +437,7 @@ . *= 0.01 -/mob/living/proc/flash(var/duration=100,var/desired_color="#FFFFFF") +/mob/living/proc/flash(duration=100,desired_color="#FFFFFF") if(duration <= 0) return FALSE @@ -463,13 +463,13 @@ return TRUE -/mob/living/on_crush(var/message=TRUE) //What happens when this object is crushed by a larger object. +/mob/living/on_crush(message=TRUE) //What happens when this object is crushed by a larger object. . = ..() play_sound(pick('sound/effects/impacts/flesh_01.ogg','sound/effects/impacts/flesh_02.ogg','sound/effects/impacts/flesh_03.ogg'),get_turf(src)) if(message) visible_message(span("danger","\The [src.name] is violently crushed!")) gib(hard=TRUE) -/mob/living/gib(var/gib_direction=0x0,var/hard=FALSE) +/mob/living/gib(gib_direction=0x0,hard=FALSE) if(qdeleting) return FALSE if(gibbed) @@ -493,7 +493,7 @@ gibbed = FALSE //Hacky, but it works. return FALSE -/mob/living/on_fall(var/turf/old_loc) +/mob/living/on_fall(turf/old_loc) . = ..() health?.adjust_loss_smart(brute=100) add_status_effect(STUN,40,40) @@ -515,7 +515,7 @@ /mob/living/get_log_name() return "[dead ? "(DEAD)" : ""][src.name]([src.client ? src.client : "NO CKEY"])([src.type])([x],[y],[z])" -/mob/living/dust(var/atom/source) +/mob/living/dust(atom/source) if(death(TRUE)) new /obj/effect/temp/death(src.loc,30) qdel(src) @@ -684,7 +684,7 @@ name = "[CHECK_NAME(name)]" return TRUE -/mob/living/proc/set_iff_tag(var/desired_iff_tag,var/force=FALSE) +/mob/living/proc/set_iff_tag(desired_iff_tag,force=FALSE) if(!force && desired_iff_tag == iff_tag) return FALSE @@ -694,7 +694,7 @@ return TRUE -/mob/living/proc/set_loyalty_tag(var/desired_loyalty_tag,var/force=FALSE) +/mob/living/proc/set_loyalty_tag(desired_loyalty_tag,force=FALSE) if(!force && desired_loyalty_tag == loyalty_tag) return FALSE @@ -710,7 +710,7 @@ . = ..() PROCESS_LIVING_FORCE(src) -/mob/living/act_emp(var/atom/owner,var/atom/source,var/atom/epicenter,var/magnitude,var/desired_loyalty_tag) +/mob/living/act_emp(atom/owner,atom/source,atom/epicenter,magnitude,desired_loyalty_tag) if(owner != src) if(!allow_hostile_action(desired_loyalty_tag,src)) @@ -719,7 +719,7 @@ . = ..() -/mob/living/act_explode(var/atom/owner,var/atom/source,var/atom/epicenter,var/magnitude,var/desired_loyalty_tag) +/mob/living/act_explode(atom/owner,atom/source,atom/epicenter,magnitude,desired_loyalty_tag) if(owner != src && !allow_hostile_action(desired_loyalty_tag,src)) return TRUE @@ -747,7 +747,7 @@ return TRUE -/mob/living/proc/do_explosion_damage(var/atom/owner,var/atom/source,var/atom/epicenter,var/magnitude,var/desired_loyalty_tag) +/mob/living/proc/do_explosion_damage(atom/owner,atom/source,atom/epicenter,magnitude,desired_loyalty_tag) var/list/params = list() params[PARAM_ICON_X] = rand(0,32) params[PARAM_ICON_Y] = rand(0,32) @@ -756,7 +756,7 @@ D.process_damage(source,src,source,object_to_damage,owner,magnitude) return TRUE -/mob/living/proc/draw_blood(var/mob/caller,var/atom/needle,var/amount=0,var/messages = TRUE) +/mob/living/proc/draw_blood(mob/caller,atom/needle,amount=0,messages = TRUE) if(!blood_type || !min(amount,blood_volume)) if(messages) caller?.to_chat(span("warning","There is no blood to draw!")) diff --git a/code/_core/mob/living/advanced/_advanced.dm b/code/_core/mob/living/advanced/_advanced.dm index b0b990cc50..529284a454 100644 --- a/code/_core/mob/living/advanced/_advanced.dm +++ b/code/_core/mob/living/advanced/_advanced.dm @@ -117,12 +117,12 @@ . = ..() -/mob/living/advanced/on_crush(var/message=TRUE) +/mob/living/advanced/on_crush(message=TRUE) if(driving) return FALSE . = ..() -/mob/living/advanced/set_dir(var/desired_dir,var/force=FALSE) +/mob/living/advanced/set_dir(desired_dir,force=FALSE) if(!force && grabbing_hand) desired_dir = dir @@ -162,7 +162,7 @@ . = ..() -/mob/living/advanced/proc/drop_all_items(var/atom/drop_location = get_turf(src), var/exclude_soulbound=FALSE,var/exclude_containers=TRUE) +/mob/living/advanced/proc/drop_all_items(atom/drop_location = get_turf(src), exclude_soulbound=FALSE,exclude_containers=TRUE) . = list() @@ -181,7 +181,7 @@ var/obj/hud/inventory/I = inventories_by_id[k] I.delete_objects() -/mob/living/advanced/proc/equip_objects_in_list(var/list/clothing_list) +/mob/living/advanced/proc/equip_objects_in_list(list/clothing_list) for(var/k in clothing_list) var/obj/item/clothing/C = k C.quick_equip(src,silent=TRUE) @@ -237,7 +237,7 @@ mob/living/advanced/Login() return ..() -/mob/living/advanced/proc/put_in_hands(var/obj/item/I,var/params,var/silent=FALSE,var/debug=FALSE) +/mob/living/advanced/proc/put_in_hands(obj/item/I,params,silent=FALSE,debug=FALSE) if(client && client.selected_hand) if(client.selected_hand == RIGHT_HAND && inventories_by_id[BODY_HAND_RIGHT_HELD] && inventories_by_id[BODY_HAND_RIGHT_HELD].can_slot_object(I,FALSE)) @@ -277,7 +277,7 @@ mob/living/advanced/Login() /mob/living/advanced/proc/get_held_right() return inventories_by_id[BODY_HAND_RIGHT_HELD]?.get_top_object() -/mob/living/advanced/do_explosion_damage(var/atom/owner,var/atom/source,var/atom/epicenter,var/magnitude,var/desired_loyalty_tag) +/mob/living/advanced/do_explosion_damage(atom/owner,atom/source,atom/epicenter,magnitude,desired_loyalty_tag) for(var/i=1,i<=5,i++) var/list/params = list() params[PARAM_ICON_X] = rand(0,32) @@ -287,7 +287,7 @@ mob/living/advanced/Login() D.process_damage(source,src,source,object_to_damage,owner,magnitude*(1/5)) return TRUE -/mob/living/advanced/act_emp(var/atom/owner,var/atom/source,var/atom/epicenter,var/magnitude,var/desired_loyalty_tag) +/mob/living/advanced/act_emp(atom/owner,atom/source,atom/epicenter,magnitude,desired_loyalty_tag) if(owner != src) if(!allow_hostile_action(desired_loyalty_tag,src)) @@ -300,7 +300,7 @@ mob/living/advanced/Login() if(O.act_emp(owner,source,epicenter,magnitude,desired_loyalty_tag)) . = TRUE -/mob/living/advanced/gib(var/gib_direction=0x0,var/hard=FALSE) +/mob/living/advanced/gib(gib_direction=0x0,hard=FALSE) if(qdeleting) return FALSE if(gibbed) @@ -312,7 +312,7 @@ mob/living/advanced/Login() return FALSE -/mob/living/advanced/proc/make_convincing_corpse(var/damage_organs=TRUE,var/damage_clothing=TRUE,var/bloody_clothing=TRUE,var/place_blood=TRUE) +/mob/living/advanced/proc/make_convincing_corpse(damage_organs=TRUE,damage_clothing=TRUE,bloody_clothing=TRUE,place_blood=TRUE) if(damage_organs) var/total_loss_limit = (src.health.health_max*0.5)/length(organs) diff --git a/code/_core/mob/living/advanced/buttons.dm b/code/_core/mob/living/advanced/buttons.dm index 9f57ca1730..7b44dd3a7e 100644 --- a/code/_core/mob/living/advanced/buttons.dm +++ b/code/_core/mob/living/advanced/buttons.dm @@ -54,7 +54,7 @@ B.update_owner(null) return TRUE -/mob/living/advanced/proc/add_chargen_buttons(var/list/blacklist=list()) +/mob/living/advanced/proc/add_chargen_buttons(list/blacklist=list()) var/species/S = SPECIES(species) var/list/local_list = chargen_buttons - blacklist for(var/v in local_list) @@ -79,10 +79,10 @@ return TRUE //Inventory -/mob/living/advanced/proc/toggle_inventory(var/show_flags_whitelist=FLAG_HUD_ALL,var/show_flags_blacklist=FLAG_HUD_NONE,var/speed = 1 SECONDS) +/mob/living/advanced/proc/toggle_inventory(show_flags_whitelist=FLAG_HUD_ALL,show_flags_blacklist=FLAG_HUD_NONE,speed = 1 SECONDS) return show_inventory(!draw_inventory,show_flags_whitelist,show_flags_blacklist,speed) -/mob/living/advanced/proc/show_inventory(var/show=TRUE,var/show_flags_whitelist,var/show_flags_blacklist,var/speed=1 SECONDS) +/mob/living/advanced/proc/show_inventory(show=TRUE,show_flags_whitelist,show_flags_blacklist,speed=1 SECONDS) draw_inventory = show for(var/k in inventories_by_id) var/obj/hud/inventory/I = inventories_by_id[k] @@ -90,6 +90,6 @@ I.show(show,speed) return TRUE -/mob/living/advanced/show_hud(var/show,var/show_flags_whitelist=FLAG_HUD_ALL,var/show_flags_blacklist=FLAG_HUD_NONE,var/speed=1 SECONDS) +/mob/living/advanced/show_hud(show,show_flags_whitelist=FLAG_HUD_ALL,show_flags_blacklist=FLAG_HUD_NONE,speed=1 SECONDS) . = ..() show_inventory(show,show_flags_whitelist,show_flags_blacklist,speed) diff --git a/code/_core/mob/living/advanced/chargen.dm b/code/_core/mob/living/advanced/chargen.dm index cb43fe14fa..107afd1aa3 100644 --- a/code/_core/mob/living/advanced/chargen.dm +++ b/code/_core/mob/living/advanced/chargen.dm @@ -1,4 +1,4 @@ -/mob/living/advanced/proc/perform_specieschange(var/desired_species,var/keep_clothes,var/chargen) +/mob/living/advanced/proc/perform_specieschange(desired_species,keep_clothes,chargen) if(changing) return FALSE @@ -17,7 +17,7 @@ post_perform_change(keep_clothes,chargen,kept_clothes) -/mob/living/advanced/proc/perform_sexchange(var/desired_sex,var/keep_clothes,var/chargen) +/mob/living/advanced/proc/perform_sexchange(desired_sex,keep_clothes,chargen) if(changing) return FALSE @@ -33,7 +33,7 @@ return TRUE -/mob/living/advanced/proc/pre_perform_change(var/keep_items) +/mob/living/advanced/proc/pre_perform_change(keep_items) changing = TRUE @@ -54,7 +54,7 @@ return kept_items -/mob/living/advanced/proc/post_perform_change(var/keep_items,var/chargen,var/list/kept_items = list()) +/mob/living/advanced/proc/post_perform_change(keep_items,chargen,list/kept_items = list()) if(chargen) add_chargen_buttons() diff --git a/code/_core/mob/living/advanced/combat.dm b/code/_core/mob/living/advanced/combat.dm index 0cf0e22049..45a250b6db 100644 --- a/code/_core/mob/living/advanced/combat.dm +++ b/code/_core/mob/living/advanced/combat.dm @@ -1,11 +1,11 @@ -/mob/living/advanced/can_be_attacked(var/atom/attacker,var/atom/weapon,var/params,var/damagetype/damage_type) +/mob/living/advanced/can_be_attacked(atom/attacker,atom/weapon,params,damagetype/damage_type) if(driving) return FALSE return ..() -/mob/living/advanced/can_attack(var/atom/attacker,var/atom/victim,var/atom/weapon,var/params,var/damagetype/damage_type) +/mob/living/advanced/can_attack(atom/attacker,atom/victim,atom/weapon,params,damagetype/damage_type) if(driving) return driving.can_attack(attacker,victim,weapon,params,damage_type) @@ -19,14 +19,14 @@ . = ..() -/mob/living/advanced/defer_click_on_object(var/mob/caller,location,control,params) +/mob/living/advanced/defer_click_on_object(mob/caller,location,control,params) if(driving) return driving . = ..() -/mob/living/advanced/get_object_to_damage(var/atom/attacker,var/atom/weapon,var/damagetype/damage_type,var/list/params = list(),var/accurate=FALSE,var/find_closest=FALSE,var/inaccuracy_modifier=1) +/mob/living/advanced/get_object_to_damage(atom/attacker,atom/weapon,damagetype/damage_type,list/params = list(),accurate=FALSE,find_closest=FALSE,inaccuracy_modifier=1) var/x_attack = params && !isnull(params[PARAM_ICON_X]) ? params[PARAM_ICON_X] : 16 var/y_attack = params && !isnull(params[PARAM_ICON_Y]) ? params[PARAM_ICON_Y] : 16 @@ -106,7 +106,7 @@ return TRUE -/mob/living/advanced/get_block_data(var/atom/attacker,var/atom/weapon,var/atom/hit_object,var/atom/blamed,var/damagetype/DT) +/mob/living/advanced/get_block_data(atom/attacker,atom/weapon,atom/hit_object,atom/blamed,damagetype/DT) var/attack_type = DT.get_attack_type() diff --git a/code/_core/mob/living/advanced/controls.dm b/code/_core/mob/living/advanced/controls.dm index 0f4c50f00d..b6927cdbbd 100644 --- a/code/_core/mob/living/advanced/controls.dm +++ b/code/_core/mob/living/advanced/controls.dm @@ -94,7 +94,7 @@ mob/living/advanced/on_right_click(var/atom/object,location,control,params) //T return FALSE -/mob/living/advanced/on_left_drop(var/atom/src_object,var/atom/over_object,src_location,over_location,src_control,over_control,params) +/mob/living/advanced/on_left_drop(atom/src_object,atom/over_object,src_location,over_location,src_control,over_control,params) if(!can_use_controls(src_object,src_location,src_control,params)) return FALSE @@ -107,7 +107,7 @@ mob/living/advanced/on_right_click(var/atom/object,location,control,params) //T return FALSE -/mob/living/advanced/on_right_drop(var/atom/src_object,var/atom/over_object,src_location,over_location,src_control,over_control,params) +/mob/living/advanced/on_right_drop(atom/src_object,atom/over_object,src_location,over_location,src_control,over_control,params) if(!can_use_controls(src_object,src_location,src_control,params)) return FALSE diff --git a/code/_core/mob/living/advanced/cqc.dm b/code/_core/mob/living/advanced/cqc.dm index 9f0d4455fa..58e1ddda1b 100644 --- a/code/_core/mob/living/advanced/cqc.dm +++ b/code/_core/mob/living/advanced/cqc.dm @@ -1,11 +1,11 @@ -/mob/living/advanced/proc/add_cqc(var/cqc_tag) +/mob/living/advanced/proc/add_cqc(cqc_tag) cqc_combo += cqc_tag var/tag_length = length(cqc_combo) if(tag_length > 5) cqc_combo = copytext(cqc_combo,1 + (tag_length-5),0) return TRUE -/mob/living/advanced/proc/check_cqc(var/atom/victim,var/atom/weapon,var/atom/hit_object,var/atom/blamed,var/damagetype/DT) +/mob/living/advanced/proc/check_cqc(atom/victim,atom/weapon,atom/hit_object,atom/blamed,damagetype/DT) if(!cqc_category) return FALSE for(var/k in SScqc.cqc_category[src.cqc_category]) diff --git a/code/_core/mob/living/advanced/emote.dm b/code/_core/mob/living/advanced/emote.dm index 679e93f472..25dca35849 100644 --- a/code/_core/mob/living/advanced/emote.dm +++ b/code/_core/mob/living/advanced/emote.dm @@ -1,4 +1,4 @@ -/mob/living/advanced/get_emote_sound(var/emote_id) +/mob/living/advanced/get_emote_sound(emote_id) . = ..() diff --git a/code/_core/mob/living/advanced/examine.dm b/code/_core/mob/living/advanced/examine.dm index 9e107124f1..f7e4a6b9ec 100644 --- a/code/_core/mob/living/advanced/examine.dm +++ b/code/_core/mob/living/advanced/examine.dm @@ -1,4 +1,4 @@ -/mob/living/advanced/get_damage_description(var/mob/examiner) +/mob/living/advanced/get_damage_description(mob/examiner) . = ..() @@ -12,7 +12,7 @@ continue . += "
[damage_description]" -/mob/living/advanced/get_examine_details_list(var/mob/examiner) +/mob/living/advanced/get_examine_details_list(mob/examiner) var/pronoun = get_pronoun_he_she_it(src) @@ -27,7 +27,7 @@ . += ..() -/mob/living/advanced/proc/on_strip(var/obj/item/I,var/atom/old_loc) +/mob/living/advanced/proc/on_strip(obj/item/I,atom/old_loc) for(var/k in inventory_defers) var/obj/hud/button/inventory_defer/ID = k diff --git a/code/_core/mob/living/advanced/handcuffs.dm b/code/_core/mob/living/advanced/handcuffs.dm index 8f83021c18..5bb91accce 100644 --- a/code/_core/mob/living/advanced/handcuffs.dm +++ b/code/_core/mob/living/advanced/handcuffs.dm @@ -1,4 +1,4 @@ -/mob/living/advanced/proc/set_handcuffs(var/desired_handcuffs = TRUE,var/obj/item/handcuffs/handcuff_item) +/mob/living/advanced/proc/set_handcuffs(desired_handcuffs = TRUE,obj/item/handcuffs/handcuff_item) if(!overlays_assoc["handcuffs"]) CRASH("WARNING: [src.get_debug_name()] didn't have a handcuff overlay!") diff --git a/code/_core/mob/living/advanced/health.dm b/code/_core/mob/living/advanced/health.dm index be6a877ae4..81cc444514 100644 --- a/code/_core/mob/living/advanced/health.dm +++ b/code/_core/mob/living/advanced/health.dm @@ -10,7 +10,7 @@ B.update_owner(src) */ -/mob/living/advanced/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/mob/living/advanced/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) . = ..() diff --git a/code/_core/mob/living/advanced/human/npc/_npc.dm b/code/_core/mob/living/advanced/human/npc/_npc.dm index 9d5996f7a6..a07dbf9233 100644 --- a/code/_core/mob/living/advanced/human/npc/_npc.dm +++ b/code/_core/mob/living/advanced/human/npc/_npc.dm @@ -3,7 +3,7 @@ var/dialogue_id soul_size = SOUL_SIZE_COMMON -/mob/living/advanced/npc/proc/can_talk_to(var/mob/caller) +/mob/living/advanced/npc/proc/can_talk_to(mob/caller) if(!dialogue_id) return FALSE @@ -28,7 +28,7 @@ return TRUE -/mob/living/advanced/npc/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/mob/living/advanced/npc/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(can_talk_to(caller)) ///Interact check isn't here because INTERACT_CHECK covers most of it and can_talk_to handles distance checks. diff --git a/code/_core/mob/living/advanced/human/npc/bandit.dm b/code/_core/mob/living/advanced/human/npc/bandit.dm index 47c4e1cd20..0c3bf9802e 100644 --- a/code/_core/mob/living/advanced/human/npc/bandit.dm +++ b/code/_core/mob/living/advanced/human/npc/bandit.dm @@ -19,7 +19,7 @@ loyalty_tag = "Bandit" iff_tag = "Bandit" -/mob/living/advanced/npc/bandit/setup_appearance(var/set_default=FALSE) +/mob/living/advanced/npc/bandit/setup_appearance(set_default=FALSE) . = ..() diff --git a/code/_core/mob/living/advanced/human/npc/beefman.dm b/code/_core/mob/living/advanced/human/npc/beefman.dm index f75cefe2c1..b3617b21a2 100644 --- a/code/_core/mob/living/advanced/human/npc/beefman.dm +++ b/code/_core/mob/living/advanced/human/npc/beefman.dm @@ -26,7 +26,7 @@ level = 14 -/mob/living/advanced/npc/beefman/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/mob/living/advanced/npc/beefman/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) if(damage_amount > 20 & luck(src,20 + damage_amount,FALSE)) play_sound('sound/weapons/unarmed/beef/beef_grab.ogg',get_turf(atom_damaged),range_max=VIEW_RANGE) @@ -55,7 +55,7 @@ return PLANE_MOVABLE_DEAD return PLANE_MOVABLE_STEALTH //Always stealth. -/mob/living/advanced/npc/beefman/post_move(var/atom/old_loc) +/mob/living/advanced/npc/beefman/post_move(atom/old_loc) . = ..() if(is_simulated(old_loc)) var/turf/simulated/S = old_loc diff --git a/code/_core/mob/living/advanced/human/npc/citizen.dm b/code/_core/mob/living/advanced/human/npc/citizen.dm index 95c5384049..f87dec2038 100644 --- a/code/_core/mob/living/advanced/human/npc/citizen.dm +++ b/code/_core/mob/living/advanced/human/npc/citizen.dm @@ -17,7 +17,7 @@ loyalty_tag = "Solarian" iff_tag = "Solarian" -/mob/living/advanced/citizen/setup_appearance(var/set_default=FALSE) +/mob/living/advanced/citizen/setup_appearance(set_default=FALSE) . = ..() diff --git a/code/_core/mob/living/advanced/human/npc/dummy.dm b/code/_core/mob/living/advanced/human/npc/dummy.dm index 3fa3c589dc..352af1d6fa 100644 --- a/code/_core/mob/living/advanced/human/npc/dummy.dm +++ b/code/_core/mob/living/advanced/human/npc/dummy.dm @@ -20,7 +20,7 @@ . = ..() add_status_effect(IMMORTAL) -/mob/living/advanced/npc/dummy/add_organ(var/obj/item/organ/O) +/mob/living/advanced/npc/dummy/add_organ(obj/item/organ/O) O = new O(src) O.health = /health/obj/item/organ/dummy return attach_organ(O) diff --git a/code/_core/mob/living/advanced/human/npc/hostage.dm b/code/_core/mob/living/advanced/human/npc/hostage.dm index ca65045c23..95571f04e7 100644 --- a/code/_core/mob/living/advanced/human/npc/hostage.dm +++ b/code/_core/mob/living/advanced/human/npc/hostage.dm @@ -11,7 +11,7 @@ var/hostage = TRUE -/mob/living/advanced/npc/hostage/setup_appearance(var/set_default=FALSE) +/mob/living/advanced/npc/hostage/setup_appearance(set_default=FALSE) . = ..() if(gender == FEMALE && !prob(10)) loadout = /loadout/hostage/female @@ -24,5 +24,5 @@ src.add_organ(/obj/item/organ/internal/implant/head/loyalty/nanotrasen) -/mob/living/advanced/npc/hostage/get_damage_received_multiplier(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/atom/blamed,var/damagetype/DT) +/mob/living/advanced/npc/hostage/get_damage_received_multiplier(atom/attacker,atom/victim,atom/weapon,atom/hit_object,atom/blamed,damagetype/DT) return 0.5 \ No newline at end of file diff --git a/code/_core/mob/living/advanced/human/npc/nanotrasen.dm b/code/_core/mob/living/advanced/human/npc/nanotrasen.dm index 38fbae4716..d3f0efe078 100644 --- a/code/_core/mob/living/advanced/human/npc/nanotrasen.dm +++ b/code/_core/mob/living/advanced/human/npc/nanotrasen.dm @@ -36,7 +36,7 @@ level = 40 ai = /ai/advanced/guarding -/mob/living/advanced/npc/nanotrasen/hanger_guard/get_damage_received_multiplier(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/atom/blamed,var/damagetype/DT) +/mob/living/advanced/npc/nanotrasen/hanger_guard/get_damage_received_multiplier(atom/attacker,atom/victim,atom/weapon,atom/hit_object,atom/blamed,damagetype/DT) return ..() * 0.5 diff --git a/code/_core/mob/living/advanced/human/npc/rev.dm b/code/_core/mob/living/advanced/human/npc/rev.dm index cfcc5bb765..e9fa77ba14 100644 --- a/code/_core/mob/living/advanced/human/npc/rev.dm +++ b/code/_core/mob/living/advanced/human/npc/rev.dm @@ -64,6 +64,6 @@ level = 60 -/mob/living/advanced/npc/rev/commander/get_damage_received_multiplier(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/atom/blamed,var/damagetype/DT) +/mob/living/advanced/npc/rev/commander/get_damage_received_multiplier(atom/attacker,atom/victim,atom/weapon,atom/hit_object,atom/blamed,damagetype/DT) . = ..() . *= 0.5 \ No newline at end of file diff --git a/code/_core/mob/living/advanced/human/npc/syndicate.dm b/code/_core/mob/living/advanced/human/npc/syndicate.dm index 551caeeddc..bd52066ef7 100644 --- a/code/_core/mob/living/advanced/human/npc/syndicate.dm +++ b/code/_core/mob/living/advanced/human/npc/syndicate.dm @@ -102,7 +102,7 @@ ) soul_size = SOUL_SIZE_RARE -/mob/living/advanced/npc/syndicate/ultra/get_damage_received_multiplier(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/atom/blamed,var/damagetype/DT) +/mob/living/advanced/npc/syndicate/ultra/get_damage_received_multiplier(atom/attacker,atom/victim,atom/weapon,atom/hit_object,atom/blamed,damagetype/DT) . = ..() . *= 0.5 diff --git a/code/_core/mob/living/advanced/human/npc/zombie/_zombie.dm b/code/_core/mob/living/advanced/human/npc/zombie/_zombie.dm index 70914f787b..b027f80208 100644 --- a/code/_core/mob/living/advanced/human/npc/zombie/_zombie.dm +++ b/code/_core/mob/living/advanced/human/npc/zombie/_zombie.dm @@ -47,7 +47,7 @@ if(prob(rest_chance)) add_status_effect(REST,-1,-2, force = TRUE) -/mob/living/advanced/npc/zombie/get_emote_sound(var/emote_id) +/mob/living/advanced/npc/zombie/get_emote_sound(emote_id) switch(emote_id) if("pain") diff --git a/code/_core/mob/living/advanced/human/npc/zombie/zombie_armored.dm b/code/_core/mob/living/advanced/human/npc/zombie/zombie_armored.dm index 6862e5aa00..698aa7ee0f 100644 --- a/code/_core/mob/living/advanced/human/npc/zombie/zombie_armored.dm +++ b/code/_core/mob/living/advanced/human/npc/zombie/zombie_armored.dm @@ -6,7 +6,7 @@ level = 20 -/mob/living/advanced/npc/zombie/armored/act_explode(var/atom/owner,var/atom/source,var/atom/epicenter,var/magnitude,var/desired_loyalty_tag) +/mob/living/advanced/npc/zombie/armored/act_explode(atom/owner,atom/source,atom/epicenter,magnitude,desired_loyalty_tag) if(owner == src) gib() diff --git a/code/_core/mob/living/advanced/human/npc/zombie/zombie_roided.dm b/code/_core/mob/living/advanced/human/npc/zombie/zombie_roided.dm index b1aac68df5..c06b6a7399 100644 --- a/code/_core/mob/living/advanced/human/npc/zombie/zombie_roided.dm +++ b/code/_core/mob/living/advanced/human/npc/zombie/zombie_roided.dm @@ -25,7 +25,7 @@ if(O.armor == /armor/default_organic) O.armor = /armor/roided_zombie -/mob/living/advanced/npc/zombie/roided/on_unblocked_hit(var/atom/attacker,var/atom/weapon,var/atom/hit_object,var/atom/blamed,var/damagetype/DT,var/total_damage_dealt=0) +/mob/living/advanced/npc/zombie/roided/on_unblocked_hit(atom/attacker,atom/weapon,atom/hit_object,atom/blamed,damagetype/DT,total_damage_dealt=0) . = ..() diff --git a/code/_core/mob/living/advanced/inventory.dm b/code/_core/mob/living/advanced/inventory.dm index ca8651ea3a..842dba91af 100644 --- a/code/_core/mob/living/advanced/inventory.dm +++ b/code/_core/mob/living/advanced/inventory.dm @@ -1,4 +1,4 @@ -/mob/living/advanced/proc/add_inventory(var/obj/hud/inventory/I) +/mob/living/advanced/proc/add_inventory(obj/hud/inventory/I) if(!I.id) log_error("[I.get_debug_name()] didn't have an ID!") @@ -14,7 +14,7 @@ return TRUE -/mob/living/advanced/proc/remove_inventory(var/obj/hud/inventory/I) +/mob/living/advanced/proc/remove_inventory(obj/hud/inventory/I) if(!I.id) log_error("[I.get_debug_name()] didn't have an ID!") @@ -49,12 +49,12 @@ return TRUE -/mob/living/advanced/proc/open_inventory(var/obj/hud/inventory/I) +/mob/living/advanced/proc/open_inventory(obj/hud/inventory/I) active_inventory = I return TRUE -/mob/living/advanced/proc/drop_hands(var/turf/T,var/disarm=FALSE) +/mob/living/advanced/proc/drop_hands(turf/T,disarm=FALSE) . = list() if(inventories_by_id[BODY_HAND_LEFT_HELD]) . += inventories_by_id[BODY_HAND_LEFT_HELD].drop_objects(T,disarm) diff --git a/code/_core/mob/living/advanced/inventory_defer.dm b/code/_core/mob/living/advanced/inventory_defer.dm index ac20d05f05..99555f2565 100644 --- a/code/_core/mob/living/advanced/inventory_defer.dm +++ b/code/_core/mob/living/advanced/inventory_defer.dm @@ -6,7 +6,7 @@ return TRUE -/mob/living/advanced/proc/add_inventory_defer(var/obj/hud/inventory/I,var/slot=0) +/mob/living/advanced/proc/add_inventory_defer(obj/hud/inventory/I,slot=0) var/x_pos = (slot % 6) - 3 var/y_pos = -FLOOR(1 + slot/6,1) @@ -24,7 +24,7 @@ return B -/mob/living/advanced/proc/examine_body_inventory(var/mob/living/advanced/caller) //caller wants to see inside src +/mob/living/advanced/proc/examine_body_inventory(mob/living/advanced/caller) //caller wants to see inside src if(!src.can_caller_interact_with(caller,distance_checks=FALSE)) return TRUE diff --git a/code/_core/mob/living/advanced/lighting.dm b/code/_core/mob/living/advanced/lighting.dm index 6d1c8ad43a..d172aed32f 100644 --- a/code/_core/mob/living/advanced/lighting.dm +++ b/code/_core/mob/living/advanced/lighting.dm @@ -1,5 +1,5 @@ /* -/mob/living/advanced/proc/update_single_lighting(var/obj/item/I) +/mob/living/advanced/proc/update_single_lighting(obj/item/I) var/dropped = !(I in held_objects) && !(I in worn_objects) return TRUE diff --git a/code/_core/mob/living/advanced/loadout.dm b/code/_core/mob/living/advanced/loadout.dm index d15f29d7b8..d88cd64b53 100644 --- a/code/_core/mob/living/advanced/loadout.dm +++ b/code/_core/mob/living/advanced/loadout.dm @@ -1,4 +1,4 @@ -/mob/living/advanced/proc/equip_loadout(var/loadout_id,var/soul_bound=FALSE) +/mob/living/advanced/proc/equip_loadout(loadout_id,soul_bound=FALSE) var/loadout/spawning_outfit = SSloadouts.all_loadouts[loadout_id] if(!spawning_outfit) diff --git a/code/_core/mob/living/advanced/movement.dm b/code/_core/mob/living/advanced/movement.dm index 4f2dc5fe9b..ac17162d02 100644 --- a/code/_core/mob/living/advanced/movement.dm +++ b/code/_core/mob/living/advanced/movement.dm @@ -1,4 +1,4 @@ -/mob/living/advanced/do_footstep(var/turf/T,var/list/footsteps_to_use,var/enter=TRUE) +/mob/living/advanced/do_footstep(turf/T,list/footsteps_to_use,enter=TRUE) . = ..() @@ -22,7 +22,7 @@ F.color = foot_right.blood_stain_color foot_right.set_bloodstain(max(foot_right.blood_stain_intensity - 0.3,2)) //Lower the bloodstain to 2. -/mob/living/advanced/handle_movement(var/adjust_delay=0) +/mob/living/advanced/handle_movement(adjust_delay=0) if(grabbing_hand && handcuffed) //Can't move while grabbed and handcuffed. return FALSE @@ -57,7 +57,7 @@ mob/living/advanced/get_movement_delay() . *= worn_move_delay_multiplier -/mob/living/advanced/get_footsteps(var/list/original_footsteps,var/enter=TRUE) +/mob/living/advanced/get_footsteps(list/original_footsteps,enter=TRUE) if(footstep_left_right_counter) if(labeled_organs[BODY_FOOT_RIGHT]) @@ -70,7 +70,7 @@ mob/living/advanced/get_movement_delay() return original_footsteps -/mob/living/advanced/post_move(var/atom/old_loc) +/mob/living/advanced/post_move(atom/old_loc) . = ..() @@ -162,7 +162,7 @@ mob/living/advanced/get_movement_delay() make_dirty(dirt_items,S.blood_level,S.blood_color) -/mob/living/advanced/proc/make_dirty(var/list/dirt_items,var/dirt_strength=1,var/dirt_color="#FFFFFF") +/mob/living/advanced/proc/make_dirty(list/dirt_items,dirt_strength=1,dirt_color="#FFFFFF") if(dirt_strength <= 0) return FALSE @@ -199,7 +199,7 @@ mob/living/advanced/get_movement_delay() return TRUE -/mob/living/advanced/proc/make_clean(var/list/clean_items,var/clean_strength=1) +/mob/living/advanced/proc/make_clean(list/clean_items,clean_strength=1) if(clean_strength <= 0) return FALSE diff --git a/code/_core/mob/living/advanced/organs.dm b/code/_core/mob/living/advanced/organs.dm index b654882e06..b469ed495d 100644 --- a/code/_core/mob/living/advanced/organs.dm +++ b/code/_core/mob/living/advanced/organs.dm @@ -1,4 +1,4 @@ -/mob/living/advanced/proc/remove_all_organs(var/do_delete=TRUE,var/turf/T) +/mob/living/advanced/proc/remove_all_organs(do_delete=TRUE,turf/T) for(var/k in organs) var/obj/item/organ/O = k @@ -12,12 +12,12 @@ return TRUE -/mob/living/advanced/proc/add_organ(var/obj/item/organ/O) +/mob/living/advanced/proc/add_organ(obj/item/organ/O) O = new O(src) if(!health) O.health = null return attach_organ(O) -/mob/living/advanced/proc/attach_organ(var/obj/item/organ/O,var/initialize=TRUE) +/mob/living/advanced/proc/attach_organ(obj/item/organ/O,initialize=TRUE) if(labeled_organs[O.attach_flag]) var/obj/item/organ/A = labeled_organs[O.attach_flag] @@ -37,7 +37,7 @@ return O -/obj/item/clothing/back/wings/handle_overlays(var/mob/living/advanced/A,var/add=FALSE,var/remove=FALSE,var/update=FALSE,var/worn=FALSE,var/icon_state_override) +/obj/item/clothing/back/wings/handle_overlays(mob/living/advanced/A,add=FALSE,remove=FALSE,update=FALSE,worn=FALSE,icon_state_override) if(remove) A.remove_overlay("\ref[src]_behind") @@ -74,7 +74,7 @@ A.update_overlay_tracked("\ref[src]_front",desired_color=src.color) -/obj/item/organ/handle_overlays(var/mob/living/advanced/A,var/add=FALSE,var/remove=FALSE,var/update=FALSE,var/worn=FALSE,var/icon_state_override) +/obj/item/organ/handle_overlays(mob/living/advanced/A,add=FALSE,remove=FALSE,update=FALSE,worn=FALSE,icon_state_override) if(remove) A.remove_overlay("\ref[src]") @@ -96,7 +96,7 @@ return TRUE -/obj/item/organ/antennae/handle_overlays(var/mob/living/advanced/A,var/add=FALSE,var/remove=FALSE,var/update=FALSE,var/worn=FALSE,var/icon_state_override) +/obj/item/organ/antennae/handle_overlays(mob/living/advanced/A,add=FALSE,remove=FALSE,update=FALSE,worn=FALSE,icon_state_override) if(remove) A.remove_overlay("\ref[src]_behind") @@ -126,7 +126,7 @@ return TRUE -/obj/item/organ/wings/handle_overlays(var/mob/living/advanced/A,var/add=FALSE,var/remove=FALSE,var/update=FALSE,var/worn=FALSE,var/icon_state_override) +/obj/item/organ/wings/handle_overlays(mob/living/advanced/A,add=FALSE,remove=FALSE,update=FALSE,worn=FALSE,icon_state_override) if(remove) A.remove_overlay("\ref[src]_behind") @@ -157,7 +157,7 @@ return TRUE -/obj/item/organ/tail/handle_overlays(var/mob/living/advanced/A,var/add=FALSE,var/remove=FALSE,var/update=FALSE,var/worn=FALSE,var/icon_state_override) +/obj/item/organ/tail/handle_overlays(mob/living/advanced/A,add=FALSE,remove=FALSE,update=FALSE,worn=FALSE,icon_state_override) if(remove) A.remove_overlay("\ref[src]_behind") @@ -184,7 +184,7 @@ return TRUE -/mob/living/advanced/proc/remove_organ(var/obj/item/organ/O,var/turf/T,var/do_delete = FALSE) +/mob/living/advanced/proc/remove_organ(obj/item/organ/O,turf/T,do_delete = FALSE) for(var/k in O.inventories) var/obj/hud/inventory/I = k diff --git a/code/_core/mob/living/advanced/overlays.dm b/code/_core/mob/living/advanced/overlays.dm index d9031d2cc4..8098f0f3e3 100644 --- a/code/_core/mob/living/advanced/overlays.dm +++ b/code/_core/mob/living/advanced/overlays.dm @@ -1,4 +1,4 @@ -/mob/living/advanced/proc/add_overlay_tracked(var/k,var/atom/object,var/desired_plane,var/desired_layer,var/desired_icon,var/desired_icon_state,var/desired_color,var/desired_additional_blends,var/desired_never_blend = FALSE, var/desired_no_initial = FALSE, var/desired_pixel_x = 0, var/desired_pixel_y = 0, var/desired_transform) +/mob/living/advanced/proc/add_overlay_tracked(k,atom/object,desired_plane,desired_layer,desired_icon,desired_icon_state,desired_color,desired_additional_blends,desired_never_blend = FALSE, desired_no_initial = FALSE, desired_pixel_x = 0, desired_pixel_y = 0, desired_transform) if(!k) k = "\ref[object]_[src.type]" @@ -61,7 +61,7 @@ mob/living/advanced/proc/remove_overlay(var/k) return TRUE */ -/mob/living/advanced/proc/update_overlay_tracked(var/k,var/desired_layer,var/desired_plane,var/desired_icon,var/desired_icon_state,var/desired_color,var/desired_additional_blends,var/desired_never_blend,var/desired_no_initial,var/desired_pixel_x,var/desired_pixel_y,var/desired_alpha,var/desired_transform,var/force) +/mob/living/advanced/proc/update_overlay_tracked(k,desired_layer,desired_plane,desired_icon,desired_icon_state,desired_color,desired_additional_blends,desired_never_blend,desired_no_initial,desired_pixel_x,desired_pixel_y,desired_alpha,desired_transform,force) var/image/overlay/O = overlays_assoc[k] @@ -105,7 +105,7 @@ mob/living/advanced/proc/remove_overlay(var/k) return TRUE -/mob/living/advanced/proc/change_organ_visual(var/desired_id, var/desired_icon,var/desired_icon_state,var/desired_color,var/desired_blend, var/desired_type,var/desired_layer,var/should_update,var/debug_message) +/mob/living/advanced/proc/change_organ_visual(desired_id, desired_icon,desired_icon_state,desired_color,desired_blend, desired_type,desired_layer,should_update,debug_message) . = FALSE for(var/k in organs) var/obj/item/organ/O = k diff --git a/code/_core/mob/living/advanced/player/_player.dm b/code/_core/mob/living/advanced/player/_player.dm index 3af71e36c7..6890498312 100644 --- a/code/_core/mob/living/advanced/player/_player.dm +++ b/code/_core/mob/living/advanced/player/_player.dm @@ -134,7 +134,7 @@ var/desired_z = CEILING(world.maxz/2,1) force_move(locate(desired_x,desired_y,desired_z)) -/mob/living/advanced/player/get_damage_received_multiplier(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/atom/blamed,var/damagetype/DT) +/mob/living/advanced/player/get_damage_received_multiplier(atom/attacker,atom/victim,atom/weapon,atom/hit_object,atom/blamed,damagetype/DT) if(attacker.is_player_controlled()) //PvP is always 0.5. return 0.5 @@ -169,7 +169,7 @@ health.update_health_stats() return TRUE -/mob/living/advanced/player/is_safe_to_delete(var/check_loc = TRUE) +/mob/living/advanced/player/is_safe_to_delete(check_loc = TRUE) if(is_saving) return FALSE . = ..() @@ -221,7 +221,7 @@ return TRUE -/mob/living/advanced/player/proc/prestige(var/skill_id) +/mob/living/advanced/player/proc/prestige(skill_id) if(!prestige_count[skill_id]) prestige_count[skill_id] = 1 else diff --git a/code/_core/mob/living/advanced/player/antagonist/_antagonist.dm b/code/_core/mob/living/advanced/player/antagonist/_antagonist.dm index c824acec5a..84aa6c57ca 100644 --- a/code/_core/mob/living/advanced/player/antagonist/_antagonist.dm +++ b/code/_core/mob/living/advanced/player/antagonist/_antagonist.dm @@ -5,7 +5,7 @@ level = 40 -/mob/living/advanced/player/antagonist/on_add_xp(var/experience/E,var/added_xp) +/mob/living/advanced/player/antagonist/on_add_xp(experience/E,added_xp) . = ..() @@ -16,7 +16,7 @@ GD.loaded_data["stored_experience"] = list() GD.loaded_data["stored_experience"][E.id] += added_xp -/mob/living/advanced/player/antagonist/adjust_currency(var/currency_to_add,var/tax=FALSE) +/mob/living/advanced/player/antagonist/adjust_currency(currency_to_add,tax=FALSE) . = ..() diff --git a/code/_core/mob/living/advanced/player/antagonist/golem.dm b/code/_core/mob/living/advanced/player/antagonist/golem.dm index 8ed4363bdf..2e71f89404 100644 --- a/code/_core/mob/living/advanced/player/antagonist/golem.dm +++ b/code/_core/mob/living/advanced/player/antagonist/golem.dm @@ -9,7 +9,7 @@ var/global/list/possible_materials = list( /mob/living/advanced/player/antagonist/golem loadout_to_use = /loadout/golem -/mob/living/advanced/player/antagonist/golem/setup_appearance(var/set_default=FALSE) +/mob/living/advanced/player/antagonist/golem/setup_appearance(set_default=FALSE) src.add_organ(/obj/item/organ/internal/implant/hand/left/iff/golem) src.add_organ(/obj/item/organ/internal/implant/head/loyalty/golem) diff --git a/code/_core/mob/living/advanced/player/antagonist/mercenary.dm b/code/_core/mob/living/advanced/player/antagonist/mercenary.dm index 34a49ee031..c635595327 100644 --- a/code/_core/mob/living/advanced/player/antagonist/mercenary.dm +++ b/code/_core/mob/living/advanced/player/antagonist/mercenary.dm @@ -19,7 +19,7 @@ var/global/list/possible_merc_loadouts = list( ) -/mob/living/advanced/player/antagonist/merc/setup_appearance(var/set_default=FALSE) +/mob/living/advanced/player/antagonist/merc/setup_appearance(set_default=FALSE) . = ..() src.add_organ(/obj/item/organ/internal/implant/hand/left/iff/merc) src.add_organ(/obj/item/organ/internal/implant/head/loyalty/merc) diff --git a/code/_core/mob/living/advanced/player/antagonist/revolutionary.dm b/code/_core/mob/living/advanced/player/antagonist/revolutionary.dm index 656818960e..6ce3b6a527 100644 --- a/code/_core/mob/living/advanced/player/antagonist/revolutionary.dm +++ b/code/_core/mob/living/advanced/player/antagonist/revolutionary.dm @@ -19,6 +19,6 @@ name = "Comrade [real_name]" return TRUE -/mob/living/advanced/player/antagonist/revolutionary/species_initialize(var/set_default=FALSE) +/mob/living/advanced/player/antagonist/revolutionary/species_initialize(set_default=FALSE) . = ..() known_languages[LANGUAGE_SLAVIC] = TRUE diff --git a/code/_core/mob/living/advanced/player/antagonist/syndicate.dm b/code/_core/mob/living/advanced/player/antagonist/syndicate.dm index d81f94bda0..c8d39be6cb 100644 --- a/code/_core/mob/living/advanced/player/antagonist/syndicate.dm +++ b/code/_core/mob/living/advanced/player/antagonist/syndicate.dm @@ -19,6 +19,6 @@ return TRUE -/mob/living/advanced/player/antagonist/syndicate/species_initialize(var/set_default=FALSE) +/mob/living/advanced/player/antagonist/syndicate/species_initialize(set_default=FALSE) . = ..() known_languages[LANGUAGE_CODESPEAK] = TRUE diff --git a/code/_core/mob/living/advanced/player/chargen.dm b/code/_core/mob/living/advanced/player/chargen.dm index a2bce0b715..e4248a05a9 100644 --- a/code/_core/mob/living/advanced/player/chargen.dm +++ b/code/_core/mob/living/advanced/player/chargen.dm @@ -66,6 +66,6 @@ src.add_organ(/obj/item/organ/internal/implant/head/loyalty/nanotrasen) -/mob/living/advanced/player/post_perform_change(var/keep_items,var/chargen,var/list/kept_items = list()) +/mob/living/advanced/player/post_perform_change(keep_items,chargen,list/kept_items = list()) . = ..() setup_iff() diff --git a/code/_core/mob/living/advanced/player/combat.dm b/code/_core/mob/living/advanced/player/combat.dm index 868415b9f1..e156af9b26 100644 --- a/code/_core/mob/living/advanced/player/combat.dm +++ b/code/_core/mob/living/advanced/player/combat.dm @@ -1,4 +1,4 @@ -/mob/living/advanced/player/can_be_attacked(var/atom/attacker,var/damagetype/damage_type) +/mob/living/advanced/player/can_be_attacked(atom/attacker,damagetype/damage_type) if(is_player(attacker) && attacker != src && !FRIENDLY_FIRE) return FALSE diff --git a/code/_core/mob/living/advanced/player/currency.dm b/code/_core/mob/living/advanced/player/currency.dm index 3a0f1dbb10..c67ab2f301 100644 --- a/code/_core/mob/living/advanced/player/currency.dm +++ b/code/_core/mob/living/advanced/player/currency.dm @@ -1,4 +1,4 @@ -/mob/living/advanced/player/proc/adjust_currency(var/currency_to_add,var/tax=FALSE,var/silent=FALSE) +/mob/living/advanced/player/proc/adjust_currency(currency_to_add,tax=FALSE,silent=FALSE) if(!currency_to_add) return FALSE var/old_currency = currency @@ -15,7 +15,7 @@ return difference -/mob/living/advanced/player/proc/spend_currency(var/currency_to_spend) +/mob/living/advanced/player/proc/spend_currency(currency_to_spend) if(currency < currency_to_spend) return FALSE return -adjust_currency(-currency_to_spend) @@ -25,7 +25,7 @@ . = ..() adjust_currency(CONFIG("CHARGEN_STARTING_CREDITS",10000)) -/mob/living/advanced/player/proc/adjust_burgerbux(var/currency_to_add,var/silent=FALSE) +/mob/living/advanced/player/proc/adjust_burgerbux(currency_to_add,silent=FALSE) if(!currency_to_add) return FALSE if(!client) @@ -41,7 +41,7 @@ return difference -/mob/living/advanced/player/proc/spend_burgerbux(var/currency_to_spend) +/mob/living/advanced/player/proc/spend_burgerbux(currency_to_spend) if(currency < currency_to_spend) return FALSE return -adjust_burgerbux(-currency_to_spend) \ No newline at end of file diff --git a/code/_core/mob/living/advanced/player/experience.dm b/code/_core/mob/living/advanced/player/experience.dm index cb8b0319ef..2fbdf19f83 100644 --- a/code/_core/mob/living/advanced/player/experience.dm +++ b/code/_core/mob/living/advanced/player/experience.dm @@ -1,4 +1,4 @@ -/mob/living/advanced/player/get_skill_power(var/id,var/min_power=0.25,var/max_power=1,var/absolute_max_power) +/mob/living/advanced/player/get_skill_power(id,min_power=0.25,max_power=1,absolute_max_power) var/experience/skill/S = get_skill(id) if(!S) log_error("Warning! Tried getting skill power of [id], but it didn't exist for [src.get_debug_name()]!") @@ -14,7 +14,7 @@ return S.get_power(min_power,max_power,absolute_max_power,bonus) -/mob/living/advanced/player/get_attribute_power(var/id,var/min_power=0.25,var/max_power=1,var/absolute_max_power) +/mob/living/advanced/player/get_attribute_power(id,min_power=0.25,max_power=1,absolute_max_power) var/experience/attribute/A = get_attribute(id) if(!A) log_error("Warning! Tried getting attribute power of [id], but it didn't exist for [src.get_debug_name()]!") diff --git a/code/_core/mob/living/advanced/player/job.dm b/code/_core/mob/living/advanced/player/job.dm index 87ebc88349..f1d7b445c4 100644 --- a/code/_core/mob/living/advanced/player/job.dm +++ b/code/_core/mob/living/advanced/player/job.dm @@ -1,4 +1,4 @@ -/mob/living/advanced/player/proc/set_job(var/job/desired_job) //Setjob is only called when the player takes a new job. +/mob/living/advanced/player/proc/set_job(job/desired_job) //Setjob is only called when the player takes a new job. if(!desired_job) job = null diff --git a/code/_core/mob/living/advanced/player/karma.dm b/code/_core/mob/living/advanced/player/karma.dm index 79a39b79a7..962502ae3e 100644 --- a/code/_core/mob/living/advanced/player/karma.dm +++ b/code/_core/mob/living/advanced/player/karma.dm @@ -1,4 +1,4 @@ -/proc/punish_player(var/mob/living/advanced/player/P) +/proc/punish_player(mob/living/advanced/player/P) var/karma_difference = abs(P.karma - initial(P.karma)) @@ -18,7 +18,7 @@ return TRUE -/proc/do_karma_event(var/mob/living/advanced/player/attacker,var/mob/living/advanced/player/victim,var/karma_gain = 0) +/proc/do_karma_event(mob/living/advanced/player/attacker,mob/living/advanced/player/victim,karma_gain = 0) var/old_victim_justice_broken = victim.mobdata.loaded_data["justice_broken"] victim.mobdata.loaded_data["justice_broken"] = 0 @@ -92,7 +92,7 @@ return FALSE -/proc/calculate_karma_gain_for_attacker(var/mob/living/advanced/player/attacker,var/mob/living/advanced/player/victim) +/proc/calculate_karma_gain_for_attacker(mob/living/advanced/player/attacker,mob/living/advanced/player/victim) if(!attacker.mobdata || !victim.mobdata) return 0 diff --git a/code/_core/mob/living/advanced/player/life.dm b/code/_core/mob/living/advanced/player/life.dm index 8c639a8090..1de9396a98 100644 --- a/code/_core/mob/living/advanced/player/life.dm +++ b/code/_core/mob/living/advanced/player/life.dm @@ -11,7 +11,7 @@ mobdata.save_character(src) allow_save = FALSE //So deathboxes don't save. -/mob/living/advanced/player/on_killed(var/list/attackers) +/mob/living/advanced/player/on_killed(list/attackers) . = ..() @@ -33,7 +33,7 @@ death_ckey = null -/mob/living/advanced/player/proc/on_kill_player(var/mob/living/advanced/player/P) +/mob/living/advanced/player/proc/on_kill_player(mob/living/advanced/player/P) HOOK_CALL("on_kill_player") return TRUE diff --git a/code/_core/mob/living/advanced/player/movement.dm b/code/_core/mob/living/advanced/player/movement.dm index de52439d2e..1578cdaffd 100644 --- a/code/_core/mob/living/advanced/player/movement.dm +++ b/code/_core/mob/living/advanced/player/movement.dm @@ -1,4 +1,4 @@ -/mob/living/advanced/player/post_move(var/atom/old_loc) +/mob/living/advanced/player/post_move(atom/old_loc) . = ..() @@ -31,7 +31,7 @@ src.update_eyes() -/mob/living/advanced/player/on_chunk_cross(var/chunk/old_chunk,var/chunk/new_chunk) +/mob/living/advanced/player/on_chunk_cross(chunk/old_chunk,chunk/new_chunk) . = ..() diff --git a/code/_core/mob/living/advanced/player/progress.dm b/code/_core/mob/living/advanced/player/progress.dm index 1e82852d04..cce2c4cac9 100644 --- a/code/_core/mob/living/advanced/player/progress.dm +++ b/code/_core/mob/living/advanced/player/progress.dm @@ -1,4 +1,4 @@ -/mob/living/advanced/player/on_progress_bar_completed(var/id,var/list/callback_list) +/mob/living/advanced/player/on_progress_bar_completed(id,list/callback_list) switch(id) if("take") @@ -17,7 +17,7 @@ ..() -/mob/living/advanced/player/on_progress_bar_failed(var/id,var/list/callback_list) +/mob/living/advanced/player/on_progress_bar_failed(id,list/callback_list) switch(id) if("take") diff --git a/code/_core/mob/living/advanced/player/saving.dm b/code/_core/mob/living/advanced/player/saving.dm index 169d90efe9..34cc28935a 100644 --- a/code/_core/mob/living/advanced/player/saving.dm +++ b/code/_core/mob/living/advanced/player/saving.dm @@ -1,4 +1,4 @@ -/mob/living/advanced/player/proc/update_premiums(var/messages=TRUE) +/mob/living/advanced/player/proc/update_premiums(messages=TRUE) var/desired_premium_amount switch(insurance/INSURANCE_PAYOUT) //How many payouts left? if(0 to 0.5) @@ -20,7 +20,7 @@ if(messages) to_chat(span("notice","Your insurance premiums have decreased from [insurance_premiums*100]% to [desired_premium_amount*100]%!")) insurance_premiums = desired_premium_amount -/mob/living/advanced/player/proc/set_mob_data(var/list/loaded_data,var/appearance_only=FALSE) +/mob/living/advanced/player/proc/set_mob_data(list/loaded_data,appearance_only=FALSE) //Name real_name = police_text(client,loaded_data["name"],check_name=TRUE,check_characters=TRUE,min_length=2,max_length=40) @@ -191,7 +191,7 @@ if(!appearance_only) default_nanotrasen_move() -/mob/living/advanced/player/proc/get_mob_data(var/save_inventory = TRUE,var/died=FALSE) +/mob/living/advanced/player/proc/get_mob_data(save_inventory = TRUE,died=FALSE) . = list() diff --git a/code/_core/mob/living/advanced/player/squad.dm b/code/_core/mob/living/advanced/player/squad.dm index dd645af33a..90f0c6ce8c 100644 --- a/code/_core/mob/living/advanced/player/squad.dm +++ b/code/_core/mob/living/advanced/player/squad.dm @@ -1,4 +1,4 @@ -/mob/living/advanced/player/proc/set_squad(var/squad/S) +/mob/living/advanced/player/proc/set_squad(squad/S) if(S == current_squad) return FALSE @@ -21,7 +21,7 @@ return TRUE -/mob/living/advanced/player/proc/add_squad_button(var/mob/living/advanced/player/P) +/mob/living/advanced/player/proc/add_squad_button(mob/living/advanced/player/P) for(var/obj/hud/button/squad/member/B in buttons) if(B.tracked_mob == P) @@ -32,7 +32,7 @@ return TRUE -/mob/living/advanced/player/proc/remove_squad_button(var/mob/living/advanced/player/P) +/mob/living/advanced/player/proc/remove_squad_button(mob/living/advanced/player/P) for(var/obj/hud/button/squad/member/B in buttons) if(B.tracked_mob == P) diff --git a/code/_core/mob/living/advanced/player/structure.dm b/code/_core/mob/living/advanced/player/structure.dm index 6f4b8843f2..f263be883f 100644 --- a/code/_core/mob/living/advanced/player/structure.dm +++ b/code/_core/mob/living/advanced/player/structure.dm @@ -1,4 +1,4 @@ -/mob/living/advanced/player/proc/set_structure_active(var/obj/structure/S) +/mob/living/advanced/player/proc/set_structure_active(obj/structure/S) if(S == active_structure) return FALSE diff --git a/code/_core/mob/living/advanced/progress_bars.dm b/code/_core/mob/living/advanced/progress_bars.dm index aa90b89568..0ba28a3bec 100644 --- a/code/_core/mob/living/advanced/progress_bars.dm +++ b/code/_core/mob/living/advanced/progress_bars.dm @@ -1,4 +1,4 @@ -/mob/living/advanced/on_progress_bar_completed(var/id,var/list/callback_list) +/mob/living/advanced/on_progress_bar_completed(id,list/callback_list) switch(id) if("enter_vehicle") @@ -60,7 +60,7 @@ ..() -/mob/living/advanced/on_progress_bar_failed(var/id,var/list/callback_list) +/mob/living/advanced/on_progress_bar_failed(id,list/callback_list) switch(id) if("enter_vehicle") diff --git a/code/_core/mob/living/advanced/species.dm b/code/_core/mob/living/advanced/species.dm index 13bf6f2a83..b6abdf8b88 100644 --- a/code/_core/mob/living/advanced/species.dm +++ b/code/_core/mob/living/advanced/species.dm @@ -48,7 +48,7 @@ return TRUE -/mob/living/advanced/proc/setup_appearance(var/set_default=FALSE) +/mob/living/advanced/proc/setup_appearance(set_default=FALSE) if(sex == PLURAL) sex = pick(MALE,FEMALE) @@ -69,7 +69,7 @@ return TRUE -/mob/living/advanced/proc/species_initialize(var/set_default=FALSE) +/mob/living/advanced/proc/species_initialize(set_default=FALSE) var/species/S = SPECIES(species) @@ -103,7 +103,7 @@ return TRUE -/mob/living/advanced/player/setup_appearance(var/set_default=FALSE) +/mob/living/advanced/player/setup_appearance(set_default=FALSE) var/savedata/client/mob/mobdata = MOBDATA(ckey_last) if(set_default || !mobdata || !length(mobdata.loaded_data["organs"])) diff --git a/code/_core/mob/living/advanced/stand/_stand.dm b/code/_core/mob/living/advanced/stand/_stand.dm index b772ae0ac8..196b7dcfba 100644 --- a/code/_core/mob/living/advanced/stand/_stand.dm +++ b/code/_core/mob/living/advanced/stand/_stand.dm @@ -41,7 +41,7 @@ FIRE = TRUE ) -/mob/living/advanced/stand/can_be_attacked(var/atom/attacker,var/atom/weapon,var/params,var/damagetype/damage_type) +/mob/living/advanced/stand/can_be_attacked(atom/attacker,atom/weapon,params,damagetype/damage_type) if(attacker && owner && attacker == owner) return FALSE @@ -58,7 +58,7 @@ /mob/living/advanced/stand/handle_alpha() return enabled ? 255 : 0 -/mob/living/advanced/stand/set_dir(var/desired_dir,var/force = FALSE) +/mob/living/advanced/stand/set_dir(desired_dir,force = FALSE) . = ..() if(.) update_offsets() @@ -109,7 +109,7 @@ return TRUE -/mob/living/advanced/stand/proc/set_enabled(var/desired_enable=FALSE) +/mob/living/advanced/stand/proc/set_enabled(desired_enable=FALSE) enabled = desired_enable @@ -128,7 +128,7 @@ return TRUE -/mob/living/advanced/stand/clicked_on_by_object(var/mob/caller,var/atom/object) +/mob/living/advanced/stand/clicked_on_by_object(mob/caller,atom/object) if(caller == owner) return TRUE diff --git a/code/_core/mob/living/advanced/topic.dm b/code/_core/mob/living/advanced/topic.dm index 69f4202f13..e00d653517 100644 --- a/code/_core/mob/living/advanced/topic.dm +++ b/code/_core/mob/living/advanced/topic.dm @@ -8,19 +8,19 @@ . = ..() -/mob/living/advanced/proc/try_uncuff(var/mob/caller) +/mob/living/advanced/proc/try_uncuff(mob/caller) if(!can_uncuff(caller)) return FALSE PROGRESS_BAR(caller,src,3 SECONDS,src::uncuff(),caller) PROGRESS_BAR_CONDITIONS(caller,src,src::can_uncuff(),caller) return TRUE -/mob/living/advanced/proc/uncuff(var/mob/caller) +/mob/living/advanced/proc/uncuff(mob/caller) caller.visible_message(span("warning","\The [caller.name] removes \the [src.name]'s handcuffs."),span("notice","You remove \the [src.name]'s handcuffs.")) set_handcuffs(FALSE) return TRUE -/mob/living/advanced/proc/can_uncuff(var/mob/caller) +/mob/living/advanced/proc/can_uncuff(mob/caller) INTERACT_CHECK_NO_DELAY(src) diff --git a/code/_core/mob/living/advanced/update.dm b/code/_core/mob/living/advanced/update.dm index 4493032ef1..3d2c0a06cc 100644 --- a/code/_core/mob/living/advanced/update.dm +++ b/code/_core/mob/living/advanced/update.dm @@ -1,4 +1,4 @@ -/mob/living/advanced/proc/update_items(var/force=FALSE) //Sent when an item needs to update. +/mob/living/advanced/proc/update_items(force=FALSE) //Sent when an item needs to update. if(qdeleting) //Bandaid fix. return FALSE diff --git a/code/_core/mob/living/chat.dm b/code/_core/mob/living/chat.dm index 2034d27b00..0f2a7095ca 100644 --- a/code/_core/mob/living/chat.dm +++ b/code/_core/mob/living/chat.dm @@ -1,4 +1,4 @@ -/mob/living/do_say(var/text_to_say, var/should_sanitize = TRUE, var/talk_type_to_use = TEXT_TALK,var/talk_range=TALK_RANGE,var/language_to_use=null) +/mob/living/do_say(text_to_say, should_sanitize = TRUE, talk_type_to_use = TEXT_TALK,talk_range=TALK_RANGE,language_to_use=null) if(dead) if(!client) return FALSE @@ -14,7 +14,7 @@ if(.) do_type(TALK_TYPE_EXCLAIMATION) -/mob/living/proc/do_type(var/type_type) +/mob/living/proc/do_type(type_type) talk_duration = 4 SECONDS if(chat_overlay) chat_overlay.icon_state = type_type diff --git a/code/_core/mob/living/combat.dm b/code/_core/mob/living/combat.dm index 64a97cf0ad..bde21a3843 100644 --- a/code/_core/mob/living/combat.dm +++ b/code/_core/mob/living/combat.dm @@ -18,7 +18,7 @@ return TRUE -/mob/living/proc/handle_blocking(var/force_change=FALSE) +/mob/living/proc/handle_blocking(force_change=FALSE) var/changed = force_change @@ -51,7 +51,7 @@ if(!force_change) animate(alpha=150, time = parry_spam_time - world.time) -/mob/living/can_attack(var/atom/attacker,var/atom/victim,var/atom/weapon,var/params,var/damagetype/damage_type) +/mob/living/can_attack(atom/attacker,atom/victim,atom/weapon,params,damagetype/damage_type) if(dead) return FALSE @@ -65,7 +65,7 @@ . = ..() -/mob/living/can_be_attacked(var/atom/attacker,var/atom/weapon,var/params,var/damagetype/damage_type) +/mob/living/can_be_attacked(atom/attacker,atom/weapon,params,damagetype/damage_type) if(src != attacker && is_living(attacker)) var/mob/living/L = attacker @@ -75,17 +75,17 @@ return ..() -/mob/living/proc/send_pain_response(var/pain_strength=50) +/mob/living/proc/send_pain_response(pain_strength=50) if(pain_strength < 75) do_emote("pain") else do_emote("scream") return TRUE -/mob/living/proc/get_block_data(var/atom/attacker,var/atom/weapon,var/atom/hit_object,var/atom/blamed,var/damagetype/DT) +/mob/living/proc/get_block_data(atom/attacker,atom/weapon,atom/hit_object,atom/blamed,damagetype/DT) return list(src,0.5) -/mob/living/proc/on_blocked_hit(var/atom/attacker,var/atom/weapon,var/atom/hit_object,var/atom/blamed,var/damagetype/DT,var/atom/block_atom,var/block_multiplier=0,var/total_damage_blocked=0) +/mob/living/proc/on_blocked_hit(atom/attacker,atom/weapon,atom/hit_object,atom/blamed,damagetype/DT,atom/block_atom,block_multiplier=0,total_damage_blocked=0) if(is_item(block_atom) && !is_organ(block_atom)) var/obj/item/I = block_atom @@ -97,14 +97,14 @@ return TRUE -/mob/living/proc/on_unblocked_hit(var/atom/attacker,var/atom/weapon,var/atom/hit_object,var/atom/blamed,var/damagetype/DT,var/total_damage_dealt=0) +/mob/living/proc/on_unblocked_hit(atom/attacker,atom/weapon,atom/hit_object,atom/blamed,damagetype/DT,total_damage_dealt=0) if(client) src.add_attribute_xp(ATTRIBUTE_CONSTITUTION,total_damage_dealt) return TRUE -/mob/living/proc/on_parried_hit(var/atom/attacker,var/atom/weapon,var/atom/hit_object,var/atom/blamed,var/damagetype/DT,var/damage_multiplier=1) +/mob/living/proc/on_parried_hit(atom/attacker,atom/weapon,atom/hit_object,atom/blamed,damagetype/DT,damage_multiplier=1) return TRUE -/mob/living/proc/parry(var/atom/attacker,var/atom/weapon,var/atom/hit_object,var/damagetype/DT) +/mob/living/proc/parry(atom/attacker,atom/weapon,atom/hit_object,damagetype/DT) if(horizontal) return FALSE diff --git a/code/_core/mob/living/disease.dm b/code/_core/mob/living/disease.dm index 3d59e78320..8e6e01794d 100644 --- a/code/_core/mob/living/disease.dm +++ b/code/_core/mob/living/disease.dm @@ -1,4 +1,4 @@ -/mob/living/proc/add_disease(var/disease/disease_to_add) +/mob/living/proc/add_disease(disease/disease_to_add) if(length(diseases) && diseases[disease_to_add]) return FALSE @@ -10,7 +10,7 @@ return TRUE -/mob/living/proc/remove_disease(var/disease/disease_to_remove) +/mob/living/proc/remove_disease(disease/disease_to_remove) if(!length(diseases) || !diseases[disease_to_remove]) return FALSE diff --git a/code/_core/mob/living/dynamic_variable.dm b/code/_core/mob/living/dynamic_variable.dm index 938e0da977..9f52b4c456 100644 --- a/code/_core/mob/living/dynamic_variable.dm +++ b/code/_core/mob/living/dynamic_variable.dm @@ -1,16 +1,16 @@ //New system is called mob_values. -/mob/living/proc/dvar_base(var/id,var/value) +/mob/living/proc/dvar_base(id,value) dynamic_variable_base[id] = value return value -/mob/living/proc/dvar_mul(var/id,var/value) +/mob/living/proc/dvar_mul(id,value) dynamic_variable_mul[id] += value return value -/mob/living/proc/dvar_add(var/id,var/value) +/mob/living/proc/dvar_add(id,value) dynamic_variable_add[id] += value return value -/mob/living/proc/dvar_get(var/id) +/mob/living/proc/dvar_get(id) return (SAFENUM(dynamic_variable_base[id]) * SAFENUM(dynamic_variable_mul[id])) + SAFENUM(dynamic_variable_add[id]) \ No newline at end of file diff --git a/code/_core/mob/living/emote.dm b/code/_core/mob/living/emote.dm index 0cc7da7744..c3adc37e82 100644 --- a/code/_core/mob/living/emote.dm +++ b/code/_core/mob/living/emote.dm @@ -1,2 +1,2 @@ -/mob/living/proc/get_emote_sound(var/emote_id) +/mob/living/proc/get_emote_sound(emote_id) return null \ No newline at end of file diff --git a/code/_core/mob/living/examine.dm b/code/_core/mob/living/examine.dm index 03a387b606..e18922744c 100644 --- a/code/_core/mob/living/examine.dm +++ b/code/_core/mob/living/examine.dm @@ -1,4 +1,4 @@ -/mob/living/proc/get_damage_description(var/mob/examiner) +/mob/living/proc/get_damage_description(mob/examiner) if(!health || health.health_max <= 0) return null @@ -60,7 +60,7 @@ return div(div_class,"[prefix] [english_list(damage_description)].") -/mob/living/get_examine_list(var/mob/examiner) +/mob/living/get_examine_list(mob/examiner) var/object_icon = ICON_TO_HTML(icon,icon_state,32,32) . = list( @@ -92,7 +92,7 @@ return null -/mob/living/get_examine_details_list(var/mob/examiner) +/mob/living/get_examine_details_list(mob/examiner) . = ..() diff --git a/code/_core/mob/living/experience.dm b/code/_core/mob/living/experience.dm index 3c79c1cc28..8ebd1538cb 100644 --- a/code/_core/mob/living/experience.dm +++ b/code/_core/mob/living/experience.dm @@ -1,66 +1,66 @@ //Skills -/mob/living/proc/get_skill(var/id,var/error_on_null = TRUE) +/mob/living/proc/get_skill(id,error_on_null = TRUE) if(!skills[id]) if(error_on_null) log_error("Warning! Tried getting skill of [id], but it didn't exist for [src.get_debug_name()]!") return null return skills[id] -/mob/living/proc/get_skill_level(var/id) +/mob/living/proc/get_skill_level(id) var/experience/skill/S = get_skill(id) if(!S) log_error("Warning! Tried getting skill level of [id], but it didn't exist for [src.get_debug_name()]!") return 25 return S.get_current_level() -/mob/living/proc/get_skill_power(var/id,var/min_power=0.25,var/max_power=1,var/absolute_max_power) +/mob/living/proc/get_skill_power(id,min_power=0.25,max_power=1,absolute_max_power) var/experience/skill/S = get_skill(id) if(!S) log_error("Warning! Tried getting skill power of [id], but it didn't exist for [src.get_debug_name()]!") return 0.25 return S.get_power(min_power,max_power,absolute_max_power) -/mob/living/proc/set_skill_level(var/id,var/desired_level) +/mob/living/proc/set_skill_level(id,desired_level) var/experience/skill/S = get_skill(id) return S.set_level(desired_level) -/mob/living/proc/set_skill_xp(var/id,var/desired_xp) +/mob/living/proc/set_skill_xp(id,desired_xp) var/experience/skill/S = get_skill(id) return S.set_xp(desired_xp) -/mob/living/proc/add_skill_xp(var/id,var/xp_to_add,var/difficulty_multiplier=TRUE) +/mob/living/proc/add_skill_xp(id,xp_to_add,difficulty_multiplier=TRUE) var/experience/skill/S = get_skill(id) return S.add_xp(xp_to_add,difficulty_multiplier=difficulty_multiplier) //Attributes -/mob/living/proc/get_attribute(var/id,var/error_on_null = TRUE) //TODO: Find out if error_on_null is needed. +/mob/living/proc/get_attribute(id,error_on_null = TRUE) //TODO: Find out if error_on_null is needed. if(!attributes[id]) if(error_on_null) log_error("Warning! Tried getting attribute of [id], but it didn't exist for [src.get_debug_name()]!") return null return attributes[id] -/mob/living/proc/get_attribute_level(var/id) +/mob/living/proc/get_attribute_level(id) var/experience/attribute/A = get_attribute(id) if(!A) log_error("Warning! Tried getting attribute level of [id], but it didn't exist for [src.get_debug_name()]!") return 25 return A.get_current_level() -/mob/living/proc/get_attribute_power(var/id,var/min_power=0.25,var/max_power=1,var/absolute_max_power) +/mob/living/proc/get_attribute_power(id,min_power=0.25,max_power=1,absolute_max_power) var/experience/attribute/A = get_attribute(id) if(!A) log_error("Warning! Tried getting attribute power of [id], but it didn't exist for [src.get_debug_name()]!") return 0.25 return A.get_power(min_power,max_power,absolute_max_power) -/mob/living/proc/set_attribute_level(var/id,var/desired_level) +/mob/living/proc/set_attribute_level(id,desired_level) var/experience/attribute/A = get_attribute(id) return A.set_level(desired_level) -/mob/living/proc/set_attribute_xp(var/id,var/desired_xp) +/mob/living/proc/set_attribute_xp(id,desired_xp) var/experience/attribute/A = get_attribute(id) return A.set_xp(desired_xp) -/mob/living/proc/add_attribute_xp(var/id,var/xp_to_add,var/difficulty_multiplier=TRUE) +/mob/living/proc/add_attribute_xp(id,xp_to_add,difficulty_multiplier=TRUE) var/experience/attribute/A = get_attribute(id) return A.add_xp(xp_to_add,difficulty_multiplier=difficulty_multiplier) @@ -103,7 +103,7 @@ E.update_experience(E.level_to_xp(E.default_level)) skills[E.id] = E -/mob/living/proc/update_level(var/first=FALSE) +/mob/living/proc/update_level(first=FALSE) var/old_level = level @@ -143,10 +143,10 @@ return old_level != level -/mob/living/proc/on_add_xp(var/experience/E,var/added_xp) +/mob/living/proc/on_add_xp(experience/E,added_xp) return TRUE -/mob/living/proc/on_level_up(var/experience/E,var/old_level,var/new_level) +/mob/living/proc/on_level_up(experience/E,old_level,new_level) var/decrease = old_level > new_level diff --git a/code/_core/mob/living/fire.dm b/code/_core/mob/living/fire.dm index e8413471c5..bd6232ef90 100644 --- a/code/_core/mob/living/fire.dm +++ b/code/_core/mob/living/fire.dm @@ -1,7 +1,7 @@ #define MAX_FIRE_STACKS 300 #define MIN_FIRE_STACKS -300 -/mob/living/proc/adjust_fire_stacks(var/added_fire_stacks = 10) +/mob/living/proc/adjust_fire_stacks(added_fire_stacks = 10) if(qdeleting) return FALSE @@ -23,7 +23,7 @@ return TRUE -/mob/living/proc/ignite(var/added_fire_stacks = 0,var/atom/source) +/mob/living/proc/ignite(added_fire_stacks = 0,atom/source) if(qdeleting) return FALSE diff --git a/code/_core/mob/living/health.dm b/code/_core/mob/living/health.dm index f1664fa75e..bab36e6047 100644 --- a/code/_core/mob/living/health.dm +++ b/code/_core/mob/living/health.dm @@ -8,7 +8,7 @@ return TRUE -/mob/living/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/mob/living/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) PROCESS_LIVING(src) @@ -75,7 +75,7 @@ remove_status_effect(PARRIED) add_status_effect(STUN,stun_magnitude,stun_duration) -/mob/living/proc/can_be_butchered(var/mob/caller,var/obj/item/butchering_item,var/atom/atom_to_butcher) +/mob/living/proc/can_be_butchered(mob/caller,obj/item/butchering_item,atom/atom_to_butcher) if(caller) INTERACT_CHECK_NO_DELAY(src) @@ -88,7 +88,7 @@ return TRUE -/mob/living/proc/on_butcher(var/mob/caller,var/atom/movable/atom_to_butcher,var/turf/override_turf) +/mob/living/proc/on_butcher(mob/caller,atom/movable/atom_to_butcher,turf/override_turf) if(src.qdeleting || atom_to_butcher.qdeleting) return FALSE @@ -136,14 +136,14 @@ else update_sprite() -/mob/living/proc/get_damage_received_multiplier(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/atom/blamed,var/damagetype/DT) +/mob/living/proc/get_damage_received_multiplier(atom/attacker,atom/victim,atom/weapon,atom/hit_object,atom/blamed,damagetype/DT) return 1 -/mob/living/proc/create_override_contents(var/mob/living/caller) +/mob/living/proc/create_override_contents(mob/living/caller) return TRUE -/mob/living/proc/on_savage_hit(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/mob/living/proc/on_savage_hit(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) var/turf/T = get_turf(src) diff --git a/code/_core/mob/living/interaction.dm b/code/_core/mob/living/interaction.dm index 494a653dae..c1ef00078f 100644 --- a/code/_core/mob/living/interaction.dm +++ b/code/_core/mob/living/interaction.dm @@ -4,10 +4,10 @@ mob/living/on_right_down(object,location,control,params) mob/living/on_left_down(object,location,control,params) return src.attack(src,object,params) -/mob/living/on_mouse_wheel(var/atom/object,delta_x,delta_y,location,control,params) +/mob/living/on_mouse_wheel(atom/object,delta_x,delta_y,location,control,params) return object.mouse_wheel_on_object(src,delta_x,delta_y,location,control,params) -/mob/living/proc/set_mouse_pointer(var/desired_icon) +/mob/living/proc/set_mouse_pointer(desired_icon) if(!client) return FALSE client.mouse_pointer_icon = desired_icon @@ -18,7 +18,7 @@ mob/living/on_left_down(object,location,control,params) return FALSE . = ..() -/mob/living/proc/update_intent(var/force) +/mob/living/proc/update_intent(force) var/desired_intent = selected_intent if(attack_flags & CONTROL_MOD_GRAB) @@ -64,7 +64,7 @@ mob/living/on_left_down(object,location,control,params) return TRUE -/mob/living/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/mob/living/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(caller == src && (object == src || is_inventory(object))) resist() diff --git a/code/_core/mob/living/life.dm b/code/_core/mob/living/life.dm index 9e1cff234b..daefc3b8b8 100644 --- a/code/_core/mob/living/life.dm +++ b/code/_core/mob/living/life.dm @@ -2,7 +2,7 @@ src.visible_message("\The [src.name] seizes up and falls limp, their eyes dead and lifeless...") return TRUE -/mob/living/proc/death(var/silent=FALSE) +/mob/living/proc/death(silent=FALSE) if(dead) return FALSE @@ -91,7 +91,7 @@ /* -/mob/living/proc/do_loot_drop(var/atom/desired_loc) +/mob/living/proc/do_loot_drop(atom/desired_loc) if(desired_loc && loot_drop && health) var/loot/L = all_loot[loot_drop] @@ -257,11 +257,11 @@ return TRUE -/mob/living/proc/on_kill(var/mob/living/victim) +/mob/living/proc/on_kill(mob/living/victim) HOOK_CALL("on_kill") return TRUE -/mob/living/proc/on_killed(var/list/attackers) +/mob/living/proc/on_killed(list/attackers) for(var/k in attackers) var/mob/living/L = k L.on_kill(src) diff --git a/code/_core/mob/living/living_traits.dm b/code/_core/mob/living/living_traits.dm index ca9e7877a8..9ce763ef03 100644 --- a/code/_core/mob/living/living_traits.dm +++ b/code/_core/mob/living/living_traits.dm @@ -19,7 +19,7 @@ return TRUE -/mob/living/proc/add_trait(var/trait/trait_to_add,var/remove_existing_category=FALSE,var/messages=TRUE) +/mob/living/proc/add_trait(trait/trait_to_add,remove_existing_category=FALSE,messages=TRUE) var/trait/T = TRAIT(trait_to_add) if(!T) @@ -42,7 +42,7 @@ return TRUE -/mob/living/proc/remove_trait(var/trait_to_remove) +/mob/living/proc/remove_trait(trait_to_remove) if(!traits[trait_to_remove]) return FALSE var/trait/T = TRAIT(trait_to_remove) @@ -53,12 +53,12 @@ T.on_remove(src) return TRUE -/mob/living/proc/get_trait_by_category(var/desired_category) +/mob/living/proc/get_trait_by_category(desired_category) if(!traits_by_category[desired_category]) return null return TRAIT(traits_by_category[desired_category]) -/mob/living/proc/has_trait(var/trait_to_check) +/mob/living/proc/has_trait(trait_to_check) return traits[trait_to_check] ? TRUE : FALSE /proc/get_trait_limit(rarity) @@ -77,7 +77,7 @@ return 0 -/mob/living/proc/can_add_trait(var/trait/trait_to_add,var/remove_existing_category=FALSE) //Set to true if you want it to remove existing traits before adding the new one. False means it will fail to add if it finds a similar trait. +/mob/living/proc/can_add_trait(trait/trait_to_add,remove_existing_category=FALSE) //Set to true if you want it to remove existing traits before adding the new one. False means it will fail to add if it finds a similar trait. if(!trait_to_add) return FALSE diff --git a/code/_core/mob/living/mob_values.dm b/code/_core/mob/living/mob_values.dm index 13798f6635..d71f305f39 100644 --- a/code/_core/mob/living/mob_values.dm +++ b/code/_core/mob/living/mob_values.dm @@ -1,7 +1,7 @@ #define ADDITION "add" #define MULTIPLICATION "mul" -/mob/living/proc/add_mob_value(var/id,var/value_type,var/value=0,var/math_type=ADDITION) +/mob/living/proc/add_mob_value(id,value_type,value=0,math_type=ADDITION) . = FALSE @@ -19,7 +19,7 @@ return . -/mob/living/proc/remove_mob_value(var/id,var/value_type,var/math_type=ADDITION) +/mob/living/proc/remove_mob_value(id,value_type,math_type=ADDITION) . = FALSE @@ -33,7 +33,7 @@ return . -/mob/living/proc/get_mob_value(var/value_type) +/mob/living/proc/get_mob_value(value_type) var/add = 0 var/mul = 1 diff --git a/code/_core/mob/living/movement.dm b/code/_core/mob/living/movement.dm index f45597f807..fd0d48ebcf 100644 --- a/code/_core/mob/living/movement.dm +++ b/code/_core/mob/living/movement.dm @@ -1,4 +1,4 @@ -/mob/living/proc/handle_footsteps(var/turf/T,var/list/footsteps_to_use,var/enter=TRUE) +/mob/living/proc/handle_footsteps(turf/T,list/footsteps_to_use,enter=TRUE) if(!T) return FALSE @@ -11,7 +11,7 @@ return TRUE -/mob/living/proc/do_footstep(var/turf/T,var/list/footsteps_to_use,var/enter=TRUE) +/mob/living/proc/do_footstep(turf/T,list/footsteps_to_use,enter=TRUE) footstep_counter = (footstep_counter + 1) % footstep_mod @@ -41,7 +41,7 @@ return TRUE -/mob/living/proc/get_footsteps(var/list/original_footsteps,var/enter=TRUE) +/mob/living/proc/get_footsteps(list/original_footsteps,enter=TRUE) return original_footsteps /mob/living/Move(NewLoc,Dir=0,step_x=0,step_y=0) @@ -51,14 +51,14 @@ . = ..() -/mob/living/set_dir(var/desired_dir,var/force=FALSE) +/mob/living/set_dir(desired_dir,force=FALSE) . = ..() if(.) handle_blocking(TRUE) -/mob/living/on_chunk_cross(var/chunk/old_chunk,var/chunk/new_chunk) +/mob/living/on_chunk_cross(chunk/old_chunk,chunk/new_chunk) . = ..() @@ -66,7 +66,7 @@ if(old_chunk) old_chunk.ai -= src.ai if(new_chunk) new_chunk.ai += src.ai -/mob/living/post_move(var/atom/old_loc) +/mob/living/post_move(atom/old_loc) . = ..() @@ -141,7 +141,7 @@ add_hydration(-0.1) return ..() -/mob/living/handle_movement(var/adjust_delay = 1) +/mob/living/handle_movement(adjust_delay = 1) //Dashing if(dash_amount > 0 && !horizontal && src.z && can_move()) @@ -250,7 +250,7 @@ var/found_movement_delay = M.get_movement_delay() . = clamp(found_movement_delay,.,.*2) -/mob/living/proc/toggle_sneak(var/on = TRUE,var/force=FALSE) +/mob/living/proc/toggle_sneak(on = TRUE,force=FALSE) if(!force && is_sneaking == on) return FALSE @@ -295,7 +295,7 @@ . = ..() -/mob/living/on_thrown(var/atom/owner,var/atom/hit_atom) //What happens after the person is thrown. +/mob/living/on_thrown(atom/owner,atom/hit_atom) //What happens after the person is thrown. if(!has_status_effects(STUN,STAGGER,PARALYZE)) if(hit_atom) @@ -305,7 +305,7 @@ return ..() -/mob/living/throw_self(var/atom/thrower,var/atom/desired_target,var/target_x,var/target_y,var/vel_x,var/vel_y,var/lifetime = -1, var/steps_allowed = 0,var/desired_loyalty_tag,var/damage_multiplier=1) +/mob/living/throw_self(atom/thrower,atom/desired_target,target_x,target_y,vel_x,vel_y,lifetime = -1, steps_allowed = 0,desired_loyalty_tag,damage_multiplier=1) if(buckled_object) return null diff --git a/code/_core/mob/living/nutrition.dm b/code/_core/mob/living/nutrition.dm index 97f78bf530..d44f0c192a 100644 --- a/code/_core/mob/living/nutrition.dm +++ b/code/_core/mob/living/nutrition.dm @@ -1,4 +1,4 @@ -/mob/living/proc/remove_nutrition_mix(var/amount_to_remove=0) +/mob/living/proc/remove_nutrition_mix(amount_to_remove=0) . = 0 @@ -21,22 +21,22 @@ return . -/mob/living/proc/add_hydration(var/amount) +/mob/living/proc/add_hydration(amount) var/amount_to_add = clamp(amount,-hydration,hydration_max-hydration) hydration += amount_to_add return amount_to_add -/mob/living/proc/add_nutrition_normal(var/amount) +/mob/living/proc/add_nutrition_normal(amount) var/amount_to_add = clamp(amount,-nutrition_normal,nutrition_max_hard-nutrition_normal) nutrition_normal += amount_to_add return amount_to_add -/mob/living/proc/add_nutrition_quality(var/amount) +/mob/living/proc/add_nutrition_quality(amount) var/amount_to_add = clamp(amount,-nutrition_quality,nutrition_max_hard-nutrition_quality) nutrition_quality += amount_to_add return amount_to_add -/mob/living/proc/add_nutrition_fast(var/amount) +/mob/living/proc/add_nutrition_fast(amount) var/amount_to_add = clamp(amount,-nutrition_fast,nutrition_max_hard-nutrition_fast) nutrition_fast += amount_to_add return amount_to_add diff --git a/code/_core/mob/living/resist.dm b/code/_core/mob/living/resist.dm index 354c22cbf4..52951ccc17 100644 --- a/code/_core/mob/living/resist.dm +++ b/code/_core/mob/living/resist.dm @@ -1,4 +1,4 @@ -/mob/living/proc/can_resist(var/messages = TRUE) +/mob/living/proc/can_resist(messages = TRUE) if(dead) if(messages) to_chat(span("warning","You can't resist while dead!")) diff --git a/code/_core/mob/living/simple/arachnid.dm b/code/_core/mob/living/simple/arachnid.dm index 8ea868caaa..e9b55f17f2 100644 --- a/code/_core/mob/living/simple/arachnid.dm +++ b/code/_core/mob/living/simple/arachnid.dm @@ -57,7 +57,7 @@ . = ..() update_sprite() -/mob/living/simple/arachnid/handle_transform(var/force=FALSE) +/mob/living/simple/arachnid/handle_transform(force=FALSE) . = ..() if(.) update_sprite() diff --git a/code/_core/mob/living/simple/ash_drake.dm b/code/_core/mob/living/simple/ash_drake.dm index e81839a07b..98ae330d19 100644 --- a/code/_core/mob/living/simple/ash_drake.dm +++ b/code/_core/mob/living/simple/ash_drake.dm @@ -78,12 +78,12 @@ var/next_special_move = 0 -/mob/living/simple/ash_drake/can_attack(var/atom/attacker,var/atom/victim,var/atom/weapon,var/params,var/damagetype/damage_type) +/mob/living/simple/ash_drake/can_attack(atom/attacker,atom/victim,atom/weapon,params,damagetype/damage_type) if(boss_state) return FALSE . = ..() -/mob/living/simple/ash_drake/can_be_attacked(var/atom/attacker,var/atom/weapon,var/params,var/damagetype/damage_type) +/mob/living/simple/ash_drake/can_be_attacked(atom/attacker,atom/weapon,params,damagetype/damage_type) if(boss_state) return FALSE . = ..() @@ -196,7 +196,7 @@ play_sound('sound/mob/ash_drake/death.ogg',get_turf(src)) -/mob/living/simple/ash_drake/proc/start_fire_breath(var/atom/desired_target) +/mob/living/simple/ash_drake/proc/start_fire_breath(atom/desired_target) if(has_status_effect(PARALYZE)) return FALSE @@ -210,7 +210,7 @@ CALLBACK("\ref[src]_do_fire_breath",20,src,src::do_fire_breath(),desired_target,stored_turf) -/mob/living/simple/ash_drake/proc/do_fire_breath(var/atom/desired_target,var/turf/fallback_turf) +/mob/living/simple/ash_drake/proc/do_fire_breath(atom/desired_target,turf/fallback_turf) var/do_bonus = FALSE @@ -247,7 +247,7 @@ add_status_effect(PARALYZE,duration=20,magnitude=-1,stealthy=TRUE) CALLBACK("\ref[src]_do_bonus_dash",21,src,src::do_bonus_dash(),fallback_turf) -/mob/living/simple/ash_drake/proc/do_bonus_dash(var/atom/desired_dash_target) +/mob/living/simple/ash_drake/proc/do_bonus_dash(atom/desired_dash_target) dash_target = desired_dash_target dash_amount = min(VIEW_RANGE,get_dist(src,dash_target)) return TRUE diff --git a/code/_core/mob/living/simple/blob_spore.dm b/code/_core/mob/living/simple/blob_spore.dm index 0f43534db0..1e33bb7faf 100644 --- a/code/_core/mob/living/simple/blob_spore.dm +++ b/code/_core/mob/living/simple/blob_spore.dm @@ -42,7 +42,7 @@ delete_on_death = TRUE -/mob/living/simple/blob_spore/post_move(var/atom/old_loc) +/mob/living/simple/blob_spore/post_move(atom/old_loc) if(idle) idle = FALSE icon_state = initial(icon_state) diff --git a/code/_core/mob/living/simple/blobbernaught.dm b/code/_core/mob/living/simple/blobbernaught.dm index d7f93df419..83552eae16 100644 --- a/code/_core/mob/living/simple/blobbernaught.dm +++ b/code/_core/mob/living/simple/blobbernaught.dm @@ -39,7 +39,7 @@ level = 12 -/mob/living/simple/blobbernaught/New(loc,desired_client,desired_level_multiplier,var/obj/structure/interactive/blob/node/desired_node) +/mob/living/simple/blobbernaught/New(loc,desired_client,desired_level_multiplier,obj/structure/interactive/blob/node/desired_node) if(desired_node) linked_node = desired_node diff --git a/code/_core/mob/living/simple/bot/beepsky.dm b/code/_core/mob/living/simple/bot/beepsky.dm index 783aae96da..ae6cbbaed7 100644 --- a/code/_core/mob/living/simple/bot/beepsky.dm +++ b/code/_core/mob/living/simple/bot/beepsky.dm @@ -19,7 +19,7 @@ enable_medical_hud = FALSE enable_security_hud = FALSE -/mob/living/simple/bot/securitron/captain/can_be_grabbed(var/atom/grabber,var/messages=FALSE) +/mob/living/simple/bot/securitron/captain/can_be_grabbed(atom/grabber,messages=FALSE) if(messages && is_living(grabber)) var/mob/living/L = grabber diff --git a/code/_core/mob/living/simple/bot/cleaner.dm b/code/_core/mob/living/simple/bot/cleaner.dm index 6c33cbdd88..ebb650bd59 100644 --- a/code/_core/mob/living/simple/bot/cleaner.dm +++ b/code/_core/mob/living/simple/bot/cleaner.dm @@ -22,7 +22,7 @@ if(.) icon_state = "dead" -/mob/living/simple/bot/cleaner/post_move(var/atom/old_loc) +/mob/living/simple/bot/cleaner/post_move(atom/old_loc) . = ..() diff --git a/code/_core/mob/living/simple/bot/medical.dm b/code/_core/mob/living/simple/bot/medical.dm index 9f892a3730..2e1772ae09 100644 --- a/code/_core/mob/living/simple/bot/medical.dm +++ b/code/_core/mob/living/simple/bot/medical.dm @@ -79,7 +79,7 @@ var/image/I = new(overlay_icon,overlay_icon_state) underlays += I -/mob/living/simple/bot/medibot/proc/get_inject_amount(var/mob/living/target) +/mob/living/simple/bot/medibot/proc/get_inject_amount(mob/living/target) . = list() @@ -97,7 +97,7 @@ return length(.) ? . : FALSE -/mob/living/simple/bot/medibot/proc/treat(var/mob/living/target) +/mob/living/simple/bot/medibot/proc/treat(mob/living/target) var/inject_amount = get_inject_amount(target) @@ -120,7 +120,7 @@ return TRUE -/mob/living/simple/bot/medibot/proc/can_treat(var/mob/living/target) +/mob/living/simple/bot/medibot/proc/can_treat(mob/living/target) if(target.qdeleting) return FALSE @@ -148,7 +148,7 @@ return TRUE -/mob/living/simple/bot/medibot/proc/try_treat(var/mob/living/target) +/mob/living/simple/bot/medibot/proc/try_treat(mob/living/target) if(get_inject_amount(target)) PROGRESS_BAR(src,src,5 SECONDS,src::treat(),target) diff --git a/code/_core/mob/living/simple/bubblegum.dm b/code/_core/mob/living/simple/bubblegum.dm index 2e44239e6d..f9b151f53a 100644 --- a/code/_core/mob/living/simple/bubblegum.dm +++ b/code/_core/mob/living/simple/bubblegum.dm @@ -118,7 +118,7 @@ if(charge_steps > 0) . = AI_TICK_FAST -/mob/living/simple/bubblegum/post_move(var/atom/old_loc) +/mob/living/simple/bubblegum/post_move(atom/old_loc) if(!horizontal) play_sound('sound/effects/impacts/meteor_impact.ogg',get_turf(src),volume = charge_steps ? 50 : 25) diff --git a/code/_core/mob/living/simple/can_man.dm b/code/_core/mob/living/simple/can_man.dm index a070ff23ee..2532a32f43 100644 --- a/code/_core/mob/living/simple/can_man.dm +++ b/code/_core/mob/living/simple/can_man.dm @@ -90,11 +90,11 @@ return TRUE . = ..() -/mob/living/simple/can_man/proc/telegraph_special_minigun_sweep(var/atom/target) +/mob/living/simple/can_man/proc/telegraph_special_minigun_sweep(atom/target) play_sound('sound/mob/can_man/rev_start.ogg',get_turf(src)) CALLBACK("\ref[src]_minigun_sweep",10,src,src::do_special_minigun_sweep(),target,30,30) -/mob/living/simple/can_man/proc/do_special_minigun_sweep(var/atom/target,var/shots_current,var/shots_max) +/mob/living/simple/can_man/proc/do_special_minigun_sweep(atom/target,shots_current,shots_max) if(dead || horizontal) return FALSE @@ -112,7 +112,7 @@ CALLBACK("\ref[src]_minigun_sweep",0.25 + max(0,shots_current/shots_max - 0.5),src,src::do_special_minigun_sweep(),target,shots_current,shots_max) -/mob/living/simple/can_man/proc/shoot_minigun(var/atom/target,var/use_spread=FALSE) +/mob/living/simple/can_man/proc/shoot_minigun(atom/target,use_spread=FALSE) var/turf/T = get_turf(src) @@ -153,7 +153,7 @@ minigun_delay = world.time + 0.5 + (health.health_current/health.health_max)*1.5 -/mob/living/simple/can_man/post_move(var/atom/old_loc) +/mob/living/simple/can_man/post_move(atom/old_loc) . = ..() //Crush below turf and the contents. if(!horizontal && ai && ai.objective_attack) diff --git a/code/_core/mob/living/simple/chess_piece.dm b/code/_core/mob/living/simple/chess_piece.dm index 55528b04b1..3282dd9c15 100644 --- a/code/_core/mob/living/simple/chess_piece.dm +++ b/code/_core/mob/living/simple/chess_piece.dm @@ -11,14 +11,14 @@ pixel_z = 4 -/mob/living/simple/chess_piece/can_be_attacked(var/atom/attacker,var/atom/weapon,var/params,var/damagetype/damage_type) +/mob/living/simple/chess_piece/can_be_attacked(atom/attacker,atom/weapon,params,damagetype/damage_type) if(!processing) return FALSE . = ..() -/mob/living/simple/chess_piece/post_move(var/atom/old_loc) +/mob/living/simple/chess_piece/post_move(atom/old_loc) . = ..() @@ -37,7 +37,7 @@ /mob/living/simple/chess_piece/proc/get_valid_move_turfs() //Returns a list. return list() -/mob/living/simple/chess_piece/proc/is_valid_turf(var/turf/T,var/ignore_pieces=FALSE,var/can_attack_enemies=TRUE,var/enemy_only=FALSE) +/mob/living/simple/chess_piece/proc/is_valid_turf(turf/T,ignore_pieces=FALSE,can_attack_enemies=TRUE,enemy_only=FALSE) //ignore_pieces: knights would ignore some pieces //can_attack_enemies: pawns wouldn't be able to attack straight ahead //enemy_only: pawns can only attack diagonally, but can't move normally that way. @@ -281,7 +281,7 @@ var/global/regex/bad_opinion = regex(@"en *passant *is *n[^f]*forced") PROCESS_LIVING(src) return TRUE -/mob/living/simple/chess_piece/king/on_listen(var/atom/speaker,var/datum/source,var/text,var/raw_text,var/language_text,var/talk_type,var/frequency, var/language = LANGUAGE_BASIC,var/talk_range=TALK_RANGE) +/mob/living/simple/chess_piece/king/on_listen(atom/speaker,datum/source,text,raw_text,language_text,talk_type,frequency, language = LANGUAGE_BASIC,talk_range=TALK_RANGE) if(talk_type == TEXT_RADIO) //Don't listen to other radio signals. This prevents spam. return ..() @@ -337,7 +337,7 @@ var/global/regex/bad_opinion = regex(@"en *passant *is *n[^f]*forced") continue src.link_piece(P) -/mob/living/simple/chess_piece/king/proc/link_piece(var/mob/living/simple/chess_piece/P) +/mob/living/simple/chess_piece/king/proc/link_piece(mob/living/simple/chess_piece/P) if(!P) CRASH("Invalid piece!") @@ -353,7 +353,7 @@ var/global/regex/bad_opinion = regex(@"en *passant *is *n[^f]*forced") return TRUE -/mob/living/simple/chess_piece/king/proc/unlink_piece(var/mob/living/simple/chess_piece/P) +/mob/living/simple/chess_piece/king/proc/unlink_piece(mob/living/simple/chess_piece/P) if(!P) CRASH("Invalid piece!") diff --git a/code/_core/mob/living/simple/clown/_clown.dm b/code/_core/mob/living/simple/clown/_clown.dm index 673e031489..8fa178b976 100644 --- a/code/_core/mob/living/simple/clown/_clown.dm +++ b/code/_core/mob/living/simple/clown/_clown.dm @@ -152,7 +152,7 @@ SLIP = TRUE ) -/mob/living/simple/clown/lube/post_move(var/atom/old_loc) +/mob/living/simple/clown/lube/post_move(atom/old_loc) . = ..() diff --git a/code/_core/mob/living/simple/cyborg.dm b/code/_core/mob/living/simple/cyborg.dm index 490f7476de..bd8bb8d03a 100644 --- a/code/_core/mob/living/simple/cyborg.dm +++ b/code/_core/mob/living/simple/cyborg.dm @@ -87,7 +87,7 @@ level = 8 -/mob/living/simple/silicon/syndieborg/proc/shoot_gun(var/atom/desired_target) +/mob/living/simple/silicon/syndieborg/proc/shoot_gun(atom/desired_target) shoot_projectile( src, desired_target, diff --git a/code/_core/mob/living/simple/devil.dm b/code/_core/mob/living/simple/devil.dm index 20dd8a6175..3cd4280a0a 100644 --- a/code/_core/mob/living/simple/devil.dm +++ b/code/_core/mob/living/simple/devil.dm @@ -32,7 +32,7 @@ level = 22 -/mob/living/simple/devil/get_damage_type(var/atom/attacker,var/atom/victim) +/mob/living/simple/devil/get_damage_type(atom/attacker,atom/victim) if(prob(25)) return /damagetype/npc/devil_gore . = ..() diff --git a/code/_core/mob/living/simple/gabber.dm b/code/_core/mob/living/simple/gabber.dm index 041fd0d93d..00ec10537e 100644 --- a/code/_core/mob/living/simple/gabber.dm +++ b/code/_core/mob/living/simple/gabber.dm @@ -76,7 +76,7 @@ var/global/list/valid_gabber_sound_files = list() "failure" ) -/mob/living/simple/gabber/get_block_power(var/atom/victim,var/atom/attacker,var/atom/weapon,var/atom/object_to_damage,var/damagetype/DT) +/mob/living/simple/gabber/get_block_power(atom/victim,atom/attacker,atom/weapon,atom/object_to_damage,damagetype/DT) return 1 /mob/living/simple/gabber/get_movement_delay() @@ -86,14 +86,14 @@ var/global/list/valid_gabber_sound_files = list() if(sword_mode) . *= 0.5 -/mob/living/simple/gabber/get_damage_received_multiplier(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/atom/blamed,var/damagetype/DT) +/mob/living/simple/gabber/get_damage_received_multiplier(atom/attacker,atom/victim,atom/weapon,atom/hit_object,atom/blamed,damagetype/DT) . = ..() if(sword_mode) . *= 0.75 -/mob/living/simple/gabber/death(var/silent=FALSE) +/mob/living/simple/gabber/death(silent=FALSE) if(!sword_mode) //Prevents exploits. start_sword_mode() @@ -101,7 +101,7 @@ var/global/list/valid_gabber_sound_files = list() . = ..() -/mob/living/simple/gabber/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/mob/living/simple/gabber/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) . = ..() @@ -146,7 +146,7 @@ var/global/list/valid_gabber_sound_files = list() return TRUE -/mob/living/simple/gabber/get_damage_type(var/atom/attacker,var/atom/victim) +/mob/living/simple/gabber/get_damage_type(atom/attacker,atom/victim) if(is_living(victim)) var/mob/living/L = victim @@ -171,7 +171,7 @@ var/global/list/valid_gabber_sound_files = list() if(ai) ai.set_active(TRUE) -/mob/living/simple/gabber/proc/do_voice(var/text_to_say,var/force=FALSE) +/mob/living/simple/gabber/proc/do_voice(text_to_say,force=FALSE) if(!force && next_special_attack > world.time) //No voice stacking. return TRUE @@ -202,7 +202,7 @@ var/global/list/valid_gabber_sound_files = list() I.layer = 1000 add_overlay(I) -/mob/living/simple/gabber/proc/slam(var/turf/target) +/mob/living/simple/gabber/proc/slam(turf/target) if(has_status_effect(PARALYZE)) return FALSE if(sword_mode) @@ -216,7 +216,7 @@ var/global/list/valid_gabber_sound_files = list() return TRUE -/mob/living/simple/gabber/proc/super_slam_jam(var/turf/target) +/mob/living/simple/gabber/proc/super_slam_jam(turf/target) if(has_status_effect(PARALYZE)) return FALSE @@ -250,7 +250,7 @@ var/global/list/valid_gabber_sound_files = list() -/mob/living/simple/gabber/proc/trap_spam(var/atom/target) +/mob/living/simple/gabber/proc/trap_spam(atom/target) if(has_status_effect(PARALYZE)) return FALSE @@ -270,7 +270,7 @@ var/global/list/valid_gabber_sound_files = list() CALLBACK("\ref[src]_shoot_trap_[i]",5 + i*2,src,src::shoot_trap(),target,math_x,math_y) -/mob/living/simple/gabber/proc/trap_lines(var/trap_switch = 0) +/mob/living/simple/gabber/proc/trap_lines(trap_switch = 0) if(has_status_effect(PARALYZE)) return FALSE @@ -300,7 +300,7 @@ var/global/list/valid_gabber_sound_files = list() var/math_y = (i - 8)*y_mul CALLBACK("\ref[src]_shoot_trap_[i]",i*2,src,src::shoot_trap(),T,math_x,math_y) -/mob/living/simple/gabber/proc/shoot_trap(var/atom/target,var/math_x,var/math_y) +/mob/living/simple/gabber/proc/shoot_trap(atom/target,math_x,math_y) if(!target || !target.z || target.z != target.z) return FALSE @@ -329,7 +329,7 @@ var/global/list/valid_gabber_sound_files = list() -/mob/living/simple/gabber/proc/shoot_bouncy_projectiles(var/atom/desired_target,var/amount=3) +/mob/living/simple/gabber/proc/shoot_bouncy_projectiles(atom/desired_target,amount=3) play_sound('sound/weapons/magic/holy_shoot.ogg',get_turf(src)) @@ -356,7 +356,7 @@ var/global/list/valid_gabber_sound_files = list() return TRUE -/mob/living/simple/gabber/get_projectile_offset(var/initial_offset_x,var/initial_offset_y,var/bullet_num,var/bullet_num_max,var/accuracy) +/mob/living/simple/gabber/get_projectile_offset(initial_offset_x,initial_offset_y,bullet_num,bullet_num_max,accuracy) if(bullet_num_max == 1) return ..() @@ -393,10 +393,10 @@ var/global/list/valid_gabber_sound_files = list() CALLBACK("\ref[src]_create_turf_destruction_[ix]_[iy]",(abs(ix) + abs(iy))*4,src,src::create_turf_destruction(),T) -/mob/living/simple/gabber/proc/create_turf_destruction(var/turf/T) +/mob/living/simple/gabber/proc/create_turf_destruction(turf/T) new /obj/effect/gabber_turf_destruction(T) return TRUE -/mob/living/simple/gabber/on_parried_hit(var/atom/attacker,var/atom/weapon,var/atom/hit_object,var/atom/blamed,var/damagetype/DT,var/damage_multiplier=1) +/mob/living/simple/gabber/on_parried_hit(atom/attacker,atom/weapon,atom/hit_object,atom/blamed,damagetype/DT,damage_multiplier=1) . = ..() do_voice(pick(gabber_voice_parry)) diff --git a/code/_core/mob/living/simple/ghost.dm b/code/_core/mob/living/simple/ghost.dm index 1bae5c6c15..ff6dbf7bb4 100644 --- a/code/_core/mob/living/simple/ghost.dm +++ b/code/_core/mob/living/simple/ghost.dm @@ -50,7 +50,7 @@ var/desired_alpha = 200 //Controlled in AI. -/mob/living/simple/ghost/on_crush(var/message=TRUE) +/mob/living/simple/ghost/on_crush(message=TRUE) return FALSE /mob/living/simple/ghost/handle_alpha() diff --git a/code/_core/mob/living/simple/goblin.dm b/code/_core/mob/living/simple/goblin.dm index 8585e7b7dd..b7a146750d 100644 --- a/code/_core/mob/living/simple/goblin.dm +++ b/code/_core/mob/living/simple/goblin.dm @@ -60,7 +60,7 @@ bag_contents?.Cut() return ..() -/mob/living/simple/goblin/proc/add_to_bag(var/atom/movable/I,var/silent=FALSE) +/mob/living/simple/goblin/proc/add_to_bag(atom/movable/I,silent=FALSE) if(isturf(I.loc)) I.force_move(src) bag_contents += I diff --git a/code/_core/mob/living/simple/goblin_king.dm b/code/_core/mob/living/simple/goblin_king.dm index b1850abc9e..6bbb19e0a5 100644 --- a/code/_core/mob/living/simple/goblin_king.dm +++ b/code/_core/mob/living/simple/goblin_king.dm @@ -67,7 +67,7 @@ icon_state = "dead" update_sprite() -/mob/living/simple/goblin_king/proc/summon_goblins(var/angered = FALSE) +/mob/living/simple/goblin_king/proc/summon_goblins(angered = FALSE) var/spawn_amount = (((angered ? 2 : 1)*length(players_fighting_boss))+2) spawn_amount = min(spawn_amount, 10) do_say("Come to us our brethren, we are being slain!") @@ -81,7 +81,7 @@ GENERATE(spawnGoblin) FINALIZE(spawnGoblin) -/mob/living/simple/goblin_king/proc/summon_totems(var/angered = FALSE) +/mob/living/simple/goblin_king/proc/summon_totems(angered = FALSE) var/spawn_amount = angered ? 3 : 1 do_say("We refuse to die, the totems will aid us!") var/turf/T = get_turf(src) @@ -102,7 +102,7 @@ GENERATE(summoned_totem) FINALIZE(summoned_totem) -/mob/living/simple/goblin_king/proc/screech(var/angered = FALSE) +/mob/living/simple/goblin_king/proc/screech(angered = FALSE) do_say("Suffer our wraith invaders, suffer!") play_sound('sound/voice/xeno/queen_screech.ogg',get_turf(src), range_min = VIEW_RANGE, range_max = VIEW_RANGE*3) var/stun_time = angered ? 40 : 20 diff --git a/code/_core/mob/living/simple/golaith/goliath.dm b/code/_core/mob/living/simple/golaith/goliath.dm index e317b688a4..bf8aa56032 100644 --- a/code/_core/mob/living/simple/golaith/goliath.dm +++ b/code/_core/mob/living/simple/golaith/goliath.dm @@ -46,7 +46,7 @@ icon_state = "[initial(icon_state)]_dead" update_sprite() -/mob/living/simple/goliath/proc/try_tentacle_attack(var/mob/living/desired_target) +/mob/living/simple/goliath/proc/try_tentacle_attack(mob/living/desired_target) if(dead) return FALSE @@ -62,7 +62,7 @@ return TRUE -/mob/living/simple/goliath/proc/do_tentacle_attack(var/mob/living/desired_target) +/mob/living/simple/goliath/proc/do_tentacle_attack(mob/living/desired_target) if(dead) return FALSE diff --git a/code/_core/mob/living/simple/gutlunch.dm b/code/_core/mob/living/simple/gutlunch.dm index e98e91f01e..fcae016b22 100644 --- a/code/_core/mob/living/simple/gutlunch.dm +++ b/code/_core/mob/living/simple/gutlunch.dm @@ -25,7 +25,7 @@ stun_angle = 0 -/mob/living/simple/gutlunch/post_move(var/atom/old_loc) +/mob/living/simple/gutlunch/post_move(atom/old_loc) . = ..() @@ -58,7 +58,7 @@ M.force_move(PT) update_sprite() -/mob/living/simple/gutlunch/proc/consume_turf(var/turf/T) +/mob/living/simple/gutlunch/proc/consume_turf(turf/T) . = FALSE diff --git a/code/_core/mob/living/simple/herald.dm b/code/_core/mob/living/simple/herald.dm index 475a4d1144..fb69818aef 100644 --- a/code/_core/mob/living/simple/herald.dm +++ b/code/_core/mob/living/simple/herald.dm @@ -56,7 +56,7 @@ level = 35 -/mob/living/simple/herald/get_damage_type(var/atom/attacker,var/atom/victim) +/mob/living/simple/herald/get_damage_type(atom/attacker,atom/victim) if( (next_teleport - world.time) >= 2 SECONDS ) return /damagetype/unarmed/cqc/sleeping_carp/crashing_wave_kick @@ -95,7 +95,7 @@ return TRUE -/mob/living/simple/herald/proc/teleport_target(var/atom/target) +/mob/living/simple/herald/proc/teleport_target(atom/target) if(!target) return FALSE diff --git a/code/_core/mob/living/simple/legion/legion_head.dm b/code/_core/mob/living/simple/legion/legion_head.dm index 21aacbaf35..9b43fed25a 100644 --- a/code/_core/mob/living/simple/legion/legion_head.dm +++ b/code/_core/mob/living/simple/legion/legion_head.dm @@ -54,7 +54,7 @@ parent_legion = null -/mob/living/simple/legionare_head/proc/convert(var/mob/living/advanced/A) +/mob/living/simple/legionare_head/proc/convert(mob/living/advanced/A) if(!can_convert || !A.dead || A.qdeleting || src.qdeleting || !is_turf(A.loc) ) return FALSE diff --git a/code/_core/mob/living/simple/parrot.dm b/code/_core/mob/living/simple/parrot.dm index 6cb85457e4..e06089d570 100644 --- a/code/_core/mob/living/simple/parrot.dm +++ b/code/_core/mob/living/simple/parrot.dm @@ -38,7 +38,7 @@ post_move(src.loc) return ..() -/mob/living/simple/parrot/post_move(var/atom/old_loc) +/mob/living/simple/parrot/post_move(atom/old_loc) if(dead || !src.z) return ..() @@ -72,7 +72,7 @@ return ..() -/mob/living/simple/parrot/on_listen(var/atom/speaker,var/datum/source,var/text,var/raw_text,var/language_text,var/talk_type,var/frequency,var/language =LANGUAGE_BASIC,var/talk_range=TALK_RANGE) +/mob/living/simple/parrot/on_listen(atom/speaker,datum/source,text,raw_text,language_text,talk_type,frequency,language =LANGUAGE_BASIC,talk_range=TALK_RANGE) if(!CALLBACK_EXISTS("\ref[src]_parrot") && length(text) <= 30 && speaker != src && prob(5)) var/desired_text = text diff --git a/code/_core/mob/living/simple/passive/cat.dm b/code/_core/mob/living/simple/passive/cat.dm index f9afd70757..fcf9f2c652 100644 --- a/code/_core/mob/living/simple/passive/cat.dm +++ b/code/_core/mob/living/simple/passive/cat.dm @@ -28,7 +28,7 @@ level = 2 -/mob/living/simple/cat/post_move(var/atom/old_loc) +/mob/living/simple/cat/post_move(atom/old_loc) var/old_sitting = sitting diff --git a/code/_core/mob/living/simple/silicon_ai.dm b/code/_core/mob/living/simple/silicon_ai.dm index ee67b38167..d76dffa236 100644 --- a/code/_core/mob/living/simple/silicon_ai.dm +++ b/code/_core/mob/living/simple/silicon_ai.dm @@ -34,7 +34,7 @@ hit_directions["[d]"] = 0 linked_shield_walls["[d]"] = list() -/mob/living/simple/silicon/ai/handle_transform(var/force=FALSE) +/mob/living/simple/silicon/ai/handle_transform(force=FALSE) . = ..() if(.) update_icon() @@ -56,7 +56,7 @@ else if(ai && ai.objective_attack) icon_state = "living" -/mob/living/simple/silicon/ai/death(var/silent=TRUE) +/mob/living/simple/silicon/ai/death(silent=TRUE) . = ..() if(.) for(var/k in linked_spawners) @@ -78,7 +78,7 @@ qdel(SW) linked_shield_walls[d_text] -= k -/mob/living/simple/silicon/ai/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/mob/living/simple/silicon/ai/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) . = ..() @@ -152,7 +152,7 @@ next_cyborg_spawn_time = max(next_cyborg_spawn_time,world.time + VIEW_RANGE*10) -/mob/living/simple/silicon/ai/proc/create_turf_destruction(var/turf/T) +/mob/living/simple/silicon/ai/proc/create_turf_destruction(turf/T) new /obj/effect/gabber_turf_destruction(T,force_turf=/turf/simulated/floor/circuit/red) return TRUE diff --git a/code/_core/mob/living/simple/silicon_cyborg.dm b/code/_core/mob/living/simple/silicon_cyborg.dm index a85a80322c..c6e0fc50cd 100644 --- a/code/_core/mob/living/simple/silicon_cyborg.dm +++ b/code/_core/mob/living/simple/silicon_cyborg.dm @@ -102,7 +102,7 @@ update_sprite() -/mob/living/simple/silicon/cyborg/death(var/silent=FALSE) +/mob/living/simple/silicon/cyborg/death(silent=FALSE) . = ..() if(.) if(silent) @@ -110,7 +110,7 @@ else gib() -/mob/living/simple/silicon/cyborg/post_move(var/atom/old_loc) +/mob/living/simple/silicon/cyborg/post_move(atom/old_loc) . = ..() if(. && !module && loc && !qdeleting && !dead) do_transform() diff --git a/code/_core/mob/living/simple/slime.dm b/code/_core/mob/living/simple/slime.dm index a89be0c786..a3d0a6aa7e 100644 --- a/code/_core/mob/living/simple/slime.dm +++ b/code/_core/mob/living/simple/slime.dm @@ -93,7 +93,7 @@ return TRUE -/mob/living/simple/slime/get_damage_received_multiplier(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/atom/blamed,var/damagetype/DT) +/mob/living/simple/slime/get_damage_received_multiplier(atom/attacker,atom/victim,atom/weapon,atom/hit_object,atom/blamed,damagetype/DT) . = ..() if(slime_traits & SLIME_TRAIT_DEFENSIVE) . *= 0.5 @@ -117,7 +117,7 @@ -/mob/living/simple/slime/post_move(var/atom/old_loc) +/mob/living/simple/slime/post_move(atom/old_loc) . = ..() if(. && loc) if(ai && ai.objective_attack && (slime_traits & SLIME_TRAIT_THORNS)) @@ -165,7 +165,7 @@ var/turf/simulated/S = T S.add_wet(100) -/mob/living/simple/slime/create_override_contents(var/mob/living/caller) //What gets created when this mob is butchered. +/mob/living/simple/slime/create_override_contents(mob/living/caller) //What gets created when this mob is butchered. var/obj/item/slime_core/SC = new(src.loc) SC.color = color SC.alpha = alpha @@ -209,7 +209,7 @@ update_sprite() -/mob/living/simple/slime/attack(var/atom/attacker,var/atom/victim,var/list/params=list(),var/atom/blamed,var/ignore_distance = FALSE, var/precise = FALSE,var/damage_multiplier=1,var/damagetype/damage_type_override) //The src attacks the victim, with the blamed taking responsibility +/mob/living/simple/slime/attack(atom/attacker,atom/victim,list/params=list(),atom/blamed,ignore_distance = FALSE, precise = FALSE,damage_multiplier=1,damagetype/damage_type_override) //The src attacks the victim, with the blamed taking responsibility if(slime_traits & SLIME_TRAIT_WEAK) damage_multiplier *= 0.5 @@ -322,7 +322,7 @@ I.appearance_flags = src.appearance_flags | RESET_ALPHA | RESET_COLOR add_underlay(I) -/mob/living/simple/slime/proc/absorb_slime(var/mob/living/simple/slime/desired_slime) +/mob/living/simple/slime/proc/absorb_slime(mob/living/simple/slime/desired_slime) if(desired_slime == src) //Can't absorb self. return FALSE @@ -445,7 +445,7 @@ slime_traits = SLIME_TRAIT_UNSTABLE -/mob/living/simple/slime/bluespace/New(var/desired_loc) +/mob/living/simple/slime/bluespace/New(desired_loc) . = ..() if(prob(50)) if(prob(50)) diff --git a/code/_core/mob/living/simple/slime_king.dm b/code/_core/mob/living/simple/slime_king.dm index 651c25bc9b..e43fd25cb0 100644 --- a/code/_core/mob/living/simple/slime_king.dm +++ b/code/_core/mob/living/simple/slime_king.dm @@ -81,7 +81,7 @@ linked_active_slimes = null . = ..() -/mob/living/simple/slime_king/proc/create_slime(var/turf/T) +/mob/living/simple/slime_king/proc/create_slime(turf/T) var/mob/living/simple/slime/S = new(T) S.color = src.color @@ -157,7 +157,7 @@ I.appearance_flags = src.appearance_flags | RESET_COLOR | KEEP_APART add_overlay(I) -/mob/living/simple/slime_king/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/mob/living/simple/slime_king/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) . = ..() @@ -204,7 +204,7 @@ /mob/living/simple/slime_king/proc/delete_self() qdel(src) -/mob/living/simple/slime_king/proc/shoot_slime_ball(var/atom/target) +/mob/living/simple/slime_king/proc/shoot_slime_ball(atom/target) if(slime_balls_left <= 0) return FALSE @@ -245,7 +245,7 @@ return TRUE -/mob/living/simple/slime_king/proc/slime_wave(var/target_direction=dir) +/mob/living/simple/slime_king/proc/slime_wave(target_direction=dir) if(has_status_effect(PARALYZE)) return FALSE @@ -290,7 +290,7 @@ next_slime_wave = world.time + 10 SECONDS next_special_attack = world.time + 10 SECONDS -/mob/living/simple/slime_king/proc/create_slime_tile(var/turf/T,var/should_create_slime=FALSE) +/mob/living/simple/slime_king/proc/create_slime_tile(turf/T,should_create_slime=FALSE) var/obj/structure/interactive/slime_wall/SW = locate() in T.contents if(SW) return FALSE var/obj/structure/interactive/slime_tile/ST = locate() in T.contents @@ -304,7 +304,7 @@ create_slime(T) return TRUE -/mob/living/simple/slime_king/proc/create_slime_wall(var/turf/T) +/mob/living/simple/slime_king/proc/create_slime_wall(turf/T) var/obj/structure/interactive/slime_tile/ST = locate() in T.contents if(ST) qdel(ST) @@ -359,7 +359,7 @@ next_slime_bomb = world.time + 30 SECONDS next_special_attack = world.time + 10 + 3 + 60 -/mob/living/simple/slime_king/proc/throw_bomb(var/turf/T,var/throw_time=40) +/mob/living/simple/slime_king/proc/throw_bomb(turf/T,throw_time=40) var/obj/item/slime_bomb/B = new(T) B.owner = src B.loyalty_tag = src.loyalty_tag @@ -375,13 +375,13 @@ CALLBACK("\ref[B]_arm",throw_time*0.75,src,src::arm_bomb(),B) play_sound('sound/effects/splort.ogg',get_turf(src)) -/mob/living/simple/slime_king/proc/arm_bomb(var/obj/item/slime_bomb/B) +/mob/living/simple/slime_king/proc/arm_bomb(obj/item/slime_bomb/B) B.anchored = FALSE B.mouse_opacity = initial(B.mouse_opacity) B.light() return TRUE -/mob/living/simple/slime_king/proc/build_a_house(var/size=4,var/build_walls=TRUE) +/mob/living/simple/slime_king/proc/build_a_house(size=4,build_walls=TRUE) if(has_status_effect(PARALYZE)) return FALSE @@ -407,7 +407,7 @@ next_slime_house = world.time + 60 SECONDS next_special_attack = world.time + 10 + size*2*3*2 -/mob/living/simple/slime_king/proc/absorb_slimes(var/absorbs_left=20) +/mob/living/simple/slime_king/proc/absorb_slimes(absorbs_left=20) if(dead) return FALSE diff --git a/code/_core/mob/living/simple/swarmer/swarmer.dm b/code/_core/mob/living/simple/swarmer/swarmer.dm index 01230605d9..b83d955c52 100644 --- a/code/_core/mob/living/simple/swarmer/swarmer.dm +++ b/code/_core/mob/living/simple/swarmer/swarmer.dm @@ -181,7 +181,7 @@ health = /health/construction collision_bullet_flags = FLAG_COLLISION_BULLET_INORGANIC -/obj/structure/interactive/swarmer/on_destruction(var/damage = TRUE) +/obj/structure/interactive/swarmer/on_destruction(damage = TRUE) . = ..() qdel(src) diff --git a/code/_core/mob/living/simple/turret.dm b/code/_core/mob/living/simple/turret.dm index e33c4996c7..354a2ae40d 100644 --- a/code/_core/mob/living/simple/turret.dm +++ b/code/_core/mob/living/simple/turret.dm @@ -41,7 +41,7 @@ stun_angle = 0 stun_elevation = 0 -/mob/living/simple/turret/face_atom(var/atom/A) +/mob/living/simple/turret/face_atom(atom/A) return set_dir(get_dir(src,A)) /mob/living/simple/turret/Finalize() @@ -52,7 +52,7 @@ GENERATE(stored_weapon) FINALIZE(stored_weapon) -/mob/living/simple/turret/attack(var/atom/attacker,var/atom/victim,var/list/params=list(),var/atom/blamed,var/ignore_distance = FALSE, var/precise = FALSE,var/damage_multiplier=1,var/damagetype/damage_type_override) //The src attacks the victim, with the blamed taking responsibility +/mob/living/simple/turret/attack(atom/attacker,atom/victim,list/params=list(),atom/blamed,ignore_distance = FALSE, precise = FALSE,damage_multiplier=1,damagetype/damage_type_override) //The src attacks the victim, with the blamed taking responsibility if(!stored_weapon) log_error("[src.get_debug_name()] didn't have a stored weapon! Deleting!") @@ -122,7 +122,7 @@ level = 3 -/mob/living/simple/turret/deployable/get_examine_list(var/mob/examiner) +/mob/living/simple/turret/deployable/get_examine_list(mob/examiner) . = ..() @@ -140,7 +140,7 @@ /mob/living/simple/turret/deployable/get_battery() return stored_battery -/mob/living/simple/turret/deployable/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/mob/living/simple/turret/deployable/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(istype(object,/obj/item/powercell/)) INTERACT_CHECK @@ -199,7 +199,7 @@ icon_state = "dead" return ..() -/mob/living/simple/turret/deployable/proc/can_pack_up(var/mob/caller) +/mob/living/simple/turret/deployable/proc/can_pack_up(mob/caller) INTERACT_CHECK_NO_DELAY(src) @@ -217,7 +217,7 @@ return TRUE -/mob/living/simple/turret/deployable/proc/pack_up(var/mob/caller) +/mob/living/simple/turret/deployable/proc/pack_up(mob/caller) caller.visible_message(span("warning","\The [caller.name] packs up \the [src.name]."),span("notice","You pack up \the [src.name].")) @@ -237,7 +237,7 @@ return TRUE -/mob/living/simple/turret/deployable/drop_on_object(var/mob/caller,var/atom/object,location,control,params) +/mob/living/simple/turret/deployable/drop_on_object(mob/caller,atom/object,location,control,params) if(caller != object) return ..() @@ -316,7 +316,7 @@ src.add_status_effect(PARALYZE,magnitude=100,duration=10,force=TRUE,stealthy=TRUE,bypass_limits=TRUE) return TRUE -/mob/living/simple/turret/ai_core/attack(var/atom/attacker,var/atom/victim,var/list/params=list(),var/atom/blamed,var/ignore_distance = FALSE, var/precise = FALSE,var/damage_multiplier=1,var/damagetype/damage_type_override) //The src attacks the victim, with the blamed taking responsibility +/mob/living/simple/turret/ai_core/attack(atom/attacker,atom/victim,list/params=list(),atom/blamed,ignore_distance = FALSE, precise = FALSE,damage_multiplier=1,damagetype/damage_type_override) //The src attacks the victim, with the blamed taking responsibility if(icon_state == "closed") open() diff --git a/code/_core/mob/living/simple/xeno/_xeno.dm b/code/_core/mob/living/simple/xeno/_xeno.dm index 3e6740a3b1..889bd7e1a7 100644 --- a/code/_core/mob/living/simple/xeno/_xeno.dm +++ b/code/_core/mob/living/simple/xeno/_xeno.dm @@ -38,7 +38,7 @@ level = 10 -/mob/living/simple/xeno/get_emote_sound(var/emote_id) +/mob/living/simple/xeno/get_emote_sound(emote_id) switch(emote_id) if("pain") @@ -93,7 +93,7 @@ next_talk = world.time + (rand(5,12)) SECONDS -/mob/living/simple/xeno/attack(var/atom/attacker,var/atom/victim,var/list/params=list(),var/atom/blamed,var/ignore_distance = FALSE, var/precise = FALSE,var/damage_multiplier=1,var/damagetype/damage_type_override) //The src attacks the victim, with the blamed taking responsibility +/mob/living/simple/xeno/attack(atom/attacker,atom/victim,list/params=list(),atom/blamed,ignore_distance = FALSE, precise = FALSE,damage_multiplier=1,damagetype/damage_type_override) //The src attacks the victim, with the blamed taking responsibility . = ..() @@ -107,7 +107,7 @@ play_sound(pick(valid_sounds),get_turf(src),range_max=VIEW_RANGE) next_talk = world.time + (rand(5,12)) SECONDS -/mob/living/simple/xeno/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/mob/living/simple/xeno/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) . = ..() if(!stealthy && !dead && damage_amount > 20 && prob(25)) @@ -130,7 +130,7 @@ update_sprite() -/mob/living/simple/xeno/throw_self(var/atom/thrower,var/atom/desired_target,var/target_x,var/target_y,var/vel_x,var/vel_y,var/lifetime = -1, var/steps_allowed = 0,var/desired_loyalty_tag,var/damage_multiplier=1) +/mob/living/simple/xeno/throw_self(atom/thrower,atom/desired_target,target_x,target_y,vel_x,vel_y,lifetime = -1, steps_allowed = 0,desired_loyalty_tag,damage_multiplier=1) if(!can_leap) return ..() @@ -149,7 +149,7 @@ P.rotate_projectile = FALSE P.set_dir(get_dir(thrower,desired_target)) -/mob/living/simple/xeno/on_thrown(var/atom/owner,var/atom/hit_atom) //What happens after the person is thrown and it hits an object. +/mob/living/simple/xeno/on_thrown(atom/owner,atom/hit_atom) //What happens after the person is thrown and it hits an object. . = ..() @@ -165,7 +165,7 @@ leaping = FALSE update_sprite() -/mob/living/simple/xeno/post_move(var/old_loc) +/mob/living/simple/xeno/post_move(old_loc) . = ..() if(.) update_icon() diff --git a/code/_core/mob/living/stat.dm b/code/_core/mob/living/stat.dm index 89f2391fe4..beb12c79bd 100644 --- a/code/_core/mob/living/stat.dm +++ b/code/_core/mob/living/stat.dm @@ -1,10 +1,10 @@ -/mob/living/proc/add_stat_element(var/obj/hud/button/stat/H) +/mob/living/proc/add_stat_element(obj/hud/button/stat/H) stat_elements[H.id] = H if(client) client.screen += H sync_stat_elements() -/mob/living/proc/remove_stat_element(var/obj/hud/button/stat/H) +/mob/living/proc/remove_stat_element(obj/hud/button/stat/H) stat_elements -= H.id //H.id is important if(client) client.screen -= H diff --git a/code/_core/mob/living/status.dm b/code/_core/mob/living/status.dm index 4bdb1242e7..6b459b7fbb 100644 --- a/code/_core/mob/living/status.dm +++ b/code/_core/mob/living/status.dm @@ -1,4 +1,4 @@ -/mob/living/proc/add_status_effect(var/status_type,var/magnitude,var/duration,var/atom/source,var/force=FALSE,var/stealthy=FALSE,var/bypass_limits=FALSE) +/mob/living/proc/add_status_effect(status_type,magnitude,duration,atom/source,force=FALSE,stealthy=FALSE,bypass_limits=FALSE) var/status_effect/S = SSstatus.all_status_effects[status_type] if(!S) @@ -71,7 +71,7 @@ PROCESS_LIVING(src) //handle_blocking is not needed here as it is in handle_transform() -/mob/living/proc/remove_status_effect(var/status_type,var/check_horizontal=TRUE) +/mob/living/proc/remove_status_effect(status_type,check_horizontal=TRUE) if(!has_status_effect(status_type)) return FALSE var/status_effect/S = SSstatus.all_status_effects[status_type] @@ -88,7 +88,7 @@ remove_status_effect(status,FALSE) handle_transform() -/mob/living/proc/handle_status_effects(var/amount_to_remove = 1) +/mob/living/proc/handle_status_effects(amount_to_remove = 1) for(var/status in status_effects) var/status_effect/S = SSstatus.all_status_effects[status] @@ -105,7 +105,7 @@ return TRUE -/mob/living/proc/has_status_effect(var/status_type) +/mob/living/proc/has_status_effect(status_type) if(src.status_effects[status_type]) return TRUE return FALSE diff --git a/code/_core/mob/living/transform.dm b/code/_core/mob/living/transform.dm index 2d69e1b723..e6e1604433 100644 --- a/code/_core/mob/living/transform.dm +++ b/code/_core/mob/living/transform.dm @@ -23,7 +23,7 @@ return PLANE_MOVABLE_STEALTH return initial(plane) -/mob/living/proc/handle_transform(var/force=FALSE) +/mob/living/proc/handle_transform(force=FALSE) . = FALSE diff --git a/code/_core/mob/movement.dm b/code/_core/mob/movement.dm index 8dee6908cc..b8e9b1b4f0 100644 --- a/code/_core/mob/movement.dm +++ b/code/_core/mob/movement.dm @@ -16,7 +16,7 @@ /mob/proc/on_walk() return TRUE -/mob/handle_movement(var/adjust_delay = 1) +/mob/handle_movement(adjust_delay = 1) if(!can_walk()) return FALSE @@ -101,7 +101,7 @@ return TRUE -/mob/post_move(var/atom/old_loc) +/mob/post_move(atom/old_loc) . = ..() @@ -161,7 +161,7 @@ if(CONFIG("ENABLE_AREA_TRACKS",FALSE) && length(new_area.tracks) && (!client.next_music_track || client.next_music_track <= world.time)) play_music_track(pick(new_area.tracks),client) -/mob/set_dir(var/desired_dir,var/force=FALSE) +/mob/set_dir(desired_dir,force=FALSE) if(!force && client && client.is_zoomed) desired_dir = client.is_zoomed diff --git a/code/_core/mob/sound.dm b/code/_core/mob/sound.dm index f6c90ee467..dd8759a860 100644 --- a/code/_core/mob/sound.dm +++ b/code/_core/mob/sound.dm @@ -1,4 +1,4 @@ -/mob/proc/get_sound_volume(var/volume=100,var/channel=1) +/mob/proc/get_sound_volume(volume=100,channel=1) var/local_volume = volume if(client.settings) diff --git a/code/_core/mob/verbs/chat.dm b/code/_core/mob/verbs/chat.dm index c02cd347a5..03716ddc39 100644 --- a/code/_core/mob/verbs/chat.dm +++ b/code/_core/mob/verbs/chat.dm @@ -1,4 +1,4 @@ -/mob/verb/say(var/text_to_say as text) +/mob/verb/say(text_to_say as text) set name = "Say" set category = "Communication" @@ -16,12 +16,12 @@ do_say(text_to_say) -/mob/verb/emote(var/emote as text,var/mob/target in view(VIEW_RANGE,src)) +/mob/verb/emote(emote as text,mob/target in view(VIEW_RANGE,src)) set name = "Emote" set category = "Communication" do_emote(text,target) -/mob/verb/me(var/emote_text as text) +/mob/verb/me(emote_text as text) set name = "Me" set category = "Communication" @@ -39,7 +39,7 @@ visible_message("\The [src.name] [emote_text]") -/mob/verb/whisper(var/text_to_say as text) +/mob/verb/whisper(text_to_say as text) set name = "Whisper" set category = "Communication" @@ -48,7 +48,7 @@ do_say(text_to_say,talk_range = WHISPER_RANGE) -/mob/verb/looc(var/text_to_say as text) +/mob/verb/looc(text_to_say as text) set name = "LOOC" set category = "Communication" diff --git a/code/_core/obj/_obj.dm b/code/_core/obj/_obj.dm index d750fd52ab..f776e9a45e 100644 --- a/code/_core/obj/_obj.dm +++ b/code/_core/obj/_obj.dm @@ -16,7 +16,7 @@ var/has_quick_function = FALSE -/obj/proc/quick(var/mob/living/advanced/caller,var/atom/object,location,params) +/obj/proc/quick(mob/living/advanced/caller,atom/object,location,params) return FALSE /obj/PreDestroy() diff --git a/code/_core/obj/decal/hazard.dm b/code/_core/obj/decal/hazard.dm index ecc9f5300c..d52d146cf0 100644 --- a/code/_core/obj/decal/hazard.dm +++ b/code/_core/obj/decal/hazard.dm @@ -51,7 +51,7 @@ icon_state = "0" alpha = 200 -/obj/decal/shuttle_number/New(var/desired_loc) +/obj/decal/shuttle_number/New(desired_loc) . = ..() pixel_x = rand(-1,1) pixel_y = rand(-1,1) \ No newline at end of file diff --git a/code/_core/obj/decal/poster.dm b/code/_core/obj/decal/poster.dm index fc3ce2b6eb..17e1ee2b1f 100644 --- a/code/_core/obj/decal/poster.dm +++ b/code/_core/obj/decal/poster.dm @@ -10,7 +10,7 @@ var/collectable_poster/stored_poster -/obj/decal/poster/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/decal/poster/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(stored_poster && is_inventory(object)) INTERACT_CHECK diff --git a/code/_core/obj/decal/road.dm b/code/_core/obj/decal/road.dm index 9b5a3c58ed..49132f97fb 100644 --- a/code/_core/obj/decal/road.dm +++ b/code/_core/obj/decal/road.dm @@ -11,7 +11,7 @@ icon_state = "1" icon = 'icons/obj/decal/road_dotted_half.dmi' -/obj/decal/road_marking/dotted_line/New(var/desired_loc) +/obj/decal/road_marking/dotted_line/New(desired_loc) icon_state = "[rand(1,6)]" . = ..() @@ -19,7 +19,7 @@ icon_state = "1" icon = 'icons/obj/decal/road_solid_cross.dmi' -/obj/decal/road_marking/solid_cross/New(var/desired_loc) +/obj/decal/road_marking/solid_cross/New(desired_loc) icon_state = "[rand(1,3)]" . = ..() @@ -27,7 +27,7 @@ icon_state = "1" icon = 'icons/obj/decal/road_solid_stop.dmi' -/obj/decal/road_marking/solid_stop/New(var/desired_loc) +/obj/decal/road_marking/solid_stop/New(desired_loc) icon_state = "[rand(1,3)]" . = ..() @@ -35,7 +35,7 @@ icon_state = "1" icon = 'icons/obj/decal/road_solid.dmi' -/obj/decal/road_marking/solid_line/New(var/desired_loc) +/obj/decal/road_marking/solid_line/New(desired_loc) icon_state = "[rand(1,4)]" . = ..() @@ -52,7 +52,7 @@ icon_state = "1" icon = 'icons/obj/decal/road_hazard.dmi' -/obj/decal/road_marking/hazard/New(var/desired_loc) +/obj/decal/road_marking/hazard/New(desired_loc) icon_state = "[rand(1,4)]" . = ..() diff --git a/code/_core/obj/effect/blob_grow.dm b/code/_core/obj/effect/blob_grow.dm index cf0fd1c214..17a7773637 100644 --- a/code/_core/obj/effect/blob_grow.dm +++ b/code/_core/obj/effect/blob_grow.dm @@ -9,6 +9,6 @@ var/tolerance = 1 //Increases every movement. -/obj/effect/blob_grow/post_move(var/atom/old_loc) +/obj/effect/blob_grow/post_move(atom/old_loc) tolerance += 0.1 . = ..() \ No newline at end of file diff --git a/code/_core/obj/effect/cleanable/blood.dm b/code/_core/obj/effect/cleanable/blood.dm index ee3be94e9f..b801440f4f 100644 --- a/code/_core/obj/effect/cleanable/blood.dm +++ b/code/_core/obj/effect/cleanable/blood.dm @@ -27,7 +27,7 @@ dry() . = ..() -/obj/effect/cleanable/blood/New(var/desired_location,var/desired_color) +/obj/effect/cleanable/blood/New(desired_location,desired_color) if(desired_color) color = desired_color @@ -41,7 +41,7 @@ update_blood_level(null,loc) . = ..() -/obj/effect/cleanable/blood/proc/update_blood_level(var/turf/simulated/new_loc,var/turf/simulated/old_loc) +/obj/effect/cleanable/blood/proc/update_blood_level(turf/simulated/new_loc,turf/simulated/old_loc) @@ -74,7 +74,7 @@ /obj/effect/cleanable/blood/splatter/grease color = "#955746" -/obj/effect/cleanable/blood/splatter/New(var/desired_location,var/desired_color,var/desired_x,var/desired_y) +/obj/effect/cleanable/blood/splatter/New(desired_location,desired_color,desired_x,desired_y) icon_state = "splatter_[rand(1,12)]" return ..() @@ -83,7 +83,7 @@ icon_state = "gib_1" blood_level = 20 -/obj/effect/cleanable/blood/gib/New(var/desired_location,var/desired_color,var/desired_x,var/desired_y) +/obj/effect/cleanable/blood/gib/New(desired_location,desired_color,desired_x,desired_y) icon_state = "gib_[rand(1,10)]" return ..() @@ -102,7 +102,7 @@ randomize_angle = FALSE -/obj/effect/cleanable/blood/line/New(var/desired_location,var/desired_color,var/desired_x,var/desired_y) +/obj/effect/cleanable/blood/line/New(desired_location,desired_color,desired_x,desired_y) icon_state = "trail_[rand(1,4)]" return ..() diff --git a/code/_core/obj/effect/cleanable/rust.dm b/code/_core/obj/effect/cleanable/rust.dm index d2715f2a1e..785e8c77d8 100644 --- a/code/_core/obj/effect/cleanable/rust.dm +++ b/code/_core/obj/effect/cleanable/rust.dm @@ -8,6 +8,6 @@ plane = PLANE_FLOOR_ATTACHMENT layer = LAYER_FLOOR_PLATING -/obj/effect/cleanable/rust/New(var/desired_loc) +/obj/effect/cleanable/rust/New(desired_loc) icon_state = pick("rust1","rust2","rust3","rust4") . = ..() \ No newline at end of file diff --git a/code/_core/obj/effect/cleanable/scorch.dm b/code/_core/obj/effect/cleanable/scorch.dm index a45df4f0e6..190422138a 100644 --- a/code/_core/obj/effect/cleanable/scorch.dm +++ b/code/_core/obj/effect/cleanable/scorch.dm @@ -8,6 +8,6 @@ plane = PLANE_FLOOR_ATTACHMENT layer = LAYER_FLOOR_PLATING -/obj/effect/cleanable/scorch/New(var/desired_loc) +/obj/effect/cleanable/scorch/New(desired_loc) icon_state = "[rand(1,6)]" . = ..() \ No newline at end of file diff --git a/code/_core/obj/effect/cleanable/tile_rot.dm b/code/_core/obj/effect/cleanable/tile_rot.dm index 63cc009521..2a28e66860 100644 --- a/code/_core/obj/effect/cleanable/tile_rot.dm +++ b/code/_core/obj/effect/cleanable/tile_rot.dm @@ -11,7 +11,7 @@ plane = PLANE_FLOOR layer = LAYER_FLOOR_DECAL + 1 -/obj/effect/cleanable/tile_rot/New(var/desired_location) +/obj/effect/cleanable/tile_rot/New(desired_location) color = rgb(114 + rand(-20,20),94 + rand(-20,20),67 + rand(-20,20)) alpha = rand(100,255) . = ..() \ No newline at end of file diff --git a/code/_core/obj/effect/cleanable/web.dm b/code/_core/obj/effect/cleanable/web.dm index 09eea84577..0f5708d51b 100644 --- a/code/_core/obj/effect/cleanable/web.dm +++ b/code/_core/obj/effect/cleanable/web.dm @@ -7,6 +7,6 @@ plane = PLANE_SCENERY -/obj/effect/cleanable/cobweb/New(var/desired_loc) +/obj/effect/cleanable/cobweb/New(desired_loc) . = ..() icon_state = pick("cobweb1","cobweb2") \ No newline at end of file diff --git a/code/_core/obj/effect/crack.dm b/code/_core/obj/effect/crack.dm index cd5404a4e5..65b5ee0ca0 100644 --- a/code/_core/obj/effect/crack.dm +++ b/code/_core/obj/effect/crack.dm @@ -8,7 +8,7 @@ plane = PLANE_FLOOR_ATTACHMENT layer = LAYER_FLOOR_WEATHER -/obj/effect/crack/New(var/desired_loc) +/obj/effect/crack/New(desired_loc) . = ..() icon_state = "[rand(1,9)]" @@ -23,7 +23,7 @@ plane = PLANE_FLOOR_ATTACHMENT layer = LAYER_FLOOR_CARPET -/obj/effect/moss/New(var/desired_loc) +/obj/effect/moss/New(desired_loc) . = ..() color = rgb(0,rand(115,140),0) icon_state = "[rand(1,3)]" \ No newline at end of file diff --git a/code/_core/obj/effect/fake_corpse.dm b/code/_core/obj/effect/fake_corpse.dm index 62581f7f7d..bcebabc0b0 100644 --- a/code/_core/obj/effect/fake_corpse.dm +++ b/code/_core/obj/effect/fake_corpse.dm @@ -6,7 +6,7 @@ anchored = TRUE -/obj/effect/fake_corpse/proc/copy_body(var/mob/living/L) +/obj/effect/fake_corpse/proc/copy_body(mob/living/L) appearance = L.appearance diff --git a/code/_core/obj/effect/fog_of_war.dm b/code/_core/obj/effect/fog_of_war.dm index 86dbde76de..831989b8e4 100644 --- a/code/_core/obj/effect/fog_of_war.dm +++ b/code/_core/obj/effect/fog_of_war.dm @@ -23,7 +23,7 @@ var/global/list/all_fog = list() return FALSE return TRUE -/obj/effect/fog_of_war/New(var/desired_loc) +/obj/effect/fog_of_war/New(desired_loc) all_fog += src alpha = 200 return ..() diff --git a/code/_core/obj/effect/footprints.dm b/code/_core/obj/effect/footprints.dm index c221d68d5d..df55406e42 100644 --- a/code/_core/obj/effect/footprints.dm +++ b/code/_core/obj/effect/footprints.dm @@ -6,7 +6,7 @@ plane = PLANE_FLOOR mouse_opacity = 1 -/obj/effect/footprint/New(var/newloc,var/desired_dir = 0) +/obj/effect/footprint/New(newloc,desired_dir = 0) set_dir(desired_dir) . = ..() diff --git a/code/_core/obj/effect/gibs.dm b/code/_core/obj/effect/gibs.dm index 0e3ca654f4..713ee2e356 100644 --- a/code/_core/obj/effect/gibs.dm +++ b/code/_core/obj/effect/gibs.dm @@ -8,7 +8,7 @@ layer = LAYER_FLOOR_DECAL -/obj/effect/gibs/New(var/desired_loc,var/desired_blood_color,var/desired_flesh_color) +/obj/effect/gibs/New(desired_loc,desired_blood_color,desired_flesh_color) ..() // force_move(desired_loc) TODO: WHY IS THIS HERE blood_color = desired_blood_color @@ -32,6 +32,6 @@ ..() -/obj/effect/gibs/random/New(var/desired_loc,var/desired_blood_color,var/desired_flesh_color) +/obj/effect/gibs/random/New(desired_loc,desired_blood_color,desired_flesh_color) icon_state = "gib[rand(1,5)]" ..() \ No newline at end of file diff --git a/code/_core/obj/effect/meteor.dm b/code/_core/obj/effect/meteor.dm index cf62b9dce5..b6dfb040f3 100644 --- a/code/_core/obj/effect/meteor.dm +++ b/code/_core/obj/effect/meteor.dm @@ -7,7 +7,7 @@ var/meteor_time = 3 SECONDS -/obj/effect/falling_meteor/New(var/desired_location) +/obj/effect/falling_meteor/New(desired_location) alpha = 0 pixel_z = TILE_SIZE*VIEW_RANGE*2 @@ -43,7 +43,7 @@ var/meteor_time = 2 SECONDS var/stored_loyalty_tag = "Ash Drake" -/obj/effect/falling_fireball/New(var/desired_location) +/obj/effect/falling_fireball/New(desired_location) alpha = 0 pixel_z = TILE_SIZE*VIEW_RANGE*2 diff --git a/code/_core/obj/effect/temp/ash_drake.dm b/code/_core/obj/effect/temp/ash_drake.dm index c5f16a242f..442f2a3e3c 100644 --- a/code/_core/obj/effect/temp/ash_drake.dm +++ b/code/_core/obj/effect/temp/ash_drake.dm @@ -18,7 +18,7 @@ obj/effect/temp/ash_drake/swoop_up/New(var/desired_loc) duration = 1 SECONDS mouse_opacity = 0 -/obj/effect/temp/ash_drake/swoop_down/New(var/desired_loc) +/obj/effect/temp/ash_drake/swoop_down/New(desired_loc) ..() alpha = 255 pixel_x = pick(-32 - 16,32 - 16) diff --git a/code/_core/obj/effect/temp/crate_gib.dm b/code/_core/obj/effect/temp/crate_gib.dm index f71c3a4e8d..dcb42169f1 100644 --- a/code/_core/obj/effect/temp/crate_gib.dm +++ b/code/_core/obj/effect/temp/crate_gib.dm @@ -5,7 +5,7 @@ mouse_opacity = 0 plane = PLANE_MOVABLE -/obj/effect/temp/crate_gib/New(var/desired_location,var/desired_time) +/obj/effect/temp/crate_gib/New(desired_location,desired_time) . = ..() icon_state = "[icon_state]_[rand(1,5)]" var/matrix/M = get_base_transform() diff --git a/code/_core/obj/effect/temp/damage_number.dm b/code/_core/obj/effect/temp/damage_number.dm index 16e6f8f62f..6d56a21887 100644 --- a/code/_core/obj/effect/temp/damage_number.dm +++ b/code/_core/obj/effect/temp/damage_number.dm @@ -25,7 +25,7 @@ SSdamagetype.all_damage_numbers -= id . = ..() -/obj/effect/damage_number/New(var/desired_location,var/desired_damage,var/desired_block,var/desired_is_real,var/desirwed_id) +/obj/effect/damage_number/New(desired_location,desired_damage,desired_block,desired_is_real,desirwed_id) . = ..() if(desirwed_id) id = desirwed_id @@ -42,7 +42,7 @@ qdel(src) return TRUE -/obj/effect/damage_number/proc/add_value(var/desired_damage,var/desired_block) +/obj/effect/damage_number/proc/add_value(desired_damage,desired_block) if(desired_damage) desired_damage = CEILING(desired_damage,1) if(desired_block) desired_block = CEILING(desired_block,1) @@ -92,7 +92,7 @@ maptext_width = TILE_SIZE*3 -/obj/effect/temp/status_effect/New(var/desired_location,var/desired_time,var/desired_value) +/obj/effect/temp/status_effect/New(desired_location,desired_time,desired_value) . = ..() maptext = "
[desired_value]
" animate(src,pixel_x = initial(pixel_x) + rand(-TILE_SIZE,TILE_SIZE),pixel_y=initial(pixel_y)+rand(0,TILE_SIZE),time=duration*0.5,easing = CIRCULAR_EASING | EASE_OUT) diff --git a/code/_core/obj/effect/temp/damaging/_damaging.dm b/code/_core/obj/effect/temp/damaging/_damaging.dm index e8ff0bb78a..8c04c5502c 100644 --- a/code/_core/obj/effect/temp/damaging/_damaging.dm +++ b/code/_core/obj/effect/temp/damaging/_damaging.dm @@ -41,7 +41,7 @@ obj/effect/temp/hazard/New(var/desired_location,var/desired_time,var/desired_own return ..() -/obj/effect/temp/hazard/proc/do_cross_damage(var/mob/living/L) +/obj/effect/temp/hazard/proc/do_cross_damage(mob/living/L) if(!cross_hazard || !enabled || !L || L.loc != src.loc) return FALSE @@ -61,12 +61,12 @@ obj/effect/temp/hazard/New(var/desired_location,var/desired_time,var/desired_own do_cross_damage(O) return ..() -/obj/effect/temp/hazard/proc/get_params(var/atom/victim) +/obj/effect/temp/hazard/proc/get_params(atom/victim) . = list() .[PARAM_ICON_X] = rand(0,32) .[PARAM_ICON_Y] = rand(0,32) -/obj/effect/temp/hazard/proc/do_damage(var/atom/victim) +/obj/effect/temp/hazard/proc/do_damage(atom/victim) var/damagetype/DT = SSdamagetype.all_damage_types[damage_type] var/list/params = get_params() if(!victim.can_be_attacked(owner,src,params,DT)) @@ -181,7 +181,7 @@ obj/effect/temp/hazard/bubblefist/attack(var/atom/attacker,var/atom/victim,var/l plane = PLANE_BLOOD layer = LAYER_FLOOR_EFFECTS -/obj/effect/temp/hazard/lava/get_params(var/atom/victim) +/obj/effect/temp/hazard/lava/get_params(atom/victim) if(is_living(victim)) var/mob/living/L = victim @@ -204,14 +204,14 @@ obj/effect/temp/hazard/bubblefist/attack(var/atom/attacker,var/atom/victim,var/l plane = PLANE_BLOOD layer = LAYER_FLOOR_EFFECTS -/obj/effect/temp/hazard/curse/New(var/desired_location,var/desired_time,var/desired_owner) +/obj/effect/temp/hazard/curse/New(desired_location,desired_time,desired_owner) if(istype(desired_location,/turf/simulated/wall/)) icon_state = "wallglow_strong" return ..() -/obj/effect/temp/hazard/curse/get_params(var/atom/victim) +/obj/effect/temp/hazard/curse/get_params(atom/victim) if(is_living(victim)) var/mob/living/L = victim @@ -233,7 +233,7 @@ obj/effect/temp/hazard/bubblefist/attack(var/atom/attacker,var/atom/victim,var/l plane = PLANE_BLOOD layer = LAYER_FLOOR_EFFECTS -/obj/effect/temp/hazard/flamethrowerfire/get_params(var/atom/victim) +/obj/effect/temp/hazard/flamethrowerfire/get_params(atom/victim) if(is_living(victim)) var/mob/living/L = victim diff --git a/code/_core/obj/effect/temp/damaging/gabber_slam.dm b/code/_core/obj/effect/temp/damaging/gabber_slam.dm index 0dbe963fac..041e5ba4eb 100644 --- a/code/_core/obj/effect/temp/damaging/gabber_slam.dm +++ b/code/_core/obj/effect/temp/damaging/gabber_slam.dm @@ -54,12 +54,12 @@ CALLBACK("\ref[src]_delete",5,src,/datum/proc/delete) -/obj/effect/gabber_slam/proc/get_params(var/atom/victim) +/obj/effect/gabber_slam/proc/get_params(atom/victim) . = list() .[PARAM_ICON_X] = 16 .[PARAM_ICON_Y] = 16 -/obj/effect/gabber_slam/proc/do_damage(var/atom/victim) +/obj/effect/gabber_slam/proc/do_damage(atom/victim) if(is_living(victim) && is_living(owner) && owner != victim) var/mob/living/L = victim diff --git a/code/_core/obj/effect/temp/damaging/gabber_turf_destruction.dm b/code/_core/obj/effect/temp/damaging/gabber_turf_destruction.dm index 9ab02d1a3d..5b66293232 100644 --- a/code/_core/obj/effect/temp/damaging/gabber_turf_destruction.dm +++ b/code/_core/obj/effect/temp/damaging/gabber_turf_destruction.dm @@ -3,7 +3,7 @@ icon_state = "b1" blend_mode = BLEND_ADD -/obj/effect/gabber_turf_destruction/New(var/desired_loc,var/turf/force_turf=null) +/obj/effect/gabber_turf_destruction/New(desired_loc,turf/force_turf=null) . = ..() icon_state = "b[rand(1,5)]" var/matrix/M = matrix() @@ -12,7 +12,7 @@ animate(src,alpha=100,transform = matrix(),time=3) CALLBACK("\ref[src]_destroy_turf",5,src,src::destroy_turf(),force_turf) -/obj/effect/gabber_turf_destruction/proc/destroy_turf(var/turf/force_turf=null) +/obj/effect/gabber_turf_destruction/proc/destroy_turf(turf/force_turf=null) animate(src,alpha=255,time=5) animate(alpha=0,time=15) icon_state = "r[rand(1,5)]" diff --git a/code/_core/obj/effect/temp/damaging/hierophant.dm b/code/_core/obj/effect/temp/damaging/hierophant.dm index 6ed75a6987..0e78be340f 100644 --- a/code/_core/obj/effect/temp/damaging/hierophant.dm +++ b/code/_core/obj/effect/temp/damaging/hierophant.dm @@ -12,7 +12,7 @@ var/copy_delay = 3 var/should_teleport = FALSE -/obj/effect/temp/hazard/hierophant/New(var/desired_location,var/desired_time,var/desired_owner) +/obj/effect/temp/hazard/hierophant/New(desired_location,desired_time,desired_owner) . = ..() play_sound('sound/effects/wand_teleport.ogg',get_turf(src)) @@ -20,7 +20,7 @@ CALLBACK("copy_hazard_\ref[src]",copy_delay,src,src::copy_hazard()) return ..() -/obj/effect/temp/hazard/hierophant/get_params(var/atom/victim) +/obj/effect/temp/hazard/hierophant/get_params(atom/victim) if(is_living(victim)) var/mob/living/L = victim diff --git a/code/_core/obj/effect/temp/damaging/slime_tile.dm b/code/_core/obj/effect/temp/damaging/slime_tile.dm index 26aac5d900..9a46a5a953 100644 --- a/code/_core/obj/effect/temp/damaging/slime_tile.dm +++ b/code/_core/obj/effect/temp/damaging/slime_tile.dm @@ -61,7 +61,7 @@ return TRUE -/obj/structure/interactive/slime_tile/proc/heal(var/mob/living/L) +/obj/structure/interactive/slime_tile/proc/heal(mob/living/L) if(src.qdeleting || L.qdeleting) return FALSE @@ -99,6 +99,6 @@ play_sound('sound/effects/slimed.ogg',get_turf(src)) telegraph_delete() -/obj/structure/interactive/slime_tile/on_destruction(var/damage = TRUE) +/obj/structure/interactive/slime_tile/on_destruction(damage = TRUE) . = ..() qdel(src) \ No newline at end of file diff --git a/code/_core/obj/effect/temp/damaging/slime_wall.dm b/code/_core/obj/effect/temp/damaging/slime_wall.dm index 1d496c436f..2c938295b8 100644 --- a/code/_core/obj/effect/temp/damaging/slime_wall.dm +++ b/code/_core/obj/effect/temp/damaging/slime_wall.dm @@ -38,7 +38,7 @@ return ..() -/obj/structure/interactive/slime_wall/on_destruction(var/damage = TRUE) +/obj/structure/interactive/slime_wall/on_destruction(damage = TRUE) . = ..() qdel(src) diff --git a/code/_core/obj/effect/temp/explosion.dm b/code/_core/obj/effect/temp/explosion.dm index c5ccafb767..270a39e3b5 100644 --- a/code/_core/obj/effect/temp/explosion.dm +++ b/code/_core/obj/effect/temp/explosion.dm @@ -8,7 +8,7 @@ pixel_x = -32 pixel_y = -32 -/obj/effect/temp/explosion/New(var/desired_location,var/desired_time,var/desired_color) +/obj/effect/temp/explosion/New(desired_location,desired_time,desired_color) . = ..() var/matrix/M = get_base_transform() if(desired_time > 2) @@ -20,7 +20,7 @@ icon = 'icons/obj/effects/explosion.dmi' icon_state = "explosion_particle" -/obj/effect/temp/explosion_particle/New(var/desired_location,var/desired_time,var/desired_color,var/desired_dir) +/obj/effect/temp/explosion_particle/New(desired_location,desired_time,desired_color,desired_dir) if(desired_dir) dir = desired_dir diff --git a/code/_core/obj/effect/temp/healing.dm b/code/_core/obj/effect/temp/healing.dm index 7c362f373d..d0b8492239 100644 --- a/code/_core/obj/effect/temp/healing.dm +++ b/code/_core/obj/effect/temp/healing.dm @@ -6,7 +6,7 @@ duration = 3 SECONDS color = "#FF0000" -/obj/effect/temp/healing/New(var/desired_location,var/desired_time,var/desired_color) +/obj/effect/temp/healing/New(desired_location,desired_time,desired_color) if(desired_color) color = desired_color diff --git a/code/_core/obj/effect/temp/impact/blood.dm b/code/_core/obj/effect/temp/impact/blood.dm index 547640aac1..722ddbb58a 100644 --- a/code/_core/obj/effect/temp/impact/blood.dm +++ b/code/_core/obj/effect/temp/impact/blood.dm @@ -6,7 +6,7 @@ duration = 3 alpha = 150 -/obj/effect/temp/impact/blood/New(var/desired_loc,var/desired_time,var/desired_color) +/obj/effect/temp/impact/blood/New(desired_loc,desired_time,desired_color) icon_state = "splatter_[rand(1,12)]" color = desired_color alpha = 0 diff --git a/code/_core/obj/effect/temp/impact/weapon_clone.dm b/code/_core/obj/effect/temp/impact/weapon_clone.dm index 0c9040f7d9..bb5a9e2392 100644 --- a/code/_core/obj/effect/temp/impact/weapon_clone.dm +++ b/code/_core/obj/effect/temp/impact/weapon_clone.dm @@ -3,7 +3,7 @@ duration = 2 alpha = 175 -/obj/effect/temp/impact/weapon_clone/New(var/desired_loc,var/desired_time,var/atom/victim,var/atom/attacker,var/atom/weapon) +/obj/effect/temp/impact/weapon_clone/New(desired_loc,desired_time,atom/victim,atom/attacker,atom/weapon) . = ..() diff --git a/code/_core/obj/effect/temp/lightning.dm b/code/_core/obj/effect/temp/lightning.dm index af991f8652..a471ca06d7 100644 --- a/code/_core/obj/effect/temp/lightning.dm +++ b/code/_core/obj/effect/temp/lightning.dm @@ -3,6 +3,6 @@ icon = 'icons/obj/effects/lightning.dmi' icon_state = "lightning" -/obj/effect/temp/lightning/New(var/desired_loc,var/desired_time) +/obj/effect/temp/lightning/New(desired_loc,desired_time) . = ..() icon_state = "[initial(icon_state)][rand(1,12)]" \ No newline at end of file diff --git a/code/_core/obj/effect/temp/portal.dm b/code/_core/obj/effect/temp/portal.dm index a323262b17..68b7a2771f 100644 --- a/code/_core/obj/effect/temp/portal.dm +++ b/code/_core/obj/effect/temp/portal.dm @@ -68,7 +68,7 @@ set_light_sprite(desired_light_range, desired_light_power, desired_light_color,desired_light_angle) return TRUE -/obj/effect/temp/portal/New(var/desired_loc,var/desired_time) +/obj/effect/temp/portal/New(desired_loc,desired_time) . = ..() transform *= 0.01 animate(src,transform=get_base_transform(),time=5,easing=BOUNCE_EASING) @@ -89,7 +89,7 @@ CALLBACK("delete_\ref[src]",300 SECONDS,src,.datum/proc/delete) -/obj/effect/temp/portal/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/effect/temp/portal/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(is_inventory(object) && linked_portal && src.invisibility < 101) INTERACT_CHECK diff --git a/code/_core/obj/effect/temp/slime_king_absorb.dm b/code/_core/obj/effect/temp/slime_king_absorb.dm index 360564c27a..66f6bee713 100644 --- a/code/_core/obj/effect/temp/slime_king_absorb.dm +++ b/code/_core/obj/effect/temp/slime_king_absorb.dm @@ -7,7 +7,7 @@ var/atom/movable/king_to_follow -/obj/effect/temp/slime_king_absorb/New(var/desired_loc,var/desired_time) +/obj/effect/temp/slime_king_absorb/New(desired_loc,desired_time) . = ..() filters += filter(type="ripple",x=0,y=0,size=10,repeat=4,radius=0,falloff=0.5,flags=WAVE_BOUNDED) animate(filters[length(filters)],radius=0,size=10,easing=SINE_EASING,time=2,loop=-1,flags=ANIMATION_PARALLEL) diff --git a/code/_core/obj/effect/temp/smoke.dm b/code/_core/obj/effect/temp/smoke.dm index a7db32f4a5..b2d7c09d26 100644 --- a/code/_core/obj/effect/temp/smoke.dm +++ b/code/_core/obj/effect/temp/smoke.dm @@ -1,4 +1,4 @@ -/proc/smoke(var/turf/desired_turf,var/desired_power=20,var/desired_duration=100,var/reagent_container/container,var/mob/owner,var/alpha=255,var/list/optional_reagents) +/proc/smoke(turf/desired_turf,desired_power=20,desired_duration=100,reagent_container/container,mob/owner,alpha=255,list/optional_reagents) if(!desired_turf) return FALSE var/reagent_container/temp/smoke/T @@ -55,17 +55,17 @@ blacklist_turfs?.Cut() owner = null -/obj/effect/temp/smoke/proc/try_splash(var/atom/A) +/obj/effect/temp/smoke/proc/try_splash(atom/A) var/amount_to_actually_splash = max(1,reagent_volume_original/max(1,smoke_volume_original)) * 0.2 container.splash(owner,A,amount_to_actually_splash,FALSE,5) return TRUE -/obj/effect/temp/smoke/Crossed(var/atom/movable/O) +/obj/effect/temp/smoke/Crossed(atom/movable/O) . = ..() if(O.density && O.reagents && container && container.volume_current > 0) try_splash(O) -/obj/effect/temp/smoke/New(var/desired_location,var/desired_time,var/list/desired_blacklist_turfs,var/reagent_container/desired_container,var/mob/desired_owner,var/desired_volume=20,var/desired_alpha=255,var/original_smoke_volume,var/original_reagent_volume) +/obj/effect/temp/smoke/New(desired_location,desired_time,list/desired_blacklist_turfs,reagent_container/desired_container,mob/desired_owner,desired_volume=20,desired_alpha=255,original_smoke_volume,original_reagent_volume) . = ..() CALLBACK("fade_out_\ref[src]",duration-fade_time,src,src::fade_out()) diff --git a/code/_core/obj/effect/temp/stand.dm b/code/_core/obj/effect/temp/stand.dm index 21b0a8db8c..2daaa74faf 100644 --- a/code/_core/obj/effect/temp/stand.dm +++ b/code/_core/obj/effect/temp/stand.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/effects/stand.dmi' icon_state = "menacing" -/obj/effect/temp/menacing/New(var/desired_location,var/desired_time,var/offset_x = 0,var/offset_y=0) +/obj/effect/temp/menacing/New(desired_location,desired_time,offset_x = 0,offset_y=0) . = ..() diff --git a/code/_core/obj/emf/_emf.dm b/code/_core/obj/emf/_emf.dm index 3d6b257429..2530a95b21 100644 --- a/code/_core/obj/emf/_emf.dm +++ b/code/_core/obj/emf/_emf.dm @@ -11,7 +11,7 @@ alpha = 0 mouse_opacity = 0 -/obj/emf/New(var/desired_loc,var/desired_level,var/desired_range) +/obj/emf/New(desired_loc,desired_level,desired_range) . = ..() SSghost.all_emfs += src diff --git a/code/_core/obj/explosion_particle.dm b/code/_core/obj/explosion_particle.dm index 4b777ab109..87421c0508 100644 --- a/code/_core/obj/explosion_particle.dm +++ b/code/_core/obj/explosion_particle.dm @@ -7,7 +7,7 @@ density = FALSE -/obj/effect/explosion_particle/New(var/desired_loc) +/obj/effect/explosion_particle/New(desired_loc) . = ..() animate(src,alpha=0,time=5) queue_delete(src,10) diff --git a/code/_core/obj/fire_process.dm b/code/_core/obj/fire_process.dm index be2f481cfa..d6a2776814 100644 --- a/code/_core/obj/fire_process.dm +++ b/code/_core/obj/fire_process.dm @@ -60,7 +60,7 @@ vis_flags = VIS_INHERIT_PLANE | VIS_INHERIT_ID -/obj/fire_process/proc/do_damage(var/atom/movable/victim,var/distance_check=0) +/obj/fire_process/proc/do_damage(atom/movable/victim,distance_check=0) if(!victim || !victim.z || !src.z || victim.z != src.z) return FALSE @@ -144,7 +144,7 @@ initial_turf = null . = ..() -/obj/fire_process/act_explode(var/atom/owner,var/atom/source,var/atom/epicenter,var/magnitude,var/desired_loyalty_tag) +/obj/fire_process/act_explode(atom/owner,atom/source,atom/epicenter,magnitude,desired_loyalty_tag) . = ..() var/found_direction = get_dir(source,src) if(get_dir(source,src) > 0) @@ -250,7 +250,7 @@ return TRUE -/obj/fire_process/proc/get_params(var/atom/victim) +/obj/fire_process/proc/get_params(atom/victim) . = list() if(is_living(victim)) var/mob/living/L = victim diff --git a/code/_core/obj/hud/_hud.dm b/code/_core/obj/hud/_hud.dm index 4d4751ac93..8eef8b5766 100644 --- a/code/_core/obj/hud/_hud.dm +++ b/code/_core/obj/hud/_hud.dm @@ -23,7 +23,7 @@ plane = PLANE_HUD layer = LAYER_HUD -/obj/hud/New(var/desired_loc) +/obj/hud/New(desired_loc) . = ..() if(!tooltip_text) tooltip_text = generate_tooltip_text() @@ -50,7 +50,7 @@ var/regex/valid_punct = regex(@"[.?!]($|\s)") return copytext(checking_text,1,best_position+1) -/obj/hud/proc/update_owner(var/mob/desired_owner) +/obj/hud/proc/update_owner(mob/desired_owner) if(owner == desired_owner) return FALSE @@ -83,10 +83,10 @@ var/regex/valid_punct = regex(@"[.?!]($|\s)") swap_colors(I) icon = I -/obj/hud/attack(var/atom/attacker,var/atom/victim,var/list/params=list(),var/atom/blamed,var/ignore_distance = FALSE, var/precise = FALSE,var/damage_multiplier=1,var/damagetype/damage_type_override) +/obj/hud/attack(atom/attacker,atom/victim,list/params=list(),atom/blamed,ignore_distance = FALSE, precise = FALSE,damage_multiplier=1,damagetype/damage_type_override) CRASH("[attacker.get_debug_name()] tried to attack [victim] with a HUD object!") -/obj/hud/proc/swap_colors(var/icon/I) +/obj/hud/proc/swap_colors(icon/I) var/list/color_scheme = DEFAULT_COLORS @@ -120,7 +120,7 @@ var/regex/valid_punct = regex(@"[.?!]($|\s)") /obj/hud/Generate() CRASH("HUD objects should never be Generated!") -/obj/hud/proc/set_tooltip(var/mob/caller) +/obj/hud/proc/set_tooltip(mob/caller) var/list/split_screen_loc = splittext(src.screen_loc,",") diff --git a/code/_core/obj/hud/buttons/_buttons.dm b/code/_core/obj/hud/buttons/_buttons.dm index 4abd4169f9..1c304ae3d0 100644 --- a/code/_core/obj/hud/buttons/_buttons.dm +++ b/code/_core/obj/hud/buttons/_buttons.dm @@ -20,7 +20,7 @@ has_quick_function = TRUE -/obj/hud/button/quick(var/mob/living/advanced/caller,var/atom/object,location,params) +/obj/hud/button/quick(mob/living/advanced/caller,atom/object,location,params) if(alpha == 0) return FALSE @@ -35,7 +35,7 @@ if(bad_delete) CRASH("[src.get_debug_name()] was deleted incorrectly!") -/obj/hud/button/proc/show(var/should_show=TRUE,var/draw_speed=1 SECONDS) +/obj/hud/button/proc/show(should_show=TRUE,draw_speed=1 SECONDS) if(should_show) animate(src,alpha= initial(alpha),time=draw_speed) mouse_opacity = initial(mouse_opacity) @@ -43,6 +43,6 @@ animate(src,alpha=0,time=draw_speed SECONDS) mouse_opacity = 0 -/obj/hud/button/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/clicked_on_by_object(mob/caller,atom/object,location,control,params) play_sound_target('sound/ui/tap-muted.ogg',caller, sound_setting = SOUND_SETTING_UI) return TRUE diff --git a/code/_core/obj/hud/buttons/ability.dm b/code/_core/obj/hud/buttons/ability.dm index 9ae18771b5..847a47a118 100644 --- a/code/_core/obj/hud/buttons/ability.dm +++ b/code/_core/obj/hud/buttons/ability.dm @@ -32,7 +32,7 @@ STAMINA = "green" ) -/obj/hud/button/ability/New(var/desired_loc) +/obj/hud/button/ability/New(desired_loc) . = ..() if(ability) ability = new ability @@ -41,7 +41,7 @@ QDEL_NULL(ability) . = ..() -/obj/hud/button/ability/proc/activate(var/mob/caller) +/obj/hud/button/ability/proc/activate(mob/caller) if(ability && ability.activate(caller)) animate(src,color="#00FF00",time=1,flags=ANIMATION_PARALLEL) @@ -106,7 +106,7 @@ src.maptext = "
[display_number]" -/obj/hud/button/ability/update_owner(var/mob/desired_owner) +/obj/hud/button/ability/update_owner(mob/desired_owner) vis_contents.Cut() diff --git a/code/_core/obj/hud/buttons/ability_choice.dm b/code/_core/obj/hud/buttons/ability_choice.dm index 56d9ee8d74..adf8e14fbe 100644 --- a/code/_core/obj/hud/buttons/ability_choice.dm +++ b/code/_core/obj/hud/buttons/ability_choice.dm @@ -1,4 +1,4 @@ -/proc/show_ability_choices(var/mob/living/advanced/A,var/obj/structure/interactive/ability_machine/machine) +/proc/show_ability_choices(mob/living/advanced/A,obj/structure/interactive/ability_machine/machine) var/list/categorized_abilities = list() @@ -120,13 +120,13 @@ color = initial(color) -/obj/hud/button/ability_choice/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/ability_choice/clicked_on_by_object(mob/caller,atom/object,location,control,params) caller.to_chat(span("notice","Click and drag to an ability slot at the top left to slot this ability.")) return TRUE -/obj/hud/button/ability_choice/proc/can_slot_ability(var/mob/caller,var/ability/ability_to_replace) +/obj/hud/button/ability_choice/proc/can_slot_ability(mob/caller,ability/ability_to_replace) if(!is_advanced(owner)) return FALSE @@ -156,7 +156,7 @@ return TRUE -/obj/hud/button/ability_choice/drop_on_object(var/mob/caller,var/atom/object,location,control,params) //Src is dragged to object +/obj/hud/button/ability_choice/drop_on_object(mob/caller,atom/object,location,control,params) //Src is dragged to object if(istype(object,/obj/hud/button/ability)) var/obj/hud/button/ability/B = object @@ -192,7 +192,7 @@ icon_state = "close" -/obj/hud/button/close_ability_choice/update_owner(var/mob/desired_owner) +/obj/hud/button/close_ability_choice/update_owner(mob/desired_owner) if(owner) HOOK_REMOVE("post_move","\ref[src]_check_distance",owner) @@ -213,12 +213,12 @@ . = ..() linked_buttons.Cut() -/obj/hud/button/close_ability_choice/update_owner(var/mob/desired_owner) +/obj/hud/button/close_ability_choice/update_owner(mob/desired_owner) for(var/k in linked_buttons) var/obj/hud/button/B = k B.update_owner(desired_owner) . = ..() -/obj/hud/button/close_ability_choice/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/close_ability_choice/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() update_owner(null) \ No newline at end of file diff --git a/code/_core/obj/hud/buttons/boss_health.dm b/code/_core/obj/hud/buttons/boss_health.dm index 9e8c7f865e..f5ea68804e 100644 --- a/code/_core/obj/hud/buttons/boss_health.dm +++ b/code/_core/obj/hud/buttons/boss_health.dm @@ -23,7 +23,7 @@ has_quick_function = FALSE -/obj/hud/button/boss_health/New(var/desired_loc) +/obj/hud/button/boss_health/New(desired_loc) . = ..() alpha = 0 mouse_opacity = 0 diff --git a/code/_core/obj/hud/buttons/cash_money.dm b/code/_core/obj/hud/buttons/cash_money.dm index 606427a9c3..42363e6a08 100644 --- a/code/_core/obj/hud/buttons/cash_money.dm +++ b/code/_core/obj/hud/buttons/cash_money.dm @@ -13,7 +13,7 @@ maptext_x = -2 -/obj/hud/button/cash_money/update_owner(var/mob/desired_owner) +/obj/hud/button/cash_money/update_owner(mob/desired_owner) . = ..() @@ -36,7 +36,7 @@ I.mouse_opacity = 0 add_overlay(I) -/obj/hud/button/cash_money/proc/update_stats(var/new_value=0,var/silent=FALSE) +/obj/hud/button/cash_money/proc/update_stats(new_value=0,silent=FALSE) new_value = max(new_value,0) @@ -71,7 +71,7 @@ I.mouse_opacity = 0 add_overlay(I) -/obj/hud/button/microstransactions/update_owner(var/mob/desired_owner) +/obj/hud/button/microstransactions/update_owner(mob/desired_owner) . = ..() @@ -84,7 +84,7 @@ return TRUE -/obj/hud/button/microstransactions/proc/update_stats(var/new_value=0,var/silent=FALSE) +/obj/hud/button/microstransactions/proc/update_stats(new_value=0,silent=FALSE) new_value = max(new_value,0) diff --git a/code/_core/obj/hud/buttons/chargen/beardstyle.dm b/code/_core/obj/hud/buttons/chargen/beardstyle.dm index ce33f8aab6..f0f47194fd 100644 --- a/code/_core/obj/hud/buttons/chargen/beardstyle.dm +++ b/code/_core/obj/hud/buttons/chargen/beardstyle.dm @@ -77,7 +77,7 @@ mob/living/advanced/proc/handle_beardstyle_chargen(var/hair_num=-1,var/desired_c chargen_flags = CHARGEN_BEARD -/obj/hud/button/chargen/change_beardstyle/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/chargen/change_beardstyle/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() @@ -130,7 +130,7 @@ mob/living/advanced/proc/handle_beardstyle_chargen(var/hair_num=-1,var/desired_c add_overlay(I_head) add_overlay(I_hair) -/obj/hud/button/chargen/beardstyle/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/chargen/beardstyle/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() if(. && is_advanced(caller)) var/mob/living/advanced/A = caller @@ -142,7 +142,7 @@ mob/living/advanced/proc/handle_beardstyle_chargen(var/hair_num=-1,var/desired_c icon_state = "square_round" screen_loc = "CENTER,CENTER+3" -/obj/hud/button/chargen/beardstyle/main/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/chargen/beardstyle/main/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() diff --git a/code/_core/obj/hud/buttons/chargen/color.dm b/code/_core/obj/hud/buttons/chargen/color.dm index 61705cb7ae..342f87b4da 100644 --- a/code/_core/obj/hud/buttons/chargen/color.dm +++ b/code/_core/obj/hud/buttons/chargen/color.dm @@ -7,7 +7,7 @@ var/green = 0 var/blue = 0 -/obj/hud/button/chargen/color/clicked_on_by_object(var/mob/caller,object,location,control,params) +/obj/hud/button/chargen/color/clicked_on_by_object(mob/caller,object,location,control,params) var/icon_x = params[PARAM_ICON_X] var/icon_y = params[PARAM_ICON_Y] diff --git a/code/_core/obj/hud/buttons/chargen/detail.dm b/code/_core/obj/hud/buttons/chargen/detail.dm index f37c9a0ed8..42b48a8354 100644 --- a/code/_core/obj/hud/buttons/chargen/detail.dm +++ b/code/_core/obj/hud/buttons/chargen/detail.dm @@ -20,7 +20,7 @@ mob/living/advanced/proc/handle_detail_chargen(var/desired_color,var/update_blen chargen_flags = CHARGEN_DETAIL -/obj/hud/button/chargen/detail/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/chargen/detail/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() diff --git a/code/_core/obj/hud/buttons/chargen/difficulty.dm b/code/_core/obj/hud/buttons/chargen/difficulty.dm index f832736bd5..1a144d7632 100644 --- a/code/_core/obj/hud/buttons/chargen/difficulty.dm +++ b/code/_core/obj/hud/buttons/chargen/difficulty.dm @@ -16,13 +16,13 @@ maptext_y = -10 maptext_width = TILE_SIZE*2 -/obj/hud/button/chargen/difficulty/update_owner(var/mob/desired_owner) +/obj/hud/button/chargen/difficulty/update_owner(mob/desired_owner) if(is_player(desired_owner)) var/mob/living/advanced/player/P = desired_owner chosen_difficulty = P.difficulty . = ..() -/obj/hud/button/chargen/difficulty/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/chargen/difficulty/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() diff --git a/code/_core/obj/hud/buttons/chargen/eyecolor.dm b/code/_core/obj/hud/buttons/chargen/eyecolor.dm index 768a5f7743..9f9b4015d1 100644 --- a/code/_core/obj/hud/buttons/chargen/eyecolor.dm +++ b/code/_core/obj/hud/buttons/chargen/eyecolor.dm @@ -24,7 +24,7 @@ mob/living/advanced/proc/handle_eyecolor_chargen(var/desired_color,var/update_bl return ..() -/obj/hud/button/chargen/eye_color/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/chargen/eye_color/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() diff --git a/code/_core/obj/hud/buttons/chargen/glow.dm b/code/_core/obj/hud/buttons/chargen/glow.dm index a04983b190..75751d9dd6 100644 --- a/code/_core/obj/hud/buttons/chargen/glow.dm +++ b/code/_core/obj/hud/buttons/chargen/glow.dm @@ -20,7 +20,7 @@ mob/living/advanced/proc/handle_glow_chargen(var/desired_color,var/update_blends chargen_flags = CHARGEN_GLOW -/obj/hud/button/chargen/glow/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/chargen/glow/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() diff --git a/code/_core/obj/hud/buttons/chargen/hairstyle.dm b/code/_core/obj/hud/buttons/chargen/hairstyle.dm index 82a3901804..1b175c9d8c 100644 --- a/code/_core/obj/hud/buttons/chargen/hairstyle.dm +++ b/code/_core/obj/hud/buttons/chargen/hairstyle.dm @@ -77,7 +77,7 @@ mob/living/advanced/proc/handle_hairstyle_chargen(var/hair_num=-1,var/desired_co chargen_flags = CHARGEN_HAIR -/obj/hud/button/chargen/change_hairstyle/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/chargen/change_hairstyle/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() @@ -125,7 +125,7 @@ mob/living/advanced/proc/handle_hairstyle_chargen(var/hair_num=-1,var/desired_co add_overlay(I_head) add_overlay(I_hair) -/obj/hud/button/chargen/hairstyle/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/chargen/hairstyle/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() if(. && is_advanced(caller)) var/mob/living/advanced/A = caller @@ -139,7 +139,7 @@ mob/living/advanced/proc/handle_hairstyle_chargen(var/hair_num=-1,var/desired_co icon_state = "square_round" screen_loc = "CENTER,CENTER+4" -/obj/hud/button/chargen/hairstyle/main/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/chargen/hairstyle/main/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() diff --git a/code/_core/obj/hud/buttons/chargen/name.dm b/code/_core/obj/hud/buttons/chargen/name.dm index 6c4d5cd592..1a58b183c2 100644 --- a/code/_core/obj/hud/buttons/chargen/name.dm +++ b/code/_core/obj/hud/buttons/chargen/name.dm @@ -14,7 +14,7 @@ user_colors = TRUE -/obj/hud/button/chargen/change_name/update_owner(var/mob/desired_owner) +/obj/hud/button/chargen/change_name/update_owner(mob/desired_owner) if(desired_owner && is_player(desired_owner)) var/mob/living/advanced/player/P = desired_owner @@ -23,7 +23,7 @@ return ..() -/obj/hud/button/chargen/change_name/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/chargen/change_name/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() diff --git a/code/_core/obj/hud/buttons/chargen/sex.dm b/code/_core/obj/hud/buttons/chargen/sex.dm index 5f5e877c9b..6441e05d73 100644 --- a/code/_core/obj/hud/buttons/chargen/sex.dm +++ b/code/_core/obj/hud/buttons/chargen/sex.dm @@ -21,7 +21,7 @@ . = ..() -/obj/hud/button/chargen/sex/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/chargen/sex/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() diff --git a/code/_core/obj/hud/buttons/chargen/skincolor.dm b/code/_core/obj/hud/buttons/chargen/skincolor.dm index ae87a7838b..186cef45dd 100644 --- a/code/_core/obj/hud/buttons/chargen/skincolor.dm +++ b/code/_core/obj/hud/buttons/chargen/skincolor.dm @@ -20,7 +20,7 @@ mob/living/advanced/proc/handle_skincolor_chargen(var/desired_color,var/update_b chargen_flags = CHARGEN_SKIN -/obj/hud/button/chargen/skin_color/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/chargen/skin_color/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() diff --git a/code/_core/obj/hud/buttons/chargen/species.dm b/code/_core/obj/hud/buttons/chargen/species.dm index c72b326330..cb238fa668 100644 --- a/code/_core/obj/hud/buttons/chargen/species.dm +++ b/code/_core/obj/hud/buttons/chargen/species.dm @@ -8,7 +8,7 @@ chargen_flags = CHARGEN_NONE -/obj/hud/button/chargen/species/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/chargen/species/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() diff --git a/code/_core/obj/hud/buttons/choice/_choice.dm b/code/_core/obj/hud/buttons/choice/_choice.dm index 3a246277b7..949d1e9c44 100644 --- a/code/_core/obj/hud/buttons/choice/_choice.dm +++ b/code/_core/obj/hud/buttons/choice/_choice.dm @@ -19,11 +19,11 @@ linked_choice = null return ..() -/obj/hud/button/choice/New(var/desired_loc,var/desired_choice) +/obj/hud/button/choice/New(desired_loc,desired_choice) linked_choice = desired_choice return ..() -/obj/hud/button/choice/clicked_on_by_object(var/mob/caller,object,location,control,params) +/obj/hud/button/choice/clicked_on_by_object(mob/caller,object,location,control,params) linked_choice.choice_made = id return TRUE diff --git a/code/_core/obj/hud/buttons/color_scheme/_color_scheme.dm b/code/_core/obj/hud/buttons/color_scheme/_color_scheme.dm index 96f2d21d61..6a1f499c0c 100644 --- a/code/_core/obj/hud/buttons/color_scheme/_color_scheme.dm +++ b/code/_core/obj/hud/buttons/color_scheme/_color_scheme.dm @@ -17,7 +17,7 @@ var/global/static/list/obj/hud/button/color_scheme_buttons = list( has_quick_function = FALSE -/obj/hud/button/close_color_scheme/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/close_color_scheme/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() @@ -35,7 +35,7 @@ var/global/static/list/obj/hud/button/color_scheme_buttons = list( has_quick_function = FALSE -/obj/hud/button/default_color_scheme/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/default_color_scheme/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() @@ -72,7 +72,7 @@ var/global/static/list/obj/hud/button/color_scheme_buttons = list( has_quick_function = FALSE -/obj/hud/button/color_scheme/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/color_scheme/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() diff --git a/code/_core/obj/hud/buttons/combat.dm b/code/_core/obj/hud/buttons/combat.dm index 73c6bb5e54..2b7a97ce10 100644 --- a/code/_core/obj/hud/buttons/combat.dm +++ b/code/_core/obj/hud/buttons/combat.dm @@ -7,7 +7,7 @@ flags = FLAGS_HUD_MOB -/obj/hud/button/resist/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/resist/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() @@ -34,7 +34,7 @@ ..() -/obj/hud/button/resist_auto/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/resist_auto/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() @@ -95,7 +95,7 @@ ..() -/obj/hud/button/targeting/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/targeting/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(!is_player(caller)) return @@ -174,7 +174,7 @@ ..() -/obj/hud/button/defense/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/defense/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(!params[PARAM_ICON_Y]) return diff --git a/code/_core/obj/hud/buttons/crafting.dm b/code/_core/obj/hud/buttons/crafting.dm index a1698ae51a..cc5836175b 100644 --- a/code/_core/obj/hud/buttons/crafting.dm +++ b/code/_core/obj/hud/buttons/crafting.dm @@ -21,12 +21,12 @@ dir = EAST screen_loc = "CENTER+2,TOP-3" -/obj/hud/button/crafting/craft/New(var/desired_loc) +/obj/hud/button/crafting/craft/New(desired_loc) . = ..() mouse_opacity = 0 alpha = 0 -/obj/hud/button/crafting/craft/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/crafting/craft/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() @@ -43,12 +43,12 @@ icon_state = "close_crafting" screen_loc = "CENTER-2,TOP-3" -/obj/hud/button/crafting/close/New(var/desired_loc) +/obj/hud/button/crafting/close/New(desired_loc) . = ..() mouse_opacity = 0 alpha = 0 -/obj/hud/button/crafting/close/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/crafting/close/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() diff --git a/code/_core/obj/hud/buttons/evade/_evade.dm b/code/_core/obj/hud/buttons/evade/_evade.dm index bbc86273b0..b98dd00db4 100644 --- a/code/_core/obj/hud/buttons/evade/_evade.dm +++ b/code/_core/obj/hud/buttons/evade/_evade.dm @@ -6,7 +6,7 @@ screen_loc = "RIGHT-4,BOTTOM" flags = FLAGS_HUD_MOB -/obj/hud/button/evade/proc/get_charge_level(var/mob/living/caller) +/obj/hud/button/evade/proc/get_charge_level(mob/living/caller) return 0 /obj/hud/button/evade/update_owner() @@ -51,7 +51,7 @@ desc_extended = "A button that controls whether or not you block when holding down the space bar." icon_state = "block" -/obj/hud/button/evade/block/get_charge_level(var/mob/living/caller) +/obj/hud/button/evade/block/get_charge_level(mob/living/caller) return caller.charge_block /obj/hud/button/evade/parry @@ -60,7 +60,7 @@ desc_extended = "A button that controls whether or not you parry when holding down the space bar." icon_state = "parry" -/obj/hud/button/evade/parry/get_charge_level(var/mob/living/caller) +/obj/hud/button/evade/parry/get_charge_level(mob/living/caller) return caller.charge_parry /obj/hud/button/evade/dodge @@ -69,7 +69,7 @@ desc_extended = "A button that controls whether or not you dodge when holding down the space bar." icon_state = "dodge" -/obj/hud/button/evade/dodge/get_charge_level(var/mob/living/caller) +/obj/hud/button/evade/dodge/get_charge_level(mob/living/caller) return caller.charge_dodge */ diff --git a/code/_core/obj/hud/buttons/examine_bar.dm b/code/_core/obj/hud/buttons/examine_bar.dm index 9e637c1dd5..2b5fa3be93 100644 --- a/code/_core/obj/hud/buttons/examine_bar.dm +++ b/code/_core/obj/hud/buttons/examine_bar.dm @@ -13,7 +13,7 @@ layer = -1000 -/obj/hud/button/examine_bar/update_owner(var/mob/desired_owner) +/obj/hud/button/examine_bar/update_owner(mob/desired_owner) var/mob/old_owner = owner diff --git a/code/_core/obj/hud/buttons/exchange.dm b/code/_core/obj/hud/buttons/exchange.dm index bdfcba70cb..3db2603c37 100644 --- a/code/_core/obj/hud/buttons/exchange.dm +++ b/code/_core/obj/hud/buttons/exchange.dm @@ -25,7 +25,7 @@ screen_loc = "CENTER+1,CENTER-1" -/obj/hud/button/exchange/sell/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/exchange/sell/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() if(is_player(caller)) @@ -76,7 +76,7 @@ screen_loc = "CENTER+3,CENTER" -/obj/hud/button/exchange/close/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/exchange/close/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() @@ -100,11 +100,11 @@ screen_loc = "CENTER,CENTER" -/obj/hud/button/exchange/base/update_owner(var/mob/desired_owner) +/obj/hud/button/exchange/base/update_owner(mob/desired_owner) set_stored_object(null) . = ..() -/obj/hud/button/exchange/base/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/exchange/base/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(stored_object) set_stored_object(null) @@ -118,7 +118,7 @@ . = ..() -/obj/hud/button/exchange/base/dropped_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/exchange/base/dropped_on_by_object(mob/caller,atom/object,location,control,params) DEFER_OBJECT @@ -129,13 +129,13 @@ . = ..() -/obj/hud/button/exchange/base/proc/stored_object_post_move(var/atom/movable/M) +/obj/hud/button/exchange/base/proc/stored_object_post_move(atom/movable/M) HOOK_REMOVE("post_move","stored_object_post_move_\ref[src]",M) if(M == stored_object) set_stored_object(null) return TRUE -/obj/hud/button/exchange/base/proc/set_stored_object(var/obj/item/I) +/obj/hud/button/exchange/base/proc/set_stored_object(obj/item/I) stored_object = I calculate_value() update_sprite() diff --git a/code/_core/obj/hud/buttons/floor_object.dm b/code/_core/obj/hud/buttons/floor_object.dm index c36273999b..6709847915 100644 --- a/code/_core/obj/hud/buttons/floor_object.dm +++ b/code/_core/obj/hud/buttons/floor_object.dm @@ -26,7 +26,7 @@ update_sprite() return TRUE -/obj/hud/button/floor_object/update_owner(var/mob/desired_owner) +/obj/hud/button/floor_object/update_owner(mob/desired_owner) var/owner_changed = owner != desired_owner @@ -65,7 +65,7 @@ vis_contents += associated_object -/obj/hud/button/floor_object/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/floor_object/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(associated_object) return object.click_on_object(caller,associated_object,location,control,params) return ..() \ No newline at end of file diff --git a/code/_core/obj/hud/buttons/ghost.dm b/code/_core/obj/hud/buttons/ghost.dm index d5b601e6fc..beede7590e 100644 --- a/code/_core/obj/hud/buttons/ghost.dm +++ b/code/_core/obj/hud/buttons/ghost.dm @@ -9,7 +9,7 @@ has_quick_function = FALSE -/obj/hud/button/new_character/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/new_character/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() @@ -37,7 +37,7 @@ has_quick_function = FALSE -/obj/hud/button/load_character/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/load_character/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() @@ -67,7 +67,7 @@ has_quick_function = FALSE -/obj/hud/button/become_antag/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/become_antag/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() @@ -92,7 +92,7 @@ var/image/I = new/image(initial(icon),"ghost_overlay") add_overlay(I) -/obj/hud/button/teleport_to_player/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/teleport_to_player/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() @@ -131,7 +131,7 @@ has_quick_function = FALSE -/obj/hud/button/dead_ghost/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/dead_ghost/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() diff --git a/code/_core/obj/hud/buttons/health/_health.dm b/code/_core/obj/hud/buttons/health/_health.dm index 0b2e39aec0..c4d831bf91 100644 --- a/code/_core/obj/hud/buttons/health/_health.dm +++ b/code/_core/obj/hud/buttons/health/_health.dm @@ -20,7 +20,7 @@ labeled_overlays?.Cut() . = ..() -/obj/hud/button/stat/update_owner(var/mob/desired_owner) +/obj/hud/button/stat/update_owner(mob/desired_owner) if(owner && is_living(owner)) var/mob/living/L = owner @@ -59,7 +59,7 @@ A. update_vis_contents() -/obj/hud/button/stat/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/stat/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(is_living(caller)) var/mob/living/L = caller @@ -108,5 +108,5 @@ return TRUE -/obj/hud/button/stat/get_examine_list(var/mob/examiner) +/obj/hud/button/stat/get_examine_list(mob/examiner) return examiner.get_examine_list(examiner) \ No newline at end of file diff --git a/code/_core/obj/hud/buttons/health/bar.dm b/code/_core/obj/hud/buttons/health/bar.dm index 231f8342ce..ac2d2d4390 100644 --- a/code/_core/obj/hud/buttons/health/bar.dm +++ b/code/_core/obj/hud/buttons/health/bar.dm @@ -45,10 +45,10 @@ flags = FLAGS_HUD_MOB -/obj/hud/button/health/bar/hp/get_examine_list(var/mob/examiner) +/obj/hud/button/health/bar/hp/get_examine_list(mob/examiner) return ..() + div("notice","You have [current] out of [max] health.") -/obj/hud/button/health/bar/hp/update_stats(var/mob/living/M) +/obj/hud/button/health/bar/hp/update_stats(mob/living/M) if(!M || !istype(M.health)) return ..() @@ -73,10 +73,10 @@ flags = FLAGS_HUD_MOB -/obj/hud/button/health/bar/sp/get_examine_list(var/mob/examiner) +/obj/hud/button/health/bar/sp/get_examine_list(mob/examiner) return ..() + div("notice","You have [current] out of [max] stamina.") -/obj/hud/button/health/bar/sp/update_stats(var/mob/living/M) +/obj/hud/button/health/bar/sp/update_stats(mob/living/M) if(!M || !istype(M.health)) return ..() @@ -101,10 +101,10 @@ flags = FLAGS_HUD_MOB -/obj/hud/button/health/bar/mp/get_examine_list(var/mob/examiner) +/obj/hud/button/health/bar/mp/get_examine_list(mob/examiner) return ..() + div("notice","You have [current] out of [max] mana.") -/obj/hud/button/health/bar/mp/update_stats(var/mob/living/M) +/obj/hud/button/health/bar/mp/update_stats(mob/living/M) if(!M || !istype(M.health)) return ..() diff --git a/code/_core/obj/hud/buttons/health/body.dm b/code/_core/obj/hud/buttons/health/body.dm index 5956a84c76..5fe89109a4 100644 --- a/code/_core/obj/hud/buttons/health/body.dm +++ b/code/_core/obj/hud/buttons/health/body.dm @@ -20,7 +20,7 @@ update_vis_contents() return FALSE -/obj/hud/button/health/body/update_owner(var/mob/desired_owner) +/obj/hud/button/health/body/update_owner(mob/desired_owner) . = ..() @@ -91,5 +91,5 @@ labeled_overlays[o_id] = I -/obj/hud/button/health/body/get_examine_list(var/mob/examiner) +/obj/hud/button/health/body/get_examine_list(mob/examiner) return examiner.get_examine_list(examiner) \ No newline at end of file diff --git a/code/_core/obj/hud/buttons/hud_message.dm b/code/_core/obj/hud/buttons/hud_message.dm index 767ca74013..81de9ca2b4 100644 --- a/code/_core/obj/hud/buttons/hud_message.dm +++ b/code/_core/obj/hud/buttons/hud_message.dm @@ -1,6 +1,6 @@ -/proc/set_message(var/desired_text,var/instant = FALSE) +/proc/set_message(desired_text,instant = FALSE) for(var/k in SSobj.all_hud_messages) var/obj/hud/button/message/M = k @@ -32,7 +32,7 @@ var/current_text -/obj/hud/button/message/New(var/desired_loc) +/obj/hud/button/message/New(desired_loc) alpha = 0 SSobj.all_hud_messages += src return ..() @@ -41,7 +41,7 @@ SSobj.all_hud_messages -= src return ..() -/obj/hud/button/message/proc/set_text(var/desired_text,var/instant = FALSE) +/obj/hud/button/message/proc/set_text(desired_text,instant = FALSE) if(!desired_text) if(instant) diff --git a/code/_core/obj/hud/buttons/hunger.dm b/code/_core/obj/hud/buttons/hunger.dm index a86ffd29b6..b66969069c 100644 --- a/code/_core/obj/hud/buttons/hunger.dm +++ b/code/_core/obj/hud/buttons/hunger.dm @@ -15,7 +15,7 @@ flags_hud = FLAG_HUD_MOB -/obj/hud/button/hunger/get_examine_list(var/mob/examiner) +/obj/hud/button/hunger/get_examine_list(mob/examiner) . = ..() if(is_living(examiner)) diff --git a/code/_core/obj/hud/buttons/intent.dm b/code/_core/obj/hud/buttons/intent.dm index 2d987f2c82..c51b96d590 100644 --- a/code/_core/obj/hud/buttons/intent.dm +++ b/code/_core/obj/hud/buttons/intent.dm @@ -19,7 +19,7 @@ active = L.intent == intent update_sprite() -/obj/hud/button/intent/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/intent/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() diff --git a/code/_core/obj/hud/buttons/inventory.dm b/code/_core/obj/hud/buttons/inventory.dm index 37fdf98a51..a5e894ead2 100644 --- a/code/_core/obj/hud/buttons/inventory.dm +++ b/code/_core/obj/hud/buttons/inventory.dm @@ -17,7 +17,7 @@ . = ..() assoc_item = null -/obj/hud/button/close_inventory/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/close_inventory/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() @@ -35,7 +35,7 @@ has_quick_function = FALSE -/obj/hud/button/hide_show_inventory/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/hide_show_inventory/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() @@ -71,7 +71,7 @@ has_quick_function = FALSE -/obj/hud/button/close_inventory_defers/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/close_inventory_defers/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() diff --git a/code/_core/obj/hud/buttons/inventory_defer.dm b/code/_core/obj/hud/buttons/inventory_defer.dm index f2a1177a49..5198e6ce18 100644 --- a/code/_core/obj/hud/buttons/inventory_defer.dm +++ b/code/_core/obj/hud/buttons/inventory_defer.dm @@ -25,7 +25,7 @@ return vis_contents[contents_length] -/obj/hud/button/inventory_defer/get_examine_list(var/mob/examiner) +/obj/hud/button/inventory_defer/get_examine_list(mob/examiner) var/obj/item/I = get_top_vis_object() if(I) return I.get_examine_list(examiner) @@ -33,7 +33,7 @@ return referencing.get_examine_list(examiner) . = ..() -/obj/hud/button/inventory_defer/get_examine_details_list(var/mob/examiner) +/obj/hud/button/inventory_defer/get_examine_details_list(mob/examiner) var/obj/item/I = get_top_vis_object() if(I) return I.get_examine_details_list(examiner) @@ -41,7 +41,7 @@ return referencing.get_examine_details_list(examiner) . = ..() -/obj/hud/button/inventory_defer/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/inventory_defer/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(!referencing) CRASH("Referenced inventory not found!") @@ -112,7 +112,7 @@ var/global/list/redscale = list( 0,0,0,1 ) -/obj/hud/button/inventory_defer/proc/clone(var/obj/hud/inventory/I) +/obj/hud/button/inventory_defer/proc/clone(obj/hud/inventory/I) referencing = I @@ -142,7 +142,7 @@ var/global/list/redscale = list( return TRUE -/obj/hud/button/inventory_defer/update_owner(var/mob/desired_owner) +/obj/hud/button/inventory_defer/update_owner(mob/desired_owner) assoc_button?.update_owner(desired_owner) diff --git a/code/_core/obj/hud/buttons/keypad.dm b/code/_core/obj/hud/buttons/keypad.dm index 598c5e85ec..3fa9c0390e 100644 --- a/code/_core/obj/hud/buttons/keypad.dm +++ b/code/_core/obj/hud/buttons/keypad.dm @@ -12,7 +12,7 @@ icon_state = "close_inventory" screen_loc = "CENTER+3,CENTER+2" -/obj/hud/button/keypad/close/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/keypad/close/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() @@ -28,7 +28,7 @@ maptext_y = 22 maptext_x = -2 -/obj/hud/button/keypad/top/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/keypad/top/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() @@ -70,7 +70,7 @@ icon_state = "keypad_bottom" screen_loc = "CENTER+2,CENTER+1" -/obj/hud/button/keypad/bottom/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/keypad/bottom/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() diff --git a/code/_core/obj/hud/buttons/lockpicking.dm b/code/_core/obj/hud/buttons/lockpicking.dm index ab6f61f253..10522d8e67 100644 --- a/code/_core/obj/hud/buttons/lockpicking.dm +++ b/code/_core/obj/hud/buttons/lockpicking.dm @@ -31,7 +31,7 @@ associated_chest = null . = ..() -/obj/hud/button/lockpicking/update_owner(var/mob/desired_owner) +/obj/hud/button/lockpicking/update_owner(mob/desired_owner) . = ..() @@ -67,7 +67,7 @@ linked_wedge.mouse_opacity = 0 vis_contents += linked_wedge -/obj/hud/button/lockpicking/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/lockpicking/clicked_on_by_object(mob/caller,atom/object,location,control,params) return TRUE /obj/hud/button/lockpicking/MouseDown(location,control,params) diff --git a/code/_core/obj/hud/buttons/map.dm b/code/_core/obj/hud/buttons/map.dm index 69735ab030..44b8581535 100644 --- a/code/_core/obj/hud/buttons/map.dm +++ b/code/_core/obj/hud/buttons/map.dm @@ -67,7 +67,7 @@ add_overlay(I) -/obj/hud/map/proc/update_map(var/desired_z=0) +/obj/hud/map/proc/update_map(desired_z=0) if(desired_z > 0) current_z = desired_z @@ -90,7 +90,7 @@ return TRUE -/obj/hud/map/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/map/clicked_on_by_object(mob/caller,atom/object,location,control,params) INTERACT_CHECK INTERACT_DELAY(30) @@ -181,10 +181,10 @@ var/map_z = 2 -/obj/hud/button/map_background/clicked_on_by_object(var/mob/caller,var/atom/caller,location,control,params) +/obj/hud/button/map_background/clicked_on_by_object(mob/caller,atom/caller,location,control,params) return TRUE -/obj/hud/button/map_background/New(var/desired_loc,var/desired_pod,var/desired_shuttle_controller) +/obj/hud/button/map_background/New(desired_loc,desired_pod,desired_shuttle_controller) connected_map = new(desired_loc) connected_map.connected_background = src @@ -212,7 +212,7 @@ . = ..() -/obj/hud/button/map_background/update_owner(var/mob/desired_owner) +/obj/hud/button/map_background/update_owner(mob/desired_owner) . = ..() @@ -269,7 +269,7 @@ . = ..() connected_background = null -/obj/hud/button/map_control/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/map_control/clicked_on_by_object(mob/caller,atom/object,location,control,params) var/obj/hud/map/M = connected_background?.connected_map diff --git a/code/_core/obj/hud/buttons/menu/_menu.dm b/code/_core/obj/hud/buttons/menu/_menu.dm index 2257a66477..58d284941f 100644 --- a/code/_core/obj/hud/buttons/menu/_menu.dm +++ b/code/_core/obj/hud/buttons/menu/_menu.dm @@ -13,7 +13,7 @@ /obj/hud/button/menu/selection var/command_to_run -/obj/hud/button/menu/selection/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/menu/selection/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() @@ -21,7 +21,7 @@ winset(caller.client,null,"command=[command_to_run]") -/obj/hud/button/menu/selection/New(var/desired_loc) +/obj/hud/button/menu/selection/New(desired_loc) color = null return ..() diff --git a/code/_core/obj/hud/buttons/mood.dm b/code/_core/obj/hud/buttons/mood.dm index e9c0e836fb..f46f4e9fab 100644 --- a/code/_core/obj/hud/buttons/mood.dm +++ b/code/_core/obj/hud/buttons/mood.dm @@ -39,7 +39,7 @@ . = ..() -/obj/hud/button/mood/get_examine_list(var/mob/caller) +/obj/hud/button/mood/get_examine_list(mob/caller) . = ..() diff --git a/code/_core/obj/hud/buttons/movement.dm b/code/_core/obj/hud/buttons/movement.dm index 5cfd4708d5..541ddf0f4f 100644 --- a/code/_core/obj/hud/buttons/movement.dm +++ b/code/_core/obj/hud/buttons/movement.dm @@ -9,7 +9,7 @@ flags_hud = FLAG_HUD_MOB -/obj/hud/button/sneak/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/sneak/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() @@ -60,7 +60,7 @@ icon_state = "move_[move_mod_button+2]" ..() -/obj/hud/button/move/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/move/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() @@ -93,7 +93,7 @@ flags_hud = FLAG_HUD_MOB -/obj/hud/button/rest/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/rest/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() @@ -111,7 +111,7 @@ flags_hud = FLAG_HUD_MOB -/obj/hud/button/stand/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/stand/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() diff --git a/code/_core/obj/hud/buttons/new_targeting.dm b/code/_core/obj/hud/buttons/new_targeting.dm index 44e967a54f..0f03af03a6 100644 --- a/code/_core/obj/hud/buttons/new_targeting.dm +++ b/code/_core/obj/hud/buttons/new_targeting.dm @@ -25,7 +25,7 @@ mouse_opacity = 1 -/obj/hud/button/targeting_new/update_owner(var/mob/desired_owner) +/obj/hud/button/targeting_new/update_owner(mob/desired_owner) . = ..() @@ -33,7 +33,7 @@ update_overlays() -/obj/hud/button/targeting_new/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/targeting_new/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() diff --git a/code/_core/obj/hud/buttons/objectives.dm b/code/_core/obj/hud/buttons/objectives.dm index ad3b54cb8a..6869361670 100644 --- a/code/_core/obj/hud/buttons/objectives.dm +++ b/code/_core/obj/hud/buttons/objectives.dm @@ -12,7 +12,7 @@ icon_state = "objectives" mouse_opacity = 2 -/obj/hud/button/objectives/New(var/desired_loc) +/obj/hud/button/objectives/New(desired_loc) SSobj.all_objective_buttons += src return ..() @@ -20,7 +20,7 @@ SSobj.all_objective_buttons -= src return ..() -/obj/hud/button/objectives/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/objectives/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() caller.to_chat(SSgamemode.active_gamemode.objective_text) diff --git a/code/_core/obj/hud/buttons/ping.dm b/code/_core/obj/hud/buttons/ping.dm index 83a5f6c698..5c23329ec1 100644 --- a/code/_core/obj/hud/buttons/ping.dm +++ b/code/_core/obj/hud/buttons/ping.dm @@ -11,7 +11,7 @@ has_quick_function = FALSE -/obj/hud/button/ping/New(var/desired_loc) +/obj/hud/button/ping/New(desired_loc) start_thinking(src) return ..() diff --git a/code/_core/obj/hud/buttons/research_game/board.dm b/code/_core/obj/hud/buttons/research_game/board.dm index d9193119e1..06dc148c70 100644 --- a/code/_core/obj/hud/buttons/research_game/board.dm +++ b/code/_core/obj/hud/buttons/research_game/board.dm @@ -75,7 +75,7 @@ return FALSE -/obj/hud/button/research/board/proc/add_points(var/points_to_add) +/obj/hud/button/research/board/proc/add_points(points_to_add) level = 1 + FLOOR(points/5,1) time_left += (points_to_add)*10 //In Deciseconds if(points_to_add >= 2) @@ -112,7 +112,7 @@ return ..() -/obj/hud/button/research/board/update_owner(var/desired_owner) +/obj/hud/button/research/board/update_owner(desired_owner) . = ..() diff --git a/code/_core/obj/hud/buttons/research_game/helpers.dm b/code/_core/obj/hud/buttons/research_game/helpers.dm index 203ff0554f..7f99a69597 100644 --- a/code/_core/obj/hud/buttons/research_game/helpers.dm +++ b/code/_core/obj/hud/buttons/research_game/helpers.dm @@ -1,4 +1,4 @@ -/mob/living/proc/toggle_research_game(var/allow_disable=TRUE,var/allow_enable = TRUE) +/mob/living/proc/toggle_research_game(allow_disable=TRUE,allow_enable = TRUE) var/obj/hud/button/research/board/B diff --git a/code/_core/obj/hud/buttons/research_game/info.dm b/code/_core/obj/hud/buttons/research_game/info.dm index d2040eb6b9..8625b50c2d 100644 --- a/code/_core/obj/hud/buttons/research_game/info.dm +++ b/code/_core/obj/hud/buttons/research_game/info.dm @@ -38,7 +38,7 @@ layer = LAYER_SCREEN_BLOOD+4 mouse_opacity = 1 -/obj/hud/button/research/info/quit/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/research/info/quit/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() @@ -48,7 +48,7 @@ return TRUE -/obj/hud/button/research/info/effect/proc/do_effect(var/obj/hud/button/research/piece/P,var/points_given) +/obj/hud/button/research/info/effect/proc/do_effect(obj/hud/button/research/piece/P,points_given) maptext = "
+[points_given]
" screen_loc = P.screen_loc var/direction = pick(-1,1) diff --git a/code/_core/obj/hud/buttons/research_game/piece.dm b/code/_core/obj/hud/buttons/research_game/piece.dm index 20c07ce3fb..6075307133 100644 --- a/code/_core/obj/hud/buttons/research_game/piece.dm +++ b/code/_core/obj/hud/buttons/research_game/piece.dm @@ -57,7 +57,7 @@ return TRUE -/obj/hud/button/research/piece/proc/check_clear(var/no_score = FALSE) +/obj/hud/button/research/piece/proc/check_clear(no_score = FALSE) var/obj/hud/button/research/piece/left = x_p-1 >= 1 ? linked_board.pieces[x_p-1][y_p] : null var/obj/hud/button/research/piece/right = x_p+1 <= RESEARCH_BOARD_SIZE ? linked_board.pieces[x_p+1][y_p] : null @@ -99,7 +99,7 @@ return left_changed + right_changed + down_changed + up_changed -/obj/hud/button/research/piece/proc/clear_piece(var/add_points = FALSE) +/obj/hud/button/research/piece/proc/clear_piece(add_points = FALSE) color_01 = COLOR_BLACK color_02 = COLOR_BLACK color_03 = COLOR_BLACK @@ -130,7 +130,7 @@ check_clear() return TRUE -/obj/hud/button/research/piece/proc/should_destroy(var/color_A,var/color_B) +/obj/hud/button/research/piece/proc/should_destroy(color_A,color_B) if(!color_A || !color_B) return FALSE @@ -144,7 +144,7 @@ return TRUE -/obj/hud/button/research/piece/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/research/piece/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() @@ -203,14 +203,14 @@ overlays.Cut() return ..() -/obj/hud/button/research/piece/New(var/desired_loc) +/obj/hud/button/research/piece/New(desired_loc) color_01 = COLOR_BLACK color_02 = COLOR_BLACK color_03 = COLOR_BLACK color_04 = COLOR_BLACK return ..() -/obj/hud/button/research/piece/proc/initialize_colors(var/list/desired_colors = RESEARCH_POSSIBLE_COLORS) +/obj/hud/button/research/piece/proc/initialize_colors(list/desired_colors = RESEARCH_POSSIBLE_COLORS) var/obj/hud/button/research/piece/left = x_p-1 >= 1 ? linked_board.pieces[x_p-1][y_p] : null var/obj/hud/button/research/piece/right = x_p+1 <= RESEARCH_BOARD_SIZE ? linked_board.pieces[x_p+1][y_p] : null diff --git a/code/_core/obj/hud/buttons/skip.dm b/code/_core/obj/hud/buttons/skip.dm index b152574366..8b5293a14c 100644 --- a/code/_core/obj/hud/buttons/skip.dm +++ b/code/_core/obj/hud/buttons/skip.dm @@ -12,7 +12,7 @@ has_quick_function = FALSE -/obj/hud/button/skip/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/skip/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() diff --git a/code/_core/obj/hud/buttons/slot.dm b/code/_core/obj/hud/buttons/slot.dm index 55d184cab1..58723d6dca 100644 --- a/code/_core/obj/hud/buttons/slot.dm +++ b/code/_core/obj/hud/buttons/slot.dm @@ -27,7 +27,7 @@ stored_object = null return ..() -/obj/hud/button/slot/update_owner(var/mob/desired_owner) +/obj/hud/button/slot/update_owner(mob/desired_owner) if(owner && !desired_owner && is_advanced(owner)) var/mob/living/advanced/A = owner @@ -39,7 +39,7 @@ var/mob/living/advanced/A = owner A.slot_buttons[id] = src -/obj/hud/button/slot/proc/activate_button(var/mob/living/advanced/caller) +/obj/hud/button/slot/proc/activate_button(mob/living/advanced/caller) if(!stored_object) return FALSE @@ -70,10 +70,10 @@ invisibility = 101 return TRUE -/obj/hud/button/slot/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/slot/clicked_on_by_object(mob/caller,atom/object,location,control,params) return TRUE -/obj/hud/button/slot/proc/store_object(var/atom/object,location,control,params) +/obj/hud/button/slot/proc/store_object(atom/object,location,control,params) if(!object) return FALSE diff --git a/code/_core/obj/hud/buttons/spectate.dm b/code/_core/obj/hud/buttons/spectate.dm index 58f0a41ce2..122771453e 100644 --- a/code/_core/obj/hud/buttons/spectate.dm +++ b/code/_core/obj/hud/buttons/spectate.dm @@ -2,7 +2,7 @@ name = "spectate" -/obj/hud/button/vr_spectate/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/vr_spectate/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() if(!SSvirtual_reality || !SSvirtual_reality.current_virtual_reality) diff --git a/code/_core/obj/hud/buttons/squad/_squad.dm b/code/_core/obj/hud/buttons/squad/_squad.dm index f8f012afcb..986a96facd 100644 --- a/code/_core/obj/hud/buttons/squad/_squad.dm +++ b/code/_core/obj/hud/buttons/squad/_squad.dm @@ -23,7 +23,7 @@ return ..() -/obj/hud/button/squad/main/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/squad/main/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() @@ -71,7 +71,7 @@ new_squad(P) -/obj/hud/button/squad/main/proc/new_squad(var/mob/living/advanced/player/P) +/obj/hud/button/squad/main/proc/new_squad(mob/living/advanced/player/P) while(P.client) var/squad_name = input("Please enter your squad name. Enter nothing to cancel.","Squad Creation",null) as text|null @@ -124,11 +124,11 @@ tracked_mob = null return ..() -/obj/hud/button/squad/member/New(var/desired_loc,var/desired_tracked_mob) +/obj/hud/button/squad/member/New(desired_loc,desired_tracked_mob) tracked_mob = desired_tracked_mob return ..() -/obj/hud/button/squad/member/update_owner(var/desired_owner) +/obj/hud/button/squad/member/update_owner(desired_owner) . = ..() diff --git a/code/_core/obj/hud/buttons/stat/_stat.dm b/code/_core/obj/hud/buttons/stat/_stat.dm index 353fc043b7..aacecf8766 100644 --- a/code/_core/obj/hud/buttons/stat/_stat.dm +++ b/code/_core/obj/hud/buttons/stat/_stat.dm @@ -13,7 +13,7 @@ return FALSE //Returning false means remove it from update. Returning true means keep it updating. -/obj/hud/button/stat/update_owner(var/mob/desired_owner) +/obj/hud/button/stat/update_owner(mob/desired_owner) if(owner && is_living(owner)) var/mob/living/L = owner diff --git a/code/_core/obj/hud/buttons/stat/body.dm b/code/_core/obj/hud/buttons/stat/body.dm index 5c452f4409..cf60287930 100644 --- a/code/_core/obj/hud/buttons/stat/body.dm +++ b/code/_core/obj/hud/buttons/stat/body.dm @@ -17,7 +17,7 @@ labeled_overlays?.Cut() . = ..() -/obj/hud/button/stat/body/update_owner(var/mob/desired_owner) +/obj/hud/button/stat/body/update_owner(mob/desired_owner) . = ..() @@ -46,7 +46,7 @@ add_vis_content(I) update() -/obj/hud/button/stat/body/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/stat/body/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(is_living(caller)) var/mob/living/L = caller @@ -101,5 +101,5 @@ . = ..() -/obj/hud/button/stat/body/get_examine_list(var/mob/examiner) +/obj/hud/button/stat/body/get_examine_list(mob/examiner) return examiner.get_examine_list(examiner) diff --git a/code/_core/obj/hud/buttons/stat/ecg.dm b/code/_core/obj/hud/buttons/stat/ecg.dm index 184766547a..a58b2e9516 100644 --- a/code/_core/obj/hud/buttons/stat/ecg.dm +++ b/code/_core/obj/hud/buttons/stat/ecg.dm @@ -14,7 +14,7 @@ mouse_opacity = 0 -/obj/hud/button/stat/ecg/New(var/desired_loc) +/obj/hud/button/stat/ecg/New(desired_loc) . = ..() filters += filter(type="drop_shadow",x=0,y=0,size=2,offset=1,color=rgb(0,255,0,100)) @@ -25,7 +25,7 @@ I.blend_mode = BLEND_INSET_OVERLAY add_overlay(I) -/obj/hud/button/stat/ecg/update_owner(var/mob/desired_owner) +/obj/hud/button/stat/ecg/update_owner(mob/desired_owner) color = "#000000" . = ..() @@ -90,5 +90,5 @@ . = ..() -/obj/hud/button/stat/ecg/get_examine_list(var/mob/examiner) +/obj/hud/button/stat/ecg/get_examine_list(mob/examiner) return examiner.get_examine_list(examiner) diff --git a/code/_core/obj/hud/buttons/stat/mana.dm b/code/_core/obj/hud/buttons/stat/mana.dm index 7adf09fc4d..411c2d7b3d 100644 --- a/code/_core/obj/hud/buttons/stat/mana.dm +++ b/code/_core/obj/hud/buttons/stat/mana.dm @@ -22,7 +22,7 @@ I.appearance_flags = src.appearance_flags | RESET_COLOR | RESET_ALPHA add_underlay(I) -/obj/hud/button/stat/mana/update_owner(var/mob/desired_owner) +/obj/hud/button/stat/mana/update_owner(mob/desired_owner) color = "#000000" . = ..() @@ -72,5 +72,5 @@ . = ..() -/obj/hud/button/stat/mana/get_examine_list(var/mob/examiner) +/obj/hud/button/stat/mana/get_examine_list(mob/examiner) return examiner.get_examine_list(examiner) diff --git a/code/_core/obj/hud/buttons/stat/resist_bar.dm b/code/_core/obj/hud/buttons/stat/resist_bar.dm index 03da31f2e1..878c44c6ee 100644 --- a/code/_core/obj/hud/buttons/stat/resist_bar.dm +++ b/code/_core/obj/hud/buttons/stat/resist_bar.dm @@ -21,7 +21,7 @@ QDEL_NULL(stored_line) . = ..() -/obj/hud/button/stat/resist_bar/New(var/desired_loc) +/obj/hud/button/stat/resist_bar/New(desired_loc) . = ..() stored_line = new(src) stored_line.icon = 'icons/hud/escape.dmi' diff --git a/code/_core/obj/hud/buttons/stat/screen_effect.dm b/code/_core/obj/hud/buttons/stat/screen_effect.dm index 3c7c9c9066..b438b222b4 100644 --- a/code/_core/obj/hud/buttons/stat/screen_effect.dm +++ b/code/_core/obj/hud/buttons/stat/screen_effect.dm @@ -20,7 +20,7 @@ flags_hud = FLAG_HUD_SPECIAL -/obj/hud/button/stat/screen_effect/update_owner(var/mob/desired_owner) +/obj/hud/button/stat/screen_effect/update_owner(mob/desired_owner) alpha = 0 switch(dir) if(NORTHWEST) diff --git a/code/_core/obj/hud/buttons/stat/stamina.dm b/code/_core/obj/hud/buttons/stat/stamina.dm index 5d96cddb0a..389f9bbbff 100644 --- a/code/_core/obj/hud/buttons/stat/stamina.dm +++ b/code/_core/obj/hud/buttons/stat/stamina.dm @@ -22,7 +22,7 @@ I.appearance_flags = src.appearance_flags | RESET_COLOR | RESET_ALPHA add_underlay(I) -/obj/hud/button/stat/stamina/update_owner(var/mob/desired_owner) +/obj/hud/button/stat/stamina/update_owner(mob/desired_owner) color = "#000000" . = ..() @@ -71,5 +71,5 @@ . = ..() -/obj/hud/button/stat/mana/get_examine_list(var/mob/examiner) +/obj/hud/button/stat/mana/get_examine_list(mob/examiner) return examiner.get_examine_list(examiner) diff --git a/code/_core/obj/hud/buttons/teleport.dm b/code/_core/obj/hud/buttons/teleport.dm index 96cbdaa0b3..f4bed29973 100644 --- a/code/_core/obj/hud/buttons/teleport.dm +++ b/code/_core/obj/hud/buttons/teleport.dm @@ -33,7 +33,7 @@ return ..() -/obj/hud/button/teleport/teleport_here/update_owner(var/mob/desired_owner) +/obj/hud/button/teleport/teleport_here/update_owner(mob/desired_owner) . = ..() @@ -48,7 +48,7 @@ name = known_locations[map_number] -/obj/hud/button/teleport/teleport_here/clicked_on_by_object(var/mob/caller,object,location,control,params) +/obj/hud/button/teleport/teleport_here/clicked_on_by_object(mob/caller,object,location,control,params) if(icon_state && all_wishgranters[icon_state] && is_player(caller)) @@ -71,7 +71,7 @@ -/obj/hud/button/teleport/teleport_here/proc/cycle_map(var/mob/living/advanced/A,var/desired_direction = EAST) +/obj/hud/button/teleport/teleport_here/proc/cycle_map(mob/living/advanced/A,desired_direction = EAST) var/list/known_locations = A.known_wishgranters - "main" @@ -91,7 +91,7 @@ /obj/hud/button/teleport/cycle/ icon_state = "arrow" -/obj/hud/button/teleport/cycle/clicked_on_by_object(var/mob/caller,object,location,control,params) +/obj/hud/button/teleport/cycle/clicked_on_by_object(mob/caller,object,location,control,params) if(!is_advanced(caller)) return FALSE diff --git a/code/_core/obj/hud/buttons/thirst.dm b/code/_core/obj/hud/buttons/thirst.dm index be7028028d..0bafd8832c 100644 --- a/code/_core/obj/hud/buttons/thirst.dm +++ b/code/_core/obj/hud/buttons/thirst.dm @@ -21,7 +21,7 @@ if(. && owner) update_sprite() -/obj/hud/button/thirst/get_examine_list(var/mob/caller) +/obj/hud/button/thirst/get_examine_list(mob/caller) . = ..() diff --git a/code/_core/obj/hud/buttons/tooltip.dm b/code/_core/obj/hud/buttons/tooltip.dm index fe3568c1ac..92022c7a1b 100644 --- a/code/_core/obj/hud/buttons/tooltip.dm +++ b/code/_core/obj/hud/buttons/tooltip.dm @@ -17,7 +17,7 @@ layer = LAYER_HUD_TOOLTIP -/obj/hud/button/tooltip/proc/set_text(var/desired_text,var/desired_screen_loc) +/obj/hud/button/tooltip/proc/set_text(desired_text,desired_screen_loc) if(!desired_text || !desired_screen_loc) animate(src,alpha=0,flags=ANIMATION_PARALLEL,time=2) @@ -29,7 +29,7 @@ return TRUE -/obj/hud/button/tooltip/update_owner(var/mob/desired_owner) +/obj/hud/button/tooltip/update_owner(mob/desired_owner) var/mob/old_owner = owner diff --git a/code/_core/obj/hud/buttons/vehicle/_vehicle.dm b/code/_core/obj/hud/buttons/vehicle/_vehicle.dm index b66e63bbd6..4f77630aeb 100644 --- a/code/_core/obj/hud/buttons/vehicle/_vehicle.dm +++ b/code/_core/obj/hud/buttons/vehicle/_vehicle.dm @@ -19,11 +19,11 @@ maptext_x = 4 var/weapon_slot = 1 -/obj/hud/button/vehicle/weapon/proc/set_map_text(var/desired_text) +/obj/hud/button/vehicle/weapon/proc/set_map_text(desired_text) maptext = desired_text return TRUE -/obj/hud/button/vehicle/weapon/update_owner(var/mob/desired_owner) +/obj/hud/button/vehicle/weapon/update_owner(mob/desired_owner) . = ..() @@ -42,7 +42,7 @@ maptext_x = 4 weapon_slot = 2 -/obj/hud/button/vehicle/weapon/right/set_map_text(var/desired_text) +/obj/hud/button/vehicle/weapon/right/set_map_text(desired_text) maptext = "
[desired_text]
" return TRUE @@ -52,7 +52,7 @@ icon_state = "eject" screen_loc = "RIGHT,BOTTOM:12+2" -/obj/hud/button/vehicle/eject/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/vehicle/eject/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() @@ -68,7 +68,7 @@ var/weapon_slot = 1 screen_loc = "CENTER-1.4,BOTTOM:12+0.5" -/obj/hud/button/vehicle/ammo_display/proc/set_map_text(var/desired_text) +/obj/hud/button/vehicle/ammo_display/proc/set_map_text(desired_text) maptext = desired_text return TRUE @@ -85,7 +85,7 @@ weapon_slot = 2 screen_loc = "CENTER+1.4,BOTTOM:12+0.5" -/obj/hud/button/vehicle/ammo_display/right/set_map_text(var/desired_text) +/obj/hud/button/vehicle/ammo_display/right/set_map_text(desired_text) maptext = "
[desired_text]
" return TRUE */ \ No newline at end of file diff --git a/code/_core/obj/hud/buttons/vendor/_vendor_button.dm b/code/_core/obj/hud/buttons/vendor/_vendor_button.dm index 100d98ca5d..de7e48ea15 100644 --- a/code/_core/obj/hud/buttons/vendor/_vendor_button.dm +++ b/code/_core/obj/hud/buttons/vendor/_vendor_button.dm @@ -23,12 +23,12 @@ var/locked //Accepts a string if it's locked. -/obj/hud/button/vendor/get_examine_list(var/mob/caller) +/obj/hud/button/vendor/get_examine_list(mob/caller) if(!associated_item) return ..() return associated_item.get_examine_list(caller) -/obj/hud/button/vendor/get_examine_details_list(var/mob/caller) +/obj/hud/button/vendor/get_examine_details_list(mob/caller) if(!associated_item) return ..() return associated_item.get_examine_details_list(caller) @@ -134,7 +134,7 @@ else color = initial(color) -/obj/hud/button/vendor/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/vendor/clicked_on_by_object(mob/caller,atom/object,location,control,params) SPAM_CHECK(5) @@ -180,7 +180,7 @@ has_quick_function = FALSE -/obj/hud/button/close_vendor/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/close_vendor/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() diff --git a/code/_core/obj/hud/buttons/vendor_defer.dm b/code/_core/obj/hud/buttons/vendor_defer.dm index 2afe3e9f4c..ba45df0b2f 100644 --- a/code/_core/obj/hud/buttons/vendor_defer.dm +++ b/code/_core/obj/hud/buttons/vendor_defer.dm @@ -17,7 +17,7 @@ name = associated_vendor.name desc_extended = associated_vendor.desc_extended -/obj/hud/button/vendor_defer/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/vendor_defer/clicked_on_by_object(mob/caller,atom/object,location,control,params) ..() . = associated_vendor.clicked_on_by_object(caller,object,location,control,params) return . @@ -42,7 +42,7 @@ -/obj/hud/button/vendor_close/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/vendor_close/clicked_on_by_object(mob/caller,atom/object,location,control,params) close() diff --git a/code/_core/obj/hud/buttons/virtual_reality.dm b/code/_core/obj/hud/buttons/virtual_reality.dm index 05a3944380..769ede5178 100644 --- a/code/_core/obj/hud/buttons/virtual_reality.dm +++ b/code/_core/obj/hud/buttons/virtual_reality.dm @@ -10,7 +10,7 @@ icon_state = "question" screen_loc = "CENTER-1,CENTER" -/obj/hud/button/virtual_reality/info/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/virtual_reality/info/clicked_on_by_object(mob/caller,atom/object,location,control,params) linked_pod.print_information() . = ..() @@ -19,7 +19,7 @@ icon_state = "arrow" screen_loc = "CENTER,CENTER" -/obj/hud/button/virtual_reality/enter/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/virtual_reality/enter/clicked_on_by_object(mob/caller,atom/object,location,control,params) linked_pod.enter_virtual_reality() . = ..() @@ -28,6 +28,6 @@ icon_state = "view_inventory" screen_loc = "CENTER+1,CENTER" -/obj/hud/button/virtual_reality/exit/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/virtual_reality/exit/clicked_on_by_object(mob/caller,atom/object,location,control,params) linked_pod.force_eject_user() . = ..() \ No newline at end of file diff --git a/code/_core/obj/hud/buttons/widget.dm b/code/_core/obj/hud/buttons/widget.dm index f9b6e073af..b216e22c59 100644 --- a/code/_core/obj/hud/buttons/widget.dm +++ b/code/_core/obj/hud/buttons/widget.dm @@ -18,7 +18,7 @@ icon_state = "xp_new" screen_loc = "RIGHT-1,TOP" -/obj/hud/button/widget/experience/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/widget/experience/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() @@ -94,7 +94,7 @@ icon_state = "logout_new" screen_loc = "RIGHT,TOP" -/obj/hud/button/widget/logout/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/widget/logout/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() @@ -109,7 +109,7 @@ icon_state = "theme_new" screen_loc = "RIGHT-2,TOP" -/obj/hud/button/widget/change_theme/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/widget/change_theme/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(!is_player(caller)) return ..() @@ -130,7 +130,7 @@ icon_state = "map_new" screen_loc = "RIGHT-3,TOP" -/obj/hud/button/widget/view_map/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/hud/button/widget/view_map/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() diff --git a/code/_core/obj/hud/click_and_drag.dm b/code/_core/obj/hud/click_and_drag.dm index c78de7d679..326b13e9d7 100644 --- a/code/_core/obj/hud/click_and_drag.dm +++ b/code/_core/obj/hud/click_and_drag.dm @@ -24,7 +24,7 @@ stored_inventory = null . = ..() -/obj/hud/click_and_drag/New(var/desired_loc) +/obj/hud/click_and_drag/New(desired_loc) if(ismob(desired_loc)) screen_loc = "CENTER,CENTER" diff --git a/code/_core/obj/hud/examine.dm b/code/_core/obj/hud/examine.dm index 5fd23b1d86..45ca6f9cd9 100644 --- a/code/_core/obj/hud/examine.dm +++ b/code/_core/obj/hud/examine.dm @@ -18,7 +18,7 @@ maptext_width = TILE_SIZE*5 maptext_height = TILE_SIZE*2 -/obj/hud/examine/New(var/desired_loc) +/obj/hud/examine/New(desired_loc) if(ismob(desired_loc)) screen_loc = "CENTER-2,TOP - 2" diff --git a/code/_core/obj/hud/flash.dm b/code/_core/obj/hud/flash.dm index 61d9574d43..ed042f2507 100644 --- a/code/_core/obj/hud/flash.dm +++ b/code/_core/obj/hud/flash.dm @@ -15,7 +15,7 @@ var/duration = 0 -/obj/hud/flash/New(var/desired_loc) +/obj/hud/flash/New(desired_loc) screen_loc = "LEFT,BOTTOM:12" . = ..() diff --git a/code/_core/obj/hud/inventory/_inventory.dm b/code/_core/obj/hud/inventory/_inventory.dm index add51895f7..9fe913a29a 100644 --- a/code/_core/obj/hud/inventory/_inventory.dm +++ b/code/_core/obj/hud/inventory/_inventory.dm @@ -119,7 +119,7 @@ . = ..() -/obj/hud/inventory/proc/is_occupied(var/ignore_contents=FALSE) +/obj/hud/inventory/proc/is_occupied(ignore_contents=FALSE) if(!ignore_contents && length(contents)) return TRUE @@ -140,7 +140,7 @@ return FALSE -/obj/hud/inventory/proc/show(var/should_show,var/speed=1 SECONDS) +/obj/hud/inventory/proc/show(should_show,speed=1 SECONDS) if(should_show) animate(src,alpha=initial(alpha),time=speed) mouse_opacity = initial(mouse_opacity) @@ -152,10 +152,10 @@ . = ..() update_sprite() -/obj/hud/inventory/can_be_attacked(var/atom/attacker,var/atom/weapon,var/params,var/damagetype/damage_type) +/obj/hud/inventory/can_be_attacked(atom/attacker,atom/weapon,params,damagetype/damage_type) return FALSE -/obj/hud/inventory/get_examine_list(var/atom/examiner) +/obj/hud/inventory/get_examine_list(atom/examiner) var/obj/item/I = get_top_object() if(!I) return list() @@ -180,7 +180,7 @@ I.pixel_x = x_offset add_overlay(I) -/obj/hud/inventory/proc/update_worn_icon(var/obj/item/item_to_update) +/obj/hud/inventory/proc/update_worn_icon(obj/item/item_to_update) var/mob/living/advanced/A = owner @@ -197,7 +197,7 @@ return TRUE -/obj/hud/inventory/proc/update_held_icon(var/obj/item/item_to_update) +/obj/hud/inventory/proc/update_held_icon(obj/item/item_to_update) //OVERLAY BUG, NOT THIS. if(!owner || !is_advanced(owner) || !item_to_update) @@ -340,7 +340,7 @@ return TRUE -/obj/hud/inventory/update_owner(var/mob/desired_owner) //Can also be safely used as an updater. +/obj/hud/inventory/update_owner(mob/desired_owner) //Can also be safely used as an updater. if(owner == desired_owner) return FALSE @@ -356,7 +356,7 @@ return TRUE -/obj/hud/inventory/proc/add_object(var/obj/item/I,var/messages = TRUE,var/bypass_checks = FALSE,var/silent=FALSE,var/debug=FALSE) +/obj/hud/inventory/proc/add_object(obj/item/I,messages = TRUE,bypass_checks = FALSE,silent=FALSE,debug=FALSE) if(!I) if(debug) log_error("add_object() fail: Item didn't exist!") @@ -422,7 +422,7 @@ return TRUE -/obj/hud/inventory/proc/drop_objects(var/turf/T,var/disarm=FALSE) +/obj/hud/inventory/proc/drop_objects(turf/T,disarm=FALSE) . = list() @@ -440,7 +440,7 @@ I.delete_on_drop = TRUE remove_object(I,T) -/obj/hud/inventory/proc/remove_object(var/obj/item/I,var/turf/drop_loc,var/pixel_x_offset=0,var/pixel_y_offset=0,var/silent=FALSE) //Removes the object from both worn and held objects, just in case. +/obj/hud/inventory/proc/remove_object(obj/item/I,turf/drop_loc,pixel_x_offset=0,pixel_y_offset=0,silent=FALSE) //Removes the object from both worn and held objects, just in case. if(!I) log_error("Error: Tried to remove null object from an inventory!") @@ -498,7 +498,7 @@ HOOK_CALL("update_stats") -/obj/hud/inventory/proc/can_unslot_object(var/obj/item/I,var/messages = FALSE) +/obj/hud/inventory/proc/can_unslot_object(obj/item/I,messages = FALSE) return TRUE /* Slot overhaul, might need this. @@ -521,7 +521,7 @@ return TRUE */ -/obj/hud/inventory/act_emp(var/atom/owner,var/atom/source,var/atom/epicenter,var/magnitude,var/desired_loyalty_tag) +/obj/hud/inventory/act_emp(atom/owner,atom/source,atom/epicenter,magnitude,desired_loyalty_tag) . = ..() @@ -530,7 +530,7 @@ if(M.act_emp(owner,source,epicenter,magnitude,desired_loyalty_tag)) . = TRUE -/obj/hud/inventory/proc/can_slot_object(var/obj/item/I,var/messages = FALSE,var/bypass=FALSE) +/obj/hud/inventory/proc/can_slot_object(obj/item/I,messages = FALSE,bypass=FALSE) if(loc && loc == I) return FALSE diff --git a/code/_core/obj/hud/inventory/bank.dm b/code/_core/obj/hud/inventory/bank.dm index 2219e1bc5f..9d78ad0bbe 100644 --- a/code/_core/obj/hud/inventory/bank.dm +++ b/code/_core/obj/hud/inventory/bank.dm @@ -13,7 +13,7 @@ priority = -101 -/obj/hud/inventory/dynamic/bank/can_slot_object(var/obj/item/I,var/messages = FALSE,var/bypass=FALSE) +/obj/hud/inventory/dynamic/bank/can_slot_object(obj/item/I,messages = FALSE,bypass=FALSE) if(!bypass) if(length(I.inventories) && I.size >= SIZE_2) diff --git a/code/_core/obj/hud/inventory/crafting.dm b/code/_core/obj/hud/inventory/crafting.dm index 848624ad4b..00422d40e7 100644 --- a/code/_core/obj/hud/inventory/crafting.dm +++ b/code/_core/obj/hud/inventory/crafting.dm @@ -10,7 +10,7 @@ drag_to_take = FALSE -/obj/hud/inventory/crafting/obj/hud/inventory/can_slot_object(var/obj/item/I,var/messages = FALSE,var/bypass=FALSE) +/obj/hud/inventory/crafting/obj/hud/inventory/can_slot_object(obj/item/I,messages = FALSE,bypass=FALSE) if(!bypass && length(I.inventories)) owner?.to_chat(span("notice","\The [I.name] cannot be fit inside \the [src.name]!")) diff --git a/code/_core/obj/hud/inventory/dynamic.dm b/code/_core/obj/hud/inventory/dynamic.dm index de6206b68f..b465abef8e 100644 --- a/code/_core/obj/hud/inventory/dynamic.dm +++ b/code/_core/obj/hud/inventory/dynamic.dm @@ -17,7 +17,7 @@ priority = -100 //Very low priority -/obj/hud/inventory/dynamic/New(var/desired_loc) +/obj/hud/inventory/dynamic/New(desired_loc) . = ..() if(is_atom(desired_loc)) var/atom/A = desired_loc @@ -27,7 +27,7 @@ /obj/hud/inventory/dynamic/sandwich //Special logic for buns -/obj/hud/inventory/dynamic/sandwich/can_slot_object(var/obj/item/I,var/messages = FALSE,var/bypass=FALSE) +/obj/hud/inventory/dynamic/sandwich/can_slot_object(obj/item/I,messages = FALSE,bypass=FALSE) if(src.loc && istype(src.loc.loc,/obj/hud/inventory/dynamic/sandwich/)) //Our sandwich is in of another sandwich. Do not accept items. //No message needed. diff --git a/code/_core/obj/hud/inventory/exchange.dm b/code/_core/obj/hud/inventory/exchange.dm index 2c9eac4b17..3a4a472abc 100644 --- a/code/_core/obj/hud/inventory/exchange.dm +++ b/code/_core/obj/hud/inventory/exchange.dm @@ -19,7 +19,7 @@ screen_loc = "CENTER,CENTER" -/obj/hud/inventory/exchange/proc/on_exchange(var/obj/item/inserted_item) +/obj/hud/inventory/exchange/proc/on_exchange(obj/item/inserted_item) return FALSE @@ -27,7 +27,7 @@ name = "gold coins exchange" -/obj/hud/inventory/exchange/gold_coins/on_exchange(var/obj/item/inserted_item) +/obj/hud/inventory/exchange/gold_coins/on_exchange(obj/item/inserted_item) if(!istype(inserted_item,/obj/item/currency)) return FALSE diff --git a/code/_core/obj/hud/inventory/grabbing.dm b/code/_core/obj/hud/inventory/grabbing.dm index f05297d0f3..4e713b5f8c 100644 --- a/code/_core/obj/hud/inventory/grabbing.dm +++ b/code/_core/obj/hud/inventory/grabbing.dm @@ -1,4 +1,4 @@ -/obj/hud/inventory/proc/grab_object(var/mob/caller as mob,var/atom/movable/object,location,control,params) +/obj/hud/inventory/proc/grab_object(mob/caller as mob,atom/movable/object,location,control,params) if(caller == object) caller.to_chat(span("notice","You cannot grab yourself, ERP is against the rules!")) @@ -81,7 +81,7 @@ return TRUE -/obj/hud/inventory/proc/release_object(var/mob/caller) +/obj/hud/inventory/proc/release_object(mob/caller) if(!grabbed_object) return FALSE if(caller && owner) @@ -105,7 +105,7 @@ if(owner) HOOK_CALL_ADV("grab_changed",owner,args) return TRUE -/obj/hud/inventory/proc/can_grab(var/mob/caller,var/atom/movable/object) +/obj/hud/inventory/proc/can_grab(mob/caller,atom/movable/object) if(!object || !caller) return FALSE @@ -118,7 +118,7 @@ return TRUE -/obj/hud/inventory/proc/reinforce_grab(var/mob/living/caller,var/force=FALSE) +/obj/hud/inventory/proc/reinforce_grab(mob/living/caller,force=FALSE) if(!grabbed_object) CRASH("Tried calling reinforce_grab without a grabbed object!") diff --git a/code/_core/obj/hud/inventory/interaction.dm b/code/_core/obj/hud/inventory/interaction.dm index 9dba12db20..11bc04365a 100644 --- a/code/_core/obj/hud/inventory/interaction.dm +++ b/code/_core/obj/hud/inventory/interaction.dm @@ -1,4 +1,4 @@ -/obj/hud/inventory/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) //The src is used on the object +/obj/hud/inventory/click_on_object(mob/caller as mob,atom/object,location,control,params) //The src is used on the object //Dead can't interact. if(is_living(caller)) @@ -241,7 +241,7 @@ return TRUE //Returning TRUE here as returning false would just run the above. -/obj/hud/inventory/proc/toggle_wield(var/mob/caller,var/obj/item/item_to_wield) +/obj/hud/inventory/proc/toggle_wield(mob/caller,obj/item/item_to_wield) if(parent_inventory) unwield(caller,item_to_wield) @@ -251,7 +251,7 @@ return TRUE -/obj/hud/inventory/proc/can_wield(var/mob/caller,var/obj/item/item_to_wield) +/obj/hud/inventory/proc/can_wield(mob/caller,obj/item/item_to_wield) if(src.is_occupied()) caller.to_chat(span("warning","Your hand must be unoccupied in order to wield this!")) @@ -271,7 +271,7 @@ -/obj/hud/inventory/proc/unwield(var/mob/caller,var/obj/item/item_to_wield) +/obj/hud/inventory/proc/unwield(mob/caller,obj/item/item_to_wield) caller.to_chat(span("notice","You unbrace \the [item_to_wield] with your [src.loc.name].")) @@ -289,7 +289,7 @@ return TRUE -/obj/hud/inventory/proc/wield(var/mob/caller,var/obj/item/item_to_wield) +/obj/hud/inventory/proc/wield(mob/caller,obj/item/item_to_wield) if(!is_item(item_to_wield) || !item_to_wield.can_wield) caller.to_chat(span("warning","You can't wield this!")) @@ -315,7 +315,7 @@ return TRUE -/obj/hud/inventory/dropped_on_by_object(var/mob/caller,var/atom/object,location,control,params) //Object dropped on src +/obj/hud/inventory/dropped_on_by_object(mob/caller,atom/object,location,control,params) //Object dropped on src DEFER_OBJECT @@ -329,7 +329,7 @@ . = ..() -/obj/hud/inventory/get_object_to_damage_with(var/atom/attacker,var/atom/victim,var/list/params=list(),var/accurate=FALSE,var/find_closet=FALSE) +/obj/hud/inventory/get_object_to_damage_with(atom/attacker,atom/victim,list/params=list(),accurate=FALSE,find_closet=FALSE) return src.loc obj/hud/inventory/proc/drop_item_from_inventory(var/turf/new_location,var/pixel_x_offset = 0,var/pixel_y_offset = 0,var/silent=FALSE) @@ -341,7 +341,7 @@ obj/hud/inventory/proc/drop_item_from_inventory(var/turf/new_location,var/pixel_ return I.drop_item(new_location,pixel_x_offset,pixel_y_offset) -/obj/hud/inventory/defer_click_on_object(var/mob/caller,location,control,params) +/obj/hud/inventory/defer_click_on_object(mob/caller,location,control,params) if(grabbed_object) return grabbed_object @@ -351,7 +351,7 @@ obj/hud/inventory/proc/drop_item_from_inventory(var/turf/new_location,var/pixel_ return src -/obj/hud/inventory/on_mouse_up(var/mob/caller as mob, var/atom/object,location,control,params) +/obj/hud/inventory/on_mouse_up(mob/caller as mob, atom/object,location,control,params) var/atom/top_object = get_top_object() diff --git a/code/_core/obj/hud/inventory/mousedrag.dm b/code/_core/obj/hud/inventory/mousedrag.dm index 4e6981d8ce..e437674bef 100644 --- a/code/_core/obj/hud/inventory/mousedrag.dm +++ b/code/_core/obj/hud/inventory/mousedrag.dm @@ -1,4 +1,4 @@ -/obj/hud/inventory/MouseDrag(var/atom/src_object,var/atom/over_object,var/atom/src_location,var/atom/over_location,src_control,over_control,params) +/obj/hud/inventory/MouseDrag(atom/src_object,atom/over_object,atom/src_location,atom/over_location,src_control,over_control,params) if(!is_player(usr) || !is_inventory(over_object)) return ..() diff --git a/code/_core/obj/hud/inventory/secure.dm b/code/_core/obj/hud/inventory/secure.dm index 04228eeb40..ce74525728 100644 --- a/code/_core/obj/hud/inventory/secure.dm +++ b/code/_core/obj/hud/inventory/secure.dm @@ -43,7 +43,7 @@ priority = -101 -/obj/hud/inventory/dynamic/secure/can_slot_object(var/obj/item/I,var/messages = FALSE,var/bypass=FALSE) +/obj/hud/inventory/dynamic/secure/can_slot_object(obj/item/I,messages = FALSE,bypass=FALSE) if(!bypass) if(length(I.inventories) && I.size >= SIZE_2) diff --git a/code/_core/obj/hud/progressbar/_progressbar.dm b/code/_core/obj/hud/progressbar/_progressbar.dm index a7e67f8316..3ceae76f66 100644 --- a/code/_core/obj/hud/progressbar/_progressbar.dm +++ b/code/_core/obj/hud/progressbar/_progressbar.dm @@ -15,7 +15,7 @@ user_colors = FALSE -/obj/hud/progress_bar/New(var/atom/new_loc,var/desired_start_time = 0,var/desired_end_time = 1) +/obj/hud/progress_bar/New(atom/new_loc,desired_start_time = 0,desired_end_time = 1) start_time = desired_start_time end_time = desired_end_time diff --git a/code/_core/obj/hud/resistbar.dm b/code/_core/obj/hud/resistbar.dm index e7fe3e338a..94a19a0101 100644 --- a/code/_core/obj/hud/resistbar.dm +++ b/code/_core/obj/hud/resistbar.dm @@ -13,7 +13,7 @@ mouse_opacity = 0 alpha = 0 -/obj/hud/resistbar/New(var/desired_loc) +/obj/hud/resistbar/New(desired_loc) . = ..() stored_line = new diff --git a/code/_core/obj/hud/screen_blood/_screen_blood.dm b/code/_core/obj/hud/screen_blood/_screen_blood.dm index 07133d0c1f..9d9a7f45fd 100644 --- a/code/_core/obj/hud/screen_blood/_screen_blood.dm +++ b/code/_core/obj/hud/screen_blood/_screen_blood.dm @@ -17,7 +17,7 @@ maptext_height = 160 maptext_width = 160 -/obj/hud/screen_blood/New(var/desired_loc,var/desired_direction=NORTHWEST) +/obj/hud/screen_blood/New(desired_loc,desired_direction=NORTHWEST) if(is_living(desired_loc)) var/mob/living/L = desired_loc diff --git a/code/_core/obj/item/_item.dm b/code/_core/obj/item/_item.dm index 3c0ddc8389..470443d3a7 100644 --- a/code/_core/obj/item/_item.dm +++ b/code/_core/obj/item/_item.dm @@ -182,7 +182,7 @@ var/unlock_requirement //Accepts a string, which is a prerequiste to unlock this to purchase in vendors. -/obj/item/proc/can_unlock(var/mob/caller) +/obj/item/proc/can_unlock(mob/caller) return TRUE /obj/item/PreDestroy() @@ -212,7 +212,7 @@ . = ..() -/obj/item/proc/use_condition(var/amount_to_use=1) +/obj/item/proc/use_condition(amount_to_use=1) if(uses_until_condition_fall <= 0) return FALSE @@ -254,7 +254,7 @@ . *= (0.75 + 0.25*clamp(quality_max/100,0.25,2)) . = CEILING(.,1) -/obj/item/get_inaccuracy(var/atom/source,var/atom/target,var/inaccuracy_modifier=1) //Only applies to melee and unarmed. For ranged, see /obj/item/weapon/ranged/proc/get_bullet_inaccuracy(var/mob/living/L,var/atom/target) +/obj/item/get_inaccuracy(atom/source,atom/target,inaccuracy_modifier=1) //Only applies to melee and unarmed. For ranged, see /obj/item/weapon/ranged/proc/get_bullet_inaccuracy(mob/living/L,atom/target) if(inaccuracy_modifier <= 0) return 0 if(is_living(source)) @@ -264,7 +264,7 @@ return (1 - L.get_skill_power(SKILL_PRECISION,0,0.5,1))*inaccuracy_modifier*4 return 0 -/obj/item/proc/add_item_count(var/amount_to_add,var/bypass_checks = FALSE) +/obj/item/proc/add_item_count(amount_to_add,bypass_checks = FALSE) if(!bypass_checks) if(!amount_to_add) @@ -284,10 +284,10 @@ return amount_to_add -/obj/item/can_be_attacked(var/atom/attacker,var/atom/weapon,var/params,var/damagetype/damage_type) +/obj/item/can_be_attacked(atom/attacker,atom/weapon,params,damagetype/damage_type) return FALSE -/obj/item/can_be_grabbed(var/atom/grabber,var/messages=TRUE) +/obj/item/can_be_grabbed(atom/grabber,messages=TRUE) if(!src.z) if(messages && is_living(grabber)) @@ -297,7 +297,7 @@ return ..() -/obj/item/proc/can_add_object_to_src_inventory(var/mob/caller,var/obj/item/object,var/enable_messages = TRUE,var/bypass = FALSE) //Can we add object to src? +/obj/item/proc/can_add_object_to_src_inventory(mob/caller,obj/item/object,enable_messages = TRUE,bypass = FALSE) //Can we add object to src? if(!length(inventories)) return null @@ -317,7 +317,7 @@ return null -/obj/item/proc/add_object_to_src_inventory(var/mob/caller,var/obj/item/object,var/enable_messages = TRUE,var/bypass = FALSE,var/silent=FALSE) //We add the object to this item's inventory. +/obj/item/proc/add_object_to_src_inventory(mob/caller,obj/item/object,enable_messages = TRUE,bypass = FALSE,silent=FALSE) //We add the object to this item's inventory. if(!length(inventories)) return FALSE @@ -355,7 +355,7 @@ return FALSE -/obj/item/New(var/desired_loc) +/obj/item/New(desired_loc) if(is_container && size <= container_max_size && !length(container_whitelist)) log_error("Warning: [get_debug_name()] had a size ([size]) less than its container max size ([container_max_size]).") @@ -443,7 +443,7 @@ I.update_overlays() -/obj/item/get_examine_list(var/mob/examiner) +/obj/item/get_examine_list(mob/examiner) . = list() . += div("examine_title","[ICON_TO_HTML(src.icon,src.icon_state,32,32)][src.name]") @@ -501,7 +501,7 @@ /obj/item/proc/get_display_value() return value -/obj/item/get_examine_details_list(var/mob/examiner) +/obj/item/get_examine_details_list(mob/examiner) . = ..() if(reagents && reagents.volume_current) . += div("notice",reagents.get_contents_english()) @@ -523,7 +523,7 @@ return TRUE -/obj/item/post_move(var/atom/old_loc) +/obj/item/post_move(atom/old_loc) if(is_container && inventory_user) if(is_inventory(old_loc) && is_inventory(loc)) @@ -538,7 +538,7 @@ . = ..() -/obj/item/proc/on_equip(var/atom/old_location,var/silent=FALSE) +/obj/item/proc/on_equip(atom/old_location,silent=FALSE) var/obj/hud/inventory/new_location = loc @@ -554,10 +554,10 @@ return TRUE -/obj/item/proc/pre_equip(var/atom/old_location,var/obj/hud/inventory/new_location) //When the item is picked up or worn. +/obj/item/proc/pre_equip(atom/old_location,obj/hud/inventory/new_location) //When the item is picked up or worn. return TRUE -/obj/item/proc/on_unequip(var/obj/hud/inventory/old_inventory,var/silent=FALSE) //When the object is dropped from the old_inventory +/obj/item/proc/on_unequip(obj/hud/inventory/old_inventory,silent=FALSE) //When the object is dropped from the old_inventory if(!is_inventory(src.loc) && delete_on_drop) qdel(src) @@ -591,7 +591,7 @@ var/obj/item/I2 = I.get_top_object() if(I2) . += I2 -/obj/item/proc/can_be_held(var/mob/living/advanced/owner,var/obj/hud/inventory/I) +/obj/item/proc/can_be_held(mob/living/advanced/owner,obj/hud/inventory/I) if(delete_on_drop) return FALSE if(anchored) @@ -604,7 +604,7 @@ return FALSE return TRUE -/obj/item/proc/can_be_worn(var/mob/living/advanced/owner,var/obj/hud/inventory/I,var/messages=FALSE) +/obj/item/proc/can_be_worn(mob/living/advanced/owner,obj/hud/inventory/I,messages=FALSE) if(delete_on_drop) if(messages) owner.to_chat("\The [src.name] cannot be removed this way!") return FALSE @@ -630,16 +630,16 @@ return TRUE -/obj/item/trigger(var/mob/caller,var/atom/source,var/signal_freq,var/signal_code) +/obj/item/trigger(mob/caller,atom/source,signal_freq,signal_code) last_interacted = caller . = ..() -/obj/item/proc/get_reagents_to_consume(var/mob/living/consumer) +/obj/item/proc/get_reagents_to_consume(mob/living/consumer) var/reagent_container/temp/T = new(src,1000) reagents.transfer_reagents_to(T,get_consume_size(consumer)) return T.qdeleting ? null : T -/obj/item/proc/get_consume_size(var/mob/living/L) +/obj/item/proc/get_consume_size(mob/living/L) . = 5 if(is_advanced(L)) var/mob/living/advanced/A = L @@ -647,14 +647,14 @@ var/species/S = SSspecies.all_species[A.species] . = S.bite_size -/obj/item/proc/feed(var/mob/caller,var/mob/living/target) +/obj/item/proc/feed(mob/caller,mob/living/target) var/reagent_container/R = get_reagents_to_consume(target) if(!R) return FALSE R.consume(caller,target) return TRUE -/obj/item/proc/try_transfer_reagents(var/mob/caller,var/atom/object,var/location,var/control,var/params) +/obj/item/proc/try_transfer_reagents(mob/caller,atom/object,location,control,params) INTERACT_CHECK INTERACT_CHECK_OBJECT @@ -700,7 +700,7 @@ return FALSE -/obj/item/proc/can_feed(var/mob/caller,var/atom/target) +/obj/item/proc/can_feed(mob/caller,atom/target) INTERACT_CHECK_NO_DELAY(src) INTERACT_CHECK_NO_DELAY(target) @@ -738,7 +738,7 @@ return TRUE -/obj/item/act_explode(var/atom/owner,var/atom/source,var/atom/epicenter,var/magnitude,var/desired_loyalty_tag) +/obj/item/act_explode(atom/owner,atom/source,atom/epicenter,magnitude,desired_loyalty_tag) . = ..() @@ -767,7 +767,7 @@ /obj/item/proc/can_parry() return TRUE -/obj/item/can_attack(var/atom/attacker,var/atom/victim,var/atom/weapon,var/params,var/damagetype/damage_type) +/obj/item/can_attack(atom/attacker,atom/victim,atom/weapon,params,damagetype/damage_type) if(quality != -1 && quality <= 0) if(ismob(attacker)) var/mob/M = attacker @@ -775,11 +775,11 @@ return FALSE return ..() -/obj/item/attack(var/atom/attacker,var/atom/victim,var/list/params=list(),var/atom/blamed,var/ignore_distance = FALSE, var/precise = FALSE,var/damage_multiplier=1,var/damagetype/damage_type_override) //The src attacks the victim, with the blamed taking responsibility +/obj/item/attack(atom/attacker,atom/victim,list/params=list(),atom/blamed,ignore_distance = FALSE, precise = FALSE,damage_multiplier=1,damagetype/damage_type_override) //The src attacks the victim, with the blamed taking responsibility damage_multiplier *= get_quality_mod() . = ..() -/obj/item/proc/set_bloodstain(var/desired_level,var/desired_color,var/force=FALSE) +/obj/item/proc/set_bloodstain(desired_level,desired_color,force=FALSE) if(!force && !enable_blood_stains) return FALSE @@ -815,7 +815,7 @@ return TRUE -/obj/item/organ/set_bloodstain(var/desired_level,var/desired_color,var/force=FALSE) +/obj/item/organ/set_bloodstain(desired_level,desired_color,force=FALSE) . = ..() if(. && is_advanced(loc)) src.handle_overlays(loc,worn=TRUE,update=TRUE) @@ -846,12 +846,12 @@ I.color = blood_stain_color add_overlay(I) -/obj/item/dust(var/atom/source) +/obj/item/dust(atom/source) qdel(src) return TRUE -/obj/item/proc/negate_damage(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/atom/blamed,var/damage_dealt=0) +/obj/item/proc/negate_damage(atom/attacker,atom/victim,atom/weapon,atom/hit_object,atom/blamed,damage_dealt=0) return FALSE /obj/item/Generate() diff --git a/code/_core/obj/item/_item_blends.dm b/code/_core/obj/item/_item_blends.dm index 136613567e..88854f424d 100644 --- a/code/_core/obj/item/_item_blends.dm +++ b/code/_core/obj/item/_item_blends.dm @@ -1,4 +1,4 @@ -/obj/item/proc/initialize_worn_blends(var/desired_icon_state) +/obj/item/proc/initialize_worn_blends(desired_icon_state) if(length(polymorphs)) var/icon/initial_icon = initial(icon) @@ -55,7 +55,7 @@ return TRUE -/obj/item/proc/remove_blend(var/desired_id) +/obj/item/proc/remove_blend(desired_id) if(!additional_blends || !additional_blends[desired_id]) return FALSE @@ -66,7 +66,7 @@ return TRUE -/obj/item/proc/add_blend(var/desired_id,var/desired_icon,var/desired_icon_state,var/desired_color,var/desired_blend, var/desired_type, var/desired_should_save,var/desired_layer) +/obj/item/proc/add_blend(desired_id,desired_icon,desired_icon_state,desired_color,desired_blend, desired_type, desired_should_save,desired_layer) //Existing blend. if(additional_blends && additional_blends[desired_id]) @@ -102,7 +102,7 @@ return IB -/obj/item/proc/handle_overlays(var/mob/living/advanced/A,var/add=FALSE,var/remove=FALSE,var/update=FALSE,var/worn=FALSE,var/icon_state_override) +/obj/item/proc/handle_overlays(mob/living/advanced/A,add=FALSE,remove=FALSE,update=FALSE,worn=FALSE,icon_state_override) if(remove) A.remove_overlay("\ref[src]") diff --git a/code/_core/obj/item/_item_data_saving.dm b/code/_core/obj/item/_item_data_saving.dm index 5dc331821d..623d4ab016 100644 --- a/code/_core/obj/item/_item_data_saving.dm +++ b/code/_core/obj/item/_item_data_saving.dm @@ -19,7 +19,7 @@ if(IB.special_type) .[id]["special_type"] = IB.special_type -/obj/item/proc/set_blend_data(var/list/blend_data) +/obj/item/proc/set_blend_data(list/blend_data) for(var/id in blend_data) var/list/blend_list = blend_data[id] @@ -35,7 +35,7 @@ return TRUE -/proc/load_and_create(var/mob/living/advanced/player/P,var/list/object_data,var/atom/loc,var/initialize=TRUE,var/loadout=FALSE) +/proc/load_and_create(mob/living/advanced/player/P,list/object_data,atom/loc,initialize=TRUE,loadout=FALSE) if(!object_data) //log_error("Tried to create an object with a null object_data list!") @@ -88,7 +88,7 @@ return I -/obj/item/proc/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/proc/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) if( (contraband || !can_save) && !length(inventories)) //The inventory check prevents people from losing their stuff if a dev is dumb and adds a contraband item with storage. if(contraband) P.to_chat(span("warning","Notice: \The [src.name] could not be saved because it is considered contraband.")) @@ -147,7 +147,7 @@ SAVEPATH("loot_to_generate") -/obj/item/organ/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/organ/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE @@ -155,7 +155,7 @@ if(length(blend_data)) .["blend_data"] = blend_data -/obj/item/organ/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/organ/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE @@ -167,7 +167,7 @@ log_debug("No blend data found for: [src.type].") -/obj/item/proc/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/proc/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) if(object_data["name"]) name = object_data["name"] @@ -204,7 +204,7 @@ return TRUE -/obj/item/proc/load_item_data_post(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/proc/load_item_data_post(mob/living/advanced/player/P,list/object_data,loadout=FALSE) if(length(object_data["reagents"])) for(var/r_id in object_data["reagents"]) var/volume = object_data["reagents"][r_id] @@ -215,7 +215,7 @@ reagents.add_reagent(R_path,volume) return TRUE -/obj/hud/inventory/proc/load_inventory_data(var/mob/living/advanced/player/P,var/list/inventory_data,var/loadout=FALSE) //Setting the data found. +/obj/hud/inventory/proc/load_inventory_data(mob/living/advanced/player/P,list/inventory_data,loadout=FALSE) //Setting the data found. if(!inventory_data) log_error("Warning: [src.get_debug_name()] in [P.get_debug_name()] had no inventory data!") @@ -260,7 +260,7 @@ return TRUE -/obj/hud/inventory/proc/save_inventory_data(var/mob/living/advanced/player/P,var/save_inventory=TRUE,var/died=FALSE,var/loadout=FALSE) //Getting the inventory and their contents for saving. +/obj/hud/inventory/proc/save_inventory_data(mob/living/advanced/player/P,save_inventory=TRUE,died=FALSE,loadout=FALSE) //Getting the inventory and their contents for saving. var/content_length = length(contents) diff --git a/code/_core/obj/item/_item_quality.dm b/code/_core/obj/item/_item_quality.dm index 4949f090b1..f05ba22e29 100644 --- a/code/_core/obj/item/_item_quality.dm +++ b/code/_core/obj/item/_item_quality.dm @@ -5,12 +5,12 @@ var/q_mod = quality/100 return max(0.25,min(cos( (q_mod-1) * 90)**min(1,1 - q_mod),2)) -/obj/item/proc/get_damage_icon_number(var/desired_quality = quality) +/obj/item/proc/get_damage_icon_number(desired_quality = quality) if(quality == -1) return 0 return FLOOR(clamp( (100 - quality) / (100/5),0,5 ),1) -/obj/item/proc/adjust_quality(var/quality_to_add=0) +/obj/item/proc/adjust_quality(quality_to_add=0) if(quality == -1) return FALSE @@ -35,7 +35,7 @@ return TRUE -/obj/item/proc/set_quality_max(var/desired_quality_max=100) +/obj/item/proc/set_quality_max(desired_quality_max=100) if(quality == -1) return FALSE @@ -48,7 +48,7 @@ value = get_base_value() -/obj/item/proc/update_quality_overlay(var/desired_damage_num = get_damage_icon_number()) +/obj/item/proc/update_quality_overlay(desired_damage_num = get_damage_icon_number()) if(!enable_torn_overlay && !enable_damage_overlay) return FALSE diff --git a/code/_core/obj/item/ability_learner/_ability_learner.dm b/code/_core/obj/item/ability_learner/_ability_learner.dm index ddb8e57e5a..a6f6f62929 100644 --- a/code/_core/obj/item/ability_learner/_ability_learner.dm +++ b/code/_core/obj/item/ability_learner/_ability_learner.dm @@ -36,7 +36,7 @@ var/image/I = new/image(initial(stored_ability.icon),initial(stored_ability.icon_state)) add_overlay(I) -/obj/item/ability_learner/click_self(var/mob/caller) +/obj/item/ability_learner/click_self(mob/caller) INTERACT_CHECK INTERACT_DELAY(10) @@ -49,7 +49,7 @@ return TRUE -/obj/item/ability_learner/proc/can_learn(var/mob/living/advanced/A) +/obj/item/ability_learner/proc/can_learn(mob/living/advanced/A) if(!A.loc || !is_inventory(src.loc)) return FALSE @@ -64,7 +64,7 @@ return TRUE -/obj/item/ability_learner/proc/learn(var/mob/living/advanced/A) +/obj/item/ability_learner/proc/learn(mob/living/advanced/A) if(!stored_ability || !A.ckey) //Something went wrong. return FALSE diff --git a/code/_core/obj/item/analyzer/_analyzer.dm b/code/_core/obj/item/analyzer/_analyzer.dm index 7cea00434c..d1e5e53330 100644 --- a/code/_core/obj/item/analyzer/_analyzer.dm +++ b/code/_core/obj/item/analyzer/_analyzer.dm @@ -5,7 +5,7 @@ has_quick_function = TRUE //use analyzers from the belt slots rarity = RARITY_COMMON -/obj/item/analyzer/quick(var/mob/caller,var/atom/object,location,params) +/obj/item/analyzer/quick(mob/caller,atom/object,location,params) if(!is_living(caller)) return FALSE @@ -13,20 +13,20 @@ return click_on_object(caller, object, location, null, params) -/obj/item/analyzer/proc/on_scan(var/mob/caller,var/atom/target,location,control,params) +/obj/item/analyzer/proc/on_scan(mob/caller,atom/target,location,control,params) return TRUE -/obj/item/analyzer/proc/can_be_scanned(var/mob/caller,var/atom/target) +/obj/item/analyzer/proc/can_be_scanned(mob/caller,atom/target) return TRUE -/obj/item/analyzer/proc/can_scan(var/mob/caller,var/atom/target) +/obj/item/analyzer/proc/can_scan(mob/caller,atom/target) if(next_scan >= world.time) caller.to_chat(span("warning","\The [src.name] is recharging, please wait!")) return FALSE return TRUE -/obj/item/analyzer/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/analyzer/click_on_object(mob/caller as mob,atom/object,location,control,params) if(object.plane < PLANE_HUD && can_be_scanned(caller,object)) INTERACT_CHECK diff --git a/code/_core/obj/item/analyzer/angle.dm b/code/_core/obj/item/analyzer/angle.dm index ef1d3b9475..0fd204f8d8 100644 --- a/code/_core/obj/item/analyzer/angle.dm +++ b/code/_core/obj/item/analyzer/angle.dm @@ -43,10 +43,10 @@ SSobj.gps_list -= src . = ..() -/obj/item/analyzer/gps/can_be_scanned(var/mob/caller,var/atom/target) +/obj/item/analyzer/gps/can_be_scanned(mob/caller,atom/target) return is_turf(target) || (target.loc && is_turf(target.loc)) -/obj/item/analyzer/gps/on_scan(var/mob/caller,var/atom/target,location,control,params) +/obj/item/analyzer/gps/on_scan(mob/caller,atom/target,location,control,params) if(!target) caller.to_chat(span("warning","Invalid target!")) @@ -84,12 +84,12 @@ caller.to_chat(span("notice","Invalid name.")) return TRUE -/obj/item/analyzer/gps/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/analyzer/gps/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("assigned_name") SAVEVAR("assigned_passkey") -/obj/item/analyzer/gps/load_item_data_post(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/analyzer/gps/load_item_data_post(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("assigned_name") LOADVAR("assigned_passkey") diff --git a/code/_core/obj/item/analyzer/armor.dm b/code/_core/obj/item/analyzer/armor.dm index a5294c9a15..1db83fb46a 100644 --- a/code/_core/obj/item/analyzer/armor.dm +++ b/code/_core/obj/item/analyzer/armor.dm @@ -9,10 +9,10 @@ var/scan_all = FALSE -/obj/item/analyzer/armor/can_be_scanned(var/mob/caller,var/atom/target) +/obj/item/analyzer/armor/can_be_scanned(mob/caller,atom/target) return is_living(target) -/obj/item/analyzer/armor/on_scan(var/mob/caller,var/atom/target,location,control,params) +/obj/item/analyzer/armor/on_scan(mob/caller,atom/target,location,control,params) if(!target || !target.health) caller.to_chat(span("warning","No valid target detected!")) diff --git a/code/_core/obj/item/analyzer/genetics.dm b/code/_core/obj/item/analyzer/genetics.dm index 074cf8b029..d652ea4e79 100644 --- a/code/_core/obj/item/analyzer/genetics.dm +++ b/code/_core/obj/item/analyzer/genetics.dm @@ -7,7 +7,7 @@ icon_state = "inventory" value = 300 -/obj/item/analyzer/genetic/can_be_scanned(var/mob/caller,var/atom/target) +/obj/item/analyzer/genetic/can_be_scanned(mob/caller,atom/target) if(get_dist(caller,target) > 1) caller.to_chat(span("warning","You're too far away!")) @@ -16,7 +16,7 @@ return is_living(target) -/obj/item/analyzer/genetic/on_scan(var/mob/caller,var/atom/target,location,control,params) +/obj/item/analyzer/genetic/on_scan(mob/caller,atom/target,location,control,params) caller.to_chat(span("notice bold underline","[target.name]'s Traits:")) diff --git a/code/_core/obj/item/analyzer/health.dm b/code/_core/obj/item/analyzer/health.dm index ae7fc8120c..93eadf865b 100644 --- a/code/_core/obj/item/analyzer/health.dm +++ b/code/_core/obj/item/analyzer/health.dm @@ -19,14 +19,14 @@ scan_range = VIEW_RANGE*0.75 icon_state = "inventory_syndicate" -/obj/item/analyzer/health/click_self(var/mob/caller,location,control,params) +/obj/item/analyzer/health/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(1) advanced = !advanced caller.to_chat(span("notice","Advanced diagnostics is [advanced ? "enabled" : "disabled"].")) return TRUE -/obj/item/analyzer/health/can_be_scanned(var/mob/caller,var/atom/target) +/obj/item/analyzer/health/can_be_scanned(mob/caller,atom/target) if(get_dist(caller,target) > scan_range) caller.to_chat(span("warning","You're too far away!")) @@ -34,7 +34,7 @@ return is_living(target) -/obj/item/analyzer/health/on_scan(var/mob/caller,var/atom/target,location,control,params) +/obj/item/analyzer/health/on_scan(mob/caller,atom/target,location,control,params) next_scan = world.time + 4 SECONDS diff --git a/code/_core/obj/item/analyzer/plant.dm b/code/_core/obj/item/analyzer/plant.dm index 9837d5ab82..57d894641f 100644 --- a/code/_core/obj/item/analyzer/plant.dm +++ b/code/_core/obj/item/analyzer/plant.dm @@ -7,10 +7,10 @@ icon_state = "inventory" value = 100 -/obj/item/analyzer/plant/can_be_scanned(var/mob/caller,var/atom/target) +/obj/item/analyzer/plant/can_be_scanned(mob/caller,atom/target) return istype(target,/obj/structure/interactive/plant) -/obj/item/analyzer/plant/on_scan(var/mob/caller,var/atom/target,location,control,params) +/obj/item/analyzer/plant/on_scan(mob/caller,atom/target,location,control,params) var/obj/structure/interactive/plant/P = target diff --git a/code/_core/obj/item/analyzer/value.dm b/code/_core/obj/item/analyzer/value.dm index f0abf1a965..cf8014e6c1 100644 --- a/code/_core/obj/item/analyzer/value.dm +++ b/code/_core/obj/item/analyzer/value.dm @@ -7,10 +7,10 @@ icon_state = "inventory" value = 450 -/obj/item/analyzer/value/can_be_scanned(var/mob/caller,var/atom/target) +/obj/item/analyzer/value/can_be_scanned(mob/caller,atom/target) return ismovable(target) -/obj/item/analyzer/value/on_scan(var/mob/caller,var/atom/target,location,control,params) +/obj/item/analyzer/value/on_scan(mob/caller,atom/target,location,control,params) var/atom/movable/M = target var/calculated_value = M.get_value() caller.to_chat(span("notice","\The [target.name]'s total value and its contents is worth [nice_number(CEILING(calculated_value,1))] credits(s).")) diff --git a/code/_core/obj/item/announcement.dm b/code/_core/obj/item/announcement.dm index 21417c9188..ce24472479 100644 --- a/code/_core/obj/item/announcement.dm +++ b/code/_core/obj/item/announcement.dm @@ -22,10 +22,10 @@ var/global/next_announcement = 0 rarity = RARITY_RARE -/obj/item/announcement/proc/can_use(var/mob/caller) +/obj/item/announcement/proc/can_use(mob/caller) return TRUE -/obj/item/announcement/click_self(var/mob/caller,location,control,params) +/obj/item/announcement/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(10) @@ -94,7 +94,7 @@ var/global/next_announcement = 0 value = 500 sound_to_play = 'sound/alert/warning.ogg' -/obj/item/announcement/syndicate/can_use(var/mob/caller) +/obj/item/announcement/syndicate/can_use(mob/caller) if(!is_living(caller)) caller.to_chat(span("warning","You don't seem to know how to use this...")) @@ -116,7 +116,7 @@ var/global/next_announcement = 0 value = 500 sound_to_play = 'sound/alert/warning.ogg' -/obj/item/announcement/wizard/can_use(var/mob/caller) +/obj/item/announcement/wizard/can_use(mob/caller) if(!is_living(caller)) caller.to_chat(span("warning","You don't seem to know how to use this...")) @@ -137,7 +137,7 @@ var/global/next_announcement = 0 value = 500 var/sounds_to_play = list('sound/alert/rev_pda_1.ogg','sound/alert/rev_pda_2.ogg','sound/alert/rev_pda_3.ogg','sound/alert/rev_pda_4.ogg') -/obj/item/announcement/rev/can_use(var/mob/caller) +/obj/item/announcement/rev/can_use(mob/caller) if(!is_living(caller)) caller.to_chat(span("warning","You don't seem to know how to use this...")) @@ -151,7 +151,7 @@ var/global/next_announcement = 0 return TRUE //This is fucking horrible but it works so I don't care -/obj/item/announcement/rev/click_self(var/mob/caller,location,control,params) +/obj/item/announcement/rev/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(10) diff --git a/code/_core/obj/item/armor_plate.dm b/code/_core/obj/item/armor_plate.dm index 7a0cf17ece..c2d635d4da 100644 --- a/code/_core/obj/item/armor_plate.dm +++ b/code/_core/obj/item/armor_plate.dm @@ -9,7 +9,7 @@ size = SIZE_2 -/obj/item/armor_plate/New(var/desired_loc) +/obj/item/armor_plate/New(desired_loc) weight = calculate_weight() return ..() @@ -28,7 +28,7 @@ . += armor_base[k] * armor_slowdown_values[k] -/obj/item/armor_plate/get_examine_list(var/mob/examiner) +/obj/item/armor_plate/get_examine_list(mob/examiner) . = ..() var/list/armor_list = list() for(var/damagetype in armor_base) diff --git a/code/_core/obj/item/attachment/_attachment.dm b/code/_core/obj/item/attachment/_attachment.dm index 8d79c80f32..ddb7f874c0 100644 --- a/code/_core/obj/item/attachment/_attachment.dm +++ b/code/_core/obj/item/attachment/_attachment.dm @@ -38,7 +38,7 @@ rarity = RARITY_UNCOMMON -/obj/item/attachment/get_examine_list(var/mob/caller) +/obj/item/attachment/get_examine_list(mob/caller) . = ..() diff --git a/code/_core/obj/item/attachment/attachment_undermount.dm b/code/_core/obj/item/attachment/attachment_undermount.dm index c167a04049..fe6b4d61a2 100644 --- a/code/_core/obj/item/attachment/attachment_undermount.dm +++ b/code/_core/obj/item/attachment/attachment_undermount.dm @@ -70,7 +70,7 @@ QDEL_NULL(stored_gun) . = ..() -/obj/item/attachment/undermount/gun/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/attachment/undermount/gun/clicked_on_by_object(mob/caller,atom/object,location,control,params) return stored_gun?.clicked_on_by_object(caller,object,location,control,params) /obj/item/attachment/undermount/gun/Generate() @@ -82,15 +82,15 @@ FINALIZE(stored_gun) . = ..() -/obj/item/attachment/undermount/gun/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/attachment/undermount/gun/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEATOM("stored_gun") -/obj/item/attachment/undermount/gun/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/attachment/undermount/gun/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADATOM("stored_gun") -/obj/item/attachment/undermount/gun/click_on_object_alt(var/mob/caller,var/atom/object,location,control,params) +/obj/item/attachment/undermount/gun/click_on_object_alt(mob/caller,atom/object,location,control,params) return stored_gun.click_on_object(caller,object,location,control,params) diff --git a/code/_core/obj/item/ball.dm b/code/_core/obj/item/ball.dm index f0f79851fc..2dff6b503d 100644 --- a/code/_core/obj/item/ball.dm +++ b/code/_core/obj/item/ball.dm @@ -27,7 +27,7 @@ var/image/I = new/image(initial(icon),"[initial(icon_state)]_shading") add_overlay(I) -/obj/item/ball/proc/set_balling(var/desired_balling=TRUE) +/obj/item/ball/proc/set_balling(desired_balling=TRUE) if(desired_balling == balling) return FALSE @@ -51,11 +51,11 @@ set_balling(FALSE) . = ..() -/obj/item/ball/post_move(var/atom/old_loc) +/obj/item/ball/post_move(atom/old_loc) . = ..() set_balling(src.z ? TRUE : FALSE) -/obj/item/ball/proc/ball_think(var/tick_rate=1) +/obj/item/ball/proc/ball_think(tick_rate=1) var/desired_move_dir = 0x0 @@ -98,7 +98,7 @@ desc_extended = "You kick this. I guess you can throw this too." icon_state = "soccer" -/obj/item/ball/soccer/get_examine_list(var/mob/examiner) +/obj/item/ball/soccer/get_examine_list(mob/examiner) . = ..() . += span("notice","Hold ALT to move over the ball without kicking it.
Hold SPACE to triple your kicking power.
Hold SHIFT while running into the ball to double your kicking power.") @@ -113,7 +113,7 @@ . = ..() on_kick(O,pull=TRUE) -/obj/item/ball/soccer/proc/on_kick(var/atom/movable/O,var/pull=FALSE) +/obj/item/ball/soccer/proc/on_kick(atom/movable/O,pull=FALSE) if(is_living(O)) var/mob/living/L = O if(L.horizontal) diff --git a/code/_core/obj/item/bank_storage.dm b/code/_core/obj/item/bank_storage.dm index 8287aa903c..c003510109 100644 --- a/code/_core/obj/item/bank_storage.dm +++ b/code/_core/obj/item/bank_storage.dm @@ -22,10 +22,10 @@ queue_delete_immune = TRUE -/obj/item/bank_storage/is_safe_to_delete(var/check_loc = TRUE) +/obj/item/bank_storage/is_safe_to_delete(check_loc = TRUE) return FALSE -/obj/item/bank_storage/on_crush(var/message=TRUE) +/obj/item/bank_storage/on_crush(message=TRUE) CRASH("ERROR: Tried crushing a bank object; something that should NEVER be crushed!") /obj/item/bank_storage/PreDestroy() diff --git a/code/_core/obj/item/broom.dm b/code/_core/obj/item/broom.dm index d124a5068c..87c0f5171d 100644 --- a/code/_core/obj/item/broom.dm +++ b/code/_core/obj/item/broom.dm @@ -12,7 +12,7 @@ var/broom_range = 1 -/obj/item/broom/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/broom/click_on_object(mob/caller as mob,atom/object,location,control,params) if(object.plane >= PLANE_HUD) diff --git a/code/_core/obj/item/bullet/_bullet_cartridge.dm b/code/_core/obj/item/bullet/_bullet_cartridge.dm index 2a6904bcbf..64186aa937 100644 --- a/code/_core/obj/item/bullet/_bullet_cartridge.dm +++ b/code/_core/obj/item/bullet/_bullet_cartridge.dm @@ -55,7 +55,7 @@ . = ..() update_sprite() -/obj/item/bullet_cartridge/New(var/desired_loc) +/obj/item/bullet_cartridge/New(desired_loc) calculate_weight() return ..() @@ -75,15 +75,15 @@ /obj/item/bullet_cartridge/proc/get_ammo_count() return amount -/obj/item/bullet_cartridge/New(var/desired_loc) +/obj/item/bullet_cartridge/New(desired_loc) . = ..() update_sprite() -/obj/item/bullet_cartridge/on_unequip(var/obj/hud/inventory/old_inventory,var/silent=FALSE) +/obj/item/bullet_cartridge/on_unequip(obj/hud/inventory/old_inventory,silent=FALSE) . = ..() update_sprite() -/obj/item/bullet_cartridge/on_equip(var/atom/old_location,var/silent=FALSE) +/obj/item/bullet_cartridge/on_equip(atom/old_location,silent=FALSE) . = ..() update_sprite() @@ -112,7 +112,7 @@ add_overlay(I) -/obj/item/bullet_cartridge/get_examine_list(var/mob/examiner) +/obj/item/bullet_cartridge/get_examine_list(mob/examiner) . = ..() @@ -123,7 +123,7 @@ . += div("notice","It contains [amount] [src.name]\s.") -/obj/item/bullet_cartridge/proc/spend_bullet(var/mob/caller,var/bonus_misfire_chance=0) +/obj/item/bullet_cartridge/proc/spend_bullet(mob/caller,bonus_misfire_chance=0) if(!is_spent) var/total_misfire_chance = bonus_misfire_chance + misfire_chance @@ -149,7 +149,7 @@ return ..() -/obj/item/bullet_cartridge/proc/transfer_src_to_bullet(var/mob/caller as mob,var/obj/item/bullet_cartridge/transfer_target,location,control,params,var/talk = TRUE) +/obj/item/bullet_cartridge/proc/transfer_src_to_bullet(mob/caller as mob,obj/item/bullet_cartridge/transfer_target,location,control,params,talk = TRUE) if(src == transfer_target) return FALSE @@ -168,7 +168,7 @@ return TRUE -/obj/item/bullet_cartridge/proc/transfer_src_to_magazine(var/mob/caller as mob,var/obj/item/magazine/transfer_target,location,control,params,var/messages = TRUE) +/obj/item/bullet_cartridge/proc/transfer_src_to_magazine(mob/caller as mob,obj/item/magazine/transfer_target,location,control,params,messages = TRUE) if(!transfer_target.can_load_magazine(caller,src)) return FALSE @@ -187,7 +187,7 @@ return TRUE -/obj/item/bullet_cartridge/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/bullet_cartridge/click_on_object(mob/caller as mob,atom/object,location,control,params) if(is_magazine(object)) INTERACT_CHECK @@ -217,11 +217,11 @@ . = ..() -/obj/item/bullet_cartridge/proc/can_load_bullet_into(var/mob/caller,var/obj/item/weapon/ranged/bullet/G) //Only used for bullettime. This feels like shitcode but whatever. +/obj/item/bullet_cartridge/proc/can_load_bullet_into(mob/caller,obj/item/weapon/ranged/bullet/G) //Only used for bullettime. This feels like shitcode but whatever. return src.can_caller_interact_with(caller,delay_checks=FALSE) && G.can_caller_interact_with(caller,delay_checks=FALSE) -/obj/item/bullet_cartridge/can_transfer_stacks_to(var/obj/item/target) +/obj/item/bullet_cartridge/can_transfer_stacks_to(obj/item/target) if(target == src) return FALSE @@ -248,7 +248,7 @@ return TRUE -/obj/item/bullet_cartridge/proc/get_recommended_value(var/debug=FALSE) +/obj/item/bullet_cartridge/proc/get_recommended_value(debug=FALSE) if(!damage_type_bullet) return 0 diff --git a/code/_core/obj/item/bullet/arrow.dm b/code/_core/obj/item/bullet/arrow.dm index 5e85cf5497..27ff4484b9 100644 --- a/code/_core/obj/item/bullet/arrow.dm +++ b/code/_core/obj/item/bullet/arrow.dm @@ -19,7 +19,7 @@ caseless = TRUE -/obj/item/bullet_cartridge/arrow/spend_bullet(var/mob/caller,var/bonus_misfire_chance=0) +/obj/item/bullet_cartridge/arrow/spend_bullet(mob/caller,bonus_misfire_chance=0) src.projectile_count = amount qdel(src) return src @@ -53,7 +53,7 @@ value = 0 value_burgerbux = 1 -/obj/item/bullet_cartridge/arrow/hardlight/spend_bullet(var/mob/caller,var/bonus_misfire_chance=0) +/obj/item/bullet_cartridge/arrow/hardlight/spend_bullet(mob/caller,bonus_misfire_chance=0) return src diff --git a/code/_core/obj/item/bullet/bolt.dm b/code/_core/obj/item/bullet/bolt.dm index a02e61ab69..fa553d1c4e 100644 --- a/code/_core/obj/item/bullet/bolt.dm +++ b/code/_core/obj/item/bullet/bolt.dm @@ -24,5 +24,5 @@ item_count_current = 3 return ..() -/obj/item/bullet_cartridge/bolt/can_be_worn(var/mob/living/advanced/owner,var/obj/hud/inventory/I,var/messages=FALSE) +/obj/item/bullet_cartridge/bolt/can_be_worn(mob/living/advanced/owner,obj/hud/inventory/I,messages=FALSE) return TRUE \ No newline at end of file diff --git a/code/_core/obj/item/bullet/shotgun_12.dm b/code/_core/obj/item/bullet/shotgun_12.dm index 4518ed2f89..da69f53263 100644 --- a/code/_core/obj/item/bullet/shotgun_12.dm +++ b/code/_core/obj/item/bullet/shotgun_12.dm @@ -32,7 +32,7 @@ . = ..() . *= 0.5 -/obj/item/bullet_cartridge/shotgun_12/can_be_worn(var/mob/living/advanced/owner,var/obj/hud/inventory/I,var/messages=FALSE) +/obj/item/bullet_cartridge/shotgun_12/can_be_worn(mob/living/advanced/owner,obj/hud/inventory/I,messages=FALSE) return TRUE /obj/item/bullet_cartridge/shotgun_12/slug diff --git a/code/_core/obj/item/bullet/shotgun_20.dm b/code/_core/obj/item/bullet/shotgun_20.dm index 50c0ffbca6..84ffe441bc 100644 --- a/code/_core/obj/item/bullet/shotgun_20.dm +++ b/code/_core/obj/item/bullet/shotgun_20.dm @@ -32,7 +32,7 @@ . = ..() . *= 0.5 -/obj/item/bullet_cartridge/shotgun_20/can_be_worn(var/mob/living/advanced/owner,var/obj/hud/inventory/I,var/messages=FALSE) +/obj/item/bullet_cartridge/shotgun_20/can_be_worn(mob/living/advanced/owner,obj/hud/inventory/I,messages=FALSE) return TRUE /obj/item/bullet_cartridge/shotgun_20/slug diff --git a/code/_core/obj/item/bullet/shotgun_23.dm b/code/_core/obj/item/bullet/shotgun_23.dm index 028c75237d..f6c1cf8913 100644 --- a/code/_core/obj/item/bullet/shotgun_23.dm +++ b/code/_core/obj/item/bullet/shotgun_23.dm @@ -31,7 +31,7 @@ . = ..() . *= 0.5 -/obj/item/bullet_cartridge/shotgun_23/can_be_worn(var/mob/living/advanced/owner,var/obj/hud/inventory/I,var/messages=FALSE) +/obj/item/bullet_cartridge/shotgun_23/can_be_worn(mob/living/advanced/owner,obj/hud/inventory/I,messages=FALSE) return TRUE /obj/item/bullet_cartridge/shotgun_23/slug diff --git a/code/_core/obj/item/bulletbox.dm b/code/_core/obj/item/bulletbox.dm index 792d9b1c3c..9a252d8296 100644 --- a/code/_core/obj/item/bulletbox.dm +++ b/code/_core/obj/item/bulletbox.dm @@ -24,17 +24,17 @@ var/next_regen = 0 //For ammo box restocking. -/obj/item/bulletbox/get_examine_list(var/mob/examiner) +/obj/item/bulletbox/get_examine_list(mob/examiner) . = ..() if(small == FALSE) . += span("notice","Use to open and deploy, ALT+Click to pack up.") -/obj/item/bulletbox/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/bulletbox/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("bullet_count") SAVEPATH("stored_bullet") -/obj/item/bulletbox/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/bulletbox/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADPATH("stored_bullet") set_stored_bullet(stored_bullet) @@ -58,12 +58,12 @@ if(stored_bullet) . += bullet_count * SSbalance.stored_value[stored_bullet] -/obj/item/bulletbox/get_examine_list(var/mob/caller) +/obj/item/bulletbox/get_examine_list(mob/caller) . = ..() if(stored_bullet) . += div("notice","It stores [initial(stored_bullet.name)] ([bullet_count]/[bullet_max] capacity).") -/obj/item/bulletbox/click_self(var/mob/caller,location,control,params) +/obj/item/bulletbox/click_self(mob/caller,location,control,params) if(small || anchored) return ..() @@ -74,7 +74,7 @@ return TRUE -/obj/item/bulletbox/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/bulletbox/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(istype(object,/obj/item/bullet_cartridge/)) INTERACT_CHECK @@ -153,7 +153,7 @@ . = ..() -/obj/item/bulletbox/proc/set_stored_bullet(var/desired_path) +/obj/item/bulletbox/proc/set_stored_bullet(desired_path) if(!desired_path) //Clear and remove. stored_bullet = null @@ -265,7 +265,7 @@ draw_bullet_on_box = FALSE value = 10 -//obj/item/bulletbox/small/get_examine_list(var/mob/examiner) +//obj/item/bulletbox/small/get_examine_list(mob/examiner) // . = ..() // . += span("notice","Use to open and deploy, ALT+Click to pack up.") diff --git a/code/_core/obj/item/cable/_cable.dm b/code/_core/obj/item/cable/_cable.dm index a9b05042e2..32ec411396 100644 --- a/code/_core/obj/item/cable/_cable.dm +++ b/code/_core/obj/item/cable/_cable.dm @@ -18,7 +18,7 @@ icon_state = "[initial(icon_state)]_[icon_count]" return ..() -/obj/item/cable/proc/treat(var/mob/caller,var/atom/A) +/obj/item/cable/proc/treat(mob/caller,atom/A) if(heal_burn) A.health.adjust_burn_loss(-heal_burn) @@ -43,7 +43,7 @@ return TRUE -/obj/item/cable/proc/can_be_treated(var/mob/caller,var/atom/target) +/obj/item/cable/proc/can_be_treated(mob/caller,atom/target) INTERACT_CHECK INTERACT_CHECK_OTHER(target) @@ -60,7 +60,7 @@ -/obj/item/cable/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/cable/click_on_object(mob/caller as mob,atom/object,location,control,params) if(is_inventory(object)) return ..() diff --git a/code/_core/obj/item/cell_charger.dm b/code/_core/obj/item/cell_charger.dm index 42e956528d..dd9fd776ef 100644 --- a/code/_core/obj/item/cell_charger.dm +++ b/code/_core/obj/item/cell_charger.dm @@ -27,11 +27,11 @@ /obj/item/cell_charger/get_battery() return battery -/obj/item/cell_charger/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/cell_charger/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEATOM("battery") -/obj/item/cell_charger/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/cell_charger/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADATOM("battery") @@ -39,7 +39,7 @@ update_sprite() return ..() -/obj/item/cell_charger/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/cell_charger/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(battery && is_inventory(object)) INTERACT_CHECK @@ -140,7 +140,7 @@ return FALSE -/obj/item/cell_charger/get_examine_list(var/mob/caller) +/obj/item/cell_charger/get_examine_list(mob/caller) . = ..() diff --git a/code/_core/obj/item/chime.dm b/code/_core/obj/item/chime.dm index 4a0958a92b..d239fac0ad 100644 --- a/code/_core/obj/item/chime.dm +++ b/code/_core/obj/item/chime.dm @@ -11,15 +11,15 @@ weight = 3 -/obj/item/chime/save_item_data(var/save_inventory = TRUE) +/obj/item/chime/save_item_data(save_inventory = TRUE) . = ..() SAVEATOM("stored_device") -/obj/item/chime/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data) +/obj/item/chime/load_item_data_pre(mob/living/advanced/player/P,list/object_data) . = ..() LOADATOM("stored_device") -/obj/item/chime/trigger(var/mob/caller,var/atom/source,var/signal_freq,var/signal_code) +/obj/item/chime/trigger(mob/caller,atom/source,signal_freq,signal_code) if(sound_to_play) var/turf/T = get_turf(src) @@ -36,12 +36,12 @@ FINALIZE(stored_device) return ..() -/obj/item/chime/click_self(var/mob/caller,location,control,params) +/obj/item/chime/click_self(mob/caller,location,control,params) if(stored_device) return stored_device.click_self(caller,location,control,params) return ..() -/obj/item/chime/clicked_on_by_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/chime/clicked_on_by_object(mob/caller as mob,atom/object,location,control,params) if(is_item(object)) var/obj/item/I = object @@ -68,7 +68,7 @@ return ..() -/obj/item/chime/on_mouse_wheel(var/mob/caller,delta_x,delta_y,location,control,params) +/obj/item/chime/on_mouse_wheel(mob/caller,delta_x,delta_y,location,control,params) if(stored_device) return stored_device.on_mouse_wheel(caller,delta_x,delta_y,location,control,params) diff --git a/code/_core/obj/item/clothing/_clothing.dm b/code/_core/obj/item/clothing/_clothing.dm index 76c42d7d42..599140fc82 100644 --- a/code/_core/obj/item/clothing/_clothing.dm +++ b/code/_core/obj/item/clothing/_clothing.dm @@ -53,7 +53,7 @@ ) -/obj/item/clothing/on_equip(var/atom/old_location,var/silent=FALSE) +/obj/item/clothing/on_equip(atom/old_location,silent=FALSE) . = ..() var/obj/hud/inventory/IN = loc if(IN.worn && is_living(IN.owner)) @@ -63,7 +63,7 @@ for(var/k in mob_values_mul) L.add_mob_value("\ref[src]",k,mob_values_mul[k],MULTIPLICATION) -/obj/item/clothing/on_unequip(var/obj/hud/inventory/old_inventory,var/silent=FALSE) //When the object is dropped from the old_inventory +/obj/item/clothing/on_unequip(obj/hud/inventory/old_inventory,silent=FALSE) //When the object is dropped from the old_inventory . = ..() if(old_inventory.worn && is_living(old_inventory.owner)) var/mob/living/L = old_inventory.owner @@ -77,7 +77,7 @@ QDEL_CUT(additional_clothing_stored) . = ..() -/obj/item/clothing/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/clothing/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE if(length(polymorphs)) .["polymorphs"] = polymorphs @@ -90,7 +90,7 @@ */ -/obj/item/clothing/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/clothing/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE if(object_data["polymorphs"]) polymorphs = object_data["polymorphs"] /* @@ -101,7 +101,7 @@ clothing_enchantments += E */ -/obj/item/clothing/New(var/desired_loc) +/obj/item/clothing/New(desired_loc) additional_clothing_stored = list() . = ..() @@ -120,5 +120,5 @@ . = ..() -/obj/item/clothing/proc/get_footsteps(var/list/original_footsteps,var/enter=TRUE) +/obj/item/clothing/proc/get_footsteps(list/original_footsteps,enter=TRUE) return original_footsteps \ No newline at end of file diff --git a/code/_core/obj/item/clothing/additional.dm b/code/_core/obj/item/clothing/additional.dm index d4fa0b9d38..fb7131757c 100644 --- a/code/_core/obj/item/clothing/additional.dm +++ b/code/_core/obj/item/clothing/additional.dm @@ -1,4 +1,4 @@ -/obj/item/clothing/proc/equip_additional_clothing(var/mob/living/advanced/caller) +/obj/item/clothing/proc/equip_additional_clothing(mob/living/advanced/caller) var/should_deploy = FALSE diff --git a/code/_core/obj/item/clothing/back/fulton.dm b/code/_core/obj/item/clothing/back/fulton.dm index e4c9866c4a..87c48734b2 100644 --- a/code/_core/obj/item/clothing/back/fulton.dm +++ b/code/_core/obj/item/clothing/back/fulton.dm @@ -19,12 +19,12 @@ var/global/list/obj/item/clothing/back/fulton/fulton_devices = list() fulton_devices -= src return ..() -/obj/item/clothing/back/fulton/click_self(var/mob/caller) +/obj/item/clothing/back/fulton/click_self(mob/caller) enabled = !enabled caller.to_chat("You [enabled ? "enable" : "disable"] \the [src].") return TRUE -/obj/item/clothing/back/fulton/proc/try_extract(var/turf/desired_turf) +/obj/item/clothing/back/fulton/proc/try_extract(turf/desired_turf) if(!enabled) return FALSE diff --git a/code/_core/obj/item/clothing/belt/_belts.dm b/code/_core/obj/item/clothing/belt/_belts.dm index 47bb7d0eb0..b0fb4d307b 100644 --- a/code/_core/obj/item/clothing/belt/_belts.dm +++ b/code/_core/obj/item/clothing/belt/_belts.dm @@ -13,7 +13,7 @@ /* -/obj/item/clothing/belt/pre_equip(var/atom/old_location,var/obj/hud/inventory/new_location) +/obj/item/clothing/belt/pre_equip(atom/old_location,obj/hud/inventory/new_location) . = ..() diff --git a/code/_core/obj/item/clothing/belt/bandolier.dm b/code/_core/obj/item/clothing/belt/bandolier.dm index 222c0b57f2..f57f505af5 100644 --- a/code/_core/obj/item/clothing/belt/bandolier.dm +++ b/code/_core/obj/item/clothing/belt/bandolier.dm @@ -27,14 +27,14 @@ var/v = stored_shells[k] shell_count += v -/obj/item/clothing/belt/bandolier/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/clothing/belt/bandolier/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE .["stored_shells"] = list() for(var/k in stored_shells) var/v = stored_shells[k] .["stored_shells"][k] = v -/obj/item/clothing/belt/bandolier/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/clothing/belt/bandolier/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE for(var/k in object_data["stored_shells"]) var/v = object_data["stored_shells"][k] @@ -58,7 +58,7 @@ var/image/I = new/image(icon,"shell_[CEILING(shell_count/step,1)]") add_overlay(I) -/obj/item/clothing/belt/bandolier/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/clothing/belt/bandolier/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(istype(object,shell_type)) INTERACT_CHECK diff --git a/code/_core/obj/item/clothing/belt/damage_deferal_shield.dm b/code/_core/obj/item/clothing/belt/damage_deferal_shield.dm index 21f4054f2d..8ed395fc97 100644 --- a/code/_core/obj/item/clothing/belt/damage_deferal_shield.dm +++ b/code/_core/obj/item/clothing/belt/damage_deferal_shield.dm @@ -29,29 +29,29 @@ rarity = RARITY_MYTHICAL -/obj/item/clothing/belt/damage_deferal_shield/use_condition(var/amount_to_use=1) +/obj/item/clothing/belt/damage_deferal_shield/use_condition(amount_to_use=1) if(!CALLBACK_EXISTS("\ref[src]_disable_shield")) return FALSE . = ..() -/obj/item/clothing/belt/damage_deferal_shield/on_equip(var/atom/old_location,var/silent=FALSE) +/obj/item/clothing/belt/damage_deferal_shield/on_equip(atom/old_location,silent=FALSE) . = ..() var/obj/hud/inventory/I = loc if(I.worn && is_advanced(I.owner)) HOOK_ADD("post_move","\ref[src]_shield_post_move",I.owner,src,src::owner_post_move()) -/obj/item/clothing/belt/damage_deferal_shield/on_unequip(var/obj/hud/inventory/old_inventory,var/silent=FALSE) //When the object is dropped from the old_inventory +/obj/item/clothing/belt/damage_deferal_shield/on_unequip(obj/hud/inventory/old_inventory,silent=FALSE) //When the object is dropped from the old_inventory . = ..() if(old_inventory.worn && is_advanced(old_inventory.owner)) HOOK_REMOVE("post_move","\ref[src]_shield_post_move",old_inventory.owner) -/obj/item/clothing/belt/damage_deferal_shield/proc/owner_post_move(var/mob/living/advanced/owner,var/atom/old_loc) +/obj/item/clothing/belt/damage_deferal_shield/proc/owner_post_move(mob/living/advanced/owner,atom/old_loc) shield_overlay.glide_size = owner.glide_size shield_overlay.force_move(owner.loc) return TRUE -/obj/item/clothing/belt/damage_deferal_shield/New(var/desired_loc) +/obj/item/clothing/belt/damage_deferal_shield/New(desired_loc) . = ..() shield_overlay = new(src) shield_overlay.mouse_opacity = 0 @@ -66,7 +66,7 @@ QDEL_NULL(shield_overlay) . = ..() -/obj/item/clothing/belt/damage_deferal_shield/click_self(var/mob/caller,location,control,params) +/obj/item/clothing/belt/damage_deferal_shield/click_self(mob/caller,location,control,params) if(CALLBACK_EXISTS("\ref[src]_disable_shield")) caller.to_chat(span("notice","You toggle \the [src.name] off and manually cycle the shield.")) @@ -114,7 +114,7 @@ update_sprite() return TRUE -/obj/item/clothing/belt/damage_deferal_shield/negate_damage(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/atom/blamed,var/damage_dealt=0) +/obj/item/clothing/belt/damage_deferal_shield/negate_damage(atom/attacker,atom/victim,atom/weapon,atom/hit_object,atom/blamed,damage_dealt=0) if(damage_dealt <= 0) //The damage doesn't exist for some reason. return FALSE diff --git a/code/_core/obj/item/clothing/belt/endless_holster.dm b/code/_core/obj/item/clothing/belt/endless_holster.dm index ce3de7e9ea..6d3630c008 100644 --- a/code/_core/obj/item/clothing/belt/endless_holster.dm +++ b/code/_core/obj/item/clothing/belt/endless_holster.dm @@ -12,7 +12,7 @@ size = SIZE_3 var/list/created_gun = list() //it's not elegant, but... -/obj/item/clothing/belt/endless_holster/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/clothing/belt/endless_holster/clicked_on_by_object(mob/caller,atom/object,location,control,params) var/mob/living/self = caller if(istype(object,/obj/hud/inventory)) INTERACT_CHECK diff --git a/code/_core/obj/item/clothing/belt/quiver.dm b/code/_core/obj/item/clothing/belt/quiver.dm index 220c5340da..06b9690b23 100644 --- a/code/_core/obj/item/clothing/belt/quiver.dm +++ b/code/_core/obj/item/clothing/belt/quiver.dm @@ -24,14 +24,14 @@ if(found_value > 0) . += amount*found_value -/obj/item/clothing/belt/belt_quiver/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/clothing/belt/belt_quiver/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE .["stored_arrows"] = list() for(var/k in stored_arrows) var/v = stored_arrows[k] .["stored_arrows"][k] = v -/obj/item/clothing/belt/belt_quiver/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/clothing/belt/belt_quiver/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE for(var/k in object_data["stored_arrows"]) var/v = object_data["stored_arrows"][k] @@ -69,7 +69,7 @@ add_overlay(I) -/obj/item/clothing/belt/belt_quiver/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/clothing/belt/belt_quiver/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(istype(object,/obj/item/bullet_cartridge/arrow)) INTERACT_CHECK @@ -106,7 +106,7 @@ . = ..() -/obj/item/clothing/belt/belt_quiver/proc/take_arrow(var/mob/caller,var/obj/hud/inventory/I) +/obj/item/clothing/belt/belt_quiver/proc/take_arrow(mob/caller,obj/hud/inventory/I) if(!length(stored_arrows)) caller.to_chat(span("warning","There are no arrows left!")) return FALSE diff --git a/code/_core/obj/item/clothing/ears/headsets.dm b/code/_core/obj/item/clothing/ears/headsets.dm index 9bd05d3902..6d619f5f17 100644 --- a/code/_core/obj/item/clothing/ears/headsets.dm +++ b/code/_core/obj/item/clothing/ears/headsets.dm @@ -6,7 +6,7 @@ var/obj/item/device/radio/stored_radio = /obj/item/device/radio/headset/nanotrasen -/obj/item/clothing/ears/headset/get_examine_list(var/mob/examiner) +/obj/item/clothing/ears/headset/get_examine_list(mob/examiner) . = ..() . += span("notice","Use the ';' prefix while speaking to talk into it.
Use the mouse wheel to change frequencies.
Click/Use in hands to toggle the signal reciever.
ALT+Click to change broadcast mode.") @@ -22,23 +22,23 @@ QDEL_NULL(stored_radio) . = ..() -/obj/item/clothing/ears/headset/click_self(var/mob/caller,location,control,params) +/obj/item/clothing/ears/headset/click_self(mob/caller,location,control,params) return stored_radio.click_self(caller,location,control,params) -/obj/item/clothing/ears/headset/clicked_on_by_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/clothing/ears/headset/clicked_on_by_object(mob/caller as mob,atom/object,location,control,params) return stored_radio.clicked_on_by_object(caller,object,location,control,params) -/obj/item/clothing/ears/headset/mouse_wheel_on_object(var/mob/caller,delta_x,delta_y,location,control,params) +/obj/item/clothing/ears/headset/mouse_wheel_on_object(mob/caller,delta_x,delta_y,location,control,params) return stored_radio.mouse_wheel_on_object(caller,delta_x,delta_y,location,control,params) -/obj/item/clothing/ears/headset/trigger(var/mob/caller,var/atom/source,var/signal_freq,var/signal_code) +/obj/item/clothing/ears/headset/trigger(mob/caller,atom/source,signal_freq,signal_code) return stored_radio.trigger(caller,source,signal_freq,signal_code) -/obj/item/clothing/ears/headset/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/clothing/ears/headset/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEATOM("stored_radio") -/obj/item/clothing/ears/headset/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/clothing/ears/headset/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADATOM("stored_radio") diff --git a/code/_core/obj/item/clothing/feet/_feet.dm b/code/_core/obj/item/clothing/feet/_feet.dm index 69f29b2e37..ca9da66f4b 100644 --- a/code/_core/obj/item/clothing/feet/_feet.dm +++ b/code/_core/obj/item/clothing/feet/_feet.dm @@ -1,7 +1,7 @@ /obj/item/clothing/feet worn_layer = LAYER_MOB_CLOTHING_SHOES -/obj/item/clothing/feet/pre_equip(var/atom/old_location,var/obj/hud/inventory/new_location) +/obj/item/clothing/feet/pre_equip(atom/old_location,obj/hud/inventory/new_location) if(new_location && new_location.worn) if(length(protected_limbs)) diff --git a/code/_core/obj/item/clothing/feet/shoes/clown.dm b/code/_core/obj/item/clothing/feet/shoes/clown.dm index 00d2b519db..234095e061 100644 --- a/code/_core/obj/item/clothing/feet/shoes/clown.dm +++ b/code/_core/obj/item/clothing/feet/shoes/clown.dm @@ -19,7 +19,7 @@ -/obj/item/clothing/feet/shoes/clown/get_footsteps(var/list/original_footsteps,var/enter=FALSE) +/obj/item/clothing/feet/shoes/clown/get_footsteps(list/original_footsteps,enter=FALSE) original_footsteps += /footstep/clownstep return original_footsteps diff --git a/code/_core/obj/item/clothing/feet/shoes/duck.dm b/code/_core/obj/item/clothing/feet/shoes/duck.dm index 28a93f5dd3..a19b9c8846 100644 --- a/code/_core/obj/item/clothing/feet/shoes/duck.dm +++ b/code/_core/obj/item/clothing/feet/shoes/duck.dm @@ -19,7 +19,7 @@ rarity = RARITY_UNCOMMON -/obj/item/clothing/feet/shoes/duck/get_footsteps(var/list/original_footsteps,var/enter=FALSE) +/obj/item/clothing/feet/shoes/duck/get_footsteps(list/original_footsteps,enter=FALSE) original_footsteps += /footstep/quack return original_footsteps diff --git a/code/_core/obj/item/clothing/glasses/_glasses.dm b/code/_core/obj/item/clothing/glasses/_glasses.dm index 99132bf036..ea7fd8882a 100644 --- a/code/_core/obj/item/clothing/glasses/_glasses.dm +++ b/code/_core/obj/item/clothing/glasses/_glasses.dm @@ -16,13 +16,13 @@ uses_until_condition_fall = 75 -/obj/item/clothing/glasses/on_equip(var/atom/old_location,var/silent=FALSE) +/obj/item/clothing/glasses/on_equip(atom/old_location,silent=FALSE) . = ..() var/obj/hud/inventory/I = loc if(I.worn && I.owner) I.owner.update_eyes() -/obj/item/clothing/glasses/on_unequip(var/obj/hud/inventory/old_inventory,var/silent=FALSE) //When the object is dropped from the old_inventory +/obj/item/clothing/glasses/on_unequip(obj/hud/inventory/old_inventory,silent=FALSE) //When the object is dropped from the old_inventory . = ..() if(old_inventory.worn && old_inventory.owner) old_inventory.owner.update_eyes() diff --git a/code/_core/obj/item/clothing/glasses/meson.dm b/code/_core/obj/item/clothing/glasses/meson.dm index d50ca5b481..52fdd2e8b4 100644 --- a/code/_core/obj/item/clothing/glasses/meson.dm +++ b/code/_core/obj/item/clothing/glasses/meson.dm @@ -31,7 +31,7 @@ value = 200 -/obj/item/clothing/glasses/meson/night_vision/pre_pickup(var/atom/old_location,var/obj/hud/inventory/new_location) +/obj/item/clothing/glasses/meson/night_vision/pre_pickup(atom/old_location,obj/hud/inventory/new_location) . = ..() diff --git a/code/_core/obj/item/clothing/glasses/nightvision.dm b/code/_core/obj/item/clothing/glasses/nightvision.dm index a1d60492cf..f376c78cb9 100644 --- a/code/_core/obj/item/clothing/glasses/nightvision.dm +++ b/code/_core/obj/item/clothing/glasses/nightvision.dm @@ -34,15 +34,15 @@ QDEL_NULL(stored_cell) . = ..() -/obj/item/clothing/glasses/nightvision/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/clothing/glasses/nightvision/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEATOM("stored_cell") -/obj/item/clothing/glasses/nightvision/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/clothing/glasses/nightvision/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADATOM("stored_cell") -/obj/item/clothing/glasses/nightvision/get_examine_list(var/mob/examiner) +/obj/item/clothing/glasses/nightvision/get_examine_list(mob/examiner) . = ..() if(stored_cell) . += div("notice","There is \a [stored_cell] installed.") @@ -50,7 +50,7 @@ else . += div("notice","There is no power cell installed.") -/obj/item/clothing/glasses/nightvision/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/clothing/glasses/nightvision/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(is_item(object)) var/obj/item/I = object @@ -107,7 +107,7 @@ icon_state = "[icon_state]_off" icon_state_worn = "[icon_state_worn]_off" -/obj/item/clothing/glasses/nightvision/proc/drain_power(var/mob/caller) +/obj/item/clothing/glasses/nightvision/proc/drain_power(mob/caller) if(!active) return FALSE @@ -130,7 +130,7 @@ return TRUE -/obj/item/clothing/glasses/nightvision/proc/set_active(var/mob/caller,var/desired_active=TRUE) +/obj/item/clothing/glasses/nightvision/proc/set_active(mob/caller,desired_active=TRUE) if(active == desired_active) return FALSE @@ -168,7 +168,7 @@ return TRUE -/obj/item/clothing/glasses/nightvision/click_self(var/mob/caller,location,control,params) +/obj/item/clothing/glasses/nightvision/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(10) @@ -178,7 +178,7 @@ return TRUE -/obj/item/clothing/glasses/nightvision/on_equip(var/atom/old_location,var/silent=FALSE) +/obj/item/clothing/glasses/nightvision/on_equip(atom/old_location,silent=FALSE) . = ..() var/obj/hud/inventory/I = loc if(I.worn && I.item_slot & SLOT_FACE && is_living(I.owner)) @@ -189,7 +189,7 @@ else if(L.ai) set_active(L,TRUE) -/obj/item/clothing/glasses/nightvision/on_unequip(var/obj/hud/inventory/old_inventory,var/silent=FALSE) //When the object is dropped from the old_inventory +/obj/item/clothing/glasses/nightvision/on_unequip(obj/hud/inventory/old_inventory,silent=FALSE) //When the object is dropped from the old_inventory . = ..() if(active && old_inventory.worn && old_inventory.item_slot & SLOT_FACE && is_living(old_inventory.owner)) var/mob/living/L = old_inventory.owner diff --git a/code/_core/obj/item/clothing/glasses/sunglasses.dm b/code/_core/obj/item/clothing/glasses/sunglasses.dm index bae0087463..0a16ef35cc 100644 --- a/code/_core/obj/item/clothing/glasses/sunglasses.dm +++ b/code/_core/obj/item/clothing/glasses/sunglasses.dm @@ -12,7 +12,7 @@ item_slot_layer = 2 /* -/obj/item/clothing/glasses/sun/pre_equip(var/atom/old_location,var/obj/hud/inventory/new_location) +/obj/item/clothing/glasses/sun/pre_equip(atom/old_location,obj/hud/inventory/new_location) . = ..() diff --git a/code/_core/obj/item/clothing/hands/_hands.dm b/code/_core/obj/item/clothing/hands/_hands.dm index cfae85ae61..86b8f7b944 100644 --- a/code/_core/obj/item/clothing/hands/_hands.dm +++ b/code/_core/obj/item/clothing/hands/_hands.dm @@ -1,7 +1,7 @@ /obj/item/clothing/hands/ worn_layer = LAYER_MOB_CLOTHING_GLOVES -/obj/item/clothing/hands/pre_equip(var/atom/old_location,var/obj/hud/inventory/new_location) +/obj/item/clothing/hands/pre_equip(atom/old_location,obj/hud/inventory/new_location) if(new_location && new_location.worn) if(length(protected_limbs)) diff --git a/code/_core/obj/item/clothing/hats/light/_light.dm b/code/_core/obj/item/clothing/hats/light/_light.dm index 33483ea52d..945e59d116 100644 --- a/code/_core/obj/item/clothing/hats/light/_light.dm +++ b/code/_core/obj/item/clothing/hats/light/_light.dm @@ -14,7 +14,7 @@ add_overlay(I) -/obj/item/clothing/head/light/initialize_worn_blends(var/desired_icon_state) +/obj/item/clothing/head/light/initialize_worn_blends(desired_icon_state) . = ..() @@ -29,7 +29,7 @@ desired_layer = worn_layer + 0.1 ) -/obj/item/clothing/head/light/click_self(var/mob/caller,location,control,params) +/obj/item/clothing/head/light/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(10) enabled = !enabled diff --git a/code/_core/obj/item/clothing/head/hats/bandana.dm b/code/_core/obj/item/clothing/head/hats/bandana.dm index ee6c62b451..2070d58680 100644 --- a/code/_core/obj/item/clothing/head/hats/bandana.dm +++ b/code/_core/obj/item/clothing/head/hats/bandana.dm @@ -19,7 +19,7 @@ value = 40 -/obj/item/clothing/head/hat/bandana/pre_equip(var/atom/old_location,var/obj/hud/inventory/new_location) +/obj/item/clothing/head/hat/bandana/pre_equip(atom/old_location,obj/hud/inventory/new_location) . = ..() diff --git a/code/_core/obj/item/clothing/head/hats/crown.dm b/code/_core/obj/item/clothing/head/hats/crown.dm index 1dd87208c8..08e9feccf1 100644 --- a/code/_core/obj/item/clothing/head/hats/crown.dm +++ b/code/_core/obj/item/clothing/head/hats/crown.dm @@ -16,7 +16,7 @@ rarity = RARITY_LEGENDARY -/obj/item/clothing/head/hat/crown/get_examine_details_list(var/mob/examiner) +/obj/item/clothing/head/hat/crown/get_examine_details_list(mob/examiner) . = ..() if(winner_name) if(is_player(examiner)) @@ -30,18 +30,18 @@ . += span("warning","The crown seems to be a fake...") -/obj/item/clothing/head/hat/crown/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/clothing/head/hat/crown/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("winner_name") -/obj/item/clothing/head/hat/crown/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/clothing/head/hat/crown/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("winner_name") var/list/vowel_shift = list("a","e","i","o","u") -/proc/shift_vowels(var/text) +/proc/shift_vowels(text) var/final_string = "" var/list/letters = splittext(text,"") for(var/letter in letters) diff --git a/code/_core/obj/item/clothing/head/hats/goblin_crown.dm b/code/_core/obj/item/clothing/head/hats/goblin_crown.dm index 0fde14b514..15d7a264be 100644 --- a/code/_core/obj/item/clothing/head/hats/goblin_crown.dm +++ b/code/_core/obj/item/clothing/head/hats/goblin_crown.dm @@ -17,13 +17,13 @@ rarity = RARITY_LEGENDARY -/obj/item/clothing/head/hat/goblin_crown/on_equip(var/atom/old_location,var/silent=FALSE) +/obj/item/clothing/head/hat/goblin_crown/on_equip(atom/old_location,silent=FALSE) . = ..() var/obj/hud/inventory/I = loc if(I.worn) START_THINKING(src) -/obj/item/clothing/head/hat/goblin_crown/on_unequip(var/obj/hud/inventory/old_inventory,var/silent=FALSE) //When the object is dropped from the old_inventory +/obj/item/clothing/head/hat/goblin_crown/on_unequip(obj/hud/inventory/old_inventory,silent=FALSE) //When the object is dropped from the old_inventory . = ..() STOP_THINKING(src) diff --git a/code/_core/obj/item/clothing/head/hats/skimask.dm b/code/_core/obj/item/clothing/head/hats/skimask.dm index ca3082211f..c0d68e66dc 100644 --- a/code/_core/obj/item/clothing/head/hats/skimask.dm +++ b/code/_core/obj/item/clothing/head/hats/skimask.dm @@ -26,7 +26,7 @@ value = 30 -/obj/item/clothing/head/hat/skimask/pre_equip(var/atom/old_location,var/obj/hud/inventory/new_location) +/obj/item/clothing/head/hat/skimask/pre_equip(atom/old_location,obj/hud/inventory/new_location) if(new_location.item_slot & SLOT_HEAD) hidden_organs[BODY_HAIR_HEAD] = TRUE diff --git a/code/_core/obj/item/clothing/head/helmet/full/blob_spore.dm b/code/_core/obj/item/clothing/head/helmet/full/blob_spore.dm index 5883f5ea28..e4b86543af 100644 --- a/code/_core/obj/item/clothing/head/helmet/full/blob_spore.dm +++ b/code/_core/obj/item/clothing/head/helmet/full/blob_spore.dm @@ -23,14 +23,14 @@ no_drop = TRUE -/obj/item/clothing/head/helmet/full/blob_spore/can_be_dragged(var/mob/caller) +/obj/item/clothing/head/helmet/full/blob_spore/can_be_dragged(mob/caller) return FALSE -/obj/item/clothing/head/helmet/full/blob_spore/proc/can_remove_blob(var/mob/caller) +/obj/item/clothing/head/helmet/full/blob_spore/proc/can_remove_blob(mob/caller) INTERACT_CHECK_NO_DELAY(src) return TRUE -/obj/item/clothing/head/helmet/full/blob_spore/proc/remove_blob(var/mob/caller,var/messsage=TRUE) +/obj/item/clothing/head/helmet/full/blob_spore/proc/remove_blob(mob/caller,messsage=TRUE) if(messsage && caller) caller.visible_message(span("notice","\The [caller.name] successfully removes \the [src.name]!"),span("notice","You sucessfully remove \the [src.name]!")) var/turf/T = get_turf(caller ? caller : src) if(T) @@ -46,7 +46,7 @@ qdel(src) return TRUE -/obj/item/clothing/head/helmet/full/blob_spore/click_self(var/mob/caller,location,control,params) +/obj/item/clothing/head/helmet/full/blob_spore/click_self(mob/caller,location,control,params) PROGRESS_BAR(caller,src,1 SECONDS,src::remove_blob(),caller) PROGRESS_BAR_CONDITIONS(caller,src,src::can_remove_blob(),caller) return TRUE @@ -103,7 +103,7 @@ -/obj/item/clothing/head/helmet/full/blob_spore/pre_equip(var/atom/old_location,var/obj/hud/inventory/new_location) +/obj/item/clothing/head/helmet/full/blob_spore/pre_equip(atom/old_location,obj/hud/inventory/new_location) . = ..() diff --git a/code/_core/obj/item/clothing/head/helmet/full/paper_bag.dm b/code/_core/obj/item/clothing/head/helmet/full/paper_bag.dm index ddbf2f7e34..2549e8fd95 100644 --- a/code/_core/obj/item/clothing/head/helmet/full/paper_bag.dm +++ b/code/_core/obj/item/clothing/head/helmet/full/paper_bag.dm @@ -28,17 +28,17 @@ . = ..() update_inventory() -/obj/item/clothing/head/helmet/full/paperbag/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/clothing/head/helmet/full/paperbag/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("logo") SAVEVAR("logobg") -/obj/item/clothing/head/helmet/full/paperbag/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/clothing/head/helmet/full/paperbag/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("logo") LOADVAR("logobg") -/obj/item/clothing/head/helmet/full/paperbag/click_self(var/mob/caller,location,control,params) +/obj/item/clothing/head/helmet/full/paperbag/click_self(mob/caller,location,control,params) var/mob/C = caller if(C.attack_flags & CONTROL_MOD_DISARM && istype(src.loc,/obj/hud/inventory/organs/)) @@ -80,7 +80,7 @@ return ..() -/obj/item/clothing/head/helmet/full/paperbag/pre_equip(var/atom/old_location,var/obj/hud/inventory/new_location) +/obj/item/clothing/head/helmet/full/paperbag/pre_equip(atom/old_location,obj/hud/inventory/new_location) . = ..() diff --git a/code/_core/obj/item/clothing/interaction.dm b/code/_core/obj/item/clothing/interaction.dm index f7bf914b9f..20dcd2e4b5 100644 --- a/code/_core/obj/item/clothing/interaction.dm +++ b/code/_core/obj/item/clothing/interaction.dm @@ -1,4 +1,4 @@ -/obj/item/clothing/click_on_object(var/mob/caller,var/atom/object,location,control,params) //When we attack something with the clothes +/obj/item/clothing/click_on_object(mob/caller,atom/object,location,control,params) //When we attack something with the clothes if(is_advanced(caller) && caller == object) //Auto-equip. //No interaction delay needed. @@ -8,7 +8,7 @@ return ..() -/obj/item/clothing/click_self(var/mob/caller,location,control,params) +/obj/item/clothing/click_self(mob/caller,location,control,params) if(length(additional_clothing_stored) && is_advanced(caller) && is_inventory(src.loc)) var/obj/hud/inventory/I = src.loc @@ -20,7 +20,7 @@ . = ..() -/obj/item/proc/quick_equip(var/mob/living/advanced/caller,var/ignore_hands = FALSE,var/ignore_worn=FALSE,var/ignore_held=FALSE,var/ignore_dynamic=FALSE,var/debug=FALSE,var/silent=FALSE) +/obj/item/proc/quick_equip(mob/living/advanced/caller,ignore_hands = FALSE,ignore_worn=FALSE,ignore_held=FALSE,ignore_dynamic=FALSE,debug=FALSE,silent=FALSE) var/obj/hud/inventory/best_inventory_wear var/obj/hud/inventory/best_inventory_equip @@ -56,7 +56,7 @@ return FALSE -/obj/item/clothing/get_examine_list(var/mob/examiner) +/obj/item/clothing/get_examine_list(mob/examiner) . = ..() diff --git a/code/_core/obj/item/clothing/masks/_masks.dm b/code/_core/obj/item/clothing/masks/_masks.dm index fd411094d5..65c1082a4c 100644 --- a/code/_core/obj/item/clothing/masks/_masks.dm +++ b/code/_core/obj/item/clothing/masks/_masks.dm @@ -10,5 +10,5 @@ uses_until_condition_fall = 300 -/obj/item/clothing/mask/proc/mod_speech(var/mob/living/advanced/caller,var/text_to_say,var/talk_type_to_use = TEXT_TALK, var/talk_range=TALK_RANGE,var/language_to_use=null) +/obj/item/clothing/mask/proc/mod_speech(mob/living/advanced/caller,text_to_say,talk_type_to_use = TEXT_TALK, talk_range=TALK_RANGE,language_to_use=null) return text_to_say \ No newline at end of file diff --git a/code/_core/obj/item/clothing/masks/endless_bubblegum.dm b/code/_core/obj/item/clothing/masks/endless_bubblegum.dm index 5abe028b8e..c79b4e259c 100644 --- a/code/_core/obj/item/clothing/masks/endless_bubblegum.dm +++ b/code/_core/obj/item/clothing/masks/endless_bubblegum.dm @@ -19,13 +19,13 @@ . = ..() . += 5000 -/obj/item/clothing/mask/endless_bubblegum/on_equip(var/atom/old_location,var/silent=FALSE) +/obj/item/clothing/mask/endless_bubblegum/on_equip(atom/old_location,silent=FALSE) . = ..() var/obj/hud/inventory/I = loc if(I.worn) START_THINKING(src) -/obj/item/clothing/mask/endless_bubblegum/on_unequip(var/obj/hud/inventory/old_inventory,var/silent=FALSE) //When the object is dropped from the old_inventory +/obj/item/clothing/mask/endless_bubblegum/on_unequip(obj/hud/inventory/old_inventory,silent=FALSE) //When the object is dropped from the old_inventory . = ..() STOP_THINKING(src) diff --git a/code/_core/obj/item/clothing/masks/paper.dm b/code/_core/obj/item/clothing/masks/paper.dm index 65ff2a2ce7..937fce3961 100644 --- a/code/_core/obj/item/clothing/masks/paper.dm +++ b/code/_core/obj/item/clothing/masks/paper.dm @@ -20,7 +20,7 @@ . = ..() update_sprite() -/obj/item/clothing/mask/paper/click_self(var/mob/caller,location,control,params) +/obj/item/clothing/mask/paper/click_self(mob/caller,location,control,params) var/mob/C = caller if(C.attack_flags & CONTROL_MOD_DISARM && istype(src.loc,/obj/hud/inventory/organs/)) INTERACT_CHECK diff --git a/code/_core/obj/item/clothing/masks/voice_of_god.dm b/code/_core/obj/item/clothing/masks/voice_of_god.dm index 4639cb1af2..ef4814f9a4 100644 --- a/code/_core/obj/item/clothing/masks/voice_of_god.dm +++ b/code/_core/obj/item/clothing/masks/voice_of_god.dm @@ -67,7 +67,7 @@ . += 18000 -/obj/item/clothing/mask/voice_of_god/get_examine_details_list(var/mob/caller) +/obj/item/clothing/mask/voice_of_god/get_examine_details_list(mob/caller) . = ..() . += div("notice bold underline","Available commands:") . += div("notice","Stop, Halt, Hold: Paralyzes all enemies in range for 2 seconds.") @@ -79,7 +79,7 @@ . += div("notice","Burn, Fire, Heat: Ignites all enemies in range for 6 seconds.") . += div("notice","All commands share a cooldown of 8 seconds, and require 50 mana and stamina to cast.") -/obj/item/clothing/mask/voice_of_god/on_equip(var/atom/old_location,var/silent=FALSE) +/obj/item/clothing/mask/voice_of_god/on_equip(atom/old_location,silent=FALSE) . = ..() var/obj/hud/inventory/I = loc if(I.worn && I.item_slot & SLOT_FACE) @@ -88,7 +88,7 @@ A.voice_modifiers = list() A.voice_modifiers[src] = nameof(src::search_for_voice()) -/obj/item/clothing/mask/voice_of_god/on_unequip(var/obj/hud/inventory/old_inventory,var/silent=FALSE) +/obj/item/clothing/mask/voice_of_god/on_unequip(obj/hud/inventory/old_inventory,silent=FALSE) . = ..() if(old_inventory.worn && old_inventory.item_slot & SLOT_FACE) var/mob/living/advanced/A = old_inventory.owner @@ -97,7 +97,7 @@ if(!length(A.voice_modifiers)) A.voice_modifiers = null -/obj/item/clothing/mask/voice_of_god/proc/search_for_voice(var/atom/speaker, var/atom/source, var/text_to_say, var/raw_text_to_say, var/text_type, var/frequency, var/language = LANGUAGE_BASIC,var/talk_range=TALK_RANGE) +/obj/item/clothing/mask/voice_of_god/proc/search_for_voice(atom/speaker, atom/source, text_to_say, raw_text_to_say, text_type, frequency, language = LANGUAGE_BASIC,talk_range=TALK_RANGE) if(next_voice > world.time) return text_to_say @@ -132,7 +132,7 @@ return text_to_say -/obj/item/clothing/mask/voice_of_god/proc/do_voice_effect(var/mob/living/advanced/caller,var/proc_effect,var/harmful=FALSE) +/obj/item/clothing/mask/voice_of_god/proc/do_voice_effect(mob/living/advanced/caller,proc_effect,harmful=FALSE) for(var/k in viewers(VIEW_RANGE,caller)) var/mob/M = k @@ -148,28 +148,28 @@ if(!allow_hostile_action(caller.loyalty_tag,L)) call(src,proc_effect)(caller,L) -/obj/item/clothing/mask/voice_of_god/proc/power_word_stop(var/mob/living/advanced/caller,var/mob/living/victim) +/obj/item/clothing/mask/voice_of_god/proc/power_word_stop(mob/living/advanced/caller,mob/living/victim) return victim.add_status_effect(PARALYZE,20,20,source=caller) -/obj/item/clothing/mask/voice_of_god/proc/power_word_drop(var/mob/living/advanced/caller,var/mob/living/victim) +/obj/item/clothing/mask/voice_of_god/proc/power_word_drop(mob/living/advanced/caller,mob/living/victim) return victim.add_status_effect(STUN,40,40,source=caller) -/obj/item/clothing/mask/voice_of_god/proc/power_word_heal(var/mob/living/advanced/caller,var/mob/living/victim) +/obj/item/clothing/mask/voice_of_god/proc/power_word_heal(mob/living/advanced/caller,mob/living/victim) return victim.add_status_effect(TEMP_REGEN,5,100,source=caller) //5 health per second for 10 seconds. -/obj/item/clothing/mask/voice_of_god/proc/power_word_harm(var/mob/living/advanced/caller,var/mob/living/victim) +/obj/item/clothing/mask/voice_of_god/proc/power_word_harm(mob/living/advanced/caller,mob/living/victim) var/damagetype/DT = SSdamagetype.all_damage_types[/damagetype/voice_of_god/harm] var/atom/object_to_damage = victim.get_object_to_damage(caller,src,damage_type,null,TRUE,TRUE) return DT.process_damage(caller,victim,src,object_to_damage,caller,1) -/obj/item/clothing/mask/voice_of_god/proc/power_word_kill(var/mob/living/advanced/caller,var/mob/living/victim) +/obj/item/clothing/mask/voice_of_god/proc/power_word_kill(mob/living/advanced/caller,mob/living/victim) if(victim.dead || !victim.has_status_effect(CRIT)) return FALSE var/damagetype/DT = SSdamagetype.all_damage_types[/damagetype/voice_of_god/kill] var/atom/object_to_damage = victim.get_object_to_damage(caller,src,damage_type,null,TRUE,TRUE) return DT.process_damage(caller,victim,src,object_to_damage,caller,1) -/obj/item/clothing/mask/voice_of_god/proc/power_word_bleed(var/mob/living/advanced/caller,var/mob/living/victim) +/obj/item/clothing/mask/voice_of_god/proc/power_word_bleed(mob/living/advanced/caller,mob/living/victim) if(!victim.blood_type) return FALSE var/bleed_amount = 50 @@ -180,6 +180,6 @@ QUEUE_HEALTH_UPDATE(victim) return TRUE -/obj/item/clothing/mask/voice_of_god/proc/power_word_burn(var/mob/living/advanced/caller,var/mob/living/victim) +/obj/item/clothing/mask/voice_of_god/proc/power_word_burn(mob/living/advanced/caller,mob/living/victim) victim.ignite(60,source=caller) return TRUE diff --git a/code/_core/obj/item/clothing/neck/goblin_necklace.dm b/code/_core/obj/item/clothing/neck/goblin_necklace.dm index 94a79aa82e..cac55f6e92 100644 --- a/code/_core/obj/item/clothing/neck/goblin_necklace.dm +++ b/code/_core/obj/item/clothing/neck/goblin_necklace.dm @@ -23,13 +23,13 @@ rarity = RARITY_LEGENDARY -/obj/item/clothing/neck/on_equip(var/atom/old_location,var/silent=FALSE) +/obj/item/clothing/neck/on_equip(atom/old_location,silent=FALSE) . = ..() var/obj/hud/inventory/I = loc if(I.worn) START_THINKING(src) -/obj/item/clothing/neck/on_unequip(var/obj/hud/inventory/old_inventory,var/silent=FALSE) //When the object is dropped from the old_inventory +/obj/item/clothing/neck/on_unequip(obj/hud/inventory/old_inventory,silent=FALSE) //When the object is dropped from the old_inventory . = ..() STOP_THINKING(src) diff --git a/code/_core/obj/item/clothing/overwear/armor/plate_carrier.dm b/code/_core/obj/item/clothing/overwear/armor/plate_carrier.dm index 236b462998..daf2922f15 100644 --- a/code/_core/obj/item/clothing/overwear/armor/plate_carrier.dm +++ b/code/_core/obj/item/clothing/overwear/armor/plate_carrier.dm @@ -16,11 +16,11 @@ size = SIZE_3 -/obj/item/clothing/overwear/armor/plate_carrier/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE) +/obj/item/clothing/overwear/armor/plate_carrier/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE) . = ..() SAVELISTATOM("installed_plate_carriers") -/obj/item/clothing/overwear/armor/plate_carrier/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data) +/obj/item/clothing/overwear/armor/plate_carrier/load_item_data_pre(mob/living/advanced/player/P,list/object_data) . = ..() LOADLISTATOM("installed_plate_carriers") @@ -36,7 +36,7 @@ .[damagetype] += P.armor_base[damagetype] > 0 ? P.armor_base[damagetype] * power_mul : P.armor_base[damagetype] -/obj/item/clothing/overwear/armor/plate_carrier/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/clothing/overwear/armor/plate_carrier/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(istype(object,/obj/item/armor_plate/)) INTERACT_CHECK @@ -57,7 +57,7 @@ return ..() -/obj/item/clothing/overwear/armor/plate_carrier/click_self(var/mob/caller) +/obj/item/clothing/overwear/armor/plate_carrier/click_self(mob/caller) if(is_advanced(caller) && length(installed_plate_carriers) && caller.attack_flags & CONTROL_MOD_DISARM) INTERACT_CHECK diff --git a/code/_core/obj/item/clothing/overwear/coat/vest.dm b/code/_core/obj/item/clothing/overwear/coat/vest.dm index f29d8e7238..c037385084 100644 --- a/code/_core/obj/item/clothing/overwear/coat/vest.dm +++ b/code/_core/obj/item/clothing/overwear/coat/vest.dm @@ -18,7 +18,7 @@ value = 90 -/obj/item/clothing/overwear/coat/vest/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/clothing/overwear/coat/vest/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(is_inventory(object)) //TODO: Move this to clothing? INTERACT_CHECK diff --git a/code/_core/obj/item/clothing/pants/goblin_loin.dm b/code/_core/obj/item/clothing/pants/goblin_loin.dm index a011b7e13d..2706048350 100644 --- a/code/_core/obj/item/clothing/pants/goblin_loin.dm +++ b/code/_core/obj/item/clothing/pants/goblin_loin.dm @@ -16,13 +16,13 @@ rarity = RARITY_LEGENDARY -/obj/item/clothing/pants/goblin_loin/on_equip(var/atom/old_location,var/silent=FALSE) +/obj/item/clothing/pants/goblin_loin/on_equip(atom/old_location,silent=FALSE) . = ..() var/obj/hud/inventory/I = loc if(I.worn) START_THINKING(src) -/obj/item/clothing/pants/goblin_loin/on_unequip(var/obj/hud/inventory/old_inventory,var/silent=FALSE) //When the object is dropped from the old_inventory +/obj/item/clothing/pants/goblin_loin/on_unequip(obj/hud/inventory/old_inventory,silent=FALSE) //When the object is dropped from the old_inventory . = ..() STOP_THINKING(src) diff --git a/code/_core/obj/item/coin/_coin.dm b/code/_core/obj/item/coin/_coin.dm index a06f38a90f..be92949b7f 100644 --- a/code/_core/obj/item/coin/_coin.dm +++ b/code/_core/obj/item/coin/_coin.dm @@ -75,7 +75,7 @@ value = 2000 rarity = RARITY_UNCOMMON -/obj/item/coin/cursed/click_self(var/mob/caller,location,control,params) +/obj/item/coin/cursed/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(1) @@ -109,7 +109,7 @@ value_burgerbux = 3 -/obj/item/coin/antag_token/click_self(var/mob/caller,location,control,params) +/obj/item/coin/antag_token/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(1) @@ -142,7 +142,7 @@ rarity = RARITY_RARE -/obj/item/coin/bananium/click_self(var/mob/caller,location,control,params) +/obj/item/coin/bananium/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(10) diff --git a/code/_core/obj/item/color/_color.dm b/code/_core/obj/item/color/_color.dm index a10ffbc385..6d22eb270f 100644 --- a/code/_core/obj/item/color/_color.dm +++ b/code/_core/obj/item/color/_color.dm @@ -11,14 +11,14 @@ var/list/type_blacklist = list() var/list/type_whitelist = list() -/obj/item/color/New(var/desired_loc) +/obj/item/color/New(desired_loc) ..() selected_color = possible_colors[1] /obj/item/color/proc/get_selected_color() return selected_color -/obj/item/color/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/color/click_on_object(mob/caller as mob,atom/object,location,control,params) if(get_dist(caller,object) > 1) caller.to_chat(span("notice","You're too far away!")) diff --git a/code/_core/obj/item/color/crayon.dm b/code/_core/obj/item/color/crayon.dm index f5cbedb7e3..eafcab2ebc 100644 --- a/code/_core/obj/item/color/crayon.dm +++ b/code/_core/obj/item/color/crayon.dm @@ -4,7 +4,7 @@ icon_state = "crayon" uses = 20 -/obj/item/color/crayon/New(var/desired_loc) +/obj/item/color/crayon/New(desired_loc) ..() update_icon() @@ -36,5 +36,5 @@ name = "green crayon" selected_color = "#00FF00" -/obj/item/color/crayon/dev/get_selected_color(var/mob/caller) +/obj/item/color/crayon/dev/get_selected_color(mob/caller) return input(caller,"What would you like the color to be?","Choose a color","#FFFFFF") as color|null \ No newline at end of file diff --git a/code/_core/obj/item/combat.dm b/code/_core/obj/item/combat.dm index 6d86b745e0..d4ab3a4d93 100644 --- a/code/_core/obj/item/combat.dm +++ b/code/_core/obj/item/combat.dm @@ -1,4 +1,4 @@ -/obj/item/proc/get_damage_type_text(var/mob/living/L) +/obj/item/proc/get_damage_type_text(mob/living/L) . = "" diff --git a/code/_core/obj/item/consumable/fertilizer.dm b/code/_core/obj/item/consumable/fertilizer.dm index 2b14a716ee..33a3e06a65 100644 --- a/code/_core/obj/item/consumable/fertilizer.dm +++ b/code/_core/obj/item/consumable/fertilizer.dm @@ -6,7 +6,7 @@ icon_state = "inventory" value = 50 -/obj/item/consumable/fertilizer/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/consumable/fertilizer/click_on_object(mob/caller as mob,atom/object,location,control,params) if (!istype(object,/obj/structure/interactive/plant)) return diff --git a/code/_core/obj/item/consumable/soulgem.dm b/code/_core/obj/item/consumable/soulgem.dm index 32128a9396..53be94199e 100644 --- a/code/_core/obj/item/consumable/soulgem.dm +++ b/code/_core/obj/item/consumable/soulgem.dm @@ -11,7 +11,7 @@ /obj/item/consumable/soulgem/on_spawn() total_charge = 1000 -/obj/item/consumable/soulgem/get_examine_text(var/mob/caller) +/obj/item/consumable/soulgem/get_examine_text(mob/caller) return ..() + span("notice","It has [total_charge] total charge.") /obj/item/consumable/soulgem/update_icon() @@ -21,7 +21,7 @@ icon_state = initial(icon_state) ..() -/obj/item/consumable/soulgem/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/consumable/soulgem/click_on_object(mob/caller as mob,atom/object,location,control,params) object = object.defer_click_on_object() diff --git a/code/_core/obj/item/container/beaker/_beaker.dm b/code/_core/obj/item/container/beaker/_beaker.dm index 6e3cbb97c1..3e293f4d9e 100644 --- a/code/_core/obj/item/container/beaker/_beaker.dm +++ b/code/_core/obj/item/container/beaker/_beaker.dm @@ -30,7 +30,7 @@ . = ..() . *= 2 -/obj/item/container/simple/beaker/can_feed(var/mob/caller,var/mob/living/target) +/obj/item/container/simple/beaker/can_feed(mob/caller,mob/living/target) if(!allow_reagent_transfer_from) return FALSE . = ..() @@ -47,7 +47,7 @@ I.color = reagents.color add_underlay(I) -/obj/item/container/simple/beaker/get_examine_list(var/mob/examiner) +/obj/item/container/simple/beaker/get_examine_list(mob/examiner) . = ..() if(reagents) . += div("notice","This can hold up to [reagents.volume_max]u of reagents.") diff --git a/code/_core/obj/item/container/beaker/bottle.dm b/code/_core/obj/item/container/beaker/bottle.dm index f773288cfc..4aad1cb629 100644 --- a/code/_core/obj/item/container/beaker/bottle.dm +++ b/code/_core/obj/item/container/beaker/bottle.dm @@ -114,7 +114,7 @@ pixel_y = 4 -/obj/item/container/simple/beaker/glass/get_consume_size(var/mob/living/L) +/obj/item/container/simple/beaker/glass/get_consume_size(mob/living/L) return ..() * 2 /obj/item/container/simple/beaker/shot @@ -131,7 +131,7 @@ pixel_y = 4 -/obj/item/container/simple/beaker/shot/get_consume_size(var/mob/living/L) +/obj/item/container/simple/beaker/shot/get_consume_size(mob/living/L) return reagents.volume_max /obj/item/container/simple/beaker/bowl @@ -160,7 +160,7 @@ size = SIZE_2 -/obj/item/container/simple/beaker/flask/get_consume_size(var/mob/living/L) +/obj/item/container/simple/beaker/flask/get_consume_size(mob/living/L) return ..() * 3 /obj/item/container/simple/beaker/flask/Generate() @@ -177,7 +177,7 @@ value = 450 -/obj/item/container/simple/beaker/flask/russian/get_consume_size(var/mob/living/L) +/obj/item/container/simple/beaker/flask/russian/get_consume_size(mob/living/L) return ..() * 4 /obj/item/container/simple/beaker/flask/engraved @@ -190,7 +190,7 @@ value = 450 -/obj/item/container/simple/beaker/flask/engraved/get_consume_size(var/mob/living/L) +/obj/item/container/simple/beaker/flask/engraved/get_consume_size(mob/living/L) return ..() * 4 /obj/item/container/simple/beaker/flask/onion diff --git a/code/_core/obj/item/container/beaker/cigarette.dm b/code/_core/obj/item/container/beaker/cigarette.dm index 3215465ee9..66df0507cc 100644 --- a/code/_core/obj/item/container/beaker/cigarette.dm +++ b/code/_core/obj/item/container/beaker/cigarette.dm @@ -33,7 +33,7 @@ size = SIZE_0 -/obj/item/container/cigarette/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/container/cigarette/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(!lit) var/damagetype/DT = SSdamagetype.all_damage_types[object.get_damage_type(caller,src)] if(DT.attack_damage_base[HEAT] || DT.attack_damage_base[LASER]) @@ -41,14 +41,14 @@ return TRUE . = ..() -/obj/item/container/cigarette/feed(var/mob/caller,var/mob/living/target) +/obj/item/container/cigarette/feed(mob/caller,mob/living/target) return FALSE -/obj/item/container/cigarette/get_damage_type(var/atom/attacker,var/atom/victim) +/obj/item/container/cigarette/get_damage_type(atom/attacker,atom/victim) if(lit) return /damagetype/melee/club/lighter/on return ..() -/obj/item/container/cigarette/proc/set_lit(var/desired_lit=TRUE) +/obj/item/container/cigarette/proc/set_lit(desired_lit=TRUE) if(lit == desired_lit) return FALSE @@ -94,7 +94,7 @@ add_overlay(I) . = ..() -/obj/item/container/cigarette/proc/consume(var/multiplier=1) +/obj/item/container/cigarette/proc/consume(multiplier=1) if(istype(src.loc,/obj/hud/inventory/organs/face)) var/obj/hud/inventory/organs/face/I = src.loc if(I.owner && I.owner.reagents) diff --git a/code/_core/obj/item/container/beaker/fuel_cell.dm b/code/_core/obj/item/container/beaker/fuel_cell.dm index 16b97ee239..a075a8d728 100644 --- a/code/_core/obj/item/container/beaker/fuel_cell.dm +++ b/code/_core/obj/item/container/beaker/fuel_cell.dm @@ -18,11 +18,11 @@ size = SIZE_1 -/obj/item/container/simple/beaker/fuel_cell/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/container/simple/beaker/fuel_cell/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("allow_reagent_transfer_to") -/obj/item/container/simple/beaker/fuel_cell/load_item_data_post(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/container/simple/beaker/fuel_cell/load_item_data_post(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("allow_reagent_transfer_to") @@ -34,7 +34,7 @@ reagents.temperature_change_mul = 1 SSreagent.all_temperature_reagent_containers += reagents -/obj/item/container/simple/beaker/fuel_cell/click_self(var/mob/caller) +/obj/item/container/simple/beaker/fuel_cell/click_self(mob/caller) if(!(allow_reagent_transfer_to || allow_reagent_transfer_from)) caller.to_chat(span("notice","You'll need a wrench in order to open \the [src.name]!")) @@ -42,7 +42,7 @@ . = ..() -/obj/item/container/simple/beaker/fuel_cell/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/container/simple/beaker/fuel_cell/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(is_item(object)) var/obj/item/I = object diff --git a/code/_core/obj/item/container/beaker/hypospray_vial.dm b/code/_core/obj/item/container/beaker/hypospray_vial.dm index 238c838027..e2f18e11be 100644 --- a/code/_core/obj/item/container/beaker/hypospray_vial.dm +++ b/code/_core/obj/item/container/beaker/hypospray_vial.dm @@ -12,11 +12,11 @@ size = SIZE_1 -/obj/item/container/simple/beaker/bottle/hypospray/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/container/simple/beaker/bottle/hypospray/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("spent") -/obj/item/container/simple/beaker/bottle/hypospray/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/container/simple/beaker/bottle/hypospray/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("spent") diff --git a/code/_core/obj/item/container/blood_pack/_blood_pack.dm b/code/_core/obj/item/container/blood_pack/_blood_pack.dm index ea35a9eada..b4b5e61d25 100644 --- a/code/_core/obj/item/container/blood_pack/_blood_pack.dm +++ b/code/_core/obj/item/container/blood_pack/_blood_pack.dm @@ -18,14 +18,14 @@ rarity = RARITY_UNCOMMON -/obj/item/container/blood_pack/feed(var/mob/caller,var/mob/living/target) +/obj/item/container/blood_pack/feed(mob/caller,mob/living/target) return FALSE -/obj/item/container/blood_pack/drop_item(var/atom/desired_loc,var/pixel_x_offset = 0,var/pixel_y_offset = 0,var/silent=FALSE) +/obj/item/container/blood_pack/drop_item(atom/desired_loc,pixel_x_offset = 0,pixel_y_offset = 0,silent=FALSE) . = ..() update_sprite() -/obj/item/container/blood_pack/on_equip(var/atom/old_location,var/silent=FALSE) //When the item is picked up. +/obj/item/container/blood_pack/on_equip(atom/old_location,silent=FALSE) //When the item is picked up. . = ..() update_sprite() @@ -33,7 +33,7 @@ . = ..() update_sprite() -/obj/item/container/blood_pack/proc/is_safe_to_attach(var/mob/living/caller,var/mob/living/target,var/messages=TRUE,var/desired_inject) +/obj/item/container/blood_pack/proc/is_safe_to_attach(mob/living/caller,mob/living/target,messages=TRUE,desired_inject) if(!isnum(desired_inject)) desired_inject = injecting @@ -52,7 +52,7 @@ return TRUE -/obj/item/container/blood_pack/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/container/blood_pack/click_on_object(mob/caller as mob,atom/object,location,control,params) if(is_living(object)) INTERACT_CHECK @@ -70,7 +70,7 @@ return ..() -/obj/item/container/blood_pack/proc/detach(var/mob/caller) +/obj/item/container/blood_pack/proc/detach(mob/caller) var/turf/T = get_turf(src) if(caller) T.visible_message(span("notice","\The [caller.name] detaches \the [src.name] from [attached_to.name].")) @@ -81,7 +81,7 @@ update_sprite() return TRUE -/obj/item/container/blood_pack/proc/attach(var/mob/caller,var/mob/living/target) +/obj/item/container/blood_pack/proc/attach(mob/caller,mob/living/target) draw_delay = initial(draw_delay) var/turf/T = get_turf(src) attached_to = target @@ -90,7 +90,7 @@ update_sprite() return TRUE -/obj/item/container/blood_pack/click_self(var/mob/caller,location,control,params) +/obj/item/container/blood_pack/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(1) @@ -116,7 +116,7 @@ return TRUE -/obj/item/container/blood_pack/proc/try_attach(var/mob/caller,var/mob/living/target) +/obj/item/container/blood_pack/proc/try_attach(mob/caller,mob/living/target) if(!can_attach_to(caller,target)) return FALSE @@ -128,7 +128,7 @@ return TRUE -/obj/item/container/blood_pack/proc/can_attach_to(var/mob/caller,var/mob/living/target) +/obj/item/container/blood_pack/proc/can_attach_to(mob/caller,mob/living/target) INTERACT_CHECK_NO_DELAY(src) INTERACT_CHECK_NO_DELAY(target) diff --git a/code/_core/obj/item/container/cheese_mold.dm b/code/_core/obj/item/container/cheese_mold.dm index cdbdb107d1..aca8cffa7f 100644 --- a/code/_core/obj/item/container/cheese_mold.dm +++ b/code/_core/obj/item/container/cheese_mold.dm @@ -18,7 +18,7 @@ size = SIZE_3 -/obj/item/container/cheese_mold/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/container/cheese_mold/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("allow_reagent_transfer_from") SAVEVAR("process_count") @@ -27,7 +27,7 @@ for(var/k in cheese_mix) .["cheese_mix"]["[k]"] = cheese_mix[k] -/obj/item/container/cheese_mold/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/container/cheese_mold/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("allow_reagent_transfer_from") SAVEVAR("process_count") @@ -37,7 +37,7 @@ if(R) cheese_mix[R] = object_data["cheese_mix"][k] -/obj/item/container/cheese_mold/get_examine_list(var/mob/caller) +/obj/item/container/cheese_mold/get_examine_list(mob/caller) . = ..() if(process_count >= CHEESE_PROCESS_TIME) . += div("notice","The cheese is ready to be removed!") @@ -67,7 +67,7 @@ CALLBACK("\ref[src]_process_cheese",1 SECONDS,src,src::process()) -/obj/item/container/cheese_mold/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/container/cheese_mold/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(process_count < CHEESE_PROCESS_TIME || !is_inventory(object)) return ..() @@ -127,7 +127,7 @@ return TRUE -/obj/item/container/cheese_mold/click_self(var/mob/caller,location,control,params) +/obj/item/container/cheese_mold/click_self(mob/caller,location,control,params) var/answer = input("Are you sure you want to empty the contents of \the [src.name]?","Empty Contents","Cancel") in list("Yes","No","Cancel") if(answer == "Yes") diff --git a/code/_core/obj/item/container/food/_food.dm b/code/_core/obj/item/container/food/_food.dm index 5a03dfdb72..73f4dd1349 100644 --- a/code/_core/obj/item/container/food/_food.dm +++ b/code/_core/obj/item/container/food/_food.dm @@ -25,7 +25,7 @@ /obj/item/container/edible/get_display_value() return get_value() -/obj/item/container/edible/quick(var/mob/caller,var/atom/object,location,params) +/obj/item/container/edible/quick(mob/caller,atom/object,location,params) return try_transfer_reagents(caller,caller,location,null,params) /obj/item/container/edible/Finalize() @@ -48,12 +48,12 @@ . = ..() transform = get_base_transform() -/obj/item/container/edible/proc/on_consumed(var/mob/caller,var/mob/living/target) //When there are no reagents left. +/obj/item/container/edible/proc/on_consumed(mob/caller,mob/living/target) //When there are no reagents left. if(delete_on_no_reagents) qdel(src) return TRUE -/obj/item/container/edible/feed(var/mob/caller,var/mob/living/target) +/obj/item/container/edible/feed(mob/caller,mob/living/target) . = ..() @@ -61,10 +61,10 @@ src.on_consumed(caller,target) -/obj/item/container/edible/proc/get_calculated_bites(var/mob/living/caller,var/total_reagents = 1) +/obj/item/container/edible/proc/get_calculated_bites(mob/living/caller,total_reagents = 1) return CEILING(total_reagents/get_consume_size(caller),1) -/obj/item/container/edible/get_reagents_to_consume(var/mob/living/consumer) +/obj/item/container/edible/get_reagents_to_consume(mob/living/consumer) var/total_reagents = reagents.volume_current diff --git a/code/_core/obj/item/container/food/burgers.dm b/code/_core/obj/item/container/food/burgers.dm index a6b35e6227..6b2f677b57 100644 --- a/code/_core/obj/item/container/food/burgers.dm +++ b/code/_core/obj/item/container/food/burgers.dm @@ -106,7 +106,7 @@ heal_amount_stamina = 0 heal_amount_mana = 0 -/obj/item/container/food/burger/clown/New(var/desired_loc) +/obj/item/container/food/burger/clown/New(desired_loc) ..() heal_amount_health = rand(-10,10) * 10 heal_amount_stamina = rand(-10,10) * 10 @@ -130,7 +130,7 @@ heal_amount_stamina = 0 heal_amount_mana = 0 -/obj/item/container/food/burger/colored/New(var/desired_loc) +/obj/item/container/food/burger/colored/New(desired_loc) ..() heal_amount_health = GetRedPart(color)/2.55 heal_amount_stamina = GetGreenPart(color)/2.55 diff --git a/code/_core/obj/item/container/food/dynamic/_dynamic.dm b/code/_core/obj/item/container/food/dynamic/_dynamic.dm index 84860bd8c0..ea8fd7c4ce 100644 --- a/code/_core/obj/item/container/food/dynamic/_dynamic.dm +++ b/code/_core/obj/item/container/food/dynamic/_dynamic.dm @@ -2,13 +2,13 @@ var/raw_icon_state var/cooked_icon_state -/obj/item/container/edible/dynamic/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/container/edible/dynamic/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("icon_state") SAVEVAR("cooked_icon_state") SAVEVAR("raw_icon_state") -/obj/item/container/edible/dynamic/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/container/edible/dynamic/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("icon_state") LOADVAR("cooked_icon_state") diff --git a/code/_core/obj/item/container/food/dynamic/bread.dm b/code/_core/obj/item/container/food/dynamic/bread.dm index 042cbdc914..115c1d488a 100644 --- a/code/_core/obj/item/container/food/dynamic/bread.dm +++ b/code/_core/obj/item/container/food/dynamic/bread.dm @@ -21,7 +21,7 @@ . = ..() reagents.add_reagent(/reagent/nutrition/dough/flour/processed,30) -/obj/item/container/edible/dynamic/bread/click_self(var/mob/caller,location,control,params) +/obj/item/container/edible/dynamic/bread/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(5) @@ -40,7 +40,7 @@ return TRUE -/obj/item/container/edible/dynamic/bread/click_on_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/container/edible/dynamic/bread/click_on_object(mob/caller,atom/object,location,control,params) if(icon_state == raw_icon_state && istype(object,/obj/item/container/edible/dynamic/bread)) //IT'S RAW. var/obj/item/container/edible/dynamic/bread/B = object @@ -63,7 +63,7 @@ return ..() -/obj/item/container/edible/dynamic/bread/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/obj/item/container/edible/dynamic/bread/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) var/original_volume = reagents.volume_current @@ -148,7 +148,7 @@ return TRUE -/obj/item/container/edible/dynamic/bread/can_be_attacked(var/atom/attacker,var/atom/weapon,var/params,var/damagetype/damage_type) +/obj/item/container/edible/dynamic/bread/can_be_attacked(atom/attacker,atom/weapon,params,damagetype/damage_type) return TRUE diff --git a/code/_core/obj/item/container/food/dynamic/cake.dm b/code/_core/obj/item/container/food/dynamic/cake.dm index 3001942a00..357b616d79 100644 --- a/code/_core/obj/item/container/food/dynamic/cake.dm +++ b/code/_core/obj/item/container/food/dynamic/cake.dm @@ -17,7 +17,7 @@ var/last_cooked = FALSE -/obj/item/container/edible/dynamic/cake/click_self(var/mob/caller,location,control,params) +/obj/item/container/edible/dynamic/cake/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(5) @@ -31,7 +31,7 @@ return TRUE -/obj/item/container/edible/dynamic/cake/click_on_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/container/edible/dynamic/cake/click_on_object(mob/caller,atom/object,location,control,params) if(icon_state == raw_icon_state && istype(object,/obj/item/container/edible/dynamic/cake)) //IT'S RAW. var/obj/item/container/edible/dynamic/bread/B = object @@ -55,7 +55,7 @@ return ..() -/obj/item/container/edible/dynamic/cake/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/obj/item/container/edible/dynamic/cake/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) var/original_volume = reagents.volume_current @@ -114,7 +114,7 @@ return TRUE -/obj/item/container/edible/dynamic/cake/can_be_attacked(var/atom/attacker,var/atom/weapon,var/params,var/damagetype/damage_type) +/obj/item/container/edible/dynamic/cake/can_be_attacked(atom/attacker,atom/weapon,params,damagetype/damage_type) return TRUE /obj/item/container/edible/dynamic/cake/update_sprite() diff --git a/code/_core/obj/item/container/food/dynamic/cheese.dm b/code/_core/obj/item/container/food/dynamic/cheese.dm index c84b9b5971..2e12f9e41d 100644 --- a/code/_core/obj/item/container/food/dynamic/cheese.dm +++ b/code/_core/obj/item/container/food/dynamic/cheese.dm @@ -22,7 +22,7 @@ created_time = get_time() return ..() -/obj/item/container/edible/dynamic/cheese/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/obj/item/container/edible/dynamic/cheese/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) if( (damage_table[BLADE] && !damage_table[BLUNT]) || damage_table[BLADE] > damage_table[BLUNT]) //Cut @@ -91,7 +91,7 @@ return ..() -/obj/item/container/edible/dynamic/cheese/can_be_attacked(var/atom/attacker,var/atom/weapon,var/params,var/damagetype/damage_type) +/obj/item/container/edible/dynamic/cheese/can_be_attacked(atom/attacker,atom/weapon,params,damagetype/damage_type) return TRUE /obj/item/container/edible/dynamic/cheese/update_icon() diff --git a/code/_core/obj/item/container/food/dynamic/meat.dm b/code/_core/obj/item/container/food/dynamic/meat.dm index cb61eb49a0..e38fffb6ed 100644 --- a/code/_core/obj/item/container/food/dynamic/meat.dm +++ b/code/_core/obj/item/container/food/dynamic/meat.dm @@ -14,10 +14,10 @@ scale_sprite = FALSE -/obj/item/container/edible/dynamic/meat/can_be_attacked(var/atom/attacker,var/atom/weapon,var/params,var/damagetype/damage_type) +/obj/item/container/edible/dynamic/meat/can_be_attacked(atom/attacker,atom/weapon,params,damagetype/damage_type) return TRUE -/obj/item/container/edible/dynamic/meat/click_self(var/mob/caller,location,control,params) +/obj/item/container/edible/dynamic/meat/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(5) @@ -109,7 +109,7 @@ return TRUE -/obj/item/container/edible/dynamic/meat/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/obj/item/container/edible/dynamic/meat/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) if( (damage_table[BLADE] && !damage_table[BLUNT]) || damage_table[BLADE] > damage_table[BLUNT]) //Cut diff --git a/code/_core/obj/item/container/food/dynamic/pizza.dm b/code/_core/obj/item/container/food/dynamic/pizza.dm index d15ec7df94..68b0cc4a57 100644 --- a/code/_core/obj/item/container/food/dynamic/pizza.dm +++ b/code/_core/obj/item/container/food/dynamic/pizza.dm @@ -45,14 +45,14 @@ pixel_x = 6 pixel_y = -1 -/obj/item/container/edible/dynamic/pizza/can_be_attacked(var/atom/attacker,var/atom/weapon,var/params,var/damagetype/damage_type) +/obj/item/container/edible/dynamic/pizza/can_be_attacked(atom/attacker,atom/weapon,params,damagetype/damage_type) return !sliced /obj/item/container/edible/dynamic/pizza/PreDestroy() QDEL_NULL(reagents_toppings) . = ..() -/obj/item/container/edible/dynamic/pizza/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/container/edible/dynamic/pizza/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("sliced") SAVEVAR("color_sauce") @@ -62,7 +62,7 @@ if(reagents_toppings && length(reagents_toppings.stored_reagents)) .["reagents_toppings"] = reagents.stored_reagents -/obj/item/container/edible/dynamic/pizza/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/container/edible/dynamic/pizza/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("sliced") LOADVAR("color_sauce") @@ -70,7 +70,7 @@ LOADLIST("topping_data") LOADLIST("offsets") -/obj/item/container/edible/dynamic/pizza/load_item_data_post(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/container/edible/dynamic/pizza/load_item_data_post(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE if(length(object_data["reagents_toppings"])) for(var/r_id in object_data["reagents_toppings"]) @@ -98,7 +98,7 @@ var/icon/I = new/icon(initial(icon),"slice_mask") filters += filter(type="alpha",icon=I) -/obj/item/container/edible/dynamic/pizza/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/obj/item/container/edible/dynamic/pizza/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) . = ..() @@ -117,7 +117,7 @@ FINALIZE(P) qdel(src) -/obj/item/container/edible/dynamic/pizza/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/container/edible/dynamic/pizza/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(!sliced && istype(object,/obj/item/container) && object.reagents && object.reagents.volume_current && !istype(object,/obj/item/container/edible/dynamic/pizza)) var/valid = FALSE @@ -228,7 +228,7 @@ add_underlay(raw) -/obj/item/container/edible/dynamic/pizza/get_reagents_to_consume(var/mob/living/consumer) //I know its shitcode to do this but what can you do. +/obj/item/container/edible/dynamic/pizza/get_reagents_to_consume(mob/living/consumer) //I know its shitcode to do this but what can you do. var/total_reagents = max(reagents_toppings.volume_current,reagents.volume_current) diff --git a/code/_core/obj/item/container/food/fish.dm b/code/_core/obj/item/container/food/fish.dm index dbc30e3e6a..3ce4873512 100644 --- a/code/_core/obj/item/container/food/fish.dm +++ b/code/_core/obj/item/container/food/fish.dm @@ -8,10 +8,10 @@ health = /health/obj/item/misc/ scale_sprite = FALSE -/obj/item/container/edible/fishing/can_be_attacked(var/atom/attacker,var/atom/weapon,var/params,var/damagetype/damage_type) +/obj/item/container/edible/fishing/can_be_attacked(atom/attacker,atom/weapon,params,damagetype/damage_type) return TRUE -/obj/item/container/edible/fishing/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/obj/item/container/edible/fishing/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) if( (damage_table[BLADE] && !damage_table[BLUNT]) || damage_table[BLADE] > damage_table[BLUNT]) //Cut var/original_volume = reagents.volume_current diff --git a/code/_core/obj/item/container/food/meme_pizza.dm b/code/_core/obj/item/container/food/meme_pizza.dm index fa0e94a9d5..2abc3ef3a2 100644 --- a/code/_core/obj/item/container/food/meme_pizza.dm +++ b/code/_core/obj/item/container/food/meme_pizza.dm @@ -31,11 +31,11 @@ return ..() -/obj/item/container/edible/meme_pizza/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/container/edible/meme_pizza/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("servings_left") -/obj/item/container/edible/meme_pizza/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/container/edible/meme_pizza/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("servings_left") @@ -44,10 +44,10 @@ update_sprite() return ..() -/obj/item/container/edible/meme_pizza/get_calculated_bites(var/mob/living/caller,var/total_reagents = 1) +/obj/item/container/edible/meme_pizza/get_calculated_bites(mob/living/caller,total_reagents = 1) return servings_left -/obj/item/container/edible/meme_pizza/feed(var/mob/caller,var/mob/living/target) +/obj/item/container/edible/meme_pizza/feed(mob/caller,mob/living/target) . = ..() if(.) servings_left = 1 //It's always going to be 1 or nothing. If it's nothing, then that might cause issues. diff --git a/code/_core/obj/item/container/food/package/_package.dm b/code/_core/obj/item/container/food/package/_package.dm index d0f2d098c4..9379bc9188 100644 --- a/code/_core/obj/item/container/food/package/_package.dm +++ b/code/_core/obj/item/container/food/package/_package.dm @@ -8,7 +8,7 @@ var/obj/item/trash/packaging //The object created when you unwrap it. var/obj/item/trash/trash //The object created when there is nothing left to eat from it. -/obj/item/container/edible/package/on_consumed(var/mob/caller,var/mob/living/target) //When there are no reagents left. +/obj/item/container/edible/package/on_consumed(mob/caller,mob/living/target) //When there are no reagents left. var/obj/hud/inventory/I @@ -24,14 +24,14 @@ return TRUE -/obj/item/container/edible/package/proc/create_trash(var/mob/caller) +/obj/item/container/edible/package/proc/create_trash(mob/caller) var/obj/item/trash/T = new trash(get_turf(caller)) INITIALIZE(T) GENERATE(T) FINALIZE(T) return T -/obj/item/container/edible/package/proc/create_packaging(var/mob/caller) +/obj/item/container/edible/package/proc/create_packaging(mob/caller) var/obj/item/trash/T = new packaging(get_turf(caller)) INITIALIZE(T) GENERATE(T) @@ -39,7 +39,7 @@ return T -/obj/item/container/edible/package/feed(var/mob/caller,var/mob/living/target) +/obj/item/container/edible/package/feed(mob/caller,mob/living/target) if(packaging) caller.to_chat(span("warning","You must unwrap \the [src.name] before eating it!")) @@ -48,7 +48,7 @@ return ..() -/obj/item/container/edible/package/proc/unwrap(var/mob/caller,var/obj/hud/inventory/I) +/obj/item/container/edible/package/proc/unwrap(mob/caller,obj/hud/inventory/I) var/obj/item/trash/T = create_packaging(caller) @@ -62,7 +62,7 @@ return TRUE -/obj/item/container/edible/package/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/container/edible/package/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(is_inventory(object) && packaging) INTERACT_CHECK diff --git a/code/_core/obj/item/container/food/package/junk.dm b/code/_core/obj/item/container/food/package/junk.dm index b5152670a5..baf517a453 100644 --- a/code/_core/obj/item/container/food/package/junk.dm +++ b/code/_core/obj/item/container/food/package/junk.dm @@ -104,7 +104,7 @@ return ..() -/obj/item/container/edible/package/junkfood/halloween/unwrap(var/mob/caller,var/obj/hud/inventory/I) +/obj/item/container/edible/package/junkfood/halloween/unwrap(mob/caller,obj/hud/inventory/I) . = ..() diff --git a/code/_core/obj/item/container/food/plants.dm b/code/_core/obj/item/container/food/plants.dm index a8fc306c59..dc5ed498c5 100644 --- a/code/_core/obj/item/container/food/plants.dm +++ b/code/_core/obj/item/container/food/plants.dm @@ -31,7 +31,7 @@ value = 0 -/obj/item/container/edible/plant/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/container/edible/plant/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEPATH("plant_type") @@ -49,7 +49,7 @@ SAVEVAR("sliced") -/obj/item/container/edible/plant/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/container/edible/plant/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADPATH("plant_type") @@ -105,10 +105,10 @@ if(sliced) icon = 'icons/obj/item/consumable/food/sliced.dmi' -/obj/item/container/edible/plant/can_be_attacked(var/atom/attacker,var/atom/weapon,var/params,var/damagetype/damage_type) +/obj/item/container/edible/plant/can_be_attacked(atom/attacker,atom/weapon,params,damagetype/damage_type) return health && !sliced -/obj/item/container/edible/plant/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/obj/item/container/edible/plant/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) if(!sliced && ((damage_table[BLADE] && !damage_table[BLUNT]) || damage_table[BLADE] > damage_table[BLUNT])) //Cut var/original_volume = reagents.volume_current diff --git a/code/_core/obj/item/container/medicine/_medicine.dm b/code/_core/obj/item/container/medicine/_medicine.dm index 971a9efef5..ff780422c2 100644 --- a/code/_core/obj/item/container/medicine/_medicine.dm +++ b/code/_core/obj/item/container/medicine/_medicine.dm @@ -36,19 +36,19 @@ . = abs(heal_brute+heal_burn)*0.2 + abs(heal_brute_percent+heal_burn_percent)*0.3 + (heal_bleeding ? 20 : 0) . = CEILING(.,1) -/obj/item/container/healing/Generate(var/desired_loc) +/obj/item/container/healing/Generate(desired_loc) . = ..() if(reagents) reagents.volume_max = amount*reagent_max_per_amount -/obj/item/container/healing/Finalize(var/desired_loc) +/obj/item/container/healing/Finalize(desired_loc) . = ..() if(reagents) reagents.volume_max = amount*reagent_max_per_amount //Safety -/obj/item/container/healing/add_item_count(var/amount_to_add,var/bypass_checks = FALSE) +/obj/item/container/healing/add_item_count(amount_to_add,bypass_checks = FALSE) . = ..() if(reagents) reagents.volume_max = max(1,amount)*reagent_max_per_amount -/obj/item/container/healing/quick(var/mob/caller,var/atom/object,location,params) +/obj/item/container/healing/quick(mob/caller,atom/object,location,params) if(!is_advanced(caller) || !is_inventory(src.loc)) return FALSE @@ -69,7 +69,7 @@ return ..() -/obj/item/container/healing/proc/treat(var/mob/caller,var/atom/A) +/obj/item/container/healing/proc/treat(mob/caller,atom/A) if(heal_bleeding && is_organ(A)) var/obj/item/organ/O = A @@ -114,7 +114,7 @@ return TRUE -/obj/item/container/healing/proc/can_be_treated(var/mob/caller,var/atom/target) +/obj/item/container/healing/proc/can_be_treated(mob/caller,atom/target) INTERACT_CHECK_NO_DELAY(src) INTERACT_CHECK_NO_DELAY(target) @@ -158,7 +158,7 @@ -/obj/item/container/healing/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/container/healing/click_on_object(mob/caller as mob,atom/object,location,control,params) if(object.plane >= PLANE_HUD) return ..() diff --git a/code/_core/obj/item/container/medicine/medicine_subtypes.dm b/code/_core/obj/item/container/medicine/medicine_subtypes.dm index 4fc8247a86..e1f9a3e891 100644 --- a/code/_core/obj/item/container/medicine/medicine_subtypes.dm +++ b/code/_core/obj/item/container/medicine/medicine_subtypes.dm @@ -113,7 +113,7 @@ . = ..() amount = 3 -/obj/item/container/healing/nanopaste/treat(var/mob/caller,var/atom/A) +/obj/item/container/healing/nanopaste/treat(mob/caller,atom/A) . = ..() @@ -147,7 +147,7 @@ /obj/item/container/healing/bone_gel/get_base_value() return value -/obj/item/container/healing/bone_gel/treat(var/mob/caller,var/atom/A) +/obj/item/container/healing/bone_gel/treat(mob/caller,atom/A) . = ..() diff --git a/code/_core/obj/item/container/medicine/spray.dm b/code/_core/obj/item/container/medicine/spray.dm index 3d43edfd49..35a936e1a0 100644 --- a/code/_core/obj/item/container/medicine/spray.dm +++ b/code/_core/obj/item/container/medicine/spray.dm @@ -30,7 +30,7 @@ -/obj/item/container/spray/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/container/spray/click_on_object(mob/caller as mob,atom/object,location,control,params) if(object.plane >= PLANE_HUD) return ..() diff --git a/code/_core/obj/item/container/pill/_pill.dm b/code/_core/obj/item/container/pill/_pill.dm index 44824fc2b0..6f74d86768 100644 --- a/code/_core/obj/item/container/pill/_pill.dm +++ b/code/_core/obj/item/container/pill/_pill.dm @@ -19,10 +19,10 @@ scale_sprite = FALSE -/obj/item/container/edible/pill/get_consume_size(var/mob/living/L) +/obj/item/container/edible/pill/get_consume_size(mob/living/L) return reagents.volume_current -/obj/item/container/edible/pill/quick(var/mob/caller,var/atom/object,location,params) +/obj/item/container/edible/pill/quick(mob/caller,atom/object,location,params) return try_transfer_reagents(caller,caller,location,null,params) /obj/item/container/edible/pill/get_consume_verb() diff --git a/code/_core/obj/item/container/simple/_simple.dm b/code/_core/obj/item/container/simple/_simple.dm index 5ff28b4048..4bded9b806 100644 --- a/code/_core/obj/item/container/simple/_simple.dm +++ b/code/_core/obj/item/container/simple/_simple.dm @@ -1,7 +1,7 @@ /obj/item/container/simple/ var/initial_reagent = null -/obj/item/container/simple/quick(var/mob/caller,var/atom/object,location,params) +/obj/item/container/simple/quick(mob/caller,atom/object,location,params) return try_transfer_reagents(caller,caller,location,null,params) /obj/item/container/simple/get_consume_verb() @@ -10,7 +10,7 @@ /obj/item/container/simple/get_consume_sound() return 'sound/items/consumables/drink.ogg' -/obj/item/container/simple/click_on_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/container/simple/click_on_object(mob/caller,atom/object,location,control,params) if(allow_reagent_transfer_to && istype(object,/obj/item/weapon/melee)) var/obj/item/weapon/melee/M = object @@ -30,7 +30,7 @@ . = ..() -/obj/item/container/simple/click_self(var/mob/caller,location,control,params) +/obj/item/container/simple/click_self(mob/caller,location,control,params) if(allow_reagent_transfer_to || allow_reagent_transfer_from) INTERACT_CHECK diff --git a/code/_core/obj/item/container/simple/alcohol.dm b/code/_core/obj/item/container/simple/alcohol.dm index 312db8570c..1c74a2a870 100644 --- a/code/_core/obj/item/container/simple/alcohol.dm +++ b/code/_core/obj/item/container/simple/alcohol.dm @@ -126,7 +126,7 @@ icon_state = "absinthe" initial_reagent = /reagent/nutrition/ethanol/absinthe -/obj/item/container/simple/alcohol/absinthe/New(var/desired_loc) +/obj/item/container/simple/alcohol/absinthe/New(desired_loc) var/list/possible_names = list( "\[CENSORED]-Strong Absinthe", diff --git a/code/_core/obj/item/container/simple/can.dm b/code/_core/obj/item/container/simple/can.dm index f7b3e22121..04ac7a08fd 100644 --- a/code/_core/obj/item/container/simple/can.dm +++ b/code/_core/obj/item/container/simple/can.dm @@ -20,7 +20,7 @@ size = SIZE_1 -/obj/item/container/simple/can/click_self(var/mob/caller,location,control,params) +/obj/item/container/simple/can/click_self(mob/caller,location,control,params) if(open) return ..() @@ -108,7 +108,7 @@ rarity = RARITY_RARE -/obj/item/container/simple/can/dr_gibb/explosive/get_examine_list(var/mob/examiner) +/obj/item/container/simple/can/dr_gibb/explosive/get_examine_list(mob/examiner) . = ..() @@ -116,7 +116,7 @@ . += div("danger","Wait, what the fuck? There is an explosive charge connected to the tab!") -/obj/item/container/simple/can/dr_gibb/explosive/click_self(var/mob/caller,location,control,params) +/obj/item/container/simple/can/dr_gibb/explosive/click_self(mob/caller,location,control,params) . = ..() @@ -129,11 +129,11 @@ explosive = FALSE -/obj/item/container/simple/can/dr_gibb/explosive/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/container/simple/can/dr_gibb/explosive/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("explosive") -/obj/item/container/simple/can/dr_gibb/explosive/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/container/simple/can/dr_gibb/explosive/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("explosive") diff --git a/code/_core/obj/item/container/syringe/_syringe.dm b/code/_core/obj/item/container/syringe/_syringe.dm index ef29501456..821cceab38 100644 --- a/code/_core/obj/item/container/syringe/_syringe.dm +++ b/code/_core/obj/item/container/syringe/_syringe.dm @@ -29,21 +29,21 @@ quality = 100 -/obj/item/container/syringe/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/container/syringe/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE if(adjustable) SAVEVAR("inject_amount_desired") if(can_inject && can_draw) SAVEVAR("injecting") -/obj/item/container/syringe/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/container/syringe/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE if(adjustable) LOADVAR("inject_amount_desired") if(can_inject && can_draw) LOADVAR("injecting") -/obj/item/container/syringe/mouse_wheel_on_object(var/mob/caller,delta_x,delta_y,location,control,params) +/obj/item/container/syringe/mouse_wheel_on_object(mob/caller,delta_x,delta_y,location,control,params) if(!adjustable) return ..() @@ -95,7 +95,7 @@ update_sprite() -/obj/item/container/syringe/click_self(var/mob/caller,location,control,params) +/obj/item/container/syringe/click_self(mob/caller,location,control,params) if(can_inject && can_draw) INTERACT_CHECK @@ -106,7 +106,7 @@ . = ..() -/obj/item/container/syringe/proc/can_inject(var/mob/caller,var/atom/target) +/obj/item/container/syringe/proc/can_inject(mob/caller,atom/target) if(!caller || !target) return FALSE @@ -158,7 +158,7 @@ return TRUE -/obj/item/container/syringe/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/container/syringe/click_on_object(mob/caller as mob,atom/object,location,control,params) if(object.plane >= PLANE_HUD) return ..() @@ -215,7 +215,7 @@ return TRUE -/obj/item/container/syringe/proc/inject(var/mob/caller,var/atom/object,var/amount=5) +/obj/item/container/syringe/proc/inject(mob/caller,atom/object,amount=5) if(amount < 0) //Draw if(is_organ(object)) //Targeting an organ. diff --git a/code/_core/obj/item/container/syringe/hypodermic.dm b/code/_core/obj/item/container/syringe/hypodermic.dm index 939f758a9c..8db72c4937 100644 --- a/code/_core/obj/item/container/syringe/hypodermic.dm +++ b/code/_core/obj/item/container/syringe/hypodermic.dm @@ -44,16 +44,16 @@ add_overlay(I) -/obj/item/container/syringe/hypodermic/adjust_quality(var/quality_to_add=0) +/obj/item/container/syringe/hypodermic/adjust_quality(quality_to_add=0) . = ..() if(. && finalized) update_sprite() -/obj/item/container/syringe/hypodermic/on_equip(var/atom/old_location,var/silent=FALSE) //When the item is picked up. +/obj/item/container/syringe/hypodermic/on_equip(atom/old_location,silent=FALSE) //When the item is picked up. . = ..() update_sprite() -/obj/item/container/syringe/hypodermic/drop_item(var/atom/desired_loc,var/pixel_x_offset = 0,var/pixel_y_offset = 0,var/silent=FALSE) +/obj/item/container/syringe/hypodermic/drop_item(atom/desired_loc,pixel_x_offset = 0,pixel_y_offset = 0,silent=FALSE) . = ..() update_sprite() diff --git a/code/_core/obj/item/container/syringe/hypospray.dm b/code/_core/obj/item/container/syringe/hypospray.dm index a8ce9d4192..2aa3e37892 100644 --- a/code/_core/obj/item/container/syringe/hypospray.dm +++ b/code/_core/obj/item/container/syringe/hypospray.dm @@ -24,7 +24,7 @@ can_draw = FALSE can_inject = TRUE -/obj/item/container/syringe/hypospray/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/container/syringe/hypospray/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(!object.reagents) return ..() diff --git a/code/_core/obj/item/container/syringe/medipen.dm b/code/_core/obj/item/container/syringe/medipen.dm index 632fa29cc8..b49a5beda2 100644 --- a/code/_core/obj/item/container/syringe/medipen.dm +++ b/code/_core/obj/item/container/syringe/medipen.dm @@ -52,10 +52,10 @@ I.color = reagents.color add_underlay(I) -/obj/item/container/syringe/medipen/mouse_wheel_on_object(var/mob/caller,delta_x,delta_y,location,control,params) +/obj/item/container/syringe/medipen/mouse_wheel_on_object(mob/caller,delta_x,delta_y,location,control,params) return -/obj/item/container/syringe/medipen/click_self(var/mob/caller,location,control,params) +/obj/item/container/syringe/medipen/click_self(mob/caller,location,control,params) return /obj/item/container/syringe/medipen/adminomnizine diff --git a/code/_core/obj/item/contract/_contract.dm b/code/_core/obj/item/contract/_contract.dm index fce1fd3702..e084f1b1b0 100644 --- a/code/_core/obj/item/contract/_contract.dm +++ b/code/_core/obj/item/contract/_contract.dm @@ -45,7 +45,7 @@ FINALIZE(reward) value_current = 0 -/obj/item/contract/proc/on_kill(var/mob/living/attacker,var/list/data=list()) +/obj/item/contract/proc/on_kill(mob/living/attacker,list/data=list()) var/mob/living/victim = data[1] if(istype(victim,type_to_check)) @@ -66,7 +66,7 @@ /obj/item/contract/get_base_value() return CEILING(reward.get_value()*0.25,1) -/obj/item/contract/get_examine_details_list(var/mob/examiner) +/obj/item/contract/get_examine_details_list(mob/examiner) . = ..() if(burgerbux_reward) . += div("notice","Reward on completion: [reward.name] and [burgerbux_reward] Burgerbux.") @@ -75,26 +75,26 @@ . += div("notice","[value_current] out of [value_max] [objective_text].") . += div("notice bold","Contract progress is only counted if this object is slotted in the top right contract slot.") -/obj/item/contract/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/contract/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEATOM("reward") SAVEVAR("value_current") SAVEVAR("burgerbux_reward") -/obj/item/contract/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/contract/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADATOM("reward") LOADVAR("value_current") LOADVAR("burgerbux_reward") -/obj/item/contract/on_equip(var/atom/old_location,var/silent=FALSE) +/obj/item/contract/on_equip(atom/old_location,silent=FALSE) . = ..() if(istype(loc,/obj/hud/inventory/organs/groin/pocket/contract)) var/obj/hud/inventory/organs/groin/pocket/contract/I = loc if(is_advanced(I.owner)) HOOK_ADD("on_kill","on_kill_\ref[src]",I.owner,src,src::on_kill()) -/obj/item/contract/on_unequip(var/obj/hud/inventory/old_inventory,var/silent=FALSE) //When the object is dropped from the old_inventory +/obj/item/contract/on_unequip(obj/hud/inventory/old_inventory,silent=FALSE) //When the object is dropped from the old_inventory . = ..() if(istype(old_inventory,/obj/hud/inventory/organs/groin/pocket/contract)) var/obj/hud/inventory/organs/groin/pocket/contract/I = old_inventory @@ -102,7 +102,7 @@ HOOK_REMOVE("on_kill","on_kill_\ref[src]",I.owner) -/obj/item/contract/proc/turn_in(var/mob/living/advanced/player/P,var/params) +/obj/item/contract/proc/turn_in(mob/living/advanced/player/P,params) var/turf/T = get_turf(P) if(src.value_current < src.value_max) P.to_chat(span("warning","You feel it would be unwise to try to turn in a contract that isn't complete yet!")) diff --git a/code/_core/obj/item/corrupting_frog.dm b/code/_core/obj/item/corrupting_frog.dm index 8c87a4c6e4..d13be56261 100644 --- a/code/_core/obj/item/corrupting_frog.dm +++ b/code/_core/obj/item/corrupting_frog.dm @@ -8,7 +8,7 @@ value = 4000 value_burgerbux = 1 -/obj/item/corrupting_frog/click_on_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/corrupting_frog/click_on_object(mob/caller,atom/object,location,control,params) if(!is_item(object) || !is_turf(object.loc)) return ..() diff --git a/code/_core/obj/item/crafting/_crafting.dm b/code/_core/obj/item/crafting/_crafting.dm index 70f355997c..ac16b77cf9 100644 --- a/code/_core/obj/item/crafting/_crafting.dm +++ b/code/_core/obj/item/crafting/_crafting.dm @@ -30,7 +30,7 @@ rarity = RARITY_UNCOMMON -/obj/item/crafting_bench/click_self(var/mob/caller,location,control,params) +/obj/item/crafting_bench/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(10) @@ -38,7 +38,7 @@ if(is_advanced(caller)) toggle_crafting(caller) -/obj/item/crafting_bench/proc/toggle_crafting(var/mob/living/advanced/A) +/obj/item/crafting_bench/proc/toggle_crafting(mob/living/advanced/A) if(!length(inventories)) return FALSE @@ -91,7 +91,7 @@ return TRUE -/obj/item/crafting_bench/proc/attempt_to_craft(var/mob/living/advanced/caller) +/obj/item/crafting_bench/proc/attempt_to_craft(mob/living/advanced/caller) var/list/item_table = generate_crafting_table(caller,src) diff --git a/code/_core/obj/item/crafting/alchemy.dm b/code/_core/obj/item/crafting/alchemy.dm index 5a8ddfac78..bf568f8888 100644 --- a/code/_core/obj/item/crafting/alchemy.dm +++ b/code/_core/obj/item/crafting/alchemy.dm @@ -21,7 +21,7 @@ /* Old code. Maybe someone else will find a use for it.... -/obj/item/crafting/alchemy/attempt_to_craft(var/mob/living/advanced/caller) +/obj/item/crafting/alchemy/attempt_to_craft(mob/living/advanced/caller) var/obj/item/container/C //Final slot container. diff --git a/code/_core/obj/item/crafting/filter.dm b/code/_core/obj/item/crafting/filter.dm index d9702dabd7..f464746717 100644 --- a/code/_core/obj/item/crafting/filter.dm +++ b/code/_core/obj/item/crafting/filter.dm @@ -25,7 +25,7 @@ var/precision = 0.1 -/obj/item/crafting_bench/filter/click_self(var/mob/caller,location,control,params) +/obj/item/crafting_bench/filter/click_self(mob/caller,location,control,params) if(caller.attack_flags & CONTROL_MOD_DISARM) var/current_setting @@ -50,7 +50,7 @@ . = ..() -/obj/item/crafting_bench/filter/attempt_to_craft(var/mob/living/advanced/caller) +/obj/item/crafting_bench/filter/attempt_to_craft(mob/living/advanced/caller) var/obj/item/container/C //Final slot container. diff --git a/code/_core/obj/item/crafting/grinder.dm b/code/_core/obj/item/crafting/grinder.dm index c5b6ea5c4e..11edaf338a 100644 --- a/code/_core/obj/item/crafting/grinder.dm +++ b/code/_core/obj/item/crafting/grinder.dm @@ -22,7 +22,7 @@ size = SIZE_4 -/obj/item/crafting_bench/grinder/attempt_to_craft(var/mob/living/advanced/caller) +/obj/item/crafting_bench/grinder/attempt_to_craft(mob/living/advanced/caller) var/obj/item/C //Final slot container. diff --git a/code/_core/obj/item/crafting/pill_press.dm b/code/_core/obj/item/crafting/pill_press.dm index a078866c76..9049633147 100644 --- a/code/_core/obj/item/crafting/pill_press.dm +++ b/code/_core/obj/item/crafting/pill_press.dm @@ -21,7 +21,7 @@ size = SIZE_4 -/obj/item/crafting_bench/pill_press/attempt_to_craft(var/mob/living/advanced/caller) +/obj/item/crafting_bench/pill_press/attempt_to_craft(mob/living/advanced/caller) var/obj/hud/inventory/crafting/result/product_slot var/obj/item/product_container diff --git a/code/_core/obj/item/cross.dm b/code/_core/obj/item/cross.dm index 6d6374307d..dbede6235e 100644 --- a/code/_core/obj/item/cross.dm +++ b/code/_core/obj/item/cross.dm @@ -17,11 +17,11 @@ health_base = 10 -/obj/item/cross/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/cross/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("broken") -/obj/item/cross/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/cross/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("broken") @@ -29,7 +29,7 @@ update_sprite() return ..() -/obj/item/cross/on_destruction(var/damage = TRUE) +/obj/item/cross/on_destruction(damage = TRUE) if(!broken) var/turf/T = get_turf(src) diff --git a/code/_core/obj/item/currency/_currency.dm b/code/_core/obj/item/currency/_currency.dm index 2983130931..8a3317ca04 100644 --- a/code/_core/obj/item/currency/_currency.dm +++ b/code/_core/obj/item/currency/_currency.dm @@ -16,7 +16,7 @@ rarity = RARITY_UNCOMMON -/obj/item/currency/can_transfer_stacks_to(var/obj/item/target) +/obj/item/currency/can_transfer_stacks_to(obj/item/target) if(target == src) //Self-stacking. return FALSE diff --git a/code/_core/obj/item/currency/gold.dm b/code/_core/obj/item/currency/gold.dm index 6c09e62707..7a2a42fa2c 100644 --- a/code/_core/obj/item/currency/gold.dm +++ b/code/_core/obj/item/currency/gold.dm @@ -55,7 +55,7 @@ -/obj/item/currency/gold_coin/proc/fly(var/turf/from_turf) +/obj/item/currency/gold_coin/proc/fly(turf/from_turf) if(amount > 5) return FALSE @@ -88,7 +88,7 @@ return TRUE -/proc/create_gold_drop(var/turf/T,var/amount=5) +/proc/create_gold_drop(turf/T,amount=5) amount = min(amount,GOLD_DROP_AMOUNT_MAX) //Enforce a limit, just in case. diff --git a/code/_core/obj/item/data_laptop.dm b/code/_core/obj/item/data_laptop.dm index b3b638a300..d2e18584c0 100644 --- a/code/_core/obj/item/data_laptop.dm +++ b/code/_core/obj/item/data_laptop.dm @@ -18,11 +18,11 @@ value = 5000 -/obj/item/data_laptop/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/data_laptop/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("used") -/obj/item/data_laptop/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/data_laptop/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("used") @@ -44,7 +44,7 @@ . = ..() update_sprite() -/obj/item/data_laptop/click_self(var/mob/caller,location,control,params) +/obj/item/data_laptop/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(10) diff --git a/code/_core/obj/item/debug.dm b/code/_core/obj/item/debug.dm index d77ff69fa5..8da5cad2d0 100644 --- a/code/_core/obj/item/debug.dm +++ b/code/_core/obj/item/debug.dm @@ -4,21 +4,21 @@ desc_extended = "What the fuck is this? How did you get it? ANSWER ME." value = -1 -/obj/item/runtime/click_self(var/mob/caller) +/obj/item/runtime/click_self(mob/caller) INTERACT_CHECK INTERACT_DELAY(10) ASSERT(null) //Force a fake error. return TRUE -/obj/item/runtime/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/runtime/click_on_object(mob/caller as mob,atom/object,location,control,params) log_debug("caller: [caller.get_debug_name()].") log_debug("object: [object.get_debug_name()].") return TRUE -/obj/item/runtime/clicked_on_by_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/runtime/clicked_on_by_object(mob/caller as mob,atom/object,location,control,params) log_debug("caller: [caller.get_debug_name()].") log_debug("object: [object.get_debug_name()].") diff --git a/code/_core/obj/item/defib.dm b/code/_core/obj/item/defib.dm index c957468f77..8f424f1c44 100644 --- a/code/_core/obj/item/defib.dm +++ b/code/_core/obj/item/defib.dm @@ -19,7 +19,7 @@ rarity = RARITY_UNCOMMON -/obj/item/defib/get_examine_list(var/mob/examiner) +/obj/item/defib/get_examine_list(mob/examiner) . = ..() if(item_slot == SLOT_TORSO_BACK) //shitcode is my passion . += span("notice","Put it on your back to be able to take out the paddles, or ALT+Click it if it's on the ground.
Requires both empty hands to pick up and use.") @@ -45,17 +45,17 @@ QDEL_NULL(paddle_right) . = ..() -/obj/item/defib/can_be_worn(var/mob/living/advanced/owner,var/obj/hud/inventory/I,var/messages=FALSE) +/obj/item/defib/can_be_worn(mob/living/advanced/owner,obj/hud/inventory/I,messages=FALSE) return TRUE -/obj/item/defib/Initialize(var/desired_loc) //Fill inventory handles the initializations here. +/obj/item/defib/Initialize(desired_loc) //Fill inventory handles the initializations here. paddle_left = new /obj/item/defib_paddle(src) paddle_left.linked_defib = src paddle_right = new /obj/item/defib_paddle(src) paddle_right.linked_defib = src return ..() -/obj/item/defib/proc/on_paddle(var/mob/caller) +/obj/item/defib/proc/on_paddle(mob/caller) if(!paddle_left.placed_target_ref || !paddle_right.placed_target_ref || paddle_left.placed_target_ref != paddle_right.placed_target_ref) return FALSE @@ -79,14 +79,14 @@ return TRUE -/obj/item/defib/proc/can_defib_target(var/mob/caller,var/mob/living/target) +/obj/item/defib/proc/can_defib_target(mob/caller,mob/living/target) INTERACT_CHECK_NO_DELAY(src) INTERACT_CHECK_NO_DELAY(target) return TRUE -/obj/item/defib/proc/defib_target(var/mob/caller,var/mob/living/target) +/obj/item/defib/proc/defib_target(mob/caller,mob/living/target) var/turf/T = get_turf(target) @@ -140,7 +140,7 @@ return TRUE -/obj/item/defib/click_self(var/mob/caller,location,control,params) +/obj/item/defib/click_self(mob/caller,location,control,params) if(!is_advanced(caller)) return FALSE @@ -163,7 +163,7 @@ return ..() -/obj/item/defib/post_move(var/atom/old_loc) +/obj/item/defib/post_move(atom/old_loc) . = ..() if(paddle_left && paddle_left.loc != src) paddle_left.drop_item(src) @@ -192,7 +192,7 @@ linked_defib = null . = ..() -/obj/item/defib_paddle/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/defib_paddle/click_on_object(mob/caller as mob,atom/object,location,control,params) if(is_inventory(object)) return ..() @@ -228,7 +228,7 @@ return ..() -/obj/item/defib_paddle/post_move(var/atom/old_loc) +/obj/item/defib_paddle/post_move(atom/old_loc) . = ..() diff --git a/code/_core/obj/item/deployable/_deployable.dm b/code/_core/obj/item/deployable/_deployable.dm index b15418c1dd..8c2bbec5df 100644 --- a/code/_core/obj/item/deployable/_deployable.dm +++ b/code/_core/obj/item/deployable/_deployable.dm @@ -7,20 +7,20 @@ amount_max = 10 amount_max_icon = 3 -/obj/item/deployable/proc/get_deploy_time(var/mob/caller) +/obj/item/deployable/proc/get_deploy_time(mob/caller) return 3 SECONDS -/obj/item/deployable/proc/pre_deploy(var/mob/caller,var/turf/T,var/obj/structure/S) +/obj/item/deployable/proc/pre_deploy(mob/caller,turf/T,obj/structure/S) S.dir = caller.dir INITIALIZE(S) FINALIZE(S) return TRUE -/obj/item/deployable/proc/post_deploy(var/mob/caller,var/turf/T,var/obj/structure/S) +/obj/item/deployable/proc/post_deploy(mob/caller,turf/T,obj/structure/S) caller.visible_message(span("notice","\The [caller.name] deploys \the [S.name]."),span("notice","You deploy \the [S.name].")) return TRUE -/obj/item/deployable/proc/deploy(var/mob/caller,var/turf/T) +/obj/item/deployable/proc/deploy(mob/caller,turf/T) var/obj/structure/S = new structure_to_deploy(T) pre_deploy(caller,T,S) @@ -29,7 +29,7 @@ return S -/obj/item/deployable/proc/can_deploy_to(var/mob/caller,var/turf/T) +/obj/item/deployable/proc/can_deploy_to(mob/caller,turf/T) if(amount <= 0) qdel(src) @@ -37,7 +37,7 @@ return T.can_construct_on(caller,structure_to_deploy) -/obj/item/deployable/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/deployable/click_on_object(mob/caller as mob,atom/object,location,control,params) if(object.plane >= PLANE_HUD) return ..() @@ -86,13 +86,13 @@ size = SIZE_9 -/obj/item/deployable/mountable/browning/get_deploy_time(var/mob/caller) +/obj/item/deployable/mountable/browning/get_deploy_time(mob/caller) return 10 SECONDS /obj/item/deployable/mob var/mob/living/mob_to_deploy -/obj/item/deployable/mob/can_deploy_to(var/mob/caller,var/turf/T) +/obj/item/deployable/mob/can_deploy_to(mob/caller,turf/T) if(amount <= 0) qdel(src) @@ -108,17 +108,17 @@ return TRUE -/obj/item/deployable/mob/pre_deploy(var/mob/caller,var/turf/T,var/mob/living/L) +/obj/item/deployable/mob/pre_deploy(mob/caller,turf/T,mob/living/L) L.dir = caller.dir INITIALIZE(L) FINALIZE(L) return TRUE -/obj/item/deployable/mob/post_deploy(var/mob/caller,var/turf/T,var/mob/living/L) +/obj/item/deployable/mob/post_deploy(mob/caller,turf/T,mob/living/L) caller.visible_message(span("notice","\The [caller.name] deploys \the [L.name]."),span("notice","You deploy \the [L.name].")) return TRUE -/obj/item/deployable/mob/deploy(var/mob/caller,var/turf/T) +/obj/item/deployable/mob/deploy(mob/caller,turf/T) var/mob/living/L = new mob_to_deploy(T) pre_deploy(caller,T,L) post_deploy(caller,T,L) @@ -142,7 +142,7 @@ rarity = RARITY_UNCOMMON -/obj/item/deployable/mob/sentry/pre_deploy(var/mob/caller,var/turf/T,var/mob/living/L) +/obj/item/deployable/mob/sentry/pre_deploy(mob/caller,turf/T,mob/living/L) . = ..() @@ -163,12 +163,12 @@ if(C.iff_tag) TD.set_iff_tag(C.iff_tag) -/obj/item/deployable/mob/sentry/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/deployable/mob/sentry/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEATOM("stored_battery") SAVEATOM("stored_magazine") -/obj/item/deployable/mob/sentry/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/deployable/mob/sentry/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADATOM("stored_battery") LOADATOM("stored_magazine") diff --git a/code/_core/obj/item/dice.dm b/code/_core/obj/item/dice.dm index c8633e1976..6ae8574f3f 100644 --- a/code/_core/obj/item/dice.dm +++ b/code/_core/obj/item/dice.dm @@ -20,11 +20,11 @@ . = ..() update_sprite() -/obj/item/dice/on_thrown(var/atom/owner,var/atom/hit_atom) //What happens after the person is thrown and it hits an object. +/obj/item/dice/on_thrown(atom/owner,atom/hit_atom) //What happens after the person is thrown and it hits an object. roll_dice(owner) return ..() -/obj/item/dice/proc/on_result(var/mob/caller,var/chosen_number,var/silent=FALSE) +/obj/item/dice/proc/on_result(mob/caller,chosen_number,silent=FALSE) if(!silent) if(caller) @@ -34,7 +34,7 @@ return TRUE -/obj/item/dice/proc/roll_dice(var/mob/caller,var/silent=FALSE) +/obj/item/dice/proc/roll_dice(mob/caller,silent=FALSE) var/chosen_number = rand(1,max_states) @@ -44,7 +44,7 @@ return TRUE -/obj/item/dice/click_self(var/mob/caller,location,control,params) +/obj/item/dice/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(10) @@ -89,15 +89,15 @@ . = ..() if(!used) icon_state = "blank" -/obj/item/dice/d20/cursed/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/dice/d20/cursed/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("used") -/obj/item/dice/d20/cursed/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/dice/d20/cursed/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("used") -/obj/item/dice/d20/cursed/roll_dice(var/mob/caller,var/silent=FALSE) +/obj/item/dice/d20/cursed/roll_dice(mob/caller,silent=FALSE) if(used) icon_state = "[initial(icon_state)]-[used]" @@ -105,7 +105,7 @@ return ..() -/obj/item/dice/d20/cursed/on_result(var/mob/caller,var/chosen_number,var/silent=FALSE) +/obj/item/dice/d20/cursed/on_result(mob/caller,chosen_number,silent=FALSE) if(!caller || silent || !is_living(caller) || !caller.client) return ..() diff --git a/code/_core/obj/item/disk/_disk.dm b/code/_core/obj/item/disk/_disk.dm index e2d718e635..315b00223d 100644 --- a/code/_core/obj/item/disk/_disk.dm +++ b/code/_core/obj/item/disk/_disk.dm @@ -17,7 +17,7 @@ weight = 0.5 -/obj/item/disk/New(var/desired_loc) +/obj/item/disk/New(desired_loc) . = ..() update_sprite() diff --git a/code/_core/obj/item/doctor_bag.dm b/code/_core/obj/item/doctor_bag.dm index 1e7633cfd4..1831ec0500 100644 --- a/code/_core/obj/item/doctor_bag.dm +++ b/code/_core/obj/item/doctor_bag.dm @@ -25,7 +25,7 @@ quality = 100 -/obj/item/doctor_bag/click_on_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/doctor_bag/click_on_object(mob/caller,atom/object,location,control,params) if(is_living(object) && is_living(caller)) @@ -53,7 +53,7 @@ . = ..() -/obj/item/doctor_bag/proc/can_be_treated(var/mob/caller,var/atom/target) +/obj/item/doctor_bag/proc/can_be_treated(mob/caller,atom/target) INTERACT_CHECK_NO_DELAY(src) INTERACT_CHECK_NO_DELAY(target) @@ -78,7 +78,7 @@ -/obj/item/doctor_bag/proc/treat(var/mob/living/caller,var/atom/A) +/obj/item/doctor_bag/proc/treat(mob/living/caller,atom/A) var/medicine_power = caller.get_skill_power(SKILL_MEDICINE,0,1,2) * (src.quality/100) diff --git a/code/_core/obj/item/drop_pod_remote/_supply_pod_remote.dm b/code/_core/obj/item/drop_pod_remote/_supply_pod_remote.dm index 3034dda6a3..304266ff4a 100644 --- a/code/_core/obj/item/drop_pod_remote/_supply_pod_remote.dm +++ b/code/_core/obj/item/drop_pod_remote/_supply_pod_remote.dm @@ -15,11 +15,11 @@ rarity = RARITY_RARE -/obj/item/supply_remote/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/supply_remote/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("charges") -/obj/item/supply_remote/load_item_data_post(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/supply_remote/load_item_data_post(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("charges") @@ -28,7 +28,7 @@ . *= charges . += 100 -/obj/item/supply_remote/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/supply_remote/click_on_object(mob/caller as mob,atom/object,location,control,params) if(!is_turf(object) && !isturf(object.loc)) return TRUE diff --git a/code/_core/obj/item/dying.dm b/code/_core/obj/item/dying.dm index 51fd7d0774..d5c55a534d 100644 --- a/code/_core/obj/item/dying.dm +++ b/code/_core/obj/item/dying.dm @@ -1,4 +1,4 @@ -/obj/item/proc/dye_self(var/mob/caller,var/obj/item/D,var/dye_color,var/dye_strength=0.5) +/obj/item/proc/dye_self(mob/caller,obj/item/D,dye_color,dye_strength=0.5) if(!dye_color) dye_color = "#FFFFFF" diff --git a/code/_core/obj/item/enchanting_chalk.dm b/code/_core/obj/item/enchanting_chalk.dm index 3994cb7481..22ca653465 100644 --- a/code/_core/obj/item/enchanting_chalk.dm +++ b/code/_core/obj/item/enchanting_chalk.dm @@ -21,7 +21,7 @@ . *= uses_left / initial(uses_left) . = CEILING(.,1) -/obj/item/enchanting_chalk/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/enchanting_chalk/click_on_object(mob/caller as mob,atom/object,location,control,params) if(object.plane >= PLANE_HUD) return ..() diff --git a/code/_core/obj/item/experience_scroll/_experience_scroll.dm b/code/_core/obj/item/experience_scroll/_experience_scroll.dm index 256f535a5b..95d2b6b5f9 100644 --- a/code/_core/obj/item/experience_scroll/_experience_scroll.dm +++ b/code/_core/obj/item/experience_scroll/_experience_scroll.dm @@ -37,11 +37,11 @@ if(overlay_color) I.color = overlay_color add_overlay(I) -/obj/item/experience_scroll/proc/gain_knowledge(var/mob/living/advanced/A) +/obj/item/experience_scroll/proc/gain_knowledge(mob/living/advanced/A) play_sound('sound/ui/friendly.ogg',get_turf(src),range_max=VIEW_RANGE) return TRUE -/obj/item/experience_scroll/click_self(var/mob/caller,location,control,params) +/obj/item/experience_scroll/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(10) diff --git a/code/_core/obj/item/experience_scroll/experience_scroll_attribute.dm b/code/_core/obj/item/experience_scroll/experience_scroll_attribute.dm index 4d9c677b6c..2e6fca5c86 100644 --- a/code/_core/obj/item/experience_scroll/experience_scroll_attribute.dm +++ b/code/_core/obj/item/experience_scroll/experience_scroll_attribute.dm @@ -14,7 +14,7 @@ . = ..() . += div("notice","Reading \the [src.name] will grant [attribute] experience.") -/obj/item/experience_scroll/attribute/gain_knowledge(var/mob/living/advanced/A) +/obj/item/experience_scroll/attribute/gain_knowledge(mob/living/advanced/A) if(!attribute) return FALSE diff --git a/code/_core/obj/item/experience_scroll/experience_scroll_skill.dm b/code/_core/obj/item/experience_scroll/experience_scroll_skill.dm index 51af5dd356..8ad57f092d 100644 --- a/code/_core/obj/item/experience_scroll/experience_scroll_skill.dm +++ b/code/_core/obj/item/experience_scroll/experience_scroll_skill.dm @@ -14,7 +14,7 @@ . = ..() . += div("notice","Reading \the [src.name] will grant [skill] experience.") -/obj/item/experience_scroll/skill/gain_knowledge(var/mob/living/advanced/A) +/obj/item/experience_scroll/skill/gain_knowledge(mob/living/advanced/A) if(!skill) return FALSE diff --git a/code/_core/obj/item/fertilizer.dm b/code/_core/obj/item/fertilizer.dm index e00eeb264b..82db050f6a 100644 --- a/code/_core/obj/item/fertilizer.dm +++ b/code/_core/obj/item/fertilizer.dm @@ -16,11 +16,11 @@ . = ..() return 20 + . * uses_left -/obj/item/fertilizer/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/fertilizer/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("uses_left") -/obj/item/fertilizer/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/fertilizer/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("uses_left") @@ -35,7 +35,7 @@ icon_state = "[icon_state]_empty" -/obj/item/fertilizer/click_on_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/fertilizer/click_on_object(mob/caller,atom/object,location,control,params) if(istype(object,/obj/structure/interactive/plant)) object = object.loc diff --git a/code/_core/obj/item/firing_pin/_firing_pin.dm b/code/_core/obj/item/firing_pin/_firing_pin.dm index 74a92d419a..a1f10f2762 100644 --- a/code/_core/obj/item/firing_pin/_firing_pin.dm +++ b/code/_core/obj/item/firing_pin/_firing_pin.dm @@ -12,10 +12,10 @@ rarity = RARITY_UNCOMMON -/obj/item/firing_pin/proc/can_shoot(var/mob/caller,var/obj/item/weapon,var/messages=TRUE) +/obj/item/firing_pin/proc/can_shoot(mob/caller,obj/item/weapon,messages=TRUE) return TRUE -/obj/item/firing_pin/proc/on_shoot(var/mob/caller,var/obj/item/weapon) +/obj/item/firing_pin/proc/on_shoot(mob/caller,obj/item/weapon) return TRUE /obj/item/firing_pin/electronic @@ -30,7 +30,7 @@ value = 50000 value_burgerbux = 1 -/obj/item/firing_pin/electronic/iff/can_shoot(var/mob/caller,var/obj/item/weapon,var/messages=TRUE) +/obj/item/firing_pin/electronic/iff/can_shoot(mob/caller,obj/item/weapon,messages=TRUE) if(src.iff_tag) if(!is_living(caller)) @@ -51,7 +51,7 @@ iff_tag = "NanoTrasen" icon_state = "nanotrasen" -/obj/item/firing_pin/electronic/iff/nanotrasen/can_shoot(var/mob/caller,var/obj/item/weapon) +/obj/item/firing_pin/electronic/iff/nanotrasen/can_shoot(mob/caller,obj/item/weapon) . = ..() @@ -71,7 +71,7 @@ icon_state = "nanotrasen" value = 200 -/obj/item/firing_pin/electronic/iff/nanotrasen/nyantrasen/on_shoot(var/mob/caller,var/obj/item/weapon) +/obj/item/firing_pin/electronic/iff/nanotrasen/nyantrasen/on_shoot(mob/caller,obj/item/weapon) if(caller && weapon) var/turf/T = get_turf(weapon) if(T) play_sound('sound/voice/catgirl/meow.ogg',T) @@ -84,7 +84,7 @@ icon_state = "nanotrasen" value = 666 -/obj/item/firing_pin/electronic/iff/nanotrasen/honkmother/on_shoot(var/mob/caller,var/obj/item/weapon) +/obj/item/firing_pin/electronic/iff/nanotrasen/honkmother/on_shoot(mob/caller,obj/item/weapon) if(caller && weapon) var/turf/T = get_turf(weapon) if(T) play_sound('sound/items/bikehorn.ogg',T) diff --git a/code/_core/obj/item/fishing/rod.dm b/code/_core/obj/item/fishing/rod.dm index cfd023c120..503c6b639b 100644 --- a/code/_core/obj/item/fishing/rod.dm +++ b/code/_core/obj/item/fishing/rod.dm @@ -53,13 +53,13 @@ -/obj/item/fishing/rod/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/fishing/rod/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEATOM("lure") SAVEATOM("line") SAVEATOM("bait") -/obj/item/fishing/rod/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/fishing/rod/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADATOM("lure") LOADATOM("line") @@ -79,7 +79,7 @@ I.color = L.color add_overlay(I) -/obj/item/fishing/rod/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/fishing/rod/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(fishing_turf) //Don't do anything while fishing. return ..() @@ -201,7 +201,7 @@ return ..() -/obj/item/fishing/rod/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/fishing/rod/click_on_object(mob/caller as mob,atom/object,location,control,params) INTERACT_CHECK @@ -281,7 +281,7 @@ return ..() -/obj/item/fishing/rod/get_examine_list(var/mob/living/advanced/caller) +/obj/item/fishing/rod/get_examine_list(mob/living/advanced/caller) . = ..() @@ -303,7 +303,7 @@ rarity = RARITY_RARE -/obj/item/fishing/rod/telescopic/click_self(var/mob/caller,location,control,params) +/obj/item/fishing/rod/telescopic/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(5) if(fishing_turf) @@ -313,11 +313,11 @@ play_sound('sound/items/drop/accessory.ogg',get_turf(src),range_max=VIEW_RANGE*0.2) return TRUE -/obj/item/fishing/rod/telescopic/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/fishing/rod/telescopic/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("compact") -/obj/item/fishing/rod/telescopic/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/fishing/rod/telescopic/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("compact") diff --git a/code/_core/obj/item/flare.dm b/code/_core/obj/item/flare.dm index d80b743f0b..995c6018c0 100644 --- a/code/_core/obj/item/flare.dm +++ b/code/_core/obj/item/flare.dm @@ -22,13 +22,13 @@ QDEL_NULL(stored_cap) . = ..() -/obj/item/flare/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/flare/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEATOM("stored_cap") SAVEVAR("ignited") SAVEVAR("has_fuel") -/obj/item/flare/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/flare/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADATOM("stored_cap") LOADVAR("ignited") @@ -38,7 +38,7 @@ . = ..() update_sprite() -/obj/item/flare/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/flare/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(istype(object,/obj/item/flare_cap/)) INTERACT_CHECK @@ -68,7 +68,7 @@ . = ..() -/obj/item/flare/post_move(var/atom/old_loc) +/obj/item/flare/post_move(atom/old_loc) . = ..() @@ -76,7 +76,7 @@ update_sprite() -/obj/item/flare/proc/ignite(var/mob/caller) +/obj/item/flare/proc/ignite(mob/caller) if(!has_fuel) caller.to_chat(span("warning","\The [src.name] is spent!")) diff --git a/code/_core/obj/item/fluff/bikehorn.dm b/code/_core/obj/item/fluff/bikehorn.dm index 526bb3d67d..e473154a45 100644 --- a/code/_core/obj/item/fluff/bikehorn.dm +++ b/code/_core/obj/item/fluff/bikehorn.dm @@ -12,7 +12,7 @@ weight = 0.25 -/obj/item/bikehorn/click_self(var/mob/caller,location,control,params) +/obj/item/bikehorn/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(20) @@ -32,7 +32,7 @@ rarity = RARITY_RARE value_burgerbux = 5 -/obj/item/bikehorn/magic/click_self(var/mob/caller,location,control,params) +/obj/item/bikehorn/magic/click_self(mob/caller,location,control,params) . = ..() diff --git a/code/_core/obj/item/fluff/whistle.dm b/code/_core/obj/item/fluff/whistle.dm index 99991d5592..710358626a 100644 --- a/code/_core/obj/item/fluff/whistle.dm +++ b/code/_core/obj/item/fluff/whistle.dm @@ -14,7 +14,7 @@ rarity = RARITY_UNCOMMON -/obj/item/whistle/click_self(var/mob/caller,location,control,params) +/obj/item/whistle/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(30) diff --git a/code/_core/obj/item/food/_food.dm b/code/_core/obj/item/food/_food.dm index e83bce406c..9d01bae3f9 100644 --- a/code/_core/obj/item/food/_food.dm +++ b/code/_core/obj/item/food/_food.dm @@ -13,11 +13,11 @@ has_quick_function = TRUE quick_function_type = FLAG_QUICK_INSTANT -/obj/item/consumable/food/quick(var/mob/living/advanced/caller,var/atom/object,location,control,params) +/obj/item/consumable/food/quick(mob/living/advanced/caller,atom/object,location,control,params) click_on_object(caller,caller) return TRUE -/obj/item/consumable/food/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/consumable/food/click_on_object(mob/caller as mob,atom/object,location,control,params) if(get_dist(caller,object) > 1) return FALSE @@ -48,7 +48,7 @@ return TRUE -/obj/item/consumable/food/proc/consume(var/mob/living/consumer) +/obj/item/consumable/food/proc/consume(mob/living/consumer) if(heal_amount_health) consumer.health_regen_buffer += heal_amount_health @@ -68,7 +68,7 @@ return TRUE -/obj/item/consumable/food/get_examine_text(var/mob/examiner) +/obj/item/consumable/food/get_examine_text(mob/examiner) . = ..() if(uses_left) diff --git a/code/_core/obj/item/food/burgers.dm b/code/_core/obj/item/food/burgers.dm index d358e02b2b..8f25dffc8d 100644 --- a/code/_core/obj/item/food/burgers.dm +++ b/code/_core/obj/item/food/burgers.dm @@ -111,7 +111,7 @@ heal_amount_stamina = 0 heal_amount_mana = 0 -/obj/item/consumable/food/burger/clown/New(var/desired_loc) +/obj/item/consumable/food/burger/clown/New(desired_loc) ..() heal_amount_health = rand(-10,10) * 10 heal_amount_stamina = rand(-10,10) * 10 @@ -135,7 +135,7 @@ heal_amount_stamina = 0 heal_amount_mana = 0 -/obj/item/consumable/food/burger/colored/New(var/desired_loc) +/obj/item/consumable/food/burger/colored/New(desired_loc) ..() heal_amount_health = GetRedPart(color)/2.55 heal_amount_stamina = GetGreenPart(color)/2.55 diff --git a/code/_core/obj/item/fulton_pack.dm b/code/_core/obj/item/fulton_pack.dm index 9a324f3eae..f129e52082 100644 --- a/code/_core/obj/item/fulton_pack.dm +++ b/code/_core/obj/item/fulton_pack.dm @@ -26,7 +26,7 @@ . = ..() icon_state = "[initial(icon_state)]_[min(amount,3)]" -/obj/item/fulton_pack/proc/can_attach_fulton(var/mob/caller,var/atom/movable/object,var/value_check = FALSE,var/turf_check=FALSE) +/obj/item/fulton_pack/proc/can_attach_fulton(mob/caller,atom/movable/object,value_check = FALSE,turf_check=FALSE) INTERACT_CHECK_NO_DELAY(src) INTERACT_CHECK_NO_DELAY(object) @@ -84,7 +84,7 @@ return TRUE -/obj/item/fulton_pack/proc/attach_fulton(var/mob/caller,var/atom/movable/M) +/obj/item/fulton_pack/proc/attach_fulton(mob/caller,atom/movable/M) var/obj/structure/interactive/fulton/F = new(get_turf(M)) INITIALIZE(F) @@ -100,7 +100,7 @@ return TRUE -/obj/item/fulton_pack/click_on_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/fulton_pack/click_on_object(mob/caller,atom/object,location,control,params) if(!ismovable(object)) return ..() diff --git a/code/_core/obj/item/genetic_ball.dm b/code/_core/obj/item/genetic_ball.dm index def7ed3999..0dc98bbbd1 100644 --- a/code/_core/obj/item/genetic_ball.dm +++ b/code/_core/obj/item/genetic_ball.dm @@ -36,12 +36,12 @@ var/global/list/genetic_upgrade_table = list( value = 0 value_burgerbux = 1 //Not in normal loot rotation. -/obj/item/genetic_ball/save_item_data(var/save_inventory = TRUE) +/obj/item/genetic_ball/save_item_data(save_inventory = TRUE) . = ..() SAVEVAR("action_type") SAVEVAR("rarity") -/obj/item/genetic_ball/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data) +/obj/item/genetic_ball/load_item_data_pre(mob/living/advanced/player/P,list/object_data) . = ..() LOADVAR("action_type") LOADVAR("rarity") @@ -55,7 +55,7 @@ var/global/list/rarity_to_number = list( RARITY_LEGENDARY = 5 ) -/obj/item/genetic_ball/click_self(var/mob/caller) +/obj/item/genetic_ball/click_self(mob/caller) if(is_living(caller)) var/mob/living/L = caller @@ -63,7 +63,7 @@ var/global/list/rarity_to_number = list( return TRUE -/obj/item/genetic_ball/click_on_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/genetic_ball/click_on_object(mob/caller,atom/object,location,control,params) if(caller == object) click_self(caller) @@ -72,7 +72,7 @@ var/global/list/rarity_to_number = list( . = ..() -/obj/item/genetic_ball/proc/do_upgrade(var/mob/living/caller) +/obj/item/genetic_ball/proc/do_upgrade(mob/living/caller) if(action_type == GENETIC_INERT) if(length(caller.traits)) diff --git a/code/_core/obj/item/ghost_trap.dm b/code/_core/obj/item/ghost_trap.dm index 945f62e991..450cfae411 100644 --- a/code/_core/obj/item/ghost_trap.dm +++ b/code/_core/obj/item/ghost_trap.dm @@ -13,11 +13,11 @@ density = TRUE -/obj/item/ghost_box/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/ghost_box/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("stored_ghost") -/obj/item/ghost_box/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/ghost_box/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("stored_ghost") @@ -49,7 +49,7 @@ qdel(G) -/obj/item/ghost_box/click_self(var/mob/caller,location,control,params) +/obj/item/ghost_box/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(1) diff --git a/code/_core/obj/item/grenade/_grenade.dm b/code/_core/obj/item/grenade/_grenade.dm index 57e8539716..b2654d3fbf 100644 --- a/code/_core/obj/item/grenade/_grenade.dm +++ b/code/_core/obj/item/grenade/_grenade.dm @@ -35,7 +35,7 @@ . *= 0.1 . = CEILING(.,1) -/obj/item/grenade/get_projectile_offset(var/initial_offset_x,var/initial_offset_y,var/bullet_num,var/bullet_num_max,var/accuracy) +/obj/item/grenade/get_projectile_offset(initial_offset_x,initial_offset_y,bullet_num,bullet_num_max,accuracy) var/num = bullet_num/bullet_num_max @@ -55,7 +55,7 @@ . = ..() update_sprite() -/obj/item/grenade/quick(var/mob/caller,var/atom/object,location,params) +/obj/item/grenade/quick(mob/caller,atom/object,location,params) if(!is_living(caller) || !object) return FALSE @@ -91,21 +91,21 @@ return TRUE -/obj/item/grenade/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/grenade/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("open") SAVEVAR("spent") SAVEATOM("stored_trigger") SAVELISTATOM("stored_containers") -/obj/item/grenade/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/grenade/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("open") LOADVAR("spent") LOADATOM("stored_trigger") LOADLISTATOM("stored_containers") -/obj/item/grenade/post_move(var/atom/old_loc) +/obj/item/grenade/post_move(atom/old_loc) . = ..() @@ -120,7 +120,7 @@ SSai.tracked_avoidance_by_z["[loc.z]"] += src -/obj/item/grenade/act_explode(var/atom/owner,var/atom/source,var/atom/epicenter,var/magnitude,var/desired_loyalty_tag) +/obj/item/grenade/act_explode(atom/owner,atom/source,atom/epicenter,magnitude,desired_loyalty_tag) if(alpha == 0) //Already gone. return FALSE @@ -135,7 +135,7 @@ mouse_opacity = 0 anchored = 2 -/obj/item/grenade/New(var/desired_loc) +/obj/item/grenade/New(desired_loc) . = ..() update_sprite() @@ -173,7 +173,7 @@ return ..() -/obj/item/grenade/click_self(var/mob/caller,location,control,params) +/obj/item/grenade/click_self(mob/caller,location,control,params) if(spent) return ..() @@ -189,7 +189,7 @@ return TRUE -/obj/item/grenade/clicked_on_by_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/grenade/clicked_on_by_object(mob/caller as mob,atom/object,location,control,params) if(spent) return ..() @@ -277,7 +277,7 @@ return ..() -/obj/item/grenade/trigger(var/mob/caller,var/atom/source,var/signal_freq,var/signal_code) +/obj/item/grenade/trigger(mob/caller,atom/source,signal_freq,signal_code) if(is_inventory(loc)) drop_item() diff --git a/code/_core/obj/item/grenade/device/special_timed.dm b/code/_core/obj/item/grenade/device/special_timed.dm index 82deeb9081..378ee0b1f8 100644 --- a/code/_core/obj/item/grenade/device/special_timed.dm +++ b/code/_core/obj/item/grenade/device/special_timed.dm @@ -25,7 +25,7 @@ for(var/obj/item/I in src.contents) . += I.get_value() -/obj/item/grenade/device/special/timed/blackhole/trigger(var/mob/caller,var/atom/source,var/signal_freq,var/signal_code) +/obj/item/grenade/device/special/timed/blackhole/trigger(mob/caller,atom/source,signal_freq,signal_code) . = ..() @@ -47,7 +47,7 @@ suck(A,6) -/obj/item/grenade/device/special/timed/blackhole/proc/suck(var/mob/living/advanced/caller,var/sucks_left=0) +/obj/item/grenade/device/special/timed/blackhole/proc/suck(mob/living/advanced/caller,sucks_left=0) var/turf/T = get_turf(src) @@ -92,7 +92,7 @@ marker_color = COLOR_GREEN_LIGHT value = 400 -/obj/item/grenade/device/special/timed/decoy/trigger(var/mob/caller,var/atom/source,var/signal_freq,var/signal_code) +/obj/item/grenade/device/special/timed/decoy/trigger(mob/caller,atom/source,signal_freq,signal_code) . = ..() @@ -121,7 +121,7 @@ marker_color = COLOR_RED value = 200 -/obj/item/grenade/device/special/timed/barrier/trigger(var/mob/caller,var/atom/source,var/signal_freq,var/signal_code) +/obj/item/grenade/device/special/timed/barrier/trigger(mob/caller,atom/source,signal_freq,signal_code) . = ..() @@ -178,7 +178,7 @@ marker_color = COLOR_GOLD value = 300 -/obj/item/grenade/device/special/timed/shell/trigger(var/mob/caller,var/atom/source,var/signal_freq,var/signal_code) +/obj/item/grenade/device/special/timed/shell/trigger(mob/caller,atom/source,signal_freq,signal_code) . = ..() diff --git a/code/_core/obj/item/grenade/fuse.dm b/code/_core/obj/item/grenade/fuse.dm index ec46ea8a62..1dd4519bf3 100644 --- a/code/_core/obj/item/grenade/fuse.dm +++ b/code/_core/obj/item/grenade/fuse.dm @@ -12,7 +12,7 @@ stored_trigger = T open = FALSE -/obj/item/grenade/fuse/trigger(var/mob/caller,var/atom/source,var/signal_freq,var/signal_code) +/obj/item/grenade/fuse/trigger(mob/caller,atom/source,signal_freq,signal_code) . = ..() if(!src.reagents) return diff --git a/code/_core/obj/item/hand_tele.dm b/code/_core/obj/item/hand_tele.dm index 9f23270ffb..0d866dc59f 100644 --- a/code/_core/obj/item/hand_tele.dm +++ b/code/_core/obj/item/hand_tele.dm @@ -49,15 +49,15 @@ /obj/item/hand_teleporter/get_battery() return battery -/obj/item/hand_teleporter/save_item_data(var/save_inventory = TRUE) +/obj/item/hand_teleporter/save_item_data(save_inventory = TRUE) . = ..() SAVEATOM("battery") -/obj/item/hand_teleporter/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data) +/obj/item/hand_teleporter/load_item_data_pre(mob/living/advanced/player/P,list/object_data) . = ..() LOADATOM("battery") -/obj/item/hand_teleporter/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/hand_teleporter/clicked_on_by_object(mob/caller,atom/object,location,control,params) object = object.defer_click_on_object(location,control,params) @@ -96,7 +96,7 @@ return ..() -/obj/item/hand_teleporter/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) //The src is used on the object +/obj/item/hand_teleporter/click_on_object(mob/caller as mob,atom/object,location,control,params) //The src is used on the object INTERACT_CHECK INTERACT_DELAY(10) @@ -134,5 +134,5 @@ return TRUE -/obj/item/hand_teleporter/get_examine_list(var/mob/caller) +/obj/item/hand_teleporter/get_examine_list(mob/caller) return ..() + div("notice","Teleports Remaining: [FLOOR(battery.charge_current/30000,1)]") diff --git a/code/_core/obj/item/handcuffs.dm b/code/_core/obj/item/handcuffs.dm index c8f0484c12..5e2503d01e 100644 --- a/code/_core/obj/item/handcuffs.dm +++ b/code/_core/obj/item/handcuffs.dm @@ -12,7 +12,7 @@ size = SIZE_1 -/obj/item/handcuffs/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/handcuffs/click_on_object(mob/caller as mob,atom/object,location,control,params) if(ismob(object)) INTERACT_CHECK @@ -30,12 +30,12 @@ return ..() -/obj/item/handcuffs/proc/cuff(var/mob/caller,var/mob/living/advanced/target) +/obj/item/handcuffs/proc/cuff(mob/caller,mob/living/advanced/target) target.visible_message(span("warning","\The [caller.name] finishes cuffing \the [target.name]."),span("danger","\The [caller.name] cuffs you!")) target.set_handcuffs(TRUE,src) return TRUE -/obj/item/handcuffs/proc/can_cuff(var/mob/caller,var/mob/living/advanced/target) +/obj/item/handcuffs/proc/can_cuff(mob/caller,mob/living/advanced/target) INTERACT_CHECK_NO_DELAY(src) INTERACT_CHECK_NO_DELAY(target) diff --git a/code/_core/obj/item/herald_mirror.dm b/code/_core/obj/item/herald_mirror.dm index 9121792744..a1b7f07a41 100644 --- a/code/_core/obj/item/herald_mirror.dm +++ b/code/_core/obj/item/herald_mirror.dm @@ -22,7 +22,7 @@ linked_destination = locate() in world return ..() -/obj/item/herald_mirror/click_self(var/mob/caller,location,control,params) +/obj/item/herald_mirror/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(10) @@ -45,7 +45,7 @@ return TRUE -/obj/item/herald_mirror/proc/can_teleport(var/mob/living/advanced/A) +/obj/item/herald_mirror/proc/can_teleport(mob/living/advanced/A) var/mob/caller = A //reeee shitcode @@ -67,7 +67,7 @@ return TRUE -/obj/item/herald_mirror/proc/do_teleport(var/mob/living/advanced/A) +/obj/item/herald_mirror/proc/do_teleport(mob/living/advanced/A) var/area/A2 = get_area(A) diff --git a/code/_core/obj/item/hope.dm b/code/_core/obj/item/hope.dm index 476ecc92a1..452b1b8919 100644 --- a/code/_core/obj/item/hope.dm +++ b/code/_core/obj/item/hope.dm @@ -12,11 +12,11 @@ value = 8000 -/obj/item/hope/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/hope/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("next_resurrect") -/obj/item/hope/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/hope/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("next_resurrect") @@ -30,7 +30,7 @@ if(next_resurrect > world.realtime) icon_state = "[icon_state]_drained" -/obj/item/hope/proc/check_resurrection(var/make_sound=TRUE) +/obj/item/hope/proc/check_resurrection(make_sound=TRUE) if(next_resurrect <= world.realtime) update_sprite() @@ -41,7 +41,7 @@ else CALLBACK("\ref[src]_check_ressurection",60 SECONDS,src,src::check_resurrection()) -/obj/item/hope/click_on_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/hope/click_on_object(mob/caller,atom/object,location,control,params) if(!is_advanced(object)) return ..() diff --git a/code/_core/obj/item/implanter/_implanter.dm b/code/_core/obj/item/implanter/_implanter.dm index 2631d6babe..33359e5681 100644 --- a/code/_core/obj/item/implanter/_implanter.dm +++ b/code/_core/obj/item/implanter/_implanter.dm @@ -28,18 +28,18 @@ return ..() -/obj/item/implanter/New(var/desired_loc) +/obj/item/implanter/New(desired_loc) . = ..() if(stored_implant) name = "[initial(name)] ([initial(stored_implant.name)])" update_sprite() -/obj/item/implanter/get_examine_details_list(var/mob/examiner) +/obj/item/implanter/get_examine_details_list(mob/examiner) . = ..() . += div("notice","Details: [initial(stored_implant.desc_extended)]") -/obj/item/implanter/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/implanter/click_on_object(mob/caller as mob,atom/object,location,control,params) if(caller != object || !is_advanced(caller)) return ..() diff --git a/code/_core/obj/item/instrument/_instrument.dm b/code/_core/obj/item/instrument/_instrument.dm index 62e2d4ea9d..4c786a2c8c 100644 --- a/code/_core/obj/item/instrument/_instrument.dm +++ b/code/_core/obj/item/instrument/_instrument.dm @@ -7,17 +7,17 @@ value = 1000 -/obj/item/instrument/New(var/desired_loc) +/obj/item/instrument/New(desired_loc) . = ..() current_song = new current_song(src) current_song.instrument_directory = instrument_type -/obj/item/instrument/click_self(var/mob/caller,location,control,params) +/obj/item/instrument/click_self(mob/caller,location,control,params) if(caller && current_song) current_song.interact(caller) return TRUE -/obj/item/instrument/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/instrument/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(anchored) diff --git a/code/_core/obj/item/interaction.dm b/code/_core/obj/item/interaction.dm index 0e8b0a4dfd..0f1925f84a 100644 --- a/code/_core/obj/item/interaction.dm +++ b/code/_core/obj/item/interaction.dm @@ -1,4 +1,4 @@ -/obj/item/click_on_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/click_on_object(mob/caller,atom/object,location,control,params) if(is_container) var/turf/found_turf @@ -31,7 +31,7 @@ . = ..() -/obj/item/clicked_on_by_object(var/mob/caller as mob,var/atom/object,location,control,params) //The src was clicked on by the object +/obj/item/clicked_on_by_object(mob/caller as mob,atom/object,location,control,params) //The src was clicked on by the object if(caller.attack_flags & CONTROL_MOD_DISARM) return src.click_self(caller,location,control,params) @@ -54,7 +54,7 @@ . = ..() -/obj/item/click_self(var/mob/caller,location,control,params) +/obj/item/click_self(mob/caller,location,control,params) if(!length(inventories)) return FALSE @@ -74,7 +74,7 @@ return FALSE -/obj/item/proc/can_interact_with_inventory(var/mob/living/advanced/caller) +/obj/item/proc/can_interact_with_inventory(mob/living/advanced/caller) if(inventory_user && inventory_user != caller) caller.to_chat(span("warning","\The [inventory_user.name] is using \the [src.name]!")) @@ -82,7 +82,7 @@ return TRUE -/obj/item/proc/open_inventory(var/mob/living/advanced/A) +/obj/item/proc/open_inventory(mob/living/advanced/A) if(loot_to_generate) var/rarity = 0 @@ -142,7 +142,7 @@ return TRUE -/obj/item/proc/close_inventory(var/mob/living/advanced/A) +/obj/item/proc/close_inventory(mob/living/advanced/A) if(inventory_user) inventory_user.using_inventories -= src @@ -158,7 +158,7 @@ return TRUE -/obj/item/drop_on_object(var/mob/caller,var/atom/object,location,control,params) //Src is dragged to object +/obj/item/drop_on_object(mob/caller,atom/object,location,control,params) //Src is dragged to object if(!can_be_dragged(caller)) return TRUE @@ -185,13 +185,13 @@ . = ..() -/obj/item/proc/can_be_dragged(var/mob/caller) +/obj/item/proc/can_be_dragged(mob/caller) if(additional_clothing_parent) return FALSE return TRUE -/obj/item/proc/dump_single_content(var/mob/caller,var/obj/item/I,var/turf/target_turf) +/obj/item/proc/dump_single_content(mob/caller,obj/item/I,turf/target_turf) if(!caller || !target_turf || !I) return FALSE @@ -209,7 +209,7 @@ return TRUE -/obj/item/proc/can_dump_contents(var/mob/caller,var/turf/target_turf) +/obj/item/proc/can_dump_contents(mob/caller,turf/target_turf) INTERACT_CHECK_NO_DELAY(src) INTERACT_CHECK_NO_DELAY(target_turf) @@ -217,7 +217,7 @@ return TRUE -/obj/item/proc/dump_contents(var/mob/caller,var/turf/target_turf) +/obj/item/proc/dump_contents(mob/caller,turf/target_turf) for(var/k in inventories) var/obj/hud/inventory/I = k @@ -232,7 +232,7 @@ return TRUE -/obj/item/proc/drop_item(var/atom/new_location,var/pixel_x_offset = 0,var/pixel_y_offset = 0,var/silent=FALSE) //Should be used in place of forcemove when possible. +/obj/item/proc/drop_item(atom/new_location,pixel_x_offset = 0,pixel_y_offset = 0,silent=FALSE) //Should be used in place of forcemove when possible. if(drop_sound && !silent && new_location && !qdeleting) if(is_turf(new_location)) diff --git a/code/_core/obj/item/inventory.dm b/code/_core/obj/item/inventory.dm index f419fe5aa4..7bf6f29555 100644 --- a/code/_core/obj/item/inventory.dm +++ b/code/_core/obj/item/inventory.dm @@ -27,8 +27,8 @@ /obj/item/proc/fill_inventory() return TRUE -/obj/item/proc/pre_fill_inventory(var/obj/item/item_added) +/obj/item/proc/pre_fill_inventory(obj/item/item_added) return TRUE -/obj/item/proc/post_fill_inventory(var/obj/item/item_added) +/obj/item/proc/post_fill_inventory(obj/item/item_added) return TRUE \ No newline at end of file diff --git a/code/_core/obj/item/legion_core.dm b/code/_core/obj/item/legion_core.dm index b03f91113f..5959231860 100644 --- a/code/_core/obj/item/legion_core.dm +++ b/code/_core/obj/item/legion_core.dm @@ -46,7 +46,7 @@ value = get_base_value() return TRUE -/obj/item/legion_core/get_examine_list(var/mob/examiner) +/obj/item/legion_core/get_examine_list(mob/examiner) . = ..() @@ -68,11 +68,11 @@ return ..() -/obj/item/legion_core/click_self(var/mob/caller,location,control,params) +/obj/item/legion_core/click_self(mob/caller,location,control,params) click_on_object(caller,caller) return TRUE -/obj/item/legion_core/click_on_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/legion_core/click_on_object(mob/caller,atom/object,location,control,params) if(is_living(object)) @@ -112,7 +112,7 @@ rarity = RARITY_UNCOMMON -/obj/item/legion_core_stabilizer/click_on_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/legion_core_stabilizer/click_on_object(mob/caller,atom/object,location,control,params) if(istype(object,/obj/item/legion_core)) INTERACT_CHECK diff --git a/code/_core/obj/item/light/tube.dm b/code/_core/obj/item/light/tube.dm index e2804a3914..9aa67a9410 100644 --- a/code/_core/obj/item/light/tube.dm +++ b/code/_core/obj/item/light/tube.dm @@ -6,7 +6,7 @@ weight = 0.25 -/obj/item/light/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/light/click_on_object(mob/caller as mob,atom/object,location,control,params) if(istype(object,light_type)) INTERACT_CHECK diff --git a/code/_core/obj/item/light_sensor.dm b/code/_core/obj/item/light_sensor.dm index f552da2368..f144463a56 100644 --- a/code/_core/obj/item/light_sensor.dm +++ b/code/_core/obj/item/light_sensor.dm @@ -21,7 +21,7 @@ var/image/I = new/image(initial(icon),initial(icon_state)) add_underlay(I) -/obj/item/light_sensor/click_self(var/mob/caller,location,control,params) +/obj/item/light_sensor/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(10) diff --git a/code/_core/obj/item/lighter.dm b/code/_core/obj/item/lighter.dm index 65fd8768bb..e417653541 100644 --- a/code/_core/obj/item/lighter.dm +++ b/code/_core/obj/item/lighter.dm @@ -15,7 +15,7 @@ value = 80 -/obj/item/lighter/click_self(var/mob/caller,location,control,params) +/obj/item/lighter/click_self(mob/caller,location,control,params) set_lit(!lit,caller) return TRUE @@ -32,7 +32,7 @@ set_light_sprite(FALSE) return TRUE -/obj/item/lighter/proc/set_lit(var/desired_lit,var/mob/caller) +/obj/item/lighter/proc/set_lit(desired_lit,mob/caller) if(desired_lit == lit) return FALSE @@ -48,7 +48,7 @@ return TRUE -/obj/item/lighter/get_damage_type(var/atom/attacker,var/atom/victim) +/obj/item/lighter/get_damage_type(atom/attacker,atom/victim) if(lit) return /damagetype/melee/club/lighter/on diff --git a/code/_core/obj/item/magazine/_magazine.dm b/code/_core/obj/item/magazine/_magazine.dm index 64d018c594..65021ab02e 100644 --- a/code/_core/obj/item/magazine/_magazine.dm +++ b/code/_core/obj/item/magazine/_magazine.dm @@ -31,7 +31,7 @@ value = 0 -/obj/item/magazine/quick(var/mob/caller,var/atom/object,location,params) +/obj/item/magazine/quick(mob/caller,atom/object,location,params) if(!is_advanced(caller) || !is_inventory(src.loc)) return FALSE @@ -59,12 +59,12 @@ return ..() -/obj/item/magazine/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/magazine/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVELIST("stored_bullets") -/obj/item/magazine/load_item_data_post(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/magazine/load_item_data_post(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE for(var/k in object_data["stored_bullets"]) @@ -85,7 +85,7 @@ . = ..() update_sprite() -/obj/item/magazine/get_examine_list(var/mob/examiner) +/obj/item/magazine/get_examine_list(mob/examiner) var results = div("notice","It contains [get_ammo_count()] bullets.") return ..() + results @@ -95,7 +95,7 @@ var/amount = stored_bullets[k] . += amount -/obj/item/magazine/proc/can_load_magazine(var/mob/caller,var/obj/item/bullet_cartridge/B) +/obj/item/magazine/proc/can_load_magazine(mob/caller,obj/item/bullet_cartridge/B) if(B.is_spent) caller?.to_chat(span("warning","The bullet is spent!")) @@ -123,7 +123,7 @@ return TRUE -/obj/item/magazine/proc/can_load_magazine_path(var/mob/caller,var/obj/item/bullet_cartridge/B) +/obj/item/magazine/proc/can_load_magazine_path(mob/caller,obj/item/bullet_cartridge/B) if(initial(B.is_spent)) caller?.to_chat(span("warning","The bullet is spent!")) @@ -156,7 +156,7 @@ -/obj/item/magazine/clicked_on_by_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/magazine/clicked_on_by_object(mob/caller as mob,atom/object,location,control,params) if(is_inventory(object) && length(stored_bullets)) INTERACT_CHECK @@ -181,7 +181,7 @@ . = ..() -/obj/item/magazine/click_self(var/mob/caller,location,control,params) +/obj/item/magazine/click_self(mob/caller,location,control,params) if(length(stored_bullets) && is_inventory(loc)) INTERACT_CHECK @@ -224,7 +224,7 @@ 'sound/weapons/ranged/generic/mag_remove5.ogg'\ ) -/obj/item/magazine/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/magazine/click_on_object(mob/caller as mob,atom/object,location,control,params) if(istype(object,/obj/item/weapon/ranged/bullet/) && !istype(src,/obj/item/magazine/clip)) INTERACT_CHECK @@ -259,13 +259,13 @@ icon_states = 0 -/obj/item/magazine/gold/can_load_magazine(var/mob/caller,var/obj/item/bullet_cartridge/B) +/obj/item/magazine/gold/can_load_magazine(mob/caller,obj/item/bullet_cartridge/B) return TRUE -/obj/item/magazine/gold/can_load_magazine_path(var/mob/caller,var/obj/item/bullet_cartridge/B) +/obj/item/magazine/gold/can_load_magazine_path(mob/caller,obj/item/bullet_cartridge/B) return TRUE -/obj/item/magazine/gold/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/magazine/gold/click_on_object(mob/caller as mob,atom/object,location,control,params) if(istype(object,/obj/item/weapon/ranged/bullet/magazine)) INTERACT_CHECK diff --git a/code/_core/obj/item/magazine/clip.dm b/code/_core/obj/item/magazine/clip.dm index 893c78eb55..914432a61d 100644 --- a/code/_core/obj/item/magazine/clip.dm +++ b/code/_core/obj/item/magazine/clip.dm @@ -3,7 +3,7 @@ desc = "Leaving these around the field won't get you in trouble with the Sergeant Major." desc_extended = "Contains ammunition for a ranged weapon. Make sure you're trying to use the right caliber." -/obj/item/magazine/clip/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/magazine/clip/click_on_object(mob/caller as mob,atom/object,location,control,params) if(is_ranged_bullet_weapon(object)) INTERACT_CHECK diff --git a/code/_core/obj/item/magazine/rifle_308_m13.dm b/code/_core/obj/item/magazine/rifle_308_m13.dm index 424ad21e17..3c5eb691c0 100644 --- a/code/_core/obj/item/magazine/rifle_308_m13.dm +++ b/code/_core/obj/item/magazine/rifle_308_m13.dm @@ -28,7 +28,7 @@ value = 10 -/obj/item/magazine/m13_762/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/magazine/m13_762/click_on_object(mob/caller as mob,atom/object,location,control,params) if(istype(object,/obj/item/weapon/ranged/bullet/magazine/rifle/m13)) var/obj/item/weapon/ranged/bullet/magazine/rifle/m13/W = object diff --git a/code/_core/obj/item/marker.dm b/code/_core/obj/item/marker.dm index 6e5813da99..d920a5daf8 100644 --- a/code/_core/obj/item/marker.dm +++ b/code/_core/obj/item/marker.dm @@ -13,7 +13,7 @@ rarity = RARITY_RARE -/obj/item/marker/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/marker/click_on_object(mob/caller as mob,atom/object,location,control,params) if(!is_item(object) || object == src) return ..() diff --git a/code/_core/obj/item/material/_material.dm b/code/_core/obj/item/material/_material.dm index fd718c41bb..f2628564eb 100644 --- a/code/_core/obj/item/material/_material.dm +++ b/code/_core/obj/item/material/_material.dm @@ -16,7 +16,7 @@ value = 0 //Auto generated. -/obj/item/material/can_transfer_stacks_to(var/obj/item/target) +/obj/item/material/can_transfer_stacks_to(obj/item/target) if(target == src) return FALSE @@ -39,11 +39,11 @@ return TRUE -/obj/item/material/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/material/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEPATH("material_id") -/obj/item/material/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/material/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADPATH("material_id") diff --git a/code/_core/obj/item/material/rod.dm b/code/_core/obj/item/material/rod.dm index 4451b0a6f5..d5bdd24332 100644 --- a/code/_core/obj/item/material/rod.dm +++ b/code/_core/obj/item/material/rod.dm @@ -24,7 +24,7 @@ color = M.color return ..() -/obj/item/material/rod/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/material/rod/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(is_item(object)) var/obj/item/I = object diff --git a/code/_core/obj/item/material/shard.dm b/code/_core/obj/item/material/shard.dm index 13f7562ebf..4c1f2688b9 100644 --- a/code/_core/obj/item/material/shard.dm +++ b/code/_core/obj/item/material/shard.dm @@ -10,7 +10,7 @@ material_multiplier = 0.5 -/obj/item/material/shard/New(var/desired_loc) +/obj/item/material/shard/New(desired_loc) . = ..() icon_state = "[initial(icon_state)]_[rand(1,3)]" return ..() \ No newline at end of file diff --git a/code/_core/obj/item/material/sheet.dm b/code/_core/obj/item/material/sheet.dm index 577de95f3b..32512e24c6 100644 --- a/code/_core/obj/item/material/sheet.dm +++ b/code/_core/obj/item/material/sheet.dm @@ -23,7 +23,7 @@ color = M.color return ..() -/obj/item/material/sheet/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/material/sheet/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(is_item(object)) var/obj/item/I = object diff --git a/code/_core/obj/item/matter_cartridge.dm b/code/_core/obj/item/matter_cartridge.dm index 3083f8e21b..526ebca1b5 100644 --- a/code/_core/obj/item/matter_cartridge.dm +++ b/code/_core/obj/item/matter_cartridge.dm @@ -9,7 +9,7 @@ weight = 5 -/obj/item/matter_cartridge/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/matter_cartridge/click_on_object(mob/caller as mob,atom/object,location,control,params) diff --git a/code/_core/obj/item/mech_attachment.dm b/code/_core/obj/item/mech_attachment.dm index dffdb9d489..20a223aaf3 100644 --- a/code/_core/obj/item/mech_attachment.dm +++ b/code/_core/obj/item/mech_attachment.dm @@ -6,7 +6,7 @@ value = 300 -/obj/item/mech_attachment/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/mech_attachment/click_on_object(mob/caller as mob,atom/object,location,control,params) if(!is_inventory(src.loc)) return attached_item.click_on_object(caller,object,location,control,params) @@ -14,7 +14,7 @@ return ..() -/obj/item/mech_attachment/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/mech_attachment/clicked_on_by_object(mob/caller,atom/object,location,control,params) object = object.defer_click_on_object(location,control,params) @@ -49,7 +49,7 @@ name = "[name] ([attached_item.name])" -/obj/item/mech_attachment/proc/attach(var/mob/caller,var/obj/item/I) +/obj/item/mech_attachment/proc/attach(mob/caller,obj/item/I) if(attached_item) caller?.to_chat(span("warning","There is already a [attached_item.name] attached to \the [src.name]!")) return FALSE @@ -59,7 +59,7 @@ update_sprite() return TRUE -/obj/item/mech_attachment/proc/unattach(var/mob/caller) +/obj/item/mech_attachment/proc/unattach(mob/caller) if(!attached_item) caller?.to_chat(span("warning","There is nothing to detach from \the [src.name]!")) return FALSE diff --git a/code/_core/obj/item/mech_delivery.dm b/code/_core/obj/item/mech_delivery.dm index c21903f0c5..2f94b4f3b4 100644 --- a/code/_core/obj/item/mech_delivery.dm +++ b/code/_core/obj/item/mech_delivery.dm @@ -9,7 +9,7 @@ weight = 4 -/obj/item/mech_delivery/click_self(var/mob/caller) +/obj/item/mech_delivery/click_self(mob/caller) if(!is_player(caller)) return ..() diff --git a/code/_core/obj/item/mech_part/_mech_part.dm b/code/_core/obj/item/mech_part/_mech_part.dm index 3d8f8855b6..351af3b6a9 100644 --- a/code/_core/obj/item/mech_part/_mech_part.dm +++ b/code/_core/obj/item/mech_part/_mech_part.dm @@ -39,7 +39,7 @@ return ..() -/obj/item/mech_part/can_be_attacked(var/atom/attacker,var/atom/weapon,var/params,var/damagetype/damage_type) +/obj/item/mech_part/can_be_attacked(atom/attacker,atom/weapon,params,damagetype/damage_type) if(!src.finalized) return FALSE diff --git a/code/_core/obj/item/mech_part/equipment/_equipment.dm b/code/_core/obj/item/mech_part/equipment/_equipment.dm index 38151775a4..14d24203ba 100644 --- a/code/_core/obj/item/mech_part/equipment/_equipment.dm +++ b/code/_core/obj/item/mech_part/equipment/_equipment.dm @@ -27,11 +27,11 @@ return stored_weapon.get_battery() return ..() -/obj/item/mech_part/equipment/weapon/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE) +/obj/item/mech_part/equipment/weapon/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE) . = ..() SAVEATOM("stored_weapon") -/obj/item/mech_part/equipment/weapon/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data) +/obj/item/mech_part/equipment/weapon/load_item_data_pre(mob/living/advanced/player/P,list/object_data) . = ..() LOADATOM("stored_weapon") if(stored_weapon) stored_weapon.update_sprite() @@ -65,13 +65,13 @@ return ..() -/obj/item/mech_part/equipment/weapon/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/mech_part/equipment/weapon/click_on_object(mob/caller as mob,atom/object,location,control,params) if(stored_weapon && istype(src.loc,/mob/living/vehicle/mech/modular) && !stored_weapon.click_on_object(caller,object,location,control,params)) return stored_weapon.attack(src.loc,object,params,caller) return ..() -/obj/item/mech_part/equipment/weapon/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/mech_part/equipment/weapon/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(stored_weapon && !is_inventory(object)) return stored_weapon.clicked_on_by_object(caller,object,location,control,params) return ..() diff --git a/code/_core/obj/item/mop.dm b/code/_core/obj/item/mop.dm index 4deff8ea9c..f9078041ab 100644 --- a/code/_core/obj/item/mop.dm +++ b/code/_core/obj/item/mop.dm @@ -15,7 +15,7 @@ weight = 2 -/obj/item/mop/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/mop/click_on_object(mob/caller as mob,atom/object,location,control,params) if(is_container(object) && object.reagents) var/obj/item/container/C = object diff --git a/code/_core/obj/item/old.dm b/code/_core/obj/item/old.dm index 8d103cc7be..7fc8d7f5be 100644 --- a/code/_core/obj/item/old.dm +++ b/code/_core/obj/item/old.dm @@ -1,4 +1,4 @@ -/obj/item/proc/get_damage_type_text(var/mob/living/advanced/A) +/obj/item/proc/get_damage_type_text(mob/living/advanced/A) var/returning_text = "" diff --git a/code/_core/obj/item/ore_bag.dm b/code/_core/obj/item/ore_bag.dm index 35ec4592ef..636c8d54af 100644 --- a/code/_core/obj/item/ore_bag.dm +++ b/code/_core/obj/item/ore_bag.dm @@ -22,18 +22,18 @@ var/material/M = MATERIAL(k) . += amount*1*M.value_per_unit -/obj/item/ore_bag/get_examine_list(var/mob/examiner) +/obj/item/ore_bag/get_examine_list(mob/examiner) . = ..() . += div("notice","The counter shows [ore_count] objects inside.") -/obj/item/ore_bag/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/ore_bag/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE if(length(contained_ore)) .["contained_ore"] = list() for(var/k in contained_ore) .["contained_ore"]["[k]"] = contained_ore[k] -/obj/item/ore_bag/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/ore_bag/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE for(var/k in object_data["contained_ore"]) contained_ore[text2path(k)] = object_data["contained_ore"][k] @@ -44,7 +44,7 @@ for(var/k in contained_ore) ore_count += contained_ore[k] -/obj/item/ore_bag/proc/can_scoop_up_ore(var/mob/caller,var/turf/T) +/obj/item/ore_bag/proc/can_scoop_up_ore(mob/caller,turf/T) if(get_dist(caller,T) > 1) return FALSE @@ -60,7 +60,7 @@ -/obj/item/ore_bag/proc/scoop_up_ore(var/mob/caller,var/turf/T) +/obj/item/ore_bag/proc/scoop_up_ore(mob/caller,turf/T) var/did_transfer = FALSE var/was_full = FALSE @@ -101,7 +101,7 @@ PROGRESS_BAR_CONDITIONS(caller,src,src::can_scoop_up_ore(),caller,T) -/obj/item/ore_bag/click_on_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/ore_bag/click_on_object(mob/caller,atom/object,location,control,params) if(object.plane >= PLANE_HUD) return ..() @@ -147,7 +147,7 @@ return TRUE -/obj/item/ore_bag/proc/dump_some_ore(var/mob/caller,var/turf/T) +/obj/item/ore_bag/proc/dump_some_ore(mob/caller,turf/T) var/ore_id = contained_ore[1] for(var/i=1,i<=min(CEILING(contained_ore[ore_id]/3,1),30),i++) diff --git a/code/_core/obj/item/organs/_organs.dm b/code/_core/obj/item/organs/_organs.dm index 1d9a352a05..b6935ae55d 100644 --- a/code/_core/obj/item/organs/_organs.dm +++ b/code/_core/obj/item/organs/_organs.dm @@ -82,7 +82,7 @@ can_hold = FALSE can_wear = FALSE -/obj/item/organ/New(var/desired_loc) +/obj/item/organ/New(desired_loc) . = ..() attached_organs = list() @@ -90,7 +90,7 @@ color = "#C284FF" //Absurd color. This makes it easier to identify issues. . = ..() -/obj/item/organ/proc/check_hit_chance(var/atom/attacker,var/atom/weapon,var/damagetype/damage_type,var/list/params = list(),var/accurate=FALSE,var/find_closest=FALSE,var/inaccuracy_modifier=1) +/obj/item/organ/proc/check_hit_chance(atom/attacker,atom/weapon,damagetype/damage_type,list/params = list(),accurate=FALSE,find_closest=FALSE,inaccuracy_modifier=1) if(projectile_dodge_chance > 0 && !accurate && !find_closest && get_dist(src,attacker) > 1) var/damagetype/DT = SSdamagetype.all_damage_types[damage_type] @@ -145,7 +145,7 @@ var/image/I = new/image(initial(icon),"[icon_state]_underlay") add_underlay(I) -/obj/item/organ/proc/send_pain_response(var/pain_amount=50) +/obj/item/organ/proc/send_pain_response(pain_amount=50) if(!has_pain) return FALSE var/mob/living/advanced/A = loc @@ -157,7 +157,7 @@ O.on_pain() return TRUE -/obj/item/organ/post_move(var/atom/old_loc) +/obj/item/organ/post_move(atom/old_loc) . = ..() @@ -165,7 +165,7 @@ update_sprite() -/obj/item/organ/proc/break_bone(var/play_sound=TRUE,var/display_mesage=TRUE) +/obj/item/organ/proc/break_bone(play_sound=TRUE,display_mesage=TRUE) if(!health || !can_be_broken || broken) return FALSE if(!broken_name) @@ -178,7 +178,7 @@ src.health.adjust_loss_smart(pain=health.health_max*0.25,organic=TRUE,robotic=FALSE) return TRUE -/obj/item/organ/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/obj/item/organ/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) . = ..() @@ -222,7 +222,7 @@ gib(gib_direction) -/obj/item/organ/proc/get_ending_organ(var/limit=10) +/obj/item/organ/proc/get_ending_organ(limit=10) var/list/valid_organs = list() for(var/k in src.attached_organs) @@ -241,7 +241,7 @@ limit-- return O.get_ending_organ(limit) -/obj/item/organ/gib(var/gib_direction=0x0,var/hard=FALSE) //Hard gib destroys the limb. +/obj/item/organ/gib(gib_direction=0x0,hard=FALSE) //Hard gib destroys the limb. if(!can_gib) return FALSE @@ -301,12 +301,12 @@ /obj/item/organ/proc/on_pain() //What happens if this organ is shot while broken. Other things can cause pain as well. return FALSE -/obj/item/organ/proc/attach_to(var/obj/item/organ/O) +/obj/item/organ/proc/attach_to(obj/item/organ/O) attached_organ = O O.attached_organs += src return TRUE -/obj/item/organ/initialize_worn_blends(var/desired_icon_state) +/obj/item/organ/initialize_worn_blends(desired_icon_state) if(enable_skin) add_blend( @@ -517,7 +517,7 @@ obj/item/organ/proc/get_damage_description(var/mob/examiner) -/obj/item/organ/act_emp(var/atom/owner,var/atom/source,var/atom/epicenter,var/magnitude,var/desired_loyalty_tag) +/obj/item/organ/act_emp(atom/owner,atom/source,atom/epicenter,magnitude,desired_loyalty_tag) . = ..() for(var/k in inventories) var/obj/hud/inventory/I = k diff --git a/code/_core/obj/item/organs/eyes.dm b/code/_core/obj/item/organs/eyes.dm index 04e9158941..074fa3745b 100644 --- a/code/_core/obj/item/organs/eyes.dm +++ b/code/_core/obj/item/organs/eyes.dm @@ -21,7 +21,7 @@ can_be_broken = FALSE -/obj/item/organ/eye/initialize_worn_blends(var/desired_icon_state) +/obj/item/organ/eye/initialize_worn_blends(desired_icon_state) . = ..() add_blend( "eye", diff --git a/code/_core/obj/item/organs/feet.dm b/code/_core/obj/item/organs/feet.dm index a85db6fccf..6bab4b7203 100644 --- a/code/_core/obj/item/organs/feet.dm +++ b/code/_core/obj/item/organs/feet.dm @@ -31,7 +31,7 @@ has_life = TRUE -/obj/item/organ/foot/proc/get_footsteps(var/list/original_footsteps,var/enter=TRUE) +/obj/item/organ/foot/proc/get_footsteps(list/original_footsteps,enter=TRUE) return original_footsteps /obj/item/organ/foot/on_pain() @@ -45,7 +45,7 @@ return TRUE -/obj/item/organ/foot/get_footsteps(var/list/original_footsteps,var/enter=TRUE) +/obj/item/organ/foot/get_footsteps(list/original_footsteps,enter=TRUE) for(var/k in src.inventories) var/obj/hud/inventory/H = k diff --git a/code/_core/obj/item/organs/hair.dm b/code/_core/obj/item/organs/hair.dm index fb2a213da2..87e1524d21 100644 --- a/code/_core/obj/item/organs/hair.dm +++ b/code/_core/obj/item/organs/hair.dm @@ -13,7 +13,7 @@ enable_skin = FALSE -/obj/item/organ/hair/initialize_worn_blends(var/desired_icon_state) +/obj/item/organ/hair/initialize_worn_blends(desired_icon_state) . = ..() add_blend( "hair_head", @@ -26,7 +26,7 @@ desired_layer = FLOAT_LAYER ) -/obj/item/organ/hair/on_organ_remove(var/mob/living/advanced/old_owner) +/obj/item/organ/hair/on_organ_remove(mob/living/advanced/old_owner) . = ..() if(!old_owner.qdeleting && !old_owner.changing) qdel(src) @@ -46,7 +46,7 @@ enable_skin = FALSE -/obj/item/organ/beard/initialize_worn_blends(var/desired_icon_state) +/obj/item/organ/beard/initialize_worn_blends(desired_icon_state) . = ..() add_blend( "hair_face", @@ -60,7 +60,7 @@ ) -/obj/item/organ/beard/on_organ_remove(var/mob/living/advanced/old_owner) +/obj/item/organ/beard/on_organ_remove(mob/living/advanced/old_owner) . = ..() if(!old_owner.qdeleting && !old_owner.changing) qdel(src) \ No newline at end of file diff --git a/code/_core/obj/item/organs/hands.dm b/code/_core/obj/item/organs/hands.dm index 3cde9ac533..7fb7499a06 100644 --- a/code/_core/obj/item/organs/hands.dm +++ b/code/_core/obj/item/organs/hands.dm @@ -67,7 +67,7 @@ return . -/obj/item/organ/hand/get_damage_type(var/atom/attacker,var/atom/victim) +/obj/item/organ/hand/get_damage_type(atom/attacker,atom/victim) if(is_living(attacker)) var/mob/living/L = attacker @@ -271,7 +271,7 @@ armor = /armor/beefman -/obj/item/organ/hand/beefman/get_damage_type(var/atom/attacker,var/atom/victim) +/obj/item/organ/hand/beefman/get_damage_type(atom/attacker,atom/victim) return damage_type /obj/item/organ/hand/beefman/left @@ -299,7 +299,7 @@ /obj/item/organ/hand/stand name = "right fast hand" -/obj/item/organ/hand/stand/get_damage_type(var/atom/attacker,var/atom/victim) +/obj/item/organ/hand/stand/get_damage_type(atom/attacker,atom/victim) return /damagetype/unarmed/fists/stand /obj/item/organ/hand/stand/left @@ -392,7 +392,7 @@ /obj/item/organ/hand/zombie name = "right zombie hand" -/obj/item/organ/hand/zombie/get_damage_type(var/atom/attacker,var/atom/victim) +/obj/item/organ/hand/zombie/get_damage_type(atom/attacker,atom/victim) if(!is_living(victim)) return /damagetype/unarmed/claw diff --git a/code/_core/obj/item/organs/heads.dm b/code/_core/obj/item/organs/heads.dm index 08374cd496..035477ebc5 100644 --- a/code/_core/obj/item/organs/heads.dm +++ b/code/_core/obj/item/organs/heads.dm @@ -37,7 +37,7 @@ has_life = TRUE -/obj/item/organ/head/get_damage_type(var/atom/attacker,var/atom/victim) +/obj/item/organ/head/get_damage_type(atom/attacker,atom/victim) if(attached_organ) return /damagetype/unarmed/bite/ . = ..() diff --git a/code/_core/obj/item/organs/internal/brain.dm b/code/_core/obj/item/organs/internal/brain.dm index fa3cfb1a57..907f6c69fe 100644 --- a/code/_core/obj/item/organs/internal/brain.dm +++ b/code/_core/obj/item/organs/internal/brain.dm @@ -29,7 +29,7 @@ -/obj/item/organ/internal/brain/on_organ_remove(var/mob/living/advanced/old_owner) +/obj/item/organ/internal/brain/on_organ_remove(mob/living/advanced/old_owner) . = ..() if(!old_owner.qdeleting && !old_owner.changing) if(old_owner.client) diff --git a/code/_core/obj/item/organs/internal/implant/_implant.dm b/code/_core/obj/item/organs/internal/implant/_implant.dm index 0b0db54bd7..d3a536f6d7 100644 --- a/code/_core/obj/item/organs/internal/implant/_implant.dm +++ b/code/_core/obj/item/organs/internal/implant/_implant.dm @@ -6,7 +6,7 @@ attach_flag = BODY_TORSO value_burgerbux = 1 -/obj/item/organ/internal/implant/on_organ_remove(var/mob/living/advanced/old_owner) +/obj/item/organ/internal/implant/on_organ_remove(mob/living/advanced/old_owner) . = ..() if(!qdeleting) qdel(src) diff --git a/code/_core/obj/item/organs/internal/implant/iff.dm b/code/_core/obj/item/organs/internal/implant/iff.dm index b86971b2c6..f5872118c0 100644 --- a/code/_core/obj/item/organs/internal/implant/iff.dm +++ b/code/_core/obj/item/organs/internal/implant/iff.dm @@ -9,11 +9,11 @@ var/registered_squad = "none" var/iff_tag = "none" -/obj/item/organ/internal/implant/hand/left/iff/on_organ_add(var/mob/living/advanced/new_owner) +/obj/item/organ/internal/implant/hand/left/iff/on_organ_add(mob/living/advanced/new_owner) new_owner.set_iff_tag(iff_tag) return ..() -/obj/item/organ/internal/implant/hand/left/iff/on_organ_remove(var/mob/living/advanced/old_owner) +/obj/item/organ/internal/implant/hand/left/iff/on_organ_remove(mob/living/advanced/old_owner) old_owner.set_iff_tag(initial(old_owner.iff_tag)) return ..() diff --git a/code/_core/obj/item/organs/internal/implant/loyalty.dm b/code/_core/obj/item/organs/internal/implant/loyalty.dm index 30d8a951e2..e1b2829344 100644 --- a/code/_core/obj/item/organs/internal/implant/loyalty.dm +++ b/code/_core/obj/item/organs/internal/implant/loyalty.dm @@ -4,11 +4,11 @@ var/registered_squad = "none" var/loyalty_tag = "none" -/obj/item/organ/internal/implant/head/loyalty/on_organ_add(var/mob/living/advanced/new_owner) +/obj/item/organ/internal/implant/head/loyalty/on_organ_add(mob/living/advanced/new_owner) new_owner.set_loyalty_tag(loyalty_tag) return ..() -/obj/item/organ/internal/implant/head/loyalty/on_organ_remove(var/mob/living/advanced/old_owner) +/obj/item/organ/internal/implant/head/loyalty/on_organ_remove(mob/living/advanced/old_owner) old_owner.set_loyalty_tag(initial(old_owner.loyalty_tag)) return ..() diff --git a/code/_core/obj/item/organs/internal/implant/misc.dm b/code/_core/obj/item/organs/internal/implant/misc.dm index 59b4fa4793..4772f9ef17 100644 --- a/code/_core/obj/item/organs/internal/implant/misc.dm +++ b/code/_core/obj/item/organs/internal/implant/misc.dm @@ -28,11 +28,11 @@ desc = "I died, please restart." desc_extended = "A special implant that detects if the user has died, then broadcasts the message to the medical frequency. Only has enough charge to broadcast one death." -/obj/item/organ/internal/implant/torso/death_alarm/on_organ_add(var/mob/living/advanced/new_owner) +/obj/item/organ/internal/implant/torso/death_alarm/on_organ_add(mob/living/advanced/new_owner) . = ..() HOOK_ADD("post_death","\ref[src]_implant_post_death",new_owner,src,src::trigger_implant()) -/obj/item/organ/internal/implant/torso/death_alarm/on_organ_remove(var/mob/living/advanced/old_owner) +/obj/item/organ/internal/implant/torso/death_alarm/on_organ_remove(mob/living/advanced/old_owner) . = ..() HOOK_REMOVE("post_death","\ref[src]_implant_post_death",old_owner) diff --git a/code/_core/obj/item/organs/torso.dm b/code/_core/obj/item/organs/torso.dm index d0921800cf..3da51f4227 100644 --- a/code/_core/obj/item/organs/torso.dm +++ b/code/_core/obj/item/organs/torso.dm @@ -32,7 +32,7 @@ has_life = TRUE -/obj/item/organ/torso/on_organ_remove(var/mob/living/advanced/old_owner) +/obj/item/organ/torso/on_organ_remove(mob/living/advanced/old_owner) . = ..() if(!old_owner.qdeleting && !old_owner.changing) if(old_owner.client) diff --git a/code/_core/obj/item/paper/_paper.dm b/code/_core/obj/item/paper/_paper.dm index d790ba6b0b..15367224a1 100644 --- a/code/_core/obj/item/paper/_paper.dm +++ b/code/_core/obj/item/paper/_paper.dm @@ -18,7 +18,7 @@ weight = 0.01 -/obj/item/paper/click_self(var/mob/caller,location,control,params) +/obj/item/paper/click_self(mob/caller,location,control,params) if(!is_player(caller) || !caller.client) return ..() @@ -40,7 +40,7 @@ return TRUE -/obj/item/paper/on_unequip(var/obj/hud/inventory/old_inventory,var/silent=FALSE) +/obj/item/paper/on_unequip(obj/hud/inventory/old_inventory,silent=FALSE) if(old_inventory && is_player(old_inventory.owner) && old_inventory.owner.client) var/mob/living/advanced/player/P = old_inventory.owner diff --git a/code/_core/obj/item/paper/book/enchanting/_enchanting.dm b/code/_core/obj/item/paper/book/enchanting/_enchanting.dm index e5678c9ece..01d1418a18 100644 --- a/code/_core/obj/item/paper/book/enchanting/_enchanting.dm +++ b/code/_core/obj/item/paper/book/enchanting/_enchanting.dm @@ -15,7 +15,7 @@ rarity = RARITY_RARE -/obj/item/paper/book/enchanting/New(var/desired_loc) +/obj/item/paper/book/enchanting/New(desired_loc) data = list() diff --git a/code/_core/obj/item/paper/map.dm b/code/_core/obj/item/paper/map.dm index a7e29f4a25..18f84f1082 100644 --- a/code/_core/obj/item/paper/map.dm +++ b/code/_core/obj/item/paper/map.dm @@ -6,7 +6,7 @@ icon_state = "inventory" value = 100 -/obj/item/map/click_self(var/mob/caller) +/obj/item/map/click_self(mob/caller) var/obj/hud/button/map_background/M_control = locate() in caller.buttons diff --git a/code/_core/obj/item/pinpointer.dm b/code/_core/obj/item/pinpointer.dm index 79b97a217e..bf161f2bc5 100644 --- a/code/_core/obj/item/pinpointer.dm +++ b/code/_core/obj/item/pinpointer.dm @@ -21,14 +21,14 @@ rarity = RARITY_UNCOMMON -/obj/item/pinpointer/quick(var/mob/caller,var/atom/object,location,params) +/obj/item/pinpointer/quick(mob/caller,atom/object,location,params) return click_self(caller) /obj/item/pinpointer/Destroy() tracked_atom = null . = ..() -/obj/item/pinpointer/get_examine_list(var/mob/caller) +/obj/item/pinpointer/get_examine_list(mob/caller) . = ..() @@ -41,7 +41,7 @@ . += div("notice","It's off.") -/obj/item/pinpointer/proc/can_track(var/atom/A) +/obj/item/pinpointer/proc/can_track(atom/A) if(!A) return FALSE @@ -119,7 +119,7 @@ value = 30 -/obj/item/pinpointer/custom/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/pinpointer/custom/click_on_object(mob/caller as mob,atom/object,location,control,params) if(scan_mode && object) INTERACT_CHECK @@ -135,7 +135,7 @@ return ..() -/obj/item/pinpointer/custom/click_self(var/mob/caller,location,control,params) +/obj/item/pinpointer/custom/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(1) @@ -165,7 +165,7 @@ rarity = RARITY_RARE -/obj/item/pinpointer/crew/click_self(var/mob/caller,location,control,params) +/obj/item/pinpointer/crew/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(1) @@ -215,7 +215,7 @@ desc_extended = "Use this to track and locate objects. This is used to exclusively track corpses of NanoTrasen Crew." value = 100 -/obj/item/pinpointer/crew/death/can_track(var/atom/A) +/obj/item/pinpointer/crew/death/can_track(atom/A) var/mob/living/advanced/player/P = A if(!istype(P)) @@ -252,7 +252,7 @@ value = 10 -/obj/item/pinpointer/landmark/click_self(var/mob/caller,location,control,params) +/obj/item/pinpointer/landmark/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(1) @@ -305,7 +305,7 @@ value = 20 -/obj/item/pinpointer/objective/click_self(var/mob/caller,location,control,params) +/obj/item/pinpointer/objective/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(1) @@ -353,7 +353,7 @@ value = 100 -/obj/item/pinpointer/boss/click_self(var/mob/caller,location,control,params) +/obj/item/pinpointer/boss/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(1) @@ -400,7 +400,7 @@ contraband = TRUE unreliable = TRUE -/obj/item/pinpointer/deathmatch/click_self(var/mob/caller,location,control,params) +/obj/item/pinpointer/deathmatch/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(1) @@ -451,7 +451,7 @@ rarity = RARITY_MYTHICAL -/obj/item/pinpointer/mobs/click_self(var/mob/caller, var/mob/living/advanced/npc/a, var/mob/living/simple/a) +/obj/item/pinpointer/mobs/click_self(mob/caller, mob/living/advanced/npc/a, mob/living/simple/a) INTERACT_CHECK INTERACT_DELAY(1) diff --git a/code/_core/obj/item/plate.dm b/code/_core/obj/item/plate.dm index 9483e2e82e..a3b56c2576 100644 --- a/code/_core/obj/item/plate.dm +++ b/code/_core/obj/item/plate.dm @@ -22,27 +22,27 @@ var/broken = FALSE -/obj/item/plate/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/plate/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("broken") SAVECONTENTS -/obj/item/plate/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/plate/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("broken") LOADCONTENTS -/obj/item/plate/on_thrown(var/atom/owner,var/atom/hit_atom) +/obj/item/plate/on_thrown(atom/owner,atom/hit_atom) if(hit_atom) on_destruction() return ..() -/obj/item/plate/can_be_attacked(var/atom/attacker,var/atom/weapon,var/params,var/damagetype/damage_type) +/obj/item/plate/can_be_attacked(atom/attacker,atom/weapon,params,damagetype/damage_type) return !broken -/obj/item/plate/on_destruction(var/damage = TRUE) +/obj/item/plate/on_destruction(damage = TRUE) var/turf/T = get_turf(src) @@ -72,7 +72,7 @@ icon_state = "[icon_state]_broken" -/obj/item/plate/get_examine_list(var/mob/examiner) +/obj/item/plate/get_examine_list(mob/examiner) . = ..() . += div("notice","This object holds up to [max_load] items that are size [max_size] or lower.") @@ -84,17 +84,17 @@ if(I.size <= max_size) I.drop_item(src) -/obj/item/plate/Entered(var/atom/movable/enterer,var/atom/oldloc) +/obj/item/plate/Entered(atom/movable/enterer,atom/oldloc) . = ..() if(oldloc != src) vis_contents |= enterer -/obj/item/plate/Exited(var/atom/movable/exiter,var/atom/newloc) +/obj/item/plate/Exited(atom/movable/exiter,atom/newloc) . = ..() if(newloc != src) vis_contents -= exiter -/obj/item/plate/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/plate/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(caller.attack_flags & CONTROL_MOD_DISARM && !broken) INTERACT_CHECK diff --git a/code/_core/obj/item/portal_scroll.dm b/code/_core/obj/item/portal_scroll.dm index 5e549920b1..7097b0dd55 100644 --- a/code/_core/obj/item/portal_scroll.dm +++ b/code/_core/obj/item/portal_scroll.dm @@ -9,7 +9,7 @@ rarity = RARITY_RARE -/obj/item/portal_scroll/get_examine_list(var/mob/examiner) +/obj/item/portal_scroll/get_examine_list(mob/examiner) . = ..() if(is_living(examiner)) var/mob/living/L = examiner @@ -18,10 +18,10 @@ var/area/A = get_area(M) if(A) . += span("notice","Using this will teleport you to \the [A.name].") -/obj/item/portal_scroll/quick(var/mob/caller,var/atom/object,location,params) +/obj/item/portal_scroll/quick(mob/caller,atom/object,location,params) click_self(caller) -/obj/item/portal_scroll/click_self(var/mob/caller,location,control,params) +/obj/item/portal_scroll/click_self(mob/caller,location,control,params) if(!is_player(caller) || !caller.client) caller.to_chat(span("warning","You don't know how to use this...")) diff --git a/code/_core/obj/item/poster.dm b/code/_core/obj/item/poster.dm index 3d05d465fb..f14557336d 100644 --- a/code/_core/obj/item/poster.dm +++ b/code/_core/obj/item/poster.dm @@ -11,11 +11,11 @@ if(!stored_poster) stored_poster = pick(SSposter.all_posters) -/obj/item/poster/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/poster/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEPATH("stored_poster") -/obj/item/poster/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/poster/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADPATH("stored_poster") @@ -31,7 +31,7 @@ desc = P.desc desc_extended = P.desc_extended -/obj/item/poster/get_examine_list(var/mob/examiner) +/obj/item/poster/get_examine_list(mob/examiner) . = ..() var/collectable_poster/P = SSposter.all_posters[stored_poster] . += "
[ICON_TO_HTML(P.icon,P.icon_state,32,32)]
" diff --git a/code/_core/obj/item/powercell/_powercell.dm b/code/_core/obj/item/powercell/_powercell.dm index 88cc9700d1..3cf1523b0a 100644 --- a/code/_core/obj/item/powercell/_powercell.dm +++ b/code/_core/obj/item/powercell/_powercell.dm @@ -15,7 +15,7 @@ weight = 2 has_quick_function = TRUE //allows batteries in the belt slots -/obj/item/powercell/quick(var/mob/caller,var/atom/object,location,params) +/obj/item/powercell/quick(mob/caller,atom/object,location,params) if(!is_advanced(caller) || !is_inventory(src.loc)) return FALSE @@ -35,11 +35,11 @@ . = ..() . += CEILING(charge_current*0.001,1) -/obj/item/powercell/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/powercell/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("charge_current") -/obj/item/powercell/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/powercell/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("charge_current") @@ -149,7 +149,7 @@ value_burgerbux = 1 //Citizens aren't supposed to have recharging power cells. -/obj/item/powercell/recharging/on_equip(var/atom/old_location,var/slient=FALSE) +/obj/item/powercell/recharging/on_equip(atom/old_location,slient=FALSE) . = ..() var/obj/hud/inventory/new_location = loc if(new_location.click_flags && new_location.owner) @@ -169,7 +169,7 @@ charge_current = min(charge_current + charge_max*0.001,charge_max) return ..() -/obj/item/powercell/get_examine_list(var/mob/caller) +/obj/item/powercell/get_examine_list(mob/caller) return ..() + div("notice","It has [charge_current] out of [charge_max] charge remaining.") diff --git a/code/_core/obj/item/powergem.dm b/code/_core/obj/item/powergem.dm index 1a046bc42a..e84a00da20 100644 --- a/code/_core/obj/item/powergem.dm +++ b/code/_core/obj/item/powergem.dm @@ -14,14 +14,14 @@ value_burgerbux = 1 //Not in rotation, yet. -/obj/item/powergem/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/powergem/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("rarity") SAVEVAR("icon_state") SAVEVAR("damage_type_to_add") SAVEVAR("damage_to_add") -/obj/item/powergem/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/powergem/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("rarity") LOADVAR("icon_state") @@ -59,7 +59,7 @@ return ..() -/obj/item/powergem/get_examine_list(var/mob/examiner) +/obj/item/powergem/get_examine_list(mob/examiner) . = ..() diff --git a/code/_core/obj/item/radio.dm b/code/_core/obj/item/radio.dm index 88f789c1c4..eec5499a97 100644 --- a/code/_core/obj/item/radio.dm +++ b/code/_core/obj/item/radio.dm @@ -11,7 +11,7 @@ weight = 1 -/obj/item/radio/get_examine_list(var/mob/examiner) +/obj/item/radio/get_examine_list(mob/examiner) . = ..() . += span("notice","ALT+Click to start broadcasting nearby speech.
Use the mouse wheel to change frequencies.
Use in hands to toggle the signal reciever.") @@ -26,22 +26,22 @@ FINALIZE(stored_radio) return ..() -/obj/item/radio/click_self(var/mob/caller,location,control,params) +/obj/item/radio/click_self(mob/caller,location,control,params) return stored_radio.click_self(caller,location,control,params) -/obj/item/radio/clicked_on_by_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/radio/clicked_on_by_object(mob/caller as mob,atom/object,location,control,params) return stored_radio.clicked_on_by_object(caller,object,location,control,params) -/obj/item/radio/mouse_wheel_on_object(var/mob/caller,delta_x,delta_y,location,control,params) +/obj/item/radio/mouse_wheel_on_object(mob/caller,delta_x,delta_y,location,control,params) return stored_radio.mouse_wheel_on_object(caller,delta_x,delta_y,location,control,params) -/obj/item/radio/trigger(var/mob/caller,var/atom/source,var/signal_freq,var/signal_code) +/obj/item/radio/trigger(mob/caller,atom/source,signal_freq,signal_code) return stored_radio.trigger(caller,source,signal_freq,signal_code) -/obj/item/radio/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/radio/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEATOM("stored_radio") -/obj/item/radio/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/radio/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADATOM("stored_radio") diff --git a/code/_core/obj/item/seed/_seed.dm b/code/_core/obj/item/seed/_seed.dm index 23de82cc82..09bd1fa72b 100644 --- a/code/_core/obj/item/seed/_seed.dm +++ b/code/_core/obj/item/seed/_seed.dm @@ -48,7 +48,7 @@ . += max(0,200-growth_produce_max)*0.25 . = CEILING(.,1) -/obj/item/seed/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/seed/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("icon_state") @@ -67,7 +67,7 @@ SAVEVAR("delete_after_harvest") -/obj/item/seed/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/seed/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("icon_state") @@ -86,7 +86,7 @@ LOADVAR("delete_after_harvest") -/obj/item/seed/click_on_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/seed/click_on_object(mob/caller,atom/object,location,control,params) if(is_turf(object)) INTERACT_CHECK diff --git a/code/_core/obj/item/slime_bomb.dm b/code/_core/obj/item/slime_bomb.dm index dd44ad1d15..305d8ff7aa 100644 --- a/code/_core/obj/item/slime_bomb.dm +++ b/code/_core/obj/item/slime_bomb.dm @@ -16,7 +16,7 @@ value = 100 -/obj/item/slime_bomb/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/slime_bomb/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(!lit) var/damagetype/DT = SSdamagetype.all_damage_types[object.get_damage_type(caller,src)] if(DT.attack_damage_base[HEAT] || DT.attack_damage_base[LASER]) @@ -24,7 +24,7 @@ return TRUE . = ..() -/obj/item/slime_bomb/proc/light(var/stage=9) +/obj/item/slime_bomb/proc/light(stage=9) stage-- lit = TRUE diff --git a/code/_core/obj/item/slime_core/_slime_core.dm b/code/_core/obj/item/slime_core/_slime_core.dm index d2eea856d2..2e3058d582 100644 --- a/code/_core/obj/item/slime_core/_slime_core.dm +++ b/code/_core/obj/item/slime_core/_slime_core.dm @@ -12,11 +12,11 @@ rarity = RARITY_UNCOMMON -/obj/item/slime_core/New(var/desired_loc) +/obj/item/slime_core/New(desired_loc) generate_name() return ..() -/obj/item/slime_core/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/slime_core/click_on_object(mob/caller as mob,atom/object,location,control,params) if(is_item(object)) INTERACT_CHECK @@ -54,7 +54,7 @@ rarity = RARITY_RARE -/obj/item/slime_core/custom/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/slime_core/custom/click_on_object(mob/caller as mob,atom/object,location,control,params) if(is_item(object)) var/mob/E = caller @@ -78,7 +78,7 @@ . = ..() -/obj/item/slime_core/custom/click_self(var/mob/caller,location,control,params) +/obj/item/slime_core/custom/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(10) var/choice = input("What would you like the color to be?", null, color) as color|null diff --git a/code/_core/obj/item/soapstone.dm b/code/_core/obj/item/soapstone.dm index ce47c2a387..94c17b80cc 100644 --- a/code/_core/obj/item/soapstone.dm +++ b/code/_core/obj/item/soapstone.dm @@ -48,7 +48,7 @@ I3.appearance_flags = src.appearance_flags add_overlay(I3) -/obj/item/soapstone/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/soapstone/click_on_object(mob/caller as mob,atom/object,location,control,params) INTERACT_CHECK INTERACT_CHECK_OBJECT diff --git a/code/_core/obj/item/soulgems/_soulgem.dm b/code/_core/obj/item/soulgems/_soulgem.dm index 07e044eee7..554016099a 100644 --- a/code/_core/obj/item/soulgems/_soulgem.dm +++ b/code/_core/obj/item/soulgems/_soulgem.dm @@ -17,11 +17,11 @@ -/obj/item/soulgem/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/soulgem/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("total_charge") -/obj/item/soulgem/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/soulgem/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("total_charge") @@ -46,7 +46,7 @@ . += (total_charge/16)**1.5 . = CEILING(.,1) -/obj/item/soulgem/get_examine_list(var/mob/caller) +/obj/item/soulgem/get_examine_list(mob/caller) return ..() + span("notice","It has [total_charge] total charge.") /obj/item/soulgem/update_sprite() @@ -97,7 +97,7 @@ -/obj/item/soulgem/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/soulgem/click_on_object(mob/caller as mob,atom/object,location,control,params) if(istype(object,/obj/effect/temp/soul)) if(total_charge != 0) diff --git a/code/_core/obj/item/spellcrafting/_spellpaper.dm b/code/_core/obj/item/spellcrafting/_spellpaper.dm index 511c1d7ae2..e21889c1fb 100644 --- a/code/_core/obj/item/spellcrafting/_spellpaper.dm +++ b/code/_core/obj/item/spellcrafting/_spellpaper.dm @@ -13,7 +13,7 @@ var/stored_modifier var/stored_modifier_color -/obj/item/spellpaper/New(var/desired_loc) +/obj/item/spellpaper/New(desired_loc) if(!stored_buff_color) stored_buff_color = random_color() diff --git a/code/_core/obj/item/spellswap/_spellswap.dm b/code/_core/obj/item/spellswap/_spellswap.dm index aa7de7c9e1..b8dc2b8c24 100644 --- a/code/_core/obj/item/spellswap/_spellswap.dm +++ b/code/_core/obj/item/spellswap/_spellswap.dm @@ -15,7 +15,7 @@ rarity = RARITY_RARE -/obj/item/spellswap/click_on_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/spellswap/click_on_object(mob/caller,atom/object,location,control,params) if(is_weapon(object)) diff --git a/code/_core/obj/item/spraycan.dm b/code/_core/obj/item/spraycan.dm index 849dc99cd6..336bd2226a 100644 --- a/code/_core/obj/item/spraycan.dm +++ b/code/_core/obj/item/spraycan.dm @@ -19,7 +19,7 @@ rarity = RARITY_RARE -/obj/item/spraycan/get_examine_list(var/mob/examiner) +/obj/item/spraycan/get_examine_list(mob/examiner) . = ..() if(cap_on == TRUE) . += span("notice","Use to select a decal to spray.
Click with an empty hand to take off the cap.") @@ -35,7 +35,7 @@ . = ..() update_sprite() -/obj/item/spraycan/click_self(var/mob/caller,location,control,params) +/obj/item/spraycan/click_self(mob/caller,location,control,params) if(!caller || !caller.client) return TRUE @@ -56,7 +56,7 @@ return TRUE -/obj/item/spraycan/proc/on_upload_spray(var/client/caller,var/icon/desired_icon) +/obj/item/spraycan/proc/on_upload_spray(client/caller,icon/desired_icon) if(!caller || !caller.mob || get_dist(caller.mob,src) > 1) return FALSE @@ -71,7 +71,7 @@ return TRUE -/obj/item/spraycan/click_on_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/spraycan/click_on_object(mob/caller,atom/object,location,control,params) if(object.plane >= PLANE_HUD) return ..() @@ -99,7 +99,7 @@ . = ..() -/obj/item/spraycan/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/spraycan/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(is_inventory(object)) INTERACT_CHECK @@ -110,7 +110,7 @@ . = ..() -/obj/item/spraycan/proc/toggle_cap(var/mob/caller) +/obj/item/spraycan/proc/toggle_cap(mob/caller) cap_on = !cap_on update_sprite() caller.to_chat(span("notice","You [cap_on ? "add" : "remove"] \the [src.name]'s cap.")) diff --git a/code/_core/obj/item/stacks.dm b/code/_core/obj/item/stacks.dm index bd76d77963..fc658f3424 100644 --- a/code/_core/obj/item/stacks.dm +++ b/code/_core/obj/item/stacks.dm @@ -1,4 +1,4 @@ -/obj/item/proc/can_transfer_stacks_to(var/obj/item/target) //General all-purpose code. +/obj/item/proc/can_transfer_stacks_to(obj/item/target) //General all-purpose code. if(target == src) return FALSE @@ -14,7 +14,7 @@ return TRUE -/obj/item/proc/transfer_amount_to(var/obj/item/target,var/amount_to_transfer = amount) +/obj/item/proc/transfer_amount_to(obj/item/target,amount_to_transfer = amount) if(!amount_to_transfer) return 0 if(amount_to_transfer < 0) return target.transfer_amount_to(src,-amount_to_transfer) @@ -36,7 +36,7 @@ //Credit goes to Unknown Person -/proc/copy(var/atom/A) +/proc/copy(atom/A) var/static/list/denyvar = make_associative( list( @@ -80,7 +80,7 @@ return N -/obj/item/click_on_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/click_on_object(mob/caller,atom/object,location,control,params) if(try_transfer_reagents(caller,object,location,control,params)) return TRUE @@ -114,7 +114,7 @@ return ..() -/obj/item/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(object == src || amount <= 1 || !is_inventory(object) || !is_inventory(src.loc) || get_dist(src,object) > 1) return ..() diff --git a/code/_core/obj/item/storage/bags/_bags.dm b/code/_core/obj/item/storage/bags/_bags.dm index 0ba8c60a49..b4f272b078 100644 --- a/code/_core/obj/item/storage/bags/_bags.dm +++ b/code/_core/obj/item/storage/bags/_bags.dm @@ -26,7 +26,7 @@ desc_extended = "A special bag that converts all plant matter into seeds when inserted into the bag." icon_state = "botany_processor" -/obj/item/storage/bags/botany/processor/click_self(var/mob/caller,location,control,params) +/obj/item/storage/bags/botany/processor/click_self(mob/caller,location,control,params) if(caller.attack_flags & CONTROL_MOD_DISARM) INTERACT_CHECK @@ -36,7 +36,7 @@ return ..() -/obj/item/storage/bags/botany/processor/proc/process_plants(var/mob/caller) +/obj/item/storage/bags/botany/processor/proc/process_plants(mob/caller) var/process_count = 0 diff --git a/code/_core/obj/item/storage/bags/bag_of_hoarding.dm b/code/_core/obj/item/storage/bags/bag_of_hoarding.dm index 76772cbc5a..37d027ce47 100644 --- a/code/_core/obj/item/storage/bags/bag_of_hoarding.dm +++ b/code/_core/obj/item/storage/bags/bag_of_hoarding.dm @@ -29,13 +29,13 @@ if(goods && hoard > 0) . += goods.get_value()*hoard -/obj/item/storage/bagofhoarding/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/storage/bagofhoarding/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("hoard") SAVEPATH("targetitem") SAVEATOM("goods") -/obj/item/storage/bagofhoarding/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/storage/bagofhoarding/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("hoard") LOADPATH("targetitem") @@ -46,14 +46,14 @@ hoard = 0 -/obj/item/storage/bagofhoarding/get_examine_details_list(var/mob/examiner) +/obj/item/storage/bagofhoarding/get_examine_details_list(mob/examiner) . = ..() if(goods && hoard > 0) . += span("notice","It currently holds [hoard] [initial(goods.name)]\s.") else . += span("notice","It does not currently hold anything.") -/obj/item/storage/bagofhoarding/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/storage/bagofhoarding/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(hoard) if(istype(object,/obj/hud/inventory)) diff --git a/code/_core/obj/item/storage/bags/pillbottle.dm b/code/_core/obj/item/storage/bags/pillbottle.dm index 7f5ce004fa..0e9844a352 100644 --- a/code/_core/obj/item/storage/bags/pillbottle.dm +++ b/code/_core/obj/item/storage/bags/pillbottle.dm @@ -24,13 +24,13 @@ value = 20 -/obj/item/storage/pillbottle/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/storage/pillbottle/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("color_lid") SAVEVAR("color_label") SAVEVAR("color_canister") -/obj/item/storage/pillbottle/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/storage/pillbottle/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("color_lid") LOADVAR("color_label") diff --git a/code/_core/obj/item/storage/cigarettes.dm b/code/_core/obj/item/storage/cigarettes.dm index 581589c75d..5194f0900a 100644 --- a/code/_core/obj/item/storage/cigarettes.dm +++ b/code/_core/obj/item/storage/cigarettes.dm @@ -23,7 +23,7 @@ value = 5 -/obj/item/storage/cigarettes/click_self(var/mob/caller,location,control,params) +/obj/item/storage/cigarettes/click_self(mob/caller,location,control,params) if(open && caller.attack_flags & CONTROL_MOD_DISARM) open = FALSE diff --git a/code/_core/obj/item/storage/death_box.dm b/code/_core/obj/item/storage/death_box.dm index 36ea355b89..28ac0d2540 100644 --- a/code/_core/obj/item/storage/death_box.dm +++ b/code/_core/obj/item/storage/death_box.dm @@ -26,7 +26,7 @@ value_burgerbux = 1 -/obj/item/storage/death_box/get_examine_list(var/mob/examiner) +/obj/item/storage/death_box/get_examine_list(mob/examiner) . = ..() . += div("danger","Death boxes cannot be stored in banks.") . += div("danger","Anyone can open a death box, even if they don't own it.") @@ -35,7 +35,7 @@ . = ..() prune_inventory() -/obj/item/storage/death_box/get_examine_list(var/mob/examiner) +/obj/item/storage/death_box/get_examine_list(mob/examiner) . = ..() if(owning_mob_name) . += div("notice","This box belongs to [owning_mob_name].") diff --git a/code/_core/obj/item/storage/heavy/_heavy.dm b/code/_core/obj/item/storage/heavy/_heavy.dm index 1a10a238d5..e9e4dc58bd 100644 --- a/code/_core/obj/item/storage/heavy/_heavy.dm +++ b/code/_core/obj/item/storage/heavy/_heavy.dm @@ -10,6 +10,6 @@ anchored = TRUE -/obj/item/storage/heavy/clicked_on_by_object(var/mob/caller as mob,var/atom/object,location,control,params) //The src was clicked on by the object +/obj/item/storage/heavy/clicked_on_by_object(mob/caller as mob,atom/object,location,control,params) //The src was clicked on by the object click_self(caller,location,control,params) return TRUE \ No newline at end of file diff --git a/code/_core/obj/item/storage/heavy/trash_pile.dm b/code/_core/obj/item/storage/heavy/trash_pile.dm index 17025fbe9a..43f36262c4 100644 --- a/code/_core/obj/item/storage/heavy/trash_pile.dm +++ b/code/_core/obj/item/storage/heavy/trash_pile.dm @@ -17,7 +17,7 @@ . = ..() prune_inventory() -/obj/item/storage/heavy/trash_pile/New(var/desired_loc) +/obj/item/storage/heavy/trash_pile/New(desired_loc) . = ..() @@ -45,7 +45,7 @@ if(filled_slots <= 0) qdel(src) -/obj/item/storage/heavy/trash_pile/click_self(var/mob/caller) +/obj/item/storage/heavy/trash_pile/click_self(mob/caller) . = ..() diff --git a/code/_core/obj/item/storage/kits/_kits.dm b/code/_core/obj/item/storage/kits/_kits.dm index b9a1ecdbfc..0e800e1e75 100644 --- a/code/_core/obj/item/storage/kits/_kits.dm +++ b/code/_core/obj/item/storage/kits/_kits.dm @@ -13,11 +13,11 @@ value = 10 -/obj/item/storage/kit/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/storage/kit/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("icon_state") -/obj/item/storage/kit/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/storage/kit/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("icon_state") diff --git a/code/_core/obj/item/storage/pouch.dm b/code/_core/obj/item/storage/pouch.dm index d710642770..2f2673b556 100644 --- a/code/_core/obj/item/storage/pouch.dm +++ b/code/_core/obj/item/storage/pouch.dm @@ -19,7 +19,7 @@ container_priority = -20 -/obj/item/storage/pouch/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/storage/pouch/click_on_object(mob/caller as mob,atom/object,location,control,params) if(caller == object && is_advanced(caller)) INTERACT_CHECK @@ -30,7 +30,7 @@ return ..() -/obj/item/storage/pouch/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/storage/pouch/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(is_inventory(object)) //Roughly pockets only. var/obj/hud/inventory/I = object diff --git a/code/_core/obj/item/storage/spelltome.dm b/code/_core/obj/item/storage/spelltome.dm index 7adc30803b..f8878b68f6 100644 --- a/code/_core/obj/item/storage/spelltome.dm +++ b/code/_core/obj/item/storage/spelltome.dm @@ -13,7 +13,7 @@ dynamic_inventory_count = 8 -/obj/item/storage/spelltome/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/storage/spelltome/click_on_object(mob/caller as mob,atom/object,location,control,params) if(!isturf(object)) return ..() @@ -32,7 +32,7 @@ return TRUE -/obj/item/storage/spelltome/proc/make_spell(var/mob/caller,var/list/inventory_contents,var/turf/chosen_turf) +/obj/item/storage/spelltome/proc/make_spell(mob/caller,list/inventory_contents,turf/chosen_turf) var/list/buff_list = list() var/list/buff_color_list = list() diff --git a/code/_core/obj/item/stripping.dm b/code/_core/obj/item/stripping.dm index 0ef7d9a87c..1f61ed741a 100644 --- a/code/_core/obj/item/stripping.dm +++ b/code/_core/obj/item/stripping.dm @@ -1,11 +1,11 @@ -/obj/item/proc/try_strip(var/mob/caller) +/obj/item/proc/try_strip(mob/caller) if(!can_strip(caller,TRUE)) return FALSE PROGRESS_BAR(caller,src,5,src::strip(),caller) PROGRESS_BAR_CONDITIONS(caller,src,src::can_strip(),caller,TRUE) return TRUE -/obj/item/proc/strip(var/mob/caller) +/obj/item/proc/strip(mob/caller) var/atom/old_loc = src.loc @@ -24,7 +24,7 @@ return TRUE -/obj/item/proc/can_strip(var/mob/caller,var/messages=FALSE) +/obj/item/proc/can_strip(mob/caller,messages=FALSE) INTERACT_CHECK_NO_DELAY(src) diff --git a/code/_core/obj/item/supply_crate.dm b/code/_core/obj/item/supply_crate.dm index 84d7e69a74..c7d06ea76f 100644 --- a/code/_core/obj/item/supply_crate.dm +++ b/code/_core/obj/item/supply_crate.dm @@ -22,7 +22,7 @@ rarity = RARITY_RARE -/obj/item/supply_crate/get_examine_list(var/mob/examiner) +/obj/item/supply_crate/get_examine_list(mob/examiner) . = ..() . += span("notice","Attack or throw to open.") @@ -35,7 +35,7 @@ var/loot/L = LOOT(loot) return CEILING(L.average_value * 1.5,100) -/obj/item/supply_crate/on_thrown(var/atom/owner,var/atom/hit_atom) +/obj/item/supply_crate/on_thrown(atom/owner,atom/hit_atom) . = ..() if(hit_atom) on_destruction() @@ -46,10 +46,10 @@ pixel_y = rand(-2,2) -/obj/item/supply_crate/can_be_attacked(var/atom/attacker,var/atom/weapon,var/params,var/damagetype/damage_type) +/obj/item/supply_crate/can_be_attacked(atom/attacker,atom/weapon,params,damagetype/damage_type) return TRUE -/obj/item/supply_crate/on_destruction(var/damage = TRUE) +/obj/item/supply_crate/on_destruction(damage = TRUE) var/turf/T = get_turf(src) play_sound('sound/effects/crate_break.ogg',T,range_max=VIEW_RANGE) diff --git a/code/_core/obj/item/supportgem.dm b/code/_core/obj/item/supportgem.dm index 4c707974db..c9e36b7391 100644 --- a/code/_core/obj/item/supportgem.dm +++ b/code/_core/obj/item/supportgem.dm @@ -63,12 +63,12 @@ update_support_stats() update_sprite() -/obj/item/supportgem/adjust_quality(var/quality_to_add=0) +/obj/item/supportgem/adjust_quality(quality_to_add=0) . = ..() if(.) update_support_stats() -/obj/item/supportgem/get_examine_list(var/mob/examiner) +/obj/item/supportgem/get_examine_list(mob/examiner) . = ..() . += div("notice",support_desc) . += div("notice","Bolded values above indicate that value scales with quality.") diff --git a/code/_core/obj/item/tape.dm b/code/_core/obj/item/tape.dm index cf3e82327f..09869ee56f 100644 --- a/code/_core/obj/item/tape.dm +++ b/code/_core/obj/item/tape.dm @@ -16,17 +16,17 @@ rarity = RARITY_RARE -/obj/item/cassette_player/get_examine_list(var/mob/examiner) +/obj/item/cassette_player/get_examine_list(mob/examiner) . = ..() if(stored_tape) . += div("notice","It currently holding [stored_tape.name] inside.") . += div("notice","It is currently [playing ? "playing" : "not playing"].") -/obj/item/cassette_player/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/cassette_player/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEATOM("stored_tape") -/obj/item/cassette_player/load_item_data_post(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/cassette_player/load_item_data_post(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADATOM("stored_tape") @@ -65,7 +65,7 @@ update_sprite() -/obj/item/cassette_player/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/cassette_player/clicked_on_by_object(mob/caller,atom/object,location,control,params) INTERACT_CHECK INTERACT_DELAY(5) @@ -96,7 +96,7 @@ . = ..() -/obj/item/cassette_player/click_self(var/mob/caller,var/atom/object) +/obj/item/cassette_player/click_self(mob/caller,atom/object) INTERACT_CHECK INTERACT_DELAY(20) @@ -124,7 +124,7 @@ return TRUE -/obj/item/cassette_player/post_move(var/atom/old_loc) +/obj/item/cassette_player/post_move(atom/old_loc) . = ..() check_valid() @@ -154,10 +154,10 @@ stored_track = pick(SStrack.all_tracks) icon_state = "tape_blue" -/obj/item/cassette_tape/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/cassette_tape/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEPATH("stored_track") -/obj/item/cassette_tape/load_item_data_post(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/cassette_tape/load_item_data_post(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADPATH("stored_track") diff --git a/code/_core/obj/item/tempering/_tempering.dm b/code/_core/obj/item/tempering/_tempering.dm index 2aff7d9bf5..79bac896f9 100644 --- a/code/_core/obj/item/tempering/_tempering.dm +++ b/code/_core/obj/item/tempering/_tempering.dm @@ -15,15 +15,15 @@ rarity = RARITY_UNCOMMON -/obj/item/tempering/save_item_data(var/mob/living/advanced/player/P, var/save_inventory=TRUE, var/died=FALSE,var/loadout=FALSE) +/obj/item/tempering/save_item_data(mob/living/advanced/player/P, save_inventory=TRUE, died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("uses_left") -/obj/item/tempering/load_item_data_post(var/mob/living/advanced/player/P, var/list/object_data,var/loadout=FALSE) +/obj/item/tempering/load_item_data_post(mob/living/advanced/player/P, list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("uses_left") -/obj/item/tempering/get_examine_list(var/mob/examiner) +/obj/item/tempering/get_examine_list(mob/examiner) . = ..() . += span("notice","Use ALT+Click to bypass confirmation prompts and to use on objects that hold inventory.") if(uses_left == -1) @@ -33,7 +33,7 @@ else . += span("notice","There are [uses_left] uses left.") -/obj/item/tempering/click_on_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/tempering/click_on_object(mob/caller,atom/object,location,control,params) if(is_item(object)) INTERACT_CHECK @@ -53,7 +53,7 @@ . = ..() -/obj/item/tempering/proc/can_temper(var/mob/caller,var/obj/item/I) +/obj/item/tempering/proc/can_temper(mob/caller,obj/item/I) //Check if there are uses. if(uses_left != -1 && uses_left <= 0) @@ -82,7 +82,7 @@ return TRUE -/obj/item/tempering/proc/on_temper(var/mob/caller,var/obj/item/I) +/obj/item/tempering/proc/on_temper(mob/caller,obj/item/I) caller.visible_message( span("notice","\The [caller.name] improves \the [I.name] with \the [src.name]."), diff --git a/code/_core/obj/item/tempering/tempering_luck.dm b/code/_core/obj/item/tempering/tempering_luck.dm index 14e86e250d..4c145d7aea 100644 --- a/code/_core/obj/item/tempering/tempering_luck.dm +++ b/code/_core/obj/item/tempering/tempering_luck.dm @@ -14,11 +14,11 @@ uses_left = 4 -/obj/item/tempering/luck/get_examine_list(var/mob/examiner) +/obj/item/tempering/luck/get_examine_list(mob/examiner) . = ..() . += span("notice","Increases the luck of items by [increase]%, up to [maximum]%, with a minimum of [minimum]%.") -/obj/item/tempering/luck/can_temper(var/mob/caller,var/obj/item/I) +/obj/item/tempering/luck/can_temper(mob/caller,obj/item/I) if(I.luck >= maximum) caller.to_chat(span("warning","\The [I.name] cannot be improved any further!")) @@ -26,7 +26,7 @@ . = ..() -/obj/item/tempering/luck/on_temper(var/mob/caller,var/obj/item/I) +/obj/item/tempering/luck/on_temper(mob/caller,obj/item/I) I.luck = clamp(I.luck + increase,minimum,maximum) . = ..() diff --git a/code/_core/obj/item/tempering/tempering_magazine.dm b/code/_core/obj/item/tempering/tempering_magazine.dm index 6e64f68808..cac53757df 100644 --- a/code/_core/obj/item/tempering/tempering_magazine.dm +++ b/code/_core/obj/item/tempering/tempering_magazine.dm @@ -19,7 +19,7 @@ value_burgerbux = 1 -/obj/item/tempering/magazine/bluespace/can_temper(var/mob/caller,var/obj/item/magazine/I) +/obj/item/tempering/magazine/bluespace/can_temper(mob/caller,obj/item/magazine/I) if(!istype(I,/obj/item/magazine)) return FALSE @@ -30,7 +30,7 @@ return ..() -/obj/item/tempering/magazine/bluespace/on_temper(var/mob/caller,var/obj/item/magazine/I) +/obj/item/tempering/magazine/bluespace/on_temper(mob/caller,obj/item/magazine/I) I.bluespaced = TRUE I.bullet_count_max *= 5 return ..() @@ -47,7 +47,7 @@ value_burgerbux = 1 -/obj/item/tempering/magazine/refiller/can_temper(var/mob/caller,var/obj/item/magazine/I) +/obj/item/tempering/magazine/refiller/can_temper(mob/caller,obj/item/magazine/I) if(!istype(I,/obj/item/magazine)) return FALSE @@ -57,7 +57,7 @@ return ..() -/obj/item/tempering/magazine/refiller/on_temper(var/mob/caller,var/obj/item/magazine/I) +/obj/item/tempering/magazine/refiller/on_temper(mob/caller,obj/item/magazine/I) I.regenerate = TRUE return ..() @@ -76,13 +76,13 @@ var/new_damage_type = /damagetype var/new_sound = list('sound/weapons/magic/chaos.ogg') -/obj/item/tempering/magazine/spellswap/can_temper(var/mob/caller,var/obj/item/magazine/I) +/obj/item/tempering/magazine/spellswap/can_temper(mob/caller,obj/item/magazine/I) if(!istype(I,/obj/item/magazine)) return FALSE return ..() -/obj/item/tempering/magazine/spellswap/on_temper(var/mob/caller,var/obj/item/magazine/I) +/obj/item/tempering/magazine/spellswap/on_temper(mob/caller,obj/item/magazine/I) if(length(I.stored_bullets)) //TODO: get this working so you have to use magic to level magic? //var/D = new_damage_type diff --git a/code/_core/obj/item/tempering/tempering_quality.dm b/code/_core/obj/item/tempering/tempering_quality.dm index 2ea3e18146..cd90d20d2f 100644 --- a/code/_core/obj/item/tempering/tempering_quality.dm +++ b/code/_core/obj/item/tempering/tempering_quality.dm @@ -5,7 +5,7 @@ has_quick_function = TRUE var/item_type_name = "items" -/obj/item/tempering/quality/quick(var/mob/caller,var/atom/object,location,params) +/obj/item/tempering/quality/quick(mob/caller,atom/object,location,params) if(!is_advanced(caller) || !is_inventory(src.loc)) return FALSE @@ -14,7 +14,7 @@ return A.put_in_hands(src,params) -/obj/item/tempering/quality/can_temper(var/mob/caller,var/obj/item/I) +/obj/item/tempering/quality/can_temper(mob/caller,obj/item/I) if(I.quality <= -1) caller.to_chat(span("warning","\The [I.name] cannot be improved!")) @@ -26,11 +26,11 @@ return ..() -/obj/item/tempering/quality/get_examine_list(var/mob/examiner) +/obj/item/tempering/quality/get_examine_list(mob/examiner) . = ..() . += span("notice","Increases the quality of [item_type_name] by [increase]%, up to [maximum]%, with a minimum of [minimum]%.") -/obj/item/tempering/quality/on_temper(var/mob/caller,var/obj/item/I) +/obj/item/tempering/quality/on_temper(mob/caller,obj/item/I) I.quality = clamp(I.quality + increase,minimum,maximum) . = ..() diff --git a/code/_core/obj/item/trigger/_device.dm b/code/_core/obj/item/trigger/_device.dm index a0f4bdc321..20e8f5fa8d 100644 --- a/code/_core/obj/item/trigger/_device.dm +++ b/code/_core/obj/item/trigger/_device.dm @@ -22,7 +22,7 @@ /obj/item/device/proc/on_inactive() return TRUE -/mob/living/advanced/player/proc/set_device_active(var/obj/item/device/D) +/mob/living/advanced/player/proc/set_device_active(obj/item/device/D) if(D == active_device) return FALSE diff --git a/code/_core/obj/item/trigger/fuse.dm b/code/_core/obj/item/trigger/fuse.dm index 310afb91d9..b9047172d9 100644 --- a/code/_core/obj/item/trigger/fuse.dm +++ b/code/_core/obj/item/trigger/fuse.dm @@ -18,21 +18,21 @@ last_caller = null return ..() -/obj/item/device/fuse/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/device/fuse/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("time_set") -/obj/item/device/fuse/load_item_data_post(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/device/fuse/load_item_data_post(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("time_set") -/obj/item/device/fuse/click_self(var/mob/caller,location,control,params) +/obj/item/device/fuse/click_self(mob/caller,location,control,params) INTERACT_CHECK SPAM_CHECK(5) trigger(caller,src,-1,-1) return TRUE -/obj/item/device/fuse/trigger(var/mob/caller,var/atom/source,var/signal_freq,var/signal_code) +/obj/item/device/fuse/trigger(mob/caller,atom/source,signal_freq,signal_code) last_caller = caller START_THINKING(src) active = TRUE diff --git a/code/_core/obj/item/trigger/keypad.dm b/code/_core/obj/item/trigger/keypad.dm index b246c5315e..18b0873d80 100644 --- a/code/_core/obj/item/trigger/keypad.dm +++ b/code/_core/obj/item/trigger/keypad.dm @@ -15,22 +15,22 @@ /obj/hud/button/keypad/close ) -/obj/item/device/keypad/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/device/keypad/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("code") -/obj/item/device/keypad/load_item_data_post(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/device/keypad/load_item_data_post(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("code") -/obj/item/device/keypad/trigger(var/mob/caller,var/atom/source,var/signal_freq,var/signal_code) +/obj/item/device/keypad/trigger(mob/caller,atom/source,signal_freq,signal_code) if(loc && signal_freq == -1 && signal_code == code) loc.trigger(caller,src,-1,-1) return TRUE -/obj/item/device/keypad/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/device/keypad/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(!is_player(caller) || !caller.client) return ..() @@ -44,19 +44,19 @@ return TRUE -/obj/item/device/keypad/on_active(var/mob/living/advanced/player/P) +/obj/item/device/keypad/on_active(mob/living/advanced/player/P) show_buttons_to(P) return ..() -/obj/item/device/keypad/on_inactive(var/mob/living/advanced/player/P) +/obj/item/device/keypad/on_inactive(mob/living/advanced/player/P) hide_buttons_from(P) return ..() -/obj/item/device/keypad/proc/show_buttons_to(var/mob/living/advanced/A) +/obj/item/device/keypad/proc/show_buttons_to(mob/living/advanced/A) for(var/v in keypad_buttons) var/obj/hud/button/keypad/K = new v K.update_owner(A) -/obj/item/device/keypad/proc/hide_buttons_from(var/mob/living/advanced/A) +/obj/item/device/keypad/proc/hide_buttons_from(mob/living/advanced/A) for(var/obj/hud/button/keypad/K in A.buttons) K.update_owner(null) \ No newline at end of file diff --git a/code/_core/obj/item/trigger/proximity.dm b/code/_core/obj/item/trigger/proximity.dm index 17ffa88279..5ad8b6e9b7 100644 --- a/code/_core/obj/item/trigger/proximity.dm +++ b/code/_core/obj/item/trigger/proximity.dm @@ -20,23 +20,23 @@ last_caller = null return ..() -/obj/item/device/proximity/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/device/proximity/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("time_set") SAVEVAR("range_set") -/obj/item/device/proximity/load_item_data_post(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/device/proximity/load_item_data_post(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("time_set") LOADVAR("range_set") -/obj/item/device/proximity/click_self(var/mob/caller,location,control,params) +/obj/item/device/proximity/click_self(mob/caller,location,control,params) INTERACT_CHECK SPAM_CHECK(5) trigger(caller,src,-1,-1) return TRUE -/obj/item/device/proximity/trigger(var/mob/caller,var/atom/source,var/signal_freq,var/signal_code) +/obj/item/device/proximity/trigger(mob/caller,atom/source,signal_freq,signal_code) last_caller = caller START_THINKING(src) active = TRUE @@ -67,7 +67,7 @@ return active -/obj/item/device/proximity/mouse_wheel_on_object(var/mob/caller,delta_x,delta_y,location,control,params) +/obj/item/device/proximity/mouse_wheel_on_object(mob/caller,delta_x,delta_y,location,control,params) var/fixed_delta = clamp(delta_y,-1,1) @@ -93,7 +93,7 @@ return TRUE -/obj/item/device/proximity/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/device/proximity/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(istype(object,/obj/item/weapon/melee/tool/multitool)) INTERACT_CHECK @@ -110,7 +110,7 @@ return ..() -/obj/item/device/proximity/get_examine_list(var/mob/examiner) +/obj/item/device/proximity/get_examine_list(mob/examiner) . = ..() . += div("notice","The timer is set at [time_set] deciseconds.") . += div("notice","The range is set at [range_set] tiles.") \ No newline at end of file diff --git a/code/_core/obj/item/trigger/radio.dm b/code/_core/obj/item/trigger/radio.dm index c985a5196d..3f17b31810 100644 --- a/code/_core/obj/item/trigger/radio.dm +++ b/code/_core/obj/item/trigger/radio.dm @@ -25,7 +25,7 @@ value = 20 -/obj/item/device/radio/get_examine_list(var/mob/examiner) +/obj/item/device/radio/get_examine_list(mob/examiner) . = ..() . += span("notice","ALT+Click to start broadcasting nearby speech.
Use the mouse wheel to change frequencies.
Use in hands to toggle the signal reciever.") @@ -35,17 +35,17 @@ "[frequency]" = TRUE ) -/obj/item/device/radio/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/device/radio/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("frequency") SAVELIST("listening_frequencies") -/obj/item/device/radio/load_item_data_post(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/device/radio/load_item_data_post(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("frequency") LOADLIST("listening_frequencies") -/obj/item/device/radio/click_self(var/mob/caller,location,control,params) +/obj/item/device/radio/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(1) @@ -100,7 +100,7 @@ caller.to_chat(span("notice","You toggle the signal reciever [receiving ? "on" : "off"].")) return TRUE -/obj/item/device/radio/mouse_wheel_on_object(var/mob/caller,delta_x,delta_y,location,control,params) +/obj/item/device/radio/mouse_wheel_on_object(mob/caller,delta_x,delta_y,location,control,params) INTERACT_CHECK @@ -150,7 +150,7 @@ list( ) */ -/obj/item/device/radio/trigger(var/mob/caller,var/atom/source,var/signal_freq,var/signal_code) +/obj/item/device/radio/trigger(mob/caller,atom/source,signal_freq,signal_code) if(signal_freq == -1) //Sent for(var/k in SSradio.all_radios) @@ -163,7 +163,7 @@ list( loc.trigger(caller,src,signal_freq,signal_code) return TRUE -/obj/item/device/radio/on_listen(var/atom/speaker,var/datum/source,var/text,var/raw_text,var/language_text,var/talk_type,var/frequency, var/language = LANGUAGE_BASIC,var/talk_range=TALK_RANGE) +/obj/item/device/radio/on_listen(atom/speaker,datum/source,text,raw_text,language_text,talk_type,frequency, language = LANGUAGE_BASIC,talk_range=TALK_RANGE) if(talk_type == TEXT_RADIO) //Don't listen to other radio signals. This prevents spam. return FALSE if(listen_range > 0 && get_dist(source,src) > listen_range) diff --git a/code/_core/obj/item/trigger/signaller.dm b/code/_core/obj/item/trigger/signaller.dm index 41762f625e..08d920a77c 100644 --- a/code/_core/obj/item/trigger/signaller.dm +++ b/code/_core/obj/item/trigger/signaller.dm @@ -20,12 +20,12 @@ value = 20 -/obj/item/device/signaller/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/device/signaller/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("frequency_current") SAVEVAR("signal_current") -/obj/item/device/signaller/load_item_data_post(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/device/signaller/load_item_data_post(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("frequency_current") LOADVAR("signal_current") @@ -34,7 +34,7 @@ frequency_current = RADIO_FREQ_DOOR signal_current = 1 -/obj/item/device/signaller/New(var/desired_loc) +/obj/item/device/signaller/New(desired_loc) SSradio.all_signalers += src return ..() @@ -42,11 +42,11 @@ SSradio.all_signalers -= src return ..() -/obj/item/device/signaller/attack(var/atom/attacker,var/atom/victim,var/list/params=list(),var/atom/blamed,var/ignore_distance = FALSE, var/precise = FALSE,var/damage_multiplier=1,var/damagetype/damage_type_override) //The src attacks the victim, with the blamed taking responsibility +/obj/item/device/signaller/attack(atom/attacker,atom/victim,list/params=list(),atom/blamed,ignore_distance = FALSE, precise = FALSE,damage_multiplier=1,damagetype/damage_type_override) //The src attacks the victim, with the blamed taking responsibility trigger(attacker,src,-1,-1) return TRUE -/obj/item/device/signaller/trigger(var/mob/caller,var/atom/source,var/signal_freq,var/signal_code) +/obj/item/device/signaller/trigger(mob/caller,atom/source,signal_freq,signal_code) if(signal_freq == -1 && signal_code == -1) for(var/k in SSradio.all_signalers) @@ -62,7 +62,7 @@ return TRUE -/obj/item/device/signaller/click_self(var/mob/caller,location,control,params) +/obj/item/device/signaller/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(1) mode = !mode @@ -70,7 +70,7 @@ spam_fix_time = 0 return TRUE -/obj/item/device/signaller/mouse_wheel_on_object(var/mob/caller,delta_x,delta_y,location,control,params) +/obj/item/device/signaller/mouse_wheel_on_object(mob/caller,delta_x,delta_y,location,control,params) var/fixed_delta = clamp(delta_y,-1,1) diff --git a/code/_core/obj/item/trigger/timer.dm b/code/_core/obj/item/trigger/timer.dm index 201197bca2..a3a46aa872 100644 --- a/code/_core/obj/item/trigger/timer.dm +++ b/code/_core/obj/item/trigger/timer.dm @@ -18,21 +18,21 @@ last_caller = null return ..() -/obj/item/device/timer/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/device/timer/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("time_set") -/obj/item/device/timer/load_item_data_post(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/device/timer/load_item_data_post(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("time_set") -/obj/item/device/timer/click_self(var/mob/caller,location,control,params) +/obj/item/device/timer/click_self(mob/caller,location,control,params) INTERACT_CHECK SPAM_CHECK(5) trigger(caller,src,-1,-1) return TRUE -/obj/item/device/timer/trigger(var/mob/caller,var/atom/source,var/signal_freq,var/signal_code) +/obj/item/device/timer/trigger(mob/caller,atom/source,signal_freq,signal_code) last_caller = caller START_THINKING(src) active = TRUE @@ -62,7 +62,7 @@ return FALSE -/obj/item/device/timer/mouse_wheel_on_object(var/mob/caller,delta_x,delta_y,location,control,params) +/obj/item/device/timer/mouse_wheel_on_object(mob/caller,delta_x,delta_y,location,control,params) var/fixed_delta = clamp(delta_y,-1,1) diff --git a/code/_core/obj/item/weapon/_weapon.dm b/code/_core/obj/item/weapon/_weapon.dm index df59087471..80f0309d19 100644 --- a/code/_core/obj/item/weapon/_weapon.dm +++ b/code/_core/obj/item/weapon/_weapon.dm @@ -56,7 +56,7 @@ value = get_base_value() return TRUE -/obj/item/weapon/get_examine_list(var/mob/examiner) +/obj/item/weapon/get_examine_list(mob/examiner) . = ..() if(upgrade_count >= 1) if(upgrade_count >= 2) @@ -64,13 +64,13 @@ else . += div("rarity legendary","★") -/obj/item/weapon/get_examine_details_list(var/mob/examiner) +/obj/item/weapon/get_examine_details_list(mob/examiner) . = ..() if(enchantment) . += div("notice","It is enchanted with [enchantment.name] \Roman[enchantment.strength]") . += div("notice","The enchantment has [enchantment.charge] charge left ([FLOOR(enchantment.charge/enchantment.cost,1)] uses).") -/obj/item/weapon/quick(var/mob/caller,var/atom/object,location,params) +/obj/item/weapon/quick(mob/caller,atom/object,location,params) if(!is_advanced(caller) || !is_inventory(src.loc)) return FALSE @@ -92,7 +92,7 @@ . = CEILING(.,1) -/obj/item/weapon/can_feed(var/mob/caller,var/atom/target) +/obj/item/weapon/can_feed(mob/caller,atom/target) return FALSE /obj/item/weapon/PostInitialize() @@ -124,7 +124,7 @@ return ..() -/obj/item/weapon/on_unequip(var/obj/hud/inventory/old_inventory,var/silent=FALSE) +/obj/item/weapon/on_unequip(obj/hud/inventory/old_inventory,silent=FALSE) wielded = FALSE if(old_inventory.child_inventory) old_inventory.child_inventory.parent_inventory = null @@ -159,7 +159,7 @@ . = ..() -/obj/item/weapon/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/weapon/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE if(length(polymorphs)) .["polymorphs"] = polymorphs if(upgrade_count >= 1) .["upgrade_count"] = upgrade_count @@ -173,7 +173,7 @@ if(stored_spellswap) SAVEATOM("stored_spellswap") -/obj/item/weapon/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/weapon/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE if(object_data["polymorphs"]) polymorphs = object_data["polymorphs"] if(object_data["upgrade_count"]) upgrade_count = object_data["upgrade_count"] diff --git a/code/_core/obj/item/weapon/get_damage.dm b/code/_core/obj/item/weapon/get_damage.dm index e5a2f55304..d2bb64305d 100644 --- a/code/_core/obj/item/weapon/get_damage.dm +++ b/code/_core/obj/item/weapon/get_damage.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/proc/get_damage_per_hit(var/armor_to_use=0) +/obj/item/weapon/proc/get_damage_per_hit(armor_to_use=0) if(!damage_type) log_error("Warning: [src.type] did not have a valid damage_type.") @@ -11,7 +11,7 @@ return D.get_damage_per_hit(armor_to_use,200) -/obj/item/weapon/melee/energy/get_damage_per_hit(var/armor_to_use=0) +/obj/item/weapon/melee/energy/get_damage_per_hit(armor_to_use=0) if(!damage_type_on) log_error("Warning: [src.type] did not have a valid damage_type_on.") @@ -24,7 +24,7 @@ return D.get_damage_per_hit(armor_to_use,200) -/obj/item/weapon/ranged/get_damage_per_hit(var/armor_to_use=0) +/obj/item/weapon/ranged/get_damage_per_hit(armor_to_use=0) var/damagetype/damage_type_to_use = get_ranged_damage_type() @@ -38,7 +38,7 @@ return D.get_damage_per_hit(armor_to_use,200) * bullet_count * damage_mod -/obj/item/weapon/ranged/bullet/get_damage_per_hit(var/armor_to_use=0) +/obj/item/weapon/ranged/bullet/get_damage_per_hit(armor_to_use=0) if(!SSbalance.weapon_to_bullet[src.type]) log_error("Warning: [src.type] did not have a valid weapon_to_bullet.") diff --git a/code/_core/obj/item/weapon/get_dps.dm b/code/_core/obj/item/weapon/get_dps.dm index 235882424a..476add304e 100644 --- a/code/_core/obj/item/weapon/get_dps.dm +++ b/code/_core/obj/item/weapon/get_dps.dm @@ -1,2 +1,2 @@ -/obj/item/weapon/proc/get_dps(var/damage_per_hit=0) +/obj/item/weapon/proc/get_dps(damage_per_hit=0) return get_hits_per_second() * damage_per_hit \ No newline at end of file diff --git a/code/_core/obj/item/weapon/get_misc.dm b/code/_core/obj/item/weapon/get_misc.dm index 9d799c4e1d..a47d56e291 100644 --- a/code/_core/obj/item/weapon/get_misc.dm +++ b/code/_core/obj/item/weapon/get_misc.dm @@ -16,10 +16,10 @@ return initial(BC.projectile_count) -/obj/item/weapon/proc/get_stopping_power(var/armor_to_use=0) +/obj/item/weapon/proc/get_stopping_power(armor_to_use=0) return get_damage_per_hit(armor_to_use)/200 -/obj/item/weapon/proc/get_shots_to_kill(var/armor_to_use=0) +/obj/item/weapon/proc/get_shots_to_kill(armor_to_use=0) var/damage_per_hit = get_damage_per_hit(armor_to_use) if(damage_per_hit <= 1) return INFINITY @@ -27,7 +27,7 @@ . = CEILING(.,1) return -/obj/item/weapon/proc/get_kill_time(var/armor_to_use=0) //In seconds. +/obj/item/weapon/proc/get_kill_time(armor_to_use=0) //In seconds. var/hits_per_second = get_hits_per_second() @@ -40,7 +40,7 @@ /obj/item/weapon/proc/get_accuracy() return 1 -/obj/item/weapon/ranged/get_accuracy(var/armor_to_use=0) //lower is more accurate. +/obj/item/weapon/ranged/get_accuracy(armor_to_use=0) //lower is more accurate. return get_static_spread() + heat_max*(1-max(1,get_stopping_power(armor_to_use))) diff --git a/code/_core/obj/item/weapon/get_value.dm b/code/_core/obj/item/weapon/get_value.dm index 45ebdb5f63..c310dcbb83 100644 --- a/code/_core/obj/item/weapon/get_value.dm +++ b/code/_core/obj/item/weapon/get_value.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/proc/get_recommended_value(var/debug=FALSE) +/obj/item/weapon/proc/get_recommended_value(debug=FALSE) var/reliability = min(1,0.25 + get_reliability()) diff --git a/code/_core/obj/item/weapon/melee/crystal.dm b/code/_core/obj/item/weapon/melee/crystal.dm index fcf397fe32..ea90a66585 100644 --- a/code/_core/obj/item/weapon/melee/crystal.dm +++ b/code/_core/obj/item/weapon/melee/crystal.dm @@ -19,15 +19,15 @@ . = ..() update_sprite() -/obj/item/weapon/melee/crystal/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/weapon/melee/crystal/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("shape") -/obj/item/weapon/melee/crystal/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/weapon/melee/crystal/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("shape") -/obj/item/weapon/melee/crystal/click_self(var/mob/caller as mob,var/atom/object,location,control,params) //The src is used on the object +/obj/item/weapon/melee/crystal/click_self(mob/caller as mob,atom/object,location,control,params) //The src is used on the object INTERACT_CHECK INTERACT_DELAY(1) diff --git a/code/_core/obj/item/weapon/melee/energy/_energy.dm b/code/_core/obj/item/weapon/melee/energy/_energy.dm index 64f1fec6a4..95a7d4c26d 100644 --- a/code/_core/obj/item/weapon/melee/energy/_energy.dm +++ b/code/_core/obj/item/weapon/melee/energy/_energy.dm @@ -12,11 +12,11 @@ /obj/item/weapon/melee/energy/can_parry() return enabled -/obj/item/weapon/melee/energy/get_examine_details_list(var/mob/examiner) +/obj/item/weapon/melee/energy/get_examine_details_list(mob/examiner) . = ..() if(enabled) . += span("notice","It is active.") -/obj/item/weapon/melee/energy/click_self(var/mob/caller,location,control,params) +/obj/item/weapon/melee/energy/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(3) enabled = !enabled @@ -55,7 +55,7 @@ return ..() -/obj/item/weapon/melee/energy/clicked_on_by_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/weapon/melee/energy/clicked_on_by_object(mob/caller as mob,atom/object,location,control,params) diff --git a/code/_core/obj/item/weapon/melee/energy/chainsaw.dm b/code/_core/obj/item/weapon/melee/energy/chainsaw.dm index 409f602cd3..1a387cf50e 100644 --- a/code/_core/obj/item/weapon/melee/energy/chainsaw.dm +++ b/code/_core/obj/item/weapon/melee/energy/chainsaw.dm @@ -38,7 +38,7 @@ return ..() -/obj/item/weapon/melee/energy/chainsaw/proc/can_start(var/mob/caller) +/obj/item/weapon/melee/energy/chainsaw/proc/can_start(mob/caller) INTERACT_CHECK_NO_DELAY(src) @@ -54,7 +54,7 @@ return TRUE -/obj/item/weapon/melee/energy/chainsaw/proc/start(var/mob/caller) +/obj/item/weapon/melee/energy/chainsaw/proc/start(mob/caller) enabled = TRUE START_THINKING(src) damage_type = damage_type_on @@ -62,7 +62,7 @@ update_sprite() return TRUE -/obj/item/weapon/melee/energy/chainsaw/proc/stop(var/mob/caller) +/obj/item/weapon/melee/energy/chainsaw/proc/stop(mob/caller) enabled = FALSE STOP_THINKING(src) damage_type = initial(damage_type) @@ -70,7 +70,7 @@ update_sprite() return TRUE -/obj/item/weapon/melee/energy/chainsaw/proc/pull_chain(var/mob/caller) +/obj/item/weapon/melee/energy/chainsaw/proc/pull_chain(mob/caller) if(prob(25)) start(caller) @@ -79,7 +79,7 @@ return TRUE -/obj/item/weapon/melee/energy/chainsaw/proc/try_start(var/mob/caller) +/obj/item/weapon/melee/energy/chainsaw/proc/try_start(mob/caller) if(caller.is_busy()) caller.to_chat(span("warning","You're already busy with a task!")) return FALSE @@ -90,7 +90,7 @@ return TRUE -/obj/item/weapon/melee/energy/chainsaw/click_self(var/mob/caller,location,control,params) +/obj/item/weapon/melee/energy/chainsaw/click_self(mob/caller,location,control,params) if(is_living(caller)) var/mob/living/L = caller @@ -111,7 +111,7 @@ return TRUE -/obj/item/weapon/melee/energy/chainsaw/should_cleave(var/atom/attacker,var/atom/victim,var/list/params) +/obj/item/weapon/melee/energy/chainsaw/should_cleave(atom/attacker,atom/victim,list/params) if(enabled && wielded) return TRUE diff --git a/code/_core/obj/item/weapon/melee/energy/energy_wrench.dm b/code/_core/obj/item/weapon/melee/energy/energy_wrench.dm index b7781c8d42..d49fa8bfd0 100644 --- a/code/_core/obj/item/weapon/melee/energy/energy_wrench.dm +++ b/code/_core/obj/item/weapon/melee/energy/energy_wrench.dm @@ -14,7 +14,7 @@ rarity = RARITY_RARE -/obj/item/weapon/melee/energy/energy_wrench/click_self(var/mob/caller,location,control,params) +/obj/item/weapon/melee/energy/energy_wrench/click_self(mob/caller,location,control,params) . = ..() @@ -25,7 +25,7 @@ else play_sound('sound/weapons/melee/esword/energy_off.ogg',get_turf(src),range_max=VIEW_RANGE) // cant use both the sounds and the wrench flag code -//obj/item/weapon/melee/energy/energy_wrench/click_self(var/mob/caller,location,control,params) +//obj/item/weapon/melee/energy/energy_wrench/click_self(mob/caller,location,control,params) // // INTERACT_CHECK // INTERACT_DELAY(1) diff --git a/code/_core/obj/item/weapon/melee/energy/handsword.dm b/code/_core/obj/item/weapon/melee/energy/handsword.dm index 80a42edaa0..745529603e 100644 --- a/code/_core/obj/item/weapon/melee/energy/handsword.dm +++ b/code/_core/obj/item/weapon/melee/energy/handsword.dm @@ -14,7 +14,7 @@ rarity = RARITY_RARE -/obj/item/weapon/melee/energy/handsword/click_self(var/mob/caller,location,control,params) +/obj/item/weapon/melee/energy/handsword/click_self(mob/caller,location,control,params) . = ..() diff --git a/code/_core/obj/item/weapon/melee/energy/katana.dm b/code/_core/obj/item/weapon/melee/energy/katana.dm index 805879a54e..eca41578e5 100644 --- a/code/_core/obj/item/weapon/melee/energy/katana.dm +++ b/code/_core/obj/item/weapon/melee/energy/katana.dm @@ -32,7 +32,7 @@ rarity = RARITY_UNCOMMON -/obj/item/weapon/melee/energy/sword/katana/merc/click_self(var/mob/caller,location,control,params) +/obj/item/weapon/melee/energy/sword/katana/merc/click_self(mob/caller,location,control,params) return TRUE /obj/item/weapon/melee/energy/sword/katana/merc/Initialize() diff --git a/code/_core/obj/item/weapon/melee/energy/plightbringer.dm b/code/_core/obj/item/weapon/melee/energy/plightbringer.dm index 99f4a0e689..9a5c70763f 100644 --- a/code/_core/obj/item/weapon/melee/energy/plightbringer.dm +++ b/code/_core/obj/item/weapon/melee/energy/plightbringer.dm @@ -15,7 +15,7 @@ rarity = RARITY_MYTHICAL -/obj/item/weapon/melee/energy/plightbringer/click_self(var/mob/caller,location,control,params) +/obj/item/weapon/melee/energy/plightbringer/click_self(mob/caller,location,control,params) . = ..() diff --git a/code/_core/obj/item/weapon/melee/energy/stunbaton.dm b/code/_core/obj/item/weapon/melee/energy/stunbaton.dm index 581d0c0e40..d8ff93dd0b 100644 --- a/code/_core/obj/item/weapon/melee/energy/stunbaton.dm +++ b/code/_core/obj/item/weapon/melee/energy/stunbaton.dm @@ -12,7 +12,7 @@ rarity = RARITY_COMMON -/obj/item/weapon/melee/energy/stunbaton/click_self(var/mob/caller,location,control,params) +/obj/item/weapon/melee/energy/stunbaton/click_self(mob/caller,location,control,params) . = ..() diff --git a/code/_core/obj/item/weapon/melee/energy/sword.dm b/code/_core/obj/item/weapon/melee/energy/sword.dm index 9365808ea6..a0118374d8 100644 --- a/code/_core/obj/item/weapon/melee/energy/sword.dm +++ b/code/_core/obj/item/weapon/melee/energy/sword.dm @@ -20,7 +20,7 @@ rarity = RARITY_RARE -/obj/item/weapon/melee/energy/sword/click_self(var/mob/caller,location,control,params) +/obj/item/weapon/melee/energy/sword/click_self(mob/caller,location,control,params) . = ..() diff --git a/code/_core/obj/item/weapon/melee/hierophant_staff.dm b/code/_core/obj/item/weapon/melee/hierophant_staff.dm index 13506bb38d..2f11e4345e 100644 --- a/code/_core/obj/item/weapon/melee/hierophant_staff.dm +++ b/code/_core/obj/item/weapon/melee/hierophant_staff.dm @@ -22,7 +22,7 @@ rarity = RARITY_MYTHICAL -/obj/item/weapon/melee/hierophant_staff/click_on_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/weapon/melee/hierophant_staff/click_on_object(mob/caller,atom/object,location,control,params) if(object.plane >= PLANE_HUD) return ..() diff --git a/code/_core/obj/item/weapon/melee/ling_blade.dm b/code/_core/obj/item/weapon/melee/ling_blade.dm index c696d71f94..3f9998ae48 100644 --- a/code/_core/obj/item/weapon/melee/ling_blade.dm +++ b/code/_core/obj/item/weapon/melee/ling_blade.dm @@ -20,7 +20,7 @@ rarity = RARITY_MYTHICAL -/obj/item/weapon/melee/sword/armblade/click_self(var/mob/caller,location,control,params) +/obj/item/weapon/melee/sword/armblade/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(1) diff --git a/code/_core/obj/item/weapon/melee/mezzaluna.dm b/code/_core/obj/item/weapon/melee/mezzaluna.dm index 391c0bec80..7500f54620 100644 --- a/code/_core/obj/item/weapon/melee/mezzaluna.dm +++ b/code/_core/obj/item/weapon/melee/mezzaluna.dm @@ -18,7 +18,7 @@ rarity = RARITY_RARE -/obj/item/weapon/melee/mezzaluna/should_cleave(var/atom/attacker,var/atom/victim,var/list/params) +/obj/item/weapon/melee/mezzaluna/should_cleave(atom/attacker,atom/victim,list/params) if(wielded) return TRUE diff --git a/code/_core/obj/item/weapon/melee/sacred_flame.dm b/code/_core/obj/item/weapon/melee/sacred_flame.dm index f7fe40b685..99fc6d81d4 100644 --- a/code/_core/obj/item/weapon/melee/sacred_flame.dm +++ b/code/_core/obj/item/weapon/melee/sacred_flame.dm @@ -19,7 +19,7 @@ var/leveled_effect = 0 -/obj/item/weapon/melee/sacred_flame/click_self(var/mob/caller) +/obj/item/weapon/melee/sacred_flame/click_self(mob/caller) INTERACT_CHECK INTERACT_DELAY(1) diff --git a/code/_core/obj/item/weapon/melee/shields.dm b/code/_core/obj/item/weapon/melee/shields.dm index c3e8964ba7..c50189e459 100644 --- a/code/_core/obj/item/weapon/melee/shields.dm +++ b/code/_core/obj/item/weapon/melee/shields.dm @@ -42,7 +42,7 @@ . = CEILING(.,1) -/obj/item/weapon/melee/shield/get_examine_list(var/mob/examiner) +/obj/item/weapon/melee/shield/get_examine_list(mob/examiner) . = ..() for(var/k in block_defense) var/v = block_defense[k] diff --git a/code/_core/obj/item/weapon/melee/slaughterclaws.dm b/code/_core/obj/item/weapon/melee/slaughterclaws.dm index b1a1f814e4..6ffc2e1763 100644 --- a/code/_core/obj/item/weapon/melee/slaughterclaws.dm +++ b/code/_core/obj/item/weapon/melee/slaughterclaws.dm @@ -16,7 +16,7 @@ rarity = RARITY_RARE -/obj/item/weapon/melee/slaughterclaws/click_on_object(var/mob/caller,var/atom/object,location,control,params) //All blood costs are made with a level 50 VIT char in mind. +/obj/item/weapon/melee/slaughterclaws/click_on_object(mob/caller,atom/object,location,control,params) //All blood costs are made with a level 50 VIT char in mind. var/mob/living/L = caller if(!istype(L)) diff --git a/code/_core/obj/item/weapon/melee/staff_of_healing.dm b/code/_core/obj/item/weapon/melee/staff_of_healing.dm index 44853eb18d..84e62f14f0 100644 --- a/code/_core/obj/item/weapon/melee/staff_of_healing.dm +++ b/code/_core/obj/item/weapon/melee/staff_of_healing.dm @@ -20,7 +20,7 @@ rarity = RARITY_LEGENDARY -/obj/item/weapon/melee/staff_of_healing/click_self(var/mob/caller,location,control,params) +/obj/item/weapon/melee/staff_of_healing/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(1) diff --git a/code/_core/obj/item/weapon/melee/swords.dm b/code/_core/obj/item/weapon/melee/swords.dm index 3dc250b692..be826522bf 100644 --- a/code/_core/obj/item/weapon/melee/swords.dm +++ b/code/_core/obj/item/weapon/melee/swords.dm @@ -128,7 +128,7 @@ rarity = RARITY_RARE -/obj/item/weapon/melee/sword/zweihander/should_cleave(var/atom/attacker,var/atom/victim,var/list/params) +/obj/item/weapon/melee/sword/zweihander/should_cleave(atom/attacker,atom/victim,list/params) if(wielded) return TRUE diff --git a/code/_core/obj/item/weapon/melee/tool/_tool.dm b/code/_core/obj/item/weapon/melee/tool/_tool.dm index 6e83ae43ae..046dc46ff0 100644 --- a/code/_core/obj/item/weapon/melee/tool/_tool.dm +++ b/code/_core/obj/item/weapon/melee/tool/_tool.dm @@ -3,7 +3,7 @@ drop_sound = 'sound/items/drop/scrap.ogg' has_quick_function = TRUE -/obj/item/weapon/melee/tool/quick(var/mob/caller,var/atom/object,location,params) +/obj/item/weapon/melee/tool/quick(mob/caller,atom/object,location,params) if(object) object.clicked_on_by_object(caller,src,location,null,params) //It's important it's called this way as not to call attack() if it fails. return TRUE @@ -77,11 +77,11 @@ var/active = FALSE -/obj/item/weapon/melee/tool/welder/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/weapon/melee/tool/welder/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("fuel_current") -/obj/item/weapon/melee/tool/welder/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/weapon/melee/tool/welder/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("fuel_current") @@ -106,7 +106,7 @@ return FALSE -/obj/item/weapon/melee/tool/welder/proc/add_fuel(var/fuel_amount = 0) +/obj/item/weapon/melee/tool/welder/proc/add_fuel(fuel_amount = 0) if(!fuel_amount) return 0 @@ -117,7 +117,7 @@ -/obj/item/weapon/melee/tool/welder/click_self(var/mob/caller,location,control,params) +/obj/item/weapon/melee/tool/welder/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(1) diff --git a/code/_core/obj/item/weapon/melee/tool/brass.dm b/code/_core/obj/item/weapon/melee/tool/brass.dm index 8218a4d6d1..525f9ea897 100644 --- a/code/_core/obj/item/weapon/melee/tool/brass.dm +++ b/code/_core/obj/item/weapon/melee/tool/brass.dm @@ -51,11 +51,11 @@ obj/item/weapon/melee/tool/brass/welder var/active = FALSE -/obj/item/weapon/melee/tool/brass/welder/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/weapon/melee/tool/brass/welder/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("fuel_current") -/obj/item/weapon/melee/tool/brass/welder/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/weapon/melee/tool/brass/welder/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("fuel_current") @@ -80,7 +80,7 @@ obj/item/weapon/melee/tool/brass/welder return FALSE -/obj/item/weapon/melee/tool/brass/welder/proc/add_fuel(var/fuel_amount = 0) +/obj/item/weapon/melee/tool/brass/welder/proc/add_fuel(fuel_amount = 0) if(!fuel_amount) return 0 @@ -91,7 +91,7 @@ obj/item/weapon/melee/tool/brass/welder -/obj/item/weapon/melee/tool/brass/welder/click_self(var/mob/caller,location,control,params) +/obj/item/weapon/melee/tool/brass/welder/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(1) diff --git a/code/_core/obj/item/weapon/melee/tool/emf.dm b/code/_core/obj/item/weapon/melee/tool/emf.dm index dd7032ddfb..a7e1c39a1e 100644 --- a/code/_core/obj/item/weapon/melee/tool/emf.dm +++ b/code/_core/obj/item/weapon/melee/tool/emf.dm @@ -12,7 +12,7 @@ weight = 1 -/obj/item/emf/proc/set_emf_level(var/desired_level) +/obj/item/emf/proc/set_emf_level(desired_level) if(desired_level == emf_level) return FALSE @@ -72,7 +72,7 @@ return TRUE -/obj/item/emf/New(var/desired_loc) +/obj/item/emf/New(desired_loc) . = ..() SSghost.all_emf_trackers += src return @@ -81,7 +81,7 @@ SSghost.all_emf_trackers -= src return ..() -/obj/item/emf/click_self(var/mob/caller,location,control,params) +/obj/item/emf/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(10) diff --git a/code/_core/obj/item/weapon/melee/tool/rcd.dm b/code/_core/obj/item/weapon/melee/tool/rcd.dm index e2f0c4ac8e..fe71bd5b8c 100644 --- a/code/_core/obj/item/weapon/melee/tool/rcd.dm +++ b/code/_core/obj/item/weapon/melee/tool/rcd.dm @@ -19,12 +19,12 @@ QDEL_NULL(rcd_disk) . = ..() -/obj/item/rcd/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/rcd/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEATOM("rcd_disk") SAVEVAR("matter_current") -/obj/item/rcd/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/rcd/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADATOM("rcd_disk") LOADVAR("matter_current") @@ -38,12 +38,12 @@ matter_current = matter_max return ..() -/obj/item/rcd/proc/add_matter(var/matter_amount) +/obj/item/rcd/proc/add_matter(matter_amount) matter_current = min(matter_current + matter_amount,matter_max) update_sprite() return matter_current -/obj/item/rcd/proc/spend_matter(var/matter_to_spend) +/obj/item/rcd/proc/spend_matter(matter_to_spend) if(matter_to_spend > matter_current) return FALSE matter_current -= matter_to_spend @@ -60,7 +60,7 @@ add_overlay(I) -/obj/item/rcd/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/rcd/click_on_object(mob/caller as mob,atom/object,location,control,params) if(object.plane >= PLANE_HUD) return ..() @@ -113,7 +113,7 @@ return ..() -/obj/item/rcd/proc/insert_disk(var/mob/caller,var/obj/item/disk/desired_disk,var/silent=FALSE) +/obj/item/rcd/proc/insert_disk(mob/caller,obj/item/disk/desired_disk,silent=FALSE) if(rcd_disk) if(caller && !silent) caller.to_chat(span("warning","There is already a [rcd_disk.name] installed in \the [src.name]!")) return null @@ -122,7 +122,7 @@ if(caller && !silent) caller.visible_message(span("notice","\The [caller.name] inserts a disk into \the [src.name]."),span("notice","You insert \the [rcd_disk.name] into \the [src.name] and download the data onto the RCD.")) return rcd_disk -/obj/item/rcd/proc/eject_disk(var/mob/caller,var/silent=FALSE) +/obj/item/rcd/proc/eject_disk(mob/caller,silent=FALSE) if(!rcd_disk) caller.to_chat(span("warning","There is no disk to eject from \the [src.name]!")) return null @@ -131,7 +131,7 @@ . = rcd_disk rcd_disk = null -/obj/item/rcd/clicked_on_by_object(var/mob/caller as mob,var/atom/object,location,control,params) //The src was clicked on by the object +/obj/item/rcd/clicked_on_by_object(mob/caller as mob,atom/object,location,control,params) //The src was clicked on by the object if(is_inventory(object) && rcd_disk) INTERACT_CHECK diff --git a/code/_core/obj/item/weapon/melee/torch.dm b/code/_core/obj/item/weapon/melee/torch.dm index 767e2eb3fd..02cbedee13 100644 --- a/code/_core/obj/item/weapon/melee/torch.dm +++ b/code/_core/obj/item/weapon/melee/torch.dm @@ -27,7 +27,7 @@ . += (desired_light_range*desired_light_power*desired_light_angle*0.1) . = CEILING(.,1) -/obj/item/weapon/melee/torch/click_self(var/mob/caller,location,control,params) +/obj/item/weapon/melee/torch/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(1) @@ -104,7 +104,7 @@ size = SIZE_2 -/obj/item/weapon/melee/torch/flashlight/get_examine_list(var/mob/examiner) +/obj/item/weapon/melee/torch/flashlight/get_examine_list(mob/examiner) . = ..() . += span("notice","Flashlights shine light only in the direction you are facing.
You can adjust where your character is looking by holding V, or automatically by having harm intent selected.") diff --git a/code/_core/obj/item/weapon/ranged/_ranged.dm b/code/_core/obj/item/weapon/ranged/_ranged.dm index 9a4dcc3e9e..aebe7a36ac 100644 --- a/code/_core/obj/item/weapon/ranged/_ranged.dm +++ b/code/_core/obj/item/weapon/ranged/_ranged.dm @@ -90,7 +90,7 @@ -/obj/item/weapon/ranged/proc/change_firemode(var/mob/caller) +/obj/item/weapon/ranged/proc/change_firemode(mob/caller) if(length(firemodes) <= 1) return FALSE current_firemode++ @@ -99,7 +99,7 @@ on_firemode_changed(caller) return TRUE -/obj/item/weapon/ranged/proc/on_firemode_changed(var/mob/caller) +/obj/item/weapon/ranged/proc/on_firemode_changed(mob/caller) var/selected_firemode = firemodes[current_firemode] switch(selected_firemode) if("automatic") @@ -113,14 +113,14 @@ caller?.to_chat(span("notice","You switch to [selected_firemode] mode.")) return TRUE -/obj/item/weapon/ranged/get_examine_list(var/mob/examiner) +/obj/item/weapon/ranged/get_examine_list(mob/examiner) . = ..() if(length(firemodes) > 1) . += div("notice","You can change between [length(firemodes)] firemodes by alt-clicking while holding this weapon. ") -/obj/item/weapon/ranged/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/weapon/ranged/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEATOM("firing_pin") SAVEATOM("attachment_barrel") @@ -130,7 +130,7 @@ SAVEATOM("stock_mod") SAVEATOM("barrel_mod") -/obj/item/weapon/ranged/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/weapon/ranged/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADATOM("firing_pin") LOADATOM("attachment_barrel") @@ -173,7 +173,7 @@ /obj/item/weapon/ranged/proc/get_ranged_damage_type() return ranged_damage_type -/obj/item/weapon/ranged/clicked_on_by_object(var/mob/caller as mob,var/atom/object,location,control,params) //The src was clicked on by the object +/obj/item/weapon/ranged/clicked_on_by_object(mob/caller as mob,atom/object,location,control,params) //The src was clicked on by the object if(is_item(object)) var/obj/item/I = object @@ -220,10 +220,10 @@ /obj/item/weapon/ranged/proc/get_static_spread() return 0.1 -/obj/item/weapon/ranged/proc/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/proc/get_skill_spread(mob/living/L) return 0.01 - (0.02 * L.get_skill_power(SKILL_RANGED)) -/obj/item/weapon/ranged/proc/get_movement_spread(var/mob/living/L) +/obj/item/weapon/ranged/proc/get_movement_spread(mob/living/L) if(L.next_move <= 0) return 0 @@ -240,7 +240,7 @@ /obj/item/weapon/ranged/proc/get_ammo_count() //How much ammo is in the gun. return 1 //Unlimited -/obj/item/weapon/ranged/proc/can_owner_shoot(var/mob/caller,var/atom/object,location,params) +/obj/item/weapon/ranged/proc/can_owner_shoot(mob/caller,atom/object,location,params) if(!caller.can_attack(caller)) return FALSE @@ -252,7 +252,7 @@ return TRUE -/obj/item/weapon/ranged/proc/can_gun_shoot(var/mob/caller,var/atom/object,location,params,var/check_time=TRUE,var/messages=TRUE) +/obj/item/weapon/ranged/proc/can_gun_shoot(mob/caller,atom/object,location,params,check_time=TRUE,messages=TRUE) if(quality <= 0) caller.to_chat(span("warning","\The [src.name] is completely broken!")) @@ -291,7 +291,7 @@ return . && (heat_current > 0 || (recoil_delay > 0 && queued_recoil > 0)) -/obj/item/weapon/ranged/click_self(var/mob/caller,location,control,params) +/obj/item/weapon/ranged/click_self(mob/caller,location,control,params) if(caller.attack_flags & CONTROL_MOD_DISARM) change_firemode(caller) @@ -299,7 +299,7 @@ . = ..() -/obj/item/weapon/ranged/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/weapon/ranged/click_on_object(mob/caller as mob,atom/object,location,control,params) if(SSclient.queued_automatics[src]) //Already doing something. return TRUE @@ -354,7 +354,7 @@ obj/item/weapon/ranged/proc/play_shoot_sounds(var/mob/caller,var/list/shoot_soun return FALSE -/obj/item/weapon/ranged/proc/pre_shoot(var/mob/caller,var/atom/object,location,params,var/damage_multiplier=1) +/obj/item/weapon/ranged/proc/pre_shoot(mob/caller,atom/object,location,params,damage_multiplier=1) if(!object) return FALSE @@ -603,7 +603,7 @@ obj/item/weapon/ranged/proc/shoot(var/mob/caller,var/atom/object,location,params return TRUE -/obj/item/weapon/ranged/proc/handle_automatic(var/mob/caller,params,var/damage_multiplier=1,var/max_bursts_to_use=0,var/shoot_delay_to_use=1) +/obj/item/weapon/ranged/proc/handle_automatic(mob/caller,params,damage_multiplier=1,max_bursts_to_use=0,shoot_delay_to_use=1) var/mob/living/advanced/player/P = caller if(!P || !P.ckey || P.qdeleting) //Not even active. @@ -645,7 +645,7 @@ obj/item/weapon/ranged/proc/shoot(var/mob/caller,var/atom/object,location,params return TRUE -/atom/proc/shoot_projectile(var/atom/caller,var/atom/target,location,params,var/obj/projectile/projectile_to_use,var/damagetype/damage_type_to_use,var/icon_pos_x=0,var/icon_pos_y=0,var/accuracy_loss=0,var/projectile_speed_to_use=0,var/bullet_count_to_use=1,var/bullet_color="#FFFFFF",var/view_punch=0,var/damage_multiplier=1,var/desired_iff_tag,var/desired_loyalty_tag,var/desired_inaccuracy_modifier=1,var/base_spread = get_base_spread(),var/penetrations_left=0) +/atom/proc/shoot_projectile(atom/caller,atom/target,location,params,obj/projectile/projectile_to_use,damagetype/damage_type_to_use,icon_pos_x=0,icon_pos_y=0,accuracy_loss=0,projectile_speed_to_use=0,bullet_count_to_use=1,bullet_color="#FFFFFF",view_punch=0,damage_multiplier=1,desired_iff_tag,desired_loyalty_tag,desired_inaccuracy_modifier=1,base_spread = get_base_spread(),penetrations_left=0) if(!target) if(location) @@ -751,12 +751,12 @@ obj/item/weapon/ranged/proc/shoot(var/mob/caller,var/atom/object,location,params /atom/proc/get_base_spread() //Random spread for when it shoots more than one projectile. return 0 -/atom/proc/get_projectile_offset(var/initial_offset_x,var/initial_offset_y,var/bullet_num,var/bullet_num_max,var/accuracy) +/atom/proc/get_projectile_offset(initial_offset_x,initial_offset_y,bullet_num,bullet_num_max,accuracy) var/new_angle = ATAN2(initial_offset_x,initial_offset_y) if(bullet_num_max > 1) new_angle += RAND_PRECISE(-accuracy,accuracy)*90 return list(cos(new_angle),sin(new_angle)) -/obj/item/weapon/ranged/proc/get_bullet_inaccuracy(var/mob/living/L,var/atom/target) +/obj/item/weapon/ranged/proc/get_bullet_inaccuracy(mob/living/L,atom/target) . = inaccuracy_modifier @@ -809,7 +809,7 @@ obj/item/weapon/ranged/proc/shoot(var/mob/caller,var/atom/object,location,params I.pixel_y = attachment_stock.attachment_offset_y + attachment_stock_offset_y add_overlay(I) -/obj/item/weapon/ranged/click_on_object_alt(var/mob/caller,var/atom/object,location,control,params) +/obj/item/weapon/ranged/click_on_object_alt(mob/caller,atom/object,location,control,params) if(attachment_undermount) return attachment_undermount.click_on_object_alt(caller,object,location,control,params) diff --git a/code/_core/obj/item/weapon/ranged/bow/_bow.dm b/code/_core/obj/item/weapon/ranged/bow/_bow.dm index 9bba169501..99374ac594 100644 --- a/code/_core/obj/item/weapon/ranged/bow/_bow.dm +++ b/code/_core/obj/item/weapon/ranged/bow/_bow.dm @@ -57,7 +57,7 @@ update_sprite() -/obj/item/weapon/ranged/bow/on_equip(var/atom/old_location,var/silent=FALSE) +/obj/item/weapon/ranged/bow/on_equip(atom/old_location,silent=FALSE) . = ..() stage_max = initial(stage_max) stage_per_decisecond = initial(stage_per_decisecond) @@ -77,10 +77,10 @@ /obj/item/weapon/ranged/bow/get_static_spread() return 0 -/obj/item/weapon/ranged/bow/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bow/get_skill_spread(mob/living/L) return max(0,0.005 - (0.01 * L.get_skill_power(SKILL_RANGED))) -/obj/item/weapon/ranged/bow/on_mouse_up(var/mob/caller as mob, var/atom/object,location,control,params) //Release. This fires the bow. +/obj/item/weapon/ranged/bow/on_mouse_up(mob/caller as mob, atom/object,location,control,params) //Release. This fires the bow. if(stage_current > 0 ) shoot(caller,object,location,params,max(stage_current/100,0.25)) stage_current = 0 @@ -90,7 +90,7 @@ update_sprite() return TRUE -/obj/item/weapon/ranged/bow/click_on_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/weapon/ranged/bow/click_on_object(mob/caller,atom/object,location,control,params) if(object.plane >= PLANE_HUD) return ..() if(object.loc && object.loc.plane >= PLANE_HUD) @@ -130,7 +130,7 @@ . = ..() || . //weirdest statement I ever wrote. -/obj/item/weapon/ranged/bow/handle_ammo(var/mob/caller) +/obj/item/weapon/ranged/bow/handle_ammo(mob/caller) if(!is_advanced(caller)) return FALSE @@ -153,7 +153,7 @@ return BC.spend_bullet(caller,0) -/obj/item/weapon/ranged/bow/handle_empty(var/mob/caller) +/obj/item/weapon/ranged/bow/handle_empty(mob/caller) return FALSE /obj/item/weapon/ranged/bow/get_damage_per_hit(armor_to_use) @@ -235,7 +235,7 @@ GENERATE(stored_arrow) FINALIZE(stored_arrow) -/obj/item/weapon/ranged/bow/hardlight/handle_ammo(var/mob/caller) +/obj/item/weapon/ranged/bow/hardlight/handle_ammo(mob/caller) . = ..() if(!.) return stored_arrow diff --git a/code/_core/obj/item/weapon/ranged/bullet/_bullet.dm b/code/_core/obj/item/weapon/ranged/bullet/_bullet.dm index d0ccc74ae1..956ca67db9 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/_bullet.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/_bullet.dm @@ -62,7 +62,7 @@ obj/item/weapon/ranged/bullet/handle_empty(var/mob/caller) return 0.25 + clamp(1-result,0.25,1)*0.75 -/obj/item/weapon/ranged/bullet/proc/accept_bullet(var/mob/caller as mob,var/obj/item/bullet_cartridge/B,var/silent=FALSE) +/obj/item/weapon/ranged/bullet/proc/accept_bullet(mob/caller as mob,obj/item/bullet_cartridge/B,silent=FALSE) if(can_load_chamber(caller,B)) if(B.amount <= 1) @@ -112,7 +112,7 @@ obj/item/weapon/ranged/bullet/handle_empty(var/mob/caller) -/obj/item/weapon/ranged/bullet/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/weapon/ranged/bullet/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE @@ -125,7 +125,7 @@ obj/item/weapon/ranged/bullet/handle_empty(var/mob/caller) if(B) .["stored_bullets"][i] = B.type -/obj/item/weapon/ranged/bullet/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/weapon/ranged/bullet/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE @@ -147,7 +147,7 @@ obj/item/weapon/ranged/bullet/handle_empty(var/mob/caller) -/obj/item/weapon/ranged/bullet/get_examine_list(var/mob/examiner) +/obj/item/weapon/ranged/bullet/get_examine_list(mob/examiner) . = ..() @@ -158,7 +158,7 @@ obj/item/weapon/ranged/bullet/handle_empty(var/mob/caller) return chambered_bullet ? chambered_bullet.damage_type : null -/obj/item/weapon/ranged/bullet/proc/eject_chambered_bullet(var/mob/caller,var/atom/new_loc,var/play_sound=FALSE) +/obj/item/weapon/ranged/bullet/proc/eject_chambered_bullet(mob/caller,atom/new_loc,play_sound=FALSE) if(!chambered_bullet) return FALSE @@ -191,7 +191,7 @@ obj/item/weapon/ranged/bullet/handle_empty(var/mob/caller) return TRUE -/obj/item/weapon/ranged/bullet/proc/eject_stored_bullet(var/mob/caller,var/obj/item/bullet_cartridge/bullet_to_remove,var/new_loc,var/play_sound=FALSE) +/obj/item/weapon/ranged/bullet/proc/eject_stored_bullet(mob/caller,obj/item/bullet_cartridge/bullet_to_remove,new_loc,play_sound=FALSE) if(!(bullet_to_remove in stored_bullets)) return FALSE @@ -212,7 +212,7 @@ obj/item/weapon/ranged/bullet/handle_empty(var/mob/caller) return bullet_to_remove -/obj/item/weapon/ranged/bullet/proc/eject_stored_bullets(var/mob/caller,var/new_loc,var/play_sound=FALSE) +/obj/item/weapon/ranged/bullet/proc/eject_stored_bullets(mob/caller,new_loc,play_sound=FALSE) for(var/k in stored_bullets) if(!k) continue @@ -221,7 +221,7 @@ obj/item/weapon/ranged/bullet/handle_empty(var/mob/caller) return TRUE -/obj/item/weapon/ranged/bullet/proc/eject_stored_bullets_spent(var/mob/caller,var/new_loc,var/play_sound=FALSE) +/obj/item/weapon/ranged/bullet/proc/eject_stored_bullets_spent(mob/caller,new_loc,play_sound=FALSE) for(var/k in stored_bullets) if(!k) continue @@ -232,7 +232,7 @@ obj/item/weapon/ranged/bullet/handle_empty(var/mob/caller) return TRUE -/obj/item/weapon/ranged/bullet/proc/spend_chambered_bullet(var/mob/caller) +/obj/item/weapon/ranged/bullet/proc/spend_chambered_bullet(mob/caller) if(!chambered_bullet || chambered_bullet.is_spent) return FALSE @@ -249,7 +249,7 @@ obj/item/weapon/ranged/bullet/handle_empty(var/mob/caller) chambered_bullet = null -/obj/item/weapon/ranged/bullet/proc/spend_stored_bullet(var/mob/caller,var/bullet_position = 1) +/obj/item/weapon/ranged/bullet/proc/spend_stored_bullet(mob/caller,bullet_position = 1) if(!length(stored_bullets) || !stored_bullets[bullet_position]) return FALSE @@ -267,7 +267,7 @@ obj/item/weapon/ranged/bullet/handle_empty(var/mob/caller) if(. && B.qdeleting) stored_bullets[bullet_position] = null -/obj/item/weapon/ranged/bullet/handle_ammo(var/mob/caller) +/obj/item/weapon/ranged/bullet/handle_ammo(mob/caller) return spend_chambered_bullet(caller) /obj/item/weapon/ranged/bullet/New() @@ -283,7 +283,7 @@ obj/item/weapon/ranged/bullet/handle_empty(var/mob/caller) /obj/item/weapon/ranged/bullet/get_ammo_count() return chambered_bullet ? 1 : 0 -/obj/item/weapon/ranged/bullet/proc/can_load_chamber(var/mob/caller,var/obj/item/bullet_cartridge/B) //B can be a type or a path. +/obj/item/weapon/ranged/bullet/proc/can_load_chamber(mob/caller,obj/item/bullet_cartridge/B) //B can be a type or a path. if(chambered_bullet) caller?.to_chat(span("warning","There is already a chambered bullet inside \the [src.name]!")) @@ -295,7 +295,7 @@ obj/item/weapon/ranged/bullet/handle_empty(var/mob/caller) return TRUE -/obj/item/weapon/ranged/bullet/proc/can_fit_bullet(var/obj/item/bullet_cartridge/B) //B can be a type or a path +/obj/item/weapon/ranged/bullet/proc/can_fit_bullet(obj/item/bullet_cartridge/B) //B can be a type or a path if(!B) return FALSE @@ -318,7 +318,7 @@ obj/item/weapon/ranged/bullet/handle_empty(var/mob/caller) return TRUE -/obj/item/weapon/ranged/bullet/proc/can_load_stored(var/mob/caller,var/obj/item/bullet_cartridge/B) +/obj/item/weapon/ranged/bullet/proc/can_load_stored(mob/caller,obj/item/bullet_cartridge/B) if(!stored_bullets || !length(stored_bullets)) return FALSE diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/_magazine.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/_magazine.dm index d843aad93b..8c3debd67a 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/_magazine.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/_magazine.dm @@ -13,11 +13,11 @@ QDEL_NULL(stored_magazine) . = ..() -/obj/item/weapon/ranged/bullet/magazine/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/weapon/ranged/bullet/magazine/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEATOM("stored_magazine") -/obj/item/weapon/ranged/bullet/magazine/load_item_data_post(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/weapon/ranged/bullet/magazine/load_item_data_post(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADATOM("stored_magazine") if(stored_magazine) @@ -26,7 +26,7 @@ /obj/item/weapon/ranged/bullet/magazine/proc/get_magazine() return stored_magazine -/obj/item/weapon/ranged/bullet/magazine/proc/get_cock_sound(var/direction="both") +/obj/item/weapon/ranged/bullet/magazine/proc/get_cock_sound(direction="both") switch(direction) if("both") return pick( @@ -53,7 +53,7 @@ return ..() -/obj/item/weapon/ranged/bullet/magazine/click_self(var/mob/caller,location,control,params) +/obj/item/weapon/ranged/bullet/magazine/click_self(mob/caller,location,control,params) . = ..() @@ -82,7 +82,7 @@ return TRUE -/obj/item/weapon/ranged/bullet/magazine/proc/eject_magazine(var/mob/caller as mob) +/obj/item/weapon/ranged/bullet/magazine/proc/eject_magazine(mob/caller as mob) if(!stored_magazine) CRASH("[caller.get_debug_name()] tried to eject a magazine from [src.get_debug_name()], but there was no stored_magazine!") @@ -102,7 +102,7 @@ return TRUE -/obj/item/weapon/ranged/bullet/magazine/clicked_on_by_object(var/mob/caller as mob,var/atom/object,location,control,params) //The src was clicked on by the object +/obj/item/weapon/ranged/bullet/magazine/clicked_on_by_object(mob/caller as mob,atom/object,location,control,params) //The src was clicked on by the object if(stored_magazine && !wielded && is_inventory(object) && is_inventory(src.loc) && !caller.attack_flags) INTERACT_CHECK @@ -119,7 +119,7 @@ return ..() -/obj/item/weapon/ranged/bullet/magazine/proc/load_new_bullet_from_magazine(var/mob/caller) +/obj/item/weapon/ranged/bullet/magazine/proc/load_new_bullet_from_magazine(mob/caller) var/obj/item/magazine/M = get_magazine() @@ -146,7 +146,7 @@ return FALSE -/obj/item/weapon/ranged/bullet/magazine/handle_ammo(var/mob/caller) +/obj/item/weapon/ranged/bullet/magazine/handle_ammo(mob/caller) . = ..() @@ -158,7 +158,7 @@ -/obj/item/weapon/ranged/bullet/magazine/proc/can_fit_magazine(var/obj/item/magazine/M) +/obj/item/weapon/ranged/bullet/magazine/proc/can_fit_magazine(obj/item/magazine/M) if(!istype(M)) return FALSE @@ -168,7 +168,7 @@ return TRUE -/obj/item/weapon/ranged/bullet/magazine/play_shoot_sounds(var/mob/caller,var/list/shoot_sounds_to_use = list(),var/shoot_alert_to_use = ALERT_LEVEL_NONE) +/obj/item/weapon/ranged/bullet/magazine/play_shoot_sounds(mob/caller,list/shoot_sounds_to_use = list(),shoot_alert_to_use = ALERT_LEVEL_NONE) . = ..() diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/misc/_misc.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/misc/_misc.dm index d64ceda416..bfc79105ef 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/misc/_misc.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/misc/_misc.dm @@ -43,11 +43,11 @@ tier = 1 -/obj/item/weapon/ranged/bullet/magazine/misc/sentry/handle_empty(var/mob/caller) +/obj/item/weapon/ranged/bullet/magazine/misc/sentry/handle_empty(mob/caller) next_shoot_time = max(next_shoot_time,world.time + 20) return ..() -/obj/item/weapon/ranged/bullet/magazine/misc/sentry/handle_ammo(var/mob/caller) +/obj/item/weapon/ranged/bullet/magazine/misc/sentry/handle_ammo(mob/caller) if(!chambered_bullet) load_new_bullet_from_magazine(caller) return ..() @@ -64,10 +64,10 @@ /obj/item/weapon/ranged/bullet/magazine/misc/sentry/get_static_spread() return 0 -/obj/item/weapon/ranged/bullet/magazine/misc/sentry/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/misc/sentry/get_skill_spread(mob/living/L) return 0 -/obj/item/weapon/ranged/bullet/magazine/misc/sentry/can_owner_shoot(var/mob/caller,var/atom/object,location,params) +/obj/item/weapon/ranged/bullet/magazine/misc/sentry/can_owner_shoot(mob/caller,atom/object,location,params) if(caller.is_player_controlled()) return FALSE return ..() \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/misc/browning.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/misc/browning.dm index ba3807a1ae..51c38ba405 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/misc/browning.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/misc/browning.dm @@ -45,11 +45,11 @@ QDEL_NULL(linked_gun) return ..() -/obj/item/weapon/ranged/bullet/magazine/misc/browning/handle_empty(var/obj/caller) +/obj/item/weapon/ranged/bullet/magazine/misc/browning/handle_empty(obj/caller) next_shoot_time = max(next_shoot_time,world.time + 20) return ..() -/obj/item/weapon/ranged/bullet/magazine/misc/browning/handle_ammo(var/obj/caller) +/obj/item/weapon/ranged/bullet/magazine/misc/browning/handle_ammo(obj/caller) if(!chambered_bullet) load_new_bullet_from_magazine(caller) linked_gun.mag_check() return ..() @@ -67,12 +67,12 @@ /obj/item/weapon/ranged/bullet/magazine/misc/browning/get_static_spread() return 0.01 -/obj/item/weapon/ranged/bullet/magazine/misc/browning/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/misc/browning/get_skill_spread(mob/living/L) if(!heat_current) return 0 return max(0,0.075 - (0.1 * L.get_skill_power(SKILL_RANGED))) -/obj/item/weapon/ranged/bullet/magazine/misc/browning/can_owner_shoot(var/mob/caller,var/atom/object,location,params) +/obj/item/weapon/ranged/bullet/magazine/misc/browning/can_owner_shoot(mob/caller,atom/object,location,params) if(angle2dir_cardinal(get_angle(caller,object))==linked_gun.dir) return TRUE else diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/_pistol.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/_pistol.dm index f454445515..5cbd5d9a0f 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/_pistol.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/_pistol.dm @@ -24,13 +24,13 @@ /obj/item/weapon/ranged/bullet/magazine/pistol/get_static_spread() return 0.01 -/obj/item/weapon/ranged/bullet/magazine/pistol/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/pistol/get_skill_spread(mob/living/L) return 0.03 - (0.03 * L.get_skill_power(SKILL_RANGED)) -/obj/item/weapon/ranged/bullet/magazine/pistol/get_movement_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/pistol/get_movement_spread(mob/living/L) return ..() * 0.5 -/obj/item/weapon/ranged/bullet/magazine/pistol/get_cock_sound(var/direction="both") +/obj/item/weapon/ranged/bullet/magazine/pistol/get_cock_sound(direction="both") switch(direction) if("both") return 'sound/weapons/ranged/generic/rack.ogg' diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/brown.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/brown.dm index 872f416f5f..36c8bb43c3 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/brown.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/brown.dm @@ -71,7 +71,7 @@ /obj/item/weapon/ranged/bullet/magazine/pistol/brown/get_static_spread() return 0.002 -/obj/item/weapon/ranged/bullet/magazine/pistol/brown/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/pistol/brown/get_skill_spread(mob/living/L) return max(0,0.01 - (0.04 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/bullet/magazine/pistol/brown/mod diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/classic.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/classic.dm index 9695d317d7..cadd7d9d10 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/classic.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/classic.dm @@ -69,5 +69,5 @@ /obj/item/weapon/ranged/bullet/magazine/pistol/classic/get_static_spread() return 0.001 -/obj/item/weapon/ranged/bullet/magazine/pistol/classic/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/pistol/classic/get_skill_spread(mob/living/L) return max(0,0.01 - (0.03 * L.get_skill_power(SKILL_RANGED)) ) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/dip.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/dip.dm index c493d846c1..38c6c9ca03 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/dip.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/dip.dm @@ -70,5 +70,5 @@ /obj/item/weapon/ranged/bullet/magazine/pistol/dip/get_static_spread() return 0.002 -/obj/item/weapon/ranged/bullet/magazine/pistol/dip/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/pistol/dip/get_skill_spread(mob/living/L) return max(0,0.02 - (0.04 * L.get_skill_power(SKILL_RANGED)) ) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/eagle.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/eagle.dm index e11f79434c..80705818e7 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/eagle.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/eagle.dm @@ -69,7 +69,7 @@ /obj/item/weapon/ranged/bullet/magazine/pistol/deagle/get_static_spread() return 0.001 -/obj/item/weapon/ranged/bullet/magazine/pistol/deagle/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/pistol/deagle/get_skill_spread(mob/living/L) return max(0,0.02 - (0.03 * L.get_skill_power(SKILL_RANGED)) ) /obj/item/weapon/ranged/bullet/magazine/pistol/deagle/gold diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/gyro.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/gyro.dm index 07d9596329..107a81217e 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/gyro.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/gyro.dm @@ -74,5 +74,5 @@ /obj/item/weapon/ranged/bullet/magazine/pistol/gyrojet/get_static_spread() return 0 -/obj/item/weapon/ranged/bullet/magazine/pistol/gyrojet/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/pistol/gyrojet/get_skill_spread(mob/living/L) return max(0,0.10 - (0.15 * L.get_skill_power(SKILL_RANGED)) ) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/holy45.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/holy45.dm index 6da267cd01..edf25b145e 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/holy45.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/holy45.dm @@ -73,5 +73,5 @@ /obj/item/weapon/ranged/bullet/magazine/pistol/holy45/get_static_spread() return 0.003 -/obj/item/weapon/ranged/bullet/magazine/pistol/holy45/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/pistol/holy45/get_skill_spread(mob/living/L) return max(0,0.01 - (0.03 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/laton.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/laton.dm index 7373a4f28d..d796eeca7f 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/laton.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/laton.dm @@ -68,7 +68,7 @@ /obj/item/weapon/ranged/bullet/magazine/pistol/laton/get_static_spread() return 0.002 -/obj/item/weapon/ranged/bullet/magazine/pistol/laton/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/pistol/laton/get_skill_spread(mob/living/L) return max(0,0.005 - (0.02 * L.get_skill_power(SKILL_RANGED)) ) /obj/item/weapon/ranged/bullet/magazine/pistol/laton/prototype @@ -134,20 +134,20 @@ rarity = RARITY_UNCOMMON -/obj/item/weapon/ranged/bullet/magazine/pistol/laton/kitchen/play_shoot_sounds(var/mob/caller,var/list/shoot_sounds_to_use = list(),var/shoot_alert_to_use = ALERT_LEVEL_NONE) +/obj/item/weapon/ranged/bullet/magazine/pistol/laton/kitchen/play_shoot_sounds(mob/caller,list/shoot_sounds_to_use = list(),shoot_alert_to_use = ALERT_LEVEL_NONE) . = ..() if(.) caller.do_say("BANG!") CALLBACK("kitchen_gun_slogan_\ref[caller]",2 SECONDS,src,src::say_slogan(),caller) -/obj/item/weapon/ranged/bullet/magazine/pistol/laton/kitchen/proc/say_slogan(var/mob/caller) +/obj/item/weapon/ranged/bullet/magazine/pistol/laton/kitchen/proc/say_slogan(mob/caller) var/slogan_to_say = kitchen_gun_slogans[slogan_number] caller.do_say(slogan_to_say) slogan_number += 1 if(slogan_number > length(kitchen_gun_slogans)) slogan_number = 1 -/obj/item/weapon/ranged/bullet/magazine/pistol/laton/kitchen/on_projectile_hit(var/obj/projectile/P,var/atom/hit_atom) +/obj/item/weapon/ranged/bullet/magazine/pistol/laton/kitchen/on_projectile_hit(obj/projectile/P,atom/hit_atom) if(istype(P,/obj/projectile/thrown/)) return ..() @@ -159,7 +159,7 @@ . = ..() -/obj/item/weapon/ranged/bullet/magazine/pistol/laton/kitchen/shoot_projectile(var/atom/caller,var/atom/target,location,params,var/obj/projectile/projectile_to_use,var/damage_type_to_use,var/icon_pos_x=0,var/icon_pos_y=0,var/accuracy_loss=0,var/projectile_speed_to_use=0,var/bullet_count_to_use=1,var/bullet_color="#FFFFFF",var/view_punch=0,var/damage_multiplier=1,var/desired_iff_tag,var/desired_loyalty_tag,var/desired_inaccuracy_modifier=1,var/base_spread = get_base_spread(),var/penetrations_left=0) +/obj/item/weapon/ranged/bullet/magazine/pistol/laton/kitchen/shoot_projectile(atom/caller,atom/target,location,params,obj/projectile/projectile_to_use,damage_type_to_use,icon_pos_x=0,icon_pos_y=0,accuracy_loss=0,projectile_speed_to_use=0,bullet_count_to_use=1,bullet_color="#FFFFFF",view_punch=0,damage_multiplier=1,desired_iff_tag,desired_loyalty_tag,desired_inaccuracy_modifier=1,base_spread = get_base_spread(),penetrations_left=0) . = ..() diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/longcon.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/longcon.dm index 1d97cb3d64..938eab43bf 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/longcon.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/longcon.dm @@ -71,5 +71,5 @@ /obj/item/weapon/ranged/bullet/magazine/pistol/longcon/get_static_spread() return 0.0045 -/obj/item/weapon/ranged/bullet/magazine/pistol/longcon/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/pistol/longcon/get_skill_spread(mob/living/L) return max(0,0.0075 - (0.02 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/military.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/military.dm index 2a573d5ec5..344a73098c 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/military.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/military.dm @@ -71,7 +71,7 @@ /obj/item/weapon/ranged/bullet/magazine/pistol/military/get_static_spread() return 0.001 -/obj/item/weapon/ranged/bullet/magazine/pistol/military/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/pistol/military/get_skill_spread(mob/living/L) return max(0,0.01 - (0.02 * L.get_skill_power(SKILL_RANGED)) ) /obj/item/weapon/ranged/bullet/magazine/pistol/military/prototype @@ -109,7 +109,7 @@ /obj/item/weapon/ranged/bullet/magazine/pistol/military/prototype/get_static_spread() return 0.001 -/obj/item/weapon/ranged/bullet/magazine/pistol/military/prototype/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/pistol/military/prototype/get_skill_spread(mob/living/L) return max(0,0.02 - (0.03 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/nt_10mm.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/nt_10mm.dm index 92fed7d97f..28fdef0a76 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/nt_10mm.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/nt_10mm.dm @@ -73,7 +73,7 @@ /obj/item/weapon/ranged/bullet/magazine/pistol/high_power/get_static_spread() return 0.0009 -/obj/item/weapon/ranged/bullet/magazine/pistol/high_power/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/pistol/high_power/get_skill_spread(mob/living/L) return max(0,0.015 - (0.03 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/overseer.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/overseer.dm index 307077b32a..7c546cc29d 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/overseer.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/overseer.dm @@ -74,7 +74,7 @@ /obj/item/weapon/ranged/bullet/magazine/pistol/overseer/get_static_spread() return 0.002 -/obj/item/weapon/ranged/bullet/magazine/pistol/overseer/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/pistol/overseer/get_skill_spread(mob/living/L) return max(0,0.01 - (0.01 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/bullet/magazine/pistol/overseer/mod diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/sabre.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/sabre.dm index 786a111132..de324c0708 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/sabre.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/sabre.dm @@ -74,7 +74,7 @@ /obj/item/weapon/ranged/bullet/magazine/pistol/high_calibre/get_static_spread() return 0.0025 -/obj/item/weapon/ranged/bullet/magazine/pistol/high_calibre/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/pistol/high_calibre/get_skill_spread(mob/living/L) return max(0,0.02 - (0.04 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/bullet/magazine/pistol/high_calibre/mod diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/sol.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/sol.dm index f6a2b000c6..b042126e86 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/sol.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/sol.dm @@ -75,5 +75,5 @@ /obj/item/weapon/ranged/bullet/magazine/pistol/sol/get_static_spread() return 0.003 -/obj/item/weapon/ranged/bullet/magazine/pistol/sol/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/pistol/sol/get_skill_spread(mob/living/L) return max(0,0.0075 - (0.035 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/syndie.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/syndie.dm index 9e2ce60028..820b6129d3 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/syndie.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/syndie.dm @@ -76,7 +76,7 @@ /obj/item/weapon/ranged/bullet/magazine/pistol/syndie/get_static_spread() return 0.004 -/obj/item/weapon/ranged/bullet/magazine/pistol/syndie/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/pistol/syndie/get_skill_spread(mob/living/L) return max(0,0.01 - (0.03 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/bullet/magazine/pistol/syndie/mod @@ -136,5 +136,5 @@ /obj/item/weapon/ranged/bullet/magazine/pistol/syndie/slavic/get_static_spread() return 0.01 -/obj/item/weapon/ranged/bullet/magazine/pistol/syndie/slavic/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/pistol/syndie/slavic/get_skill_spread(mob/living/L) return max(0,0.02 - (0.03 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/tactical.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/tactical.dm index e8935e20f0..7dab0526f2 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/tactical.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/tactical.dm @@ -72,7 +72,7 @@ /obj/item/weapon/ranged/bullet/magazine/pistol/tactical/get_static_spread() return 0.003 -/obj/item/weapon/ranged/bullet/magazine/pistol/tactical/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/pistol/tactical/get_skill_spread(mob/living/L) return max(0,0.01 - (0.03 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/bullet/magazine/pistol/tactical/mod @@ -117,5 +117,5 @@ /obj/item/weapon/ranged/bullet/magazine/pistol/tactical/mod/get_static_spread() return 0 -/obj/item/weapon/ranged/bullet/magazine/pistol/tactical/mod/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/pistol/tactical/mod/get_skill_spread(mob/living/L) return max(0,0.03 - (0.03 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/tranq.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/tranq.dm index cf3b810ec8..2f61342e6b 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/tranq.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/tranq.dm @@ -44,5 +44,5 @@ /obj/item/weapon/ranged/bullet/magazine/pistol/tranq/get_static_spread() return 0 -/obj/item/weapon/ranged/bullet/magazine/pistol/tranq/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/pistol/tranq/get_skill_spread(mob/living/L) return max(0,0.005 - (0.02 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/yarygin.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/yarygin.dm index 036db52ab7..9ac7737989 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/yarygin.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/pistol/yarygin.dm @@ -76,5 +76,5 @@ /obj/item/weapon/ranged/bullet/magazine/pistol/yarygin/get_static_spread() return 0.004 -/obj/item/weapon/ranged/bullet/magazine/pistol/yarygin/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/pistol/yarygin/get_skill_spread(mob/living/L) return max(0,0.02 - (0.03 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/abakan.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/abakan.dm index 0c236252fa..69fe27c200 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/abakan.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/abakan.dm @@ -74,5 +74,5 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/an94/get_static_spread() return 0.005 -/obj/item/weapon/ranged/bullet/magazine/rifle/an94/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/an94/get_skill_spread(mob/living/L) return max(0,0.01 - (0.07 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/advanced.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/advanced.dm index 5e73a4799f..3f2ef3529d 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/advanced.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/advanced.dm @@ -84,5 +84,5 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/advanced/get_static_spread() return 0.001 -/obj/item/weapon/ranged/bullet/magazine/rifle/advanced/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/advanced/get_skill_spread(mob/living/L) return max(0,0.03 - (0.04 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/ak12.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/ak12.dm index 19f2289e7c..9f15961c21 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/ak12.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/ak12.dm @@ -72,7 +72,7 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/ak12/get_static_spread() return 0.004 -/obj/item/weapon/ranged/bullet/magazine/rifle/ak12/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/ak12/get_skill_spread(mob/living/L) return max(0,0.01 - (0.03 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/ak13.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/ak13.dm index 1d4ed5f0bd..3c8522fd5d 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/ak13.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/ak13.dm @@ -72,6 +72,6 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/ak13/get_static_spread() return 0.008 -/obj/item/weapon/ranged/bullet/magazine/rifle/ak13/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/ak13/get_skill_spread(mob/living/L) if(!heat_current) return 0 return max(0,0.01 - (0.05 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/ak47.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/ak47.dm index 286838b1cd..bbfac8c53e 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/ak47.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/ak47.dm @@ -85,7 +85,7 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/ak47/get_static_spread() return 0.001 -/obj/item/weapon/ranged/bullet/magazine/rifle/ak47/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/ak47/get_skill_spread(mob/living/L) return max(0,0.025 - (0.05 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/assault.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/assault.dm index 9c4ec9b0c7..f506f32ad3 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/assault.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/assault.dm @@ -76,7 +76,7 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/assault/get_static_spread() return 0.01 -/obj/item/weapon/ranged/bullet/magazine/rifle/assault/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/assault/get_skill_spread(mob/living/L) return max(0,0.02 - (0.04 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/bullet/magazine/rifle/assault/equipped/Generate() diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/bullpop_solaris.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/bullpop_solaris.dm index 1033e7a9a5..e8e009cb48 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/bullpop_solaris.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/bullpop_solaris.dm @@ -69,5 +69,5 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/bullpup_sol/get_static_spread() return 0.01 -/obj/item/weapon/ranged/bullet/magazine/rifle/bullpup_sol/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/bullpup_sol/get_skill_spread(mob/living/L) return max(0,0.01 - (0.04 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/burst.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/burst.dm index 8bd0623cfc..a668890b40 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/burst.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/burst.dm @@ -84,7 +84,7 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/burst/get_static_spread() return 0.0075 -/obj/item/weapon/ranged/bullet/magazine/rifle/burst/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/burst/get_skill_spread(mob/living/L) return max(0,0.03 - (0.06 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/bullet/magazine/rifle/burst/mod @@ -124,5 +124,5 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/burst/mod/get_static_spread() return 0.002 -/obj/item/weapon/ranged/bullet/magazine/rifle/burst/mod/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/burst/mod/get_skill_spread(mob/living/L) return max(0,0.03 - (0.06 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/carbine.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/carbine.dm index 183ebd9e65..c8cd2fc22d 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/carbine.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/carbine.dm @@ -95,10 +95,10 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/carbine/get_static_spread() return 0.007 -/obj/item/weapon/ranged/bullet/magazine/rifle/carbine/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/carbine/get_skill_spread(mob/living/L) return max(0,0.02 - (0.04 * L.get_skill_power(SKILL_RANGED))) -/obj/item/weapon/ranged/bullet/magazine/rifle/carbine/get_cock_sound(var/direction="both") +/obj/item/weapon/ranged/bullet/magazine/rifle/carbine/get_cock_sound(direction="both") return 'sound/weapons/ranged/generic/smg_rack.ogg' /obj/item/weapon/ranged/bullet/magazine/rifle/carbine/mod @@ -119,7 +119,7 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/carbine/mod/get_static_spread() return 0.03 -/obj/item/weapon/ranged/bullet/magazine/rifle/carbine/mod/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/carbine/mod/get_skill_spread(mob/living/L) return max(0,0.04 - (0.04 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/dmca.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/dmca.dm index 72763d2de9..fb8bb8e6b0 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/dmca.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/dmca.dm @@ -86,5 +86,5 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/dmca/get_static_spread() return 0.004 -/obj/item/weapon/ranged/bullet/magazine/rifle/dmca/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/dmca/get_skill_spread(mob/living/L) return max(0,0.01 - (0.04 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/dmr.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/dmr.dm index fb1d054dd0..d2d9ba064e 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/dmr.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/dmr.dm @@ -83,7 +83,7 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/dmr/get_static_spread() return 0 -/obj/item/weapon/ranged/bullet/magazine/rifle/dmr/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/dmr/get_skill_spread(mob/living/L) return max(0,0.003 - (0.003 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/gauss.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/gauss.dm index cf67f8a6ab..6122872c8a 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/gauss.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/gauss.dm @@ -59,7 +59,7 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/gauss_gun/get_static_spread() return 0 -/obj/item/weapon/ranged/bullet/magazine/rifle/gauss_gun/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/gauss_gun/get_skill_spread(mob/living/L) return max(0.001 - (0.001 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/bullet/magazine/rifle/gauss_gun/auto @@ -113,5 +113,5 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/gauss_gun/auto/get_static_spread() return 0.001 -/obj/item/weapon/ranged/bullet/magazine/rifle/gauss_gun/auto/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/gauss_gun/auto/get_skill_spread(mob/living/L) return max(0.01 - (0.01 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/groza.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/groza.dm index 0521860ef9..b5d8001b58 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/groza.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/groza.dm @@ -83,7 +83,7 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/groza/get_static_spread() return 0.01 -/obj/item/weapon/ranged/bullet/magazine/rifle/groza/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/groza/get_skill_spread(mob/living/L) return max(0,0.01 - (0.03 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/bullet/magazine/rifle/groza/equipped/Generate() diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/heavy_sniper.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/heavy_sniper.dm index e77ac34daf..811dc1f16a 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/heavy_sniper.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/heavy_sniper.dm @@ -96,7 +96,7 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/heavy_sniper/get_static_spread() return 0 -/obj/item/weapon/ranged/bullet/magazine/rifle/heavy_sniper/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/heavy_sniper/get_skill_spread(mob/living/L) return max(0,0.005 - (0.01 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/honey.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/honey.dm index 2e15655e0d..9bfd5271b1 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/honey.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/honey.dm @@ -65,5 +65,5 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/honey/get_static_spread() return 0.001 -/obj/item/weapon/ranged/bullet/magazine/rifle/honey/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/honey/get_skill_spread(mob/living/L) return max(0,0.002 - (0.004 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/lmg.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/lmg.dm index 847295b78b..68c893def2 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/lmg.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/lmg.dm @@ -105,5 +105,5 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/lmg/get_static_spread() return 0.005 -/obj/item/weapon/ranged/bullet/magazine/rifle/lmg/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/lmg/get_skill_spread(mob/living/L) return max(0,0.075 - (0.1 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/lmg_nt.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/lmg_nt.dm index 9d4a5b0981..f52e9f5d20 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/lmg_nt.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/lmg_nt.dm @@ -84,5 +84,5 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/lmg_nt/get_static_spread() return 0.0075 -/obj/item/weapon/ranged/bullet/magazine/rifle/lmg_nt/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/lmg_nt/get_skill_spread(mob/living/L) return max(0,0.1 - (0.1 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/lmg_nt_classic.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/lmg_nt_classic.dm index 83d2a75014..6eaa036e50 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/lmg_nt_classic.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/lmg_nt_classic.dm @@ -99,6 +99,6 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/lmg_nt_classic/get_static_spread() return 0.003 -/obj/item/weapon/ranged/bullet/magazine/rifle/lmg_nt_classic/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/lmg_nt_classic/get_skill_spread(mob/living/L) if(!heat_current) return 0 return max(0,0.02 - (0.04 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/lmg_nt_light.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/lmg_nt_light.dm index 0f7e97fbd5..fbd36ee9ad 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/lmg_nt_light.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/lmg_nt_light.dm @@ -83,6 +83,6 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/lmg_nt_light/get_static_spread() return 0.0075 -/obj/item/weapon/ranged/bullet/magazine/rifle/lmg_nt_light/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/lmg_nt_light/get_skill_spread(mob/living/L) if(!heat_current) return 0 return max(0,0.02 - (0.06 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/m13.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/m13.dm index 8de46805e1..c75ef149a8 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/m13.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/m13.dm @@ -82,17 +82,17 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/m13/get_static_spread() return 0.0001 -/obj/item/weapon/ranged/bullet/magazine/rifle/m13/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/m13/get_skill_spread(mob/living/L) return max(0,0.01 - (0.02 * L.get_skill_power(SKILL_RANGED))) -/obj/item/weapon/ranged/bullet/magazine/rifle/m13/load_new_bullet_from_magazine(var/mob/caller) +/obj/item/weapon/ranged/bullet/magazine/rifle/m13/load_new_bullet_from_magazine(mob/caller) . = ..() if(!chambered_bullet && stored_magazine) var/turf/T = get_turf(src) play_sound('sound/weapons/ranged/generic/clip_ping.ogg',T) eject_magazine(caller) -/obj/item/weapon/ranged/bullet/magazine/rifle/m13/clicked_on_by_object(var/mob/caller as mob,var/atom/object,location,control,params) //The src was clicked on by the object +/obj/item/weapon/ranged/bullet/magazine/rifle/m13/clicked_on_by_object(mob/caller as mob,atom/object,location,control,params) //The src was clicked on by the object if(stored_magazine && !wielded && is_inventory(object) && is_inventory(src.loc) && !caller.attack_flags) //Can't remove magazine normally. return TRUE @@ -100,7 +100,7 @@ . = ..() -/obj/item/weapon/ranged/bullet/magazine/rifle/m13/accept_bullet(var/mob/caller as mob,var/obj/item/bullet_cartridge/B,var/silent=FALSE) +/obj/item/weapon/ranged/bullet/magazine/rifle/m13/accept_bullet(mob/caller as mob,obj/item/bullet_cartridge/B,silent=FALSE) if(!stored_magazine) caller.to_chat(span("warning","You can't load \the [B.name] into \the [src.name] without a clip inserted!")) diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/m4.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/m4.dm index 6a0b478688..7f91bee95c 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/m4.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/m4.dm @@ -83,7 +83,7 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/m4/get_static_spread() return 0.0075 -/obj/item/weapon/ranged/bullet/magazine/rifle/m4/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/m4/get_skill_spread(mob/living/L) return max(0,0.01 - (0.04 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/marksman.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/marksman.dm index 89408ab2b4..5556840ce4 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/marksman.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/marksman.dm @@ -83,7 +83,7 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/marksman/get_static_spread() return 0 -/obj/item/weapon/ranged/bullet/magazine/rifle/marksman/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/marksman/get_skill_spread(mob/living/L) return max(0,0.01 - (0.02 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/merc.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/merc.dm index 6403f95ee0..5d780ad30b 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/merc.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/merc.dm @@ -80,7 +80,7 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/merc/get_static_spread() return 0 -/obj/item/weapon/ranged/bullet/magazine/rifle/merc/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/merc/get_skill_spread(mob/living/L) return max(0,0.03 - (0.04 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/bullet/magazine/rifle/merc/equipped/Generate() diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/minigun.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/minigun.dm index 4d93613529..e077ced9a5 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/minigun.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/minigun.dm @@ -62,5 +62,5 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/minigun/get_static_spread() return 0.01 -/obj/item/weapon/ranged/bullet/magazine/rifle/minigun/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/minigun/get_skill_spread(mob/living/L) return max(0,0.1 - (0.1 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/moar.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/moar.dm index a79e2986a6..4a77ba4636 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/moar.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/moar.dm @@ -83,5 +83,5 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/moar/get_static_spread() return 0.02 -/obj/item/weapon/ranged/bullet/magazine/rifle/moar/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/moar/get_skill_spread(mob/living/L) return max(0,0.01 - (0.02 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/nt_carbine.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/nt_carbine.dm index 19e4f15385..d393323b01 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/nt_carbine.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/nt_carbine.dm @@ -84,5 +84,5 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/nt_carbine/get_static_spread() return 0.01 -/obj/item/weapon/ranged/bullet/magazine/rifle/nt_carbine/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/nt_carbine/get_skill_spread(mob/living/L) return max(0,0.005 - (0.01 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/nt_rifle.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/nt_rifle.dm index d7e0c9d596..f0af24a983 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/nt_rifle.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/nt_rifle.dm @@ -82,5 +82,5 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/standard/get_static_spread() return 0.001 -/obj/item/weapon/ranged/bullet/magazine/rifle/standard/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/standard/get_skill_spread(mob/living/L) return max(0,0.01 - (0.04 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/ooc.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/ooc.dm index 5be16459be..ef973ace04 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/ooc.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/ooc.dm @@ -74,7 +74,7 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/ooc/get_static_spread() return 0.0075 -/obj/item/weapon/ranged/bullet/magazine/rifle/ooc/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/ooc/get_skill_spread(mob/living/L) return max(0,0.04 - (0.04 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/bullet/magazine/rifle/ooc/Generate() diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/pdw.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/pdw.dm index f3ed368f03..80057e92b8 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/pdw.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/pdw.dm @@ -85,5 +85,5 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/pdw/get_static_spread() return 0.01 -/obj/item/weapon/ranged/bullet/magazine/rifle/pdw/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/pdw/get_skill_spread(mob/living/L) return max(0,0.005 - (0.02 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/pkm.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/pkm.dm index 6ab93b1d49..7c69a050cb 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/pkm.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/pkm.dm @@ -91,5 +91,5 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/pkm/get_static_spread() return 0.005 -/obj/item/weapon/ranged/bullet/magazine/rifle/pkm/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/pkm/get_skill_spread(mob/living/L) return max(0,0.1 - (0.11 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/pulse.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/pulse.dm index 8fd9a4a9bc..668259505b 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/pulse.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/pulse.dm @@ -84,7 +84,7 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/pulse/get_static_spread() return 0.002 -/obj/item/weapon/ranged/bullet/magazine/rifle/pulse/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/pulse/get_skill_spread(mob/living/L) return max(0,0.01 - (0.01 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/bullet/magazine/rifle/pulse/update_icon() diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/semi.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/semi.dm index d5903b462f..d05544d597 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/semi.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/semi.dm @@ -82,5 +82,5 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/semi/get_static_spread() return 0.0005 -/obj/item/weapon/ranged/bullet/magazine/rifle/semi/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/semi/get_skill_spread(mob/living/L) return max(0,0.01 - (0.04 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/service.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/service.dm index ca79096e2d..8e7e5bf30a 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/service.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/service.dm @@ -84,5 +84,5 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/service/get_static_spread() return 0.0001 -/obj/item/weapon/ranged/bullet/magazine/rifle/service/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/service/get_skill_spread(mob/living/L) return max(0,0.02 - (0.06 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/sniper.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/sniper.dm index 9b8e210651..53523ebdcd 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/sniper.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/sniper.dm @@ -45,5 +45,5 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/sniper/get_static_spread() return 0 -/obj/item/weapon/ranged/bullet/magazine/rifle/sniper/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/sniper/get_skill_spread(mob/living/L) return max(0,0.004 - (0.004 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/sniper_127.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/sniper_127.dm index 70cbb01b7e..31bcc12d4f 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/sniper_127.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/sniper_127.dm @@ -90,7 +90,7 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/sniper_127/get_static_spread() return 0 -/obj/item/weapon/ranged/bullet/magazine/rifle/sniper_127/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/sniper_127/get_skill_spread(mob/living/L) return max(0,0.005 - (0.005 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/bullet/magazine/rifle/sniper_127/Generate() diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/sniper_20.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/sniper_20.dm index 589c02ab99..d62e245f2d 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/sniper_20.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/sniper_20.dm @@ -84,7 +84,7 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/sniper_20/get_static_spread() return 0 -/obj/item/weapon/ranged/bullet/magazine/rifle/sniper_20/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/sniper_20/get_skill_spread(mob/living/L) return max(0,0.01 - (0.01 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/bullet/magazine/rifle/sniper_20/Generate() @@ -101,5 +101,5 @@ . = ..() -/obj/item/weapon/ranged/bullet/magazine/rifle/sniper_20/get_cock_sound(var/direction="both") +/obj/item/weapon/ranged/bullet/magazine/rifle/sniper_20/get_cock_sound(direction="both") return 'sound/weapons/ranged/rifle/20mm_sniper/bolt.ogg' diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/sniper_nt.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/sniper_nt.dm index 5646125036..c52a021a34 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/sniper_nt.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/sniper_nt.dm @@ -68,5 +68,5 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/sniper_nt/get_static_spread() return 0 -/obj/item/weapon/ranged/bullet/magazine/rifle/sniper_nt/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/sniper_nt/get_skill_spread(mob/living/L) return max(0,0.005 - (0.01 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/sol_burst.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/sol_burst.dm index e4e8439211..4b00428a0f 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/sol_burst.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/sol_burst.dm @@ -87,7 +87,7 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/sol_burst/get_static_spread() return 0.005 -/obj/item/weapon/ranged/bullet/magazine/rifle/sol_burst/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/sol_burst/get_skill_spread(mob/living/L) return max(0,0.02 - (0.04 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/starter.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/starter.dm index efbf96297f..35b27c0a0d 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/starter.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/starter.dm @@ -83,7 +83,7 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/starter/get_static_spread() return 0.0015 -/obj/item/weapon/ranged/bullet/magazine/rifle/starter/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/starter/get_skill_spread(mob/living/L) return max(0,0.005 - (0.05 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/bullet/magazine/rifle/starter/equipped/Generate() diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/svd.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/svd.dm index 201a133a01..0c8f419c1f 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/svd.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/svd.dm @@ -72,5 +72,5 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/svd/get_static_spread() return 0 -/obj/item/weapon/ranged/bullet/magazine/rifle/svd/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/svd/get_skill_spread(mob/living/L) return max(0,0.002 - (0.003 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/svt.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/svt.dm index 9f880058d4..84eb25768d 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/svt.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/svt.dm @@ -76,5 +76,5 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/svt/get_static_spread() return 0.001 -/obj/item/weapon/ranged/bullet/magazine/rifle/svt/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/svt/get_skill_spread(mob/living/L) return max(0,0.008 - (0.016 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/syringe_rifle.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/syringe_rifle.dm index 2c6a9504b4..0b548fc2bc 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/syringe_rifle.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/syringe_rifle.dm @@ -96,7 +96,7 @@ ..() -/obj/item/weapon/ranged/bullet/magazine/rifle/syringe/shoot_projectile(var/atom/caller,var/atom/target,location,params,var/obj/projectile/projectile_to_use,var/damagetype/damage_type_to_use,var/icon_pos_x=0,var/icon_pos_y=0,var/accuracy_loss=0,var/projectile_speed_to_use=0,var/bullet_count_to_use=1,var/bullet_color="#FFFFFF",var/view_punch=0,var/damage_multiplier=1,var/desired_iff_tag,var/desired_loyalty_tag,var/desired_inaccuracy_modifier=1,var/base_spread = get_base_spread(),var/penetrations_left=0) +/obj/item/weapon/ranged/bullet/magazine/rifle/syringe/shoot_projectile(atom/caller,atom/target,location,params,obj/projectile/projectile_to_use,damagetype/damage_type_to_use,icon_pos_x=0,icon_pos_y=0,accuracy_loss=0,projectile_speed_to_use=0,bullet_count_to_use=1,bullet_color="#FFFFFF",view_punch=0,damage_multiplier=1,desired_iff_tag,desired_loyalty_tag,desired_inaccuracy_modifier=1,base_spread = get_base_spread(),penetrations_left=0) . = ..() @@ -112,5 +112,5 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/syringe/get_static_spread() return 0 -/obj/item/weapon/ranged/bullet/magazine/rifle/syringe/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/syringe/get_skill_spread(mob/living/L) return max(0,0.01 - (0.02 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/tungsten.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/tungsten.dm index c5a0f8a716..0caad7a47b 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/tungsten.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/tungsten.dm @@ -91,8 +91,8 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/tungsten/get_static_spread() return 0.001 -/obj/item/weapon/ranged/bullet/magazine/rifle/tungsten/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/tungsten/get_skill_spread(mob/living/L) return max(0,0.02 - (0.04 * L.get_skill_power(SKILL_RANGED))) -/obj/item/weapon/ranged/bullet/magazine/rifle/tungsten/get_cock_sound(var/direction="both") +/obj/item/weapon/ranged/bullet/magazine/rifle/tungsten/get_cock_sound(direction="both") return 'sound/weapons/ranged/generic/smg_rack.ogg' \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/val.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/val.dm index 2a259c0c06..ae1b1ed9b3 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/val.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/val.dm @@ -70,5 +70,5 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/val/get_static_spread() return 0.001 -/obj/item/weapon/ranged/bullet/magazine/rifle/val/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/val/get_skill_spread(mob/living/L) return max(0,0.002 - (0.004 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/vintorez.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/vintorez.dm index 406d111c30..81d5287ccc 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/vintorez.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/vintorez.dm @@ -74,5 +74,5 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/vintorez/get_static_spread() return 0.001 -/obj/item/weapon/ranged/bullet/magazine/rifle/vintorez/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/vintorez/get_skill_spread(mob/living/L) return max(0,0.002 - (0.004 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/shotgun/autoshotgun.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/shotgun/autoshotgun.dm index c3ea7bd8bf..6ce7dcf8ab 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/shotgun/autoshotgun.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/shotgun/autoshotgun.dm @@ -80,5 +80,5 @@ /obj/item/weapon/ranged/bullet/magazine/shotgun/bulldog/get_static_spread() return 0.001 -/obj/item/weapon/ranged/bullet/magazine/shotgun/bulldog/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/shotgun/bulldog/get_skill_spread(mob/living/L) return max(0,0.05 - (0.1 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/shotgun/cursed.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/shotgun/cursed.dm index ee96354435..f73182adea 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/shotgun/cursed.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/shotgun/cursed.dm @@ -20,7 +20,7 @@ /obj/item/weapon/ranged/bullet/magazine/shotgun/bulldog/cursed/get_ranged_damage_type() return /damagetype/ranged/magic/chaos -/obj/item/weapon/ranged/bullet/magazine/shotgun/bulldog/cursed/spend_chambered_bullet(var/mob/caller) //magazine/shotgun/bulldog/cursed/ +/obj/item/weapon/ranged/bullet/magazine/shotgun/bulldog/cursed/spend_chambered_bullet(mob/caller) //magazine/shotgun/bulldog/cursed/ //remove a bullet from the chamber, but make a new one to return. if(!chambered_bullet || chambered_bullet.is_spent) return FALSE diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/shotgun/saiga.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/shotgun/saiga.dm index 812b85d6dc..bd04b28696 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/shotgun/saiga.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/shotgun/saiga.dm @@ -80,5 +80,5 @@ /obj/item/weapon/ranged/bullet/magazine/shotgun/saiga_20/get_static_spread() return 0.007 -/obj/item/weapon/ranged/bullet/magazine/shotgun/saiga_20/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/shotgun/saiga_20/get_skill_spread(mob/living/L) return max(0,0.08 - (0.15 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/bizon.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/bizon.dm index 81963d5992..0a497cba63 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/bizon.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/bizon.dm @@ -70,5 +70,5 @@ /obj/item/weapon/ranged/bullet/magazine/smg/bizon/get_static_spread() return 0.005 -/obj/item/weapon/ranged/bullet/magazine/smg/bizon/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/smg/bizon/get_skill_spread(mob/living/L) return max(0,0.1 - (0.2 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/bullpup.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/bullpup.dm index 50f1ed99f3..4444b55285 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/bullpup.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/bullpup.dm @@ -77,7 +77,7 @@ /obj/item/weapon/ranged/bullet/magazine/smg/bullpup/get_static_spread() return 0.005 -/obj/item/weapon/ranged/bullet/magazine/smg/bullpup/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/smg/bullpup/get_skill_spread(mob/living/L) if(!heat_current) return 0 return max(0,0.02 - (0.04 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/chris.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/chris.dm index e3030091a1..c9f9dda855 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/chris.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/chris.dm @@ -80,7 +80,7 @@ /obj/item/weapon/ranged/bullet/magazine/smg/chris/get_static_spread() return 0.001 -/obj/item/weapon/ranged/bullet/magazine/smg/chris/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/smg/chris/get_skill_spread(mob/living/L) return max(0,0.005 - (0.01 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/fbi.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/fbi.dm index a1a6ad1155..98ebab807b 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/fbi.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/fbi.dm @@ -79,5 +79,5 @@ /obj/item/weapon/ranged/bullet/magazine/smg/fbi/get_static_spread() return 0.005 -/obj/item/weapon/ranged/bullet/magazine/smg/fbi/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/smg/fbi/get_skill_spread(mob/living/L) return max(0,0.01 - (0.03 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/handheld.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/handheld.dm index 03dba5e57e..051df06d71 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/handheld.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/handheld.dm @@ -77,5 +77,5 @@ /obj/item/weapon/ranged/bullet/magazine/smg/handheld/get_static_spread() return 0.015 -/obj/item/weapon/ranged/bullet/magazine/smg/handheld/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/smg/handheld/get_skill_spread(mob/living/L) return max(0,0.01 - (0.04 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/nanotech.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/nanotech.dm index a1d3d0e66b..89590d0bc8 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/nanotech.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/nanotech.dm @@ -83,5 +83,5 @@ /obj/item/weapon/ranged/bullet/magazine/smg/nanotech/get_static_spread() return 0.004 -/obj/item/weapon/ranged/bullet/magazine/smg/nanotech/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/smg/nanotech/get_skill_spread(mob/living/L) return 0.01 - (0.02 * L.get_skill_power(SKILL_RANGED)) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/p69.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/p69.dm index 489f6545b3..17217060c3 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/p69.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/p69.dm @@ -80,5 +80,5 @@ /obj/item/weapon/ranged/bullet/magazine/smg/p69/get_static_spread() return 0.02 -/obj/item/weapon/ranged/bullet/magazine/smg/p69/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/smg/p69/get_skill_spread(mob/living/L) return 0.02 - (0.04 * L.get_skill_power(SKILL_RANGED)) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/pdw.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/pdw.dm index 10d9c88aaa..b6b3f1c02d 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/pdw.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/pdw.dm @@ -80,7 +80,7 @@ /obj/item/weapon/ranged/bullet/magazine/smg/pdw/get_static_spread() return 0.005 -/obj/item/weapon/ranged/bullet/magazine/smg/pdw/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/smg/pdw/get_skill_spread(mob/living/L) return max(0,0.01 - (0.04 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/bullet/magazine/smg/pdw/update_icon() diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/pdw2.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/pdw2.dm index ff232682ec..2427d6f032 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/pdw2.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/pdw2.dm @@ -74,5 +74,5 @@ /obj/item/weapon/ranged/bullet/magazine/smg/pdw2/get_static_spread() return 0.004 -/obj/item/weapon/ranged/bullet/magazine/smg/pdw2/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/smg/pdw2/get_skill_spread(mob/living/L) return max(0,0.01 - (0.04 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/silent.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/silent.dm index 45eb2ce4be..ed50045915 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/silent.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/silent.dm @@ -14,5 +14,5 @@ /obj/item/weapon/ranged/bullet/magazine/smg/tactical/get_static_spread() //Base spread return 0.02 -/obj/item/weapon/ranged/bullet/magazine/smg/tactical/get_skill_spread(var/mob/living/L) //Base spread +/obj/item/weapon/ranged/bullet/magazine/smg/tactical/get_skill_spread(mob/living/L) //Base spread return 0.05 - (0.05 * L.get_skill_power(SKILL_RANGED)) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/smart.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/smart.dm index 12fd6fc97b..2d191ab6cc 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/smart.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/smart.dm @@ -79,5 +79,5 @@ /obj/item/weapon/ranged/bullet/magazine/smg/smart/get_static_spread() return 0.01 -/obj/item/weapon/ranged/bullet/magazine/smg/smart/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/smg/smart/get_skill_spread(mob/living/L) return max(0,0.04 - (0.04 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/syn.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/syn.dm index 7411fb9fb3..714d321b92 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/syn.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/syn.dm @@ -80,5 +80,5 @@ /obj/item/weapon/ranged/bullet/magazine/smg/syn_smg/get_static_spread() return 0.025 -/obj/item/weapon/ranged/bullet/magazine/smg/syn_smg/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/smg/syn_smg/get_skill_spread(mob/living/L) return 0.02 - (0.04 * L.get_skill_power(SKILL_RANGED)) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/tactical.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/tactical.dm index 895d8d341a..bfb466900f 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/tactical.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/tactical.dm @@ -84,7 +84,7 @@ /obj/item/weapon/ranged/bullet/magazine/smg/tactical/get_static_spread() return 0.001 -/obj/item/weapon/ranged/bullet/magazine/smg/tactical/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/smg/tactical/get_skill_spread(mob/living/L) return max(0,0.005 - (0.02 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/thompson.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/thompson.dm index ebfdb9950d..6c0dd0d7ed 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/thompson.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/thompson.dm @@ -79,7 +79,7 @@ /obj/item/weapon/ranged/bullet/magazine/smg/thompson/get_static_spread() return 0.005 -/obj/item/weapon/ranged/bullet/magazine/smg/thompson/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/smg/thompson/get_skill_spread(mob/living/L) return max(0,0.005 - (0.01 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/wasp.dm b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/wasp.dm index 29970ec59a..925dc40d41 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/wasp.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/magazine/smg/wasp.dm @@ -26,5 +26,5 @@ /obj/item/weapon/ranged/bullet/magazine/smg/wasp/get_static_spread() //Base spread return 0.03 -/obj/item/weapon/ranged/bullet/magazine/smg/wasp/get_skill_spread(var/mob/living/L) //Base spread +/obj/item/weapon/ranged/bullet/magazine/smg/wasp/get_skill_spread(mob/living/L) //Base spread return 0.03 - (0.03 * L.get_skill_power(SKILL_RANGED)) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/pump/_pump.dm b/code/_core/obj/item/weapon/ranged/bullet/pump/_pump.dm index 240a11bc66..2df0283d73 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/pump/_pump.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/pump/_pump.dm @@ -12,7 +12,7 @@ tier_type = "shotgun" -/obj/item/weapon/ranged/bullet/pump/proc/pump(var/mob/caller,var/silent=FALSE) +/obj/item/weapon/ranged/bullet/pump/proc/pump(mob/caller,silent=FALSE) var/turf/T = get_turf(src) @@ -36,7 +36,7 @@ /obj/item/weapon/ranged/bullet/pump/get_ranged_damage_type() return stored_bullets[1] ? stored_bullets[1].damage_type : null -/obj/item/weapon/ranged/bullet/pump/click_self(var/mob/caller,location,control,params) +/obj/item/weapon/ranged/bullet/pump/click_self(mob/caller,location,control,params) if(next_shoot_time > world.time + pump_delay) return TRUE @@ -57,8 +57,8 @@ return get_real_length(stored_bullets) -/obj/item/weapon/ranged/bullet/pump/can_load_chamber(var/mob/caller,var/obj/item/bullet_cartridge/B) +/obj/item/weapon/ranged/bullet/pump/can_load_chamber(mob/caller,obj/item/bullet_cartridge/B) return FALSE -/obj/item/weapon/ranged/bullet/pump/get_examine_list(var/mob/caller) +/obj/item/weapon/ranged/bullet/pump/get_examine_list(mob/caller) return ..() + div("notice","[get_ammo_count()] shell\s remaining in the tube.") diff --git a/code/_core/obj/item/weapon/ranged/bullet/pump/rev_gl.dm b/code/_core/obj/item/weapon/ranged/bullet/pump/rev_gl.dm index c5aa076025..544707a8e1 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/pump/rev_gl.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/pump/rev_gl.dm @@ -79,5 +79,5 @@ /obj/item/weapon/ranged/bullet/pump/gm94/get_static_spread() return 0.01 -/obj/item/weapon/ranged/bullet/pump/gm94/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/pump/gm94/get_skill_spread(mob/living/L) return max(0,0.03 - (0.12 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/pump/rifle/hunting.dm b/code/_core/obj/item/weapon/ranged/bullet/pump/rifle/hunting.dm index 567e300066..98b1c2b2ba 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/pump/rifle/hunting.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/pump/rifle/hunting.dm @@ -32,5 +32,5 @@ return 0.01 return 0 -/obj/item/weapon/ranged/bullet/pump/rifle/hunting/get_skill_spread(var/mob/living/L) //Base spread +/obj/item/weapon/ranged/bullet/pump/rifle/hunting/get_skill_spread(mob/living/L) //Base spread return 0.01 - (0.01 * L.get_skill_power(SKILL_RANGED)) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/combat_shotgun.dm b/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/combat_shotgun.dm index cd8e2622f9..52ad64b095 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/combat_shotgun.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/combat_shotgun.dm @@ -78,7 +78,7 @@ /obj/item/weapon/ranged/bullet/pump/shotgun/combat/get_static_spread() return 0.002 -/obj/item/weapon/ranged/bullet/pump/shotgun/combat/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/pump/shotgun/combat/get_skill_spread(mob/living/L) return max(0,0.005 - (0.005 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/bullet/pump/shotgun/combat/get_base_spread() diff --git a/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/doom.dm b/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/doom.dm index 037b34296d..129bbad083 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/doom.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/doom.dm @@ -80,7 +80,7 @@ /obj/item/weapon/ranged/bullet/pump/shotgun/doom/get_static_spread() return 0.005 -/obj/item/weapon/ranged/bullet/pump/shotgun/doom/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/pump/shotgun/doom/get_skill_spread(mob/living/L) return max(0,0.04 - (0.08 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/bullet/pump/shotgun/doom/get_base_spread() diff --git a/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/fortress.dm b/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/fortress.dm index c6a0f3b7fe..e7f3bb9446 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/fortress.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/fortress.dm @@ -80,7 +80,7 @@ /obj/item/weapon/ranged/bullet/pump/shotgun/fortress/get_static_spread() return 0.015 -/obj/item/weapon/ranged/bullet/pump/shotgun/fortress/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/pump/shotgun/fortress/get_skill_spread(mob/living/L) return max(0,0.01 - (0.05 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/bullet/pump/shotgun/fortress/get_base_spread() diff --git a/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/frenchie.dm b/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/frenchie.dm index 22d586b47f..51becc6fbe 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/frenchie.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/frenchie.dm @@ -77,7 +77,7 @@ /obj/item/weapon/ranged/bullet/pump/shotgun/frenchie/get_static_spread() return 0.004 -/obj/item/weapon/ranged/bullet/pump/shotgun/frenchie/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/pump/shotgun/frenchie/get_skill_spread(mob/living/L) return max(0,0.01 - (0.04 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/bullet/pump/shotgun/frenchie/get_base_spread() diff --git a/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/ks23.dm b/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/ks23.dm index b57e3d0b48..6092f13773 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/ks23.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/ks23.dm @@ -82,6 +82,6 @@ /obj/item/weapon/ranged/bullet/pump/shotgun/ks23/get_static_spread() return 0.003 -/obj/item/weapon/ranged/bullet/pump/shotgun/ks23/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/pump/shotgun/ks23/get_skill_spread(mob/living/L) if(!heat_current) return 0 return max(0,0.025 - (0.01 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/lever.dm b/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/lever.dm index 51f5a5f0ef..253d083339 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/lever.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/lever.dm @@ -79,7 +79,7 @@ /obj/item/weapon/ranged/bullet/pump/shotgun/lever/get_static_spread() return 0.001 -/obj/item/weapon/ranged/bullet/pump/shotgun/lever/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/pump/shotgun/lever/get_skill_spread(mob/living/L) if(!heat_current) return 0 return max(0,0.02 - (0.04 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/nt.dm b/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/nt.dm index f3b3397d26..b9ce2aa20e 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/nt.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/nt.dm @@ -79,7 +79,7 @@ /obj/item/weapon/ranged/bullet/pump/shotgun/nt/get_static_spread() return 0.004 -/obj/item/weapon/ranged/bullet/pump/shotgun/nt/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/pump/shotgun/nt/get_skill_spread(mob/living/L) return max(0,0.01 - (0.04 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/bullet/pump/shotgun/nt/get_base_spread() diff --git a/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/semi.dm b/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/semi.dm index e6f5cefca0..a5b36349be 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/semi.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/semi.dm @@ -82,13 +82,13 @@ /obj/item/weapon/ranged/bullet/pump/shotgun/semi/get_static_spread() return 0.007 -/obj/item/weapon/ranged/bullet/pump/shotgun/semi/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/pump/shotgun/semi/get_skill_spread(mob/living/L) return max(0,0.04 - (0.08 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/bullet/pump/shotgun/semi/get_base_spread() return 0.2 -/obj/item/weapon/ranged/bullet/pump/shotgun/semi/handle_ammo(var/mob/caller) +/obj/item/weapon/ranged/bullet/pump/shotgun/semi/handle_ammo(mob/caller) . = ..() pump(silent = TRUE) diff --git a/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/tactical.dm b/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/tactical.dm index c785d3fc0e..8854004adc 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/tactical.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/tactical.dm @@ -82,7 +82,7 @@ /obj/item/weapon/ranged/bullet/pump/shotgun/tactical/get_static_spread() return 0.008 -/obj/item/weapon/ranged/bullet/pump/shotgun/tactical/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/pump/shotgun/tactical/get_skill_spread(mob/living/L) return max(0,0.04 - (0.06 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/bullet/pump/shotgun/tactical/get_base_spread() diff --git a/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/tech.dm b/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/tech.dm index 1921230a55..2a6391dd2b 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/tech.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/pump/shotgun/tech.dm @@ -80,13 +80,13 @@ /obj/item/weapon/ranged/bullet/pump/shotgun/tech/get_static_spread() return 0.006 -/obj/item/weapon/ranged/bullet/pump/shotgun/tech/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/pump/shotgun/tech/get_skill_spread(mob/living/L) return max(0,0.06 - (0.06 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/bullet/pump/shotgun/tech/get_base_spread() return 0.18 -/obj/item/weapon/ranged/bullet/pump/shotgun/tech/handle_ammo(var/mob/caller) +/obj/item/weapon/ranged/bullet/pump/shotgun/tech/handle_ammo(mob/caller) . = ..() pump(silent = TRUE) diff --git a/code/_core/obj/item/weapon/ranged/bullet/revolver/_revolver.dm b/code/_core/obj/item/weapon/ranged/bullet/revolver/_revolver.dm index c9316b6b23..75f4da157c 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/revolver/_revolver.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/revolver/_revolver.dm @@ -19,7 +19,7 @@ open = TRUE . = ..() -/obj/item/weapon/ranged/bullet/revolver/proc/can_fit_clip(var/obj/item/I) +/obj/item/weapon/ranged/bullet/revolver/proc/can_fit_clip(obj/item/I) if(istype(I,/obj/item/magazine/clip/revolver)) var/obj/item/magazine/M = I @@ -28,7 +28,7 @@ return FALSE -/obj/item/weapon/ranged/bullet/revolver/shoot(var/mob/caller,var/atom/object,location,params,var/damage_multiplier=1,var/click_called=FALSE) +/obj/item/weapon/ranged/bullet/revolver/shoot(mob/caller,atom/object,location,params,damage_multiplier=1,click_called=FALSE) if(!has_quickshot) return ..() @@ -45,7 +45,7 @@ play_sound('sound/weapons/ranged/generic/revolver_timing.ogg',T) -/obj/item/weapon/ranged/bullet/revolver/get_shoot_delay(var/mob/caller,var/atom/target,location,params) +/obj/item/weapon/ranged/bullet/revolver/get_shoot_delay(mob/caller,atom/target,location,params) . = ..() @@ -57,17 +57,17 @@ if(shot_ago >= 1 && shot_ago <= .) //Can shoot really fast, for a penalty. return shot_ago -/obj/item/weapon/ranged/bullet/revolver/New(var/desired_loc) +/obj/item/weapon/ranged/bullet/revolver/New(desired_loc) . = ..() stored_bullets = new/list(bullet_count_max) /obj/item/weapon/ranged/bullet/revolver/get_ranged_damage_type() return stored_bullets[current_chamber] ? stored_bullets[current_chamber].damage_type : null -/obj/item/weapon/ranged/bullet/revolver/can_load_chamber(var/mob/caller,var/obj/item/bullet_cartridge/B) +/obj/item/weapon/ranged/bullet/revolver/can_load_chamber(mob/caller,obj/item/bullet_cartridge/B) return FALSE -/obj/item/weapon/ranged/bullet/revolver/proc/rotate_cylinder(var/rotate_amount=1) +/obj/item/weapon/ranged/bullet/revolver/proc/rotate_cylinder(rotate_amount=1) if(rotate_amount == 0) return FALSE @@ -77,7 +77,7 @@ return current_chamber -/obj/item/weapon/ranged/bullet/revolver/click_self(var/mob/caller,location,control,params) +/obj/item/weapon/ranged/bullet/revolver/click_self(mob/caller,location,control,params) if(can_shoot_while_open) return TRUE @@ -104,12 +104,12 @@ /obj/item/weapon/ranged/bullet/revolver/get_ammo_count() return get_real_length(stored_bullets) -/obj/item/weapon/ranged/bullet/revolver/handle_ammo(var/mob/caller,var/bullet_position=1) +/obj/item/weapon/ranged/bullet/revolver/handle_ammo(mob/caller,bullet_position=1) var/obj/item/bullet_cartridge/B = spend_stored_bullet(caller,current_chamber) rotate_cylinder(1) return B -/obj/item/weapon/ranged/bullet/revolver/can_gun_shoot(var/mob/caller,var/atom/object,location,params,var/check_time=TRUE,var/messages=TRUE) +/obj/item/weapon/ranged/bullet/revolver/can_gun_shoot(mob/caller,atom/object,location,params,check_time=TRUE,messages=TRUE) if(!can_shoot_while_open && open) if(messages) caller.to_chat(span("warning","Close \the [src.name] before firing!")) @@ -117,7 +117,7 @@ return ..() -/obj/item/weapon/ranged/bullet/revolver/clicked_on_by_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/weapon/ranged/bullet/revolver/clicked_on_by_object(mob/caller as mob,atom/object,location,control,params) if(open && is_inventory(object) && src && is_inventory(src.loc)) //The revolver is in an inventory, and you clicked on it with your empty hands. diff --git a/code/_core/obj/item/weapon/ranged/bullet/revolver/big_game.dm b/code/_core/obj/item/weapon/ranged/bullet/revolver/big_game.dm index cfd84b9d77..b4513f6c09 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/revolver/big_game.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/revolver/big_game.dm @@ -75,5 +75,5 @@ /obj/item/weapon/ranged/bullet/revolver/big_game/get_static_spread() return 0 -/obj/item/weapon/ranged/bullet/revolver/big_game/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/revolver/big_game/get_skill_spread(mob/living/L) return max(0,0.02 - (0.02 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/revolver/commander.dm b/code/_core/obj/item/weapon/ranged/bullet/revolver/commander.dm index ebbe201d3d..73e05ca263 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/revolver/commander.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/revolver/commander.dm @@ -74,5 +74,5 @@ /obj/item/weapon/ranged/bullet/revolver/commander/get_static_spread() return 0 -/obj/item/weapon/ranged/bullet/revolver/commander/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/revolver/commander/get_skill_spread(mob/living/L) return max(0,0.01 - (0.01 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/revolver/comp.dm b/code/_core/obj/item/weapon/ranged/bullet/revolver/comp.dm index 196952a0e2..3d67e71a9d 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/revolver/comp.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/revolver/comp.dm @@ -74,5 +74,5 @@ /obj/item/weapon/ranged/bullet/revolver/comp/get_static_spread() return 0 -/obj/item/weapon/ranged/bullet/revolver/comp/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/revolver/comp/get_skill_spread(mob/living/L) return max(0,0.01 - (0.01 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/revolver/dbarrel.dm b/code/_core/obj/item/weapon/ranged/bullet/revolver/dbarrel.dm index 964532e70c..28883103b8 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/revolver/dbarrel.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/revolver/dbarrel.dm @@ -48,5 +48,5 @@ /obj/item/weapon/ranged/bullet/revolver/dbarrel/get_static_spread() return 0.01 -/obj/item/weapon/ranged/bullet/revolver/dbarrel/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/revolver/dbarrel/get_skill_spread(mob/living/L) return max(0,0.03 - (0.06 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/revolver/deckhard.dm b/code/_core/obj/item/weapon/ranged/bullet/revolver/deckhard.dm index fa7b687ab2..360e282624 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/revolver/deckhard.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/revolver/deckhard.dm @@ -74,5 +74,5 @@ /obj/item/weapon/ranged/bullet/revolver/deckhard/get_static_spread() return 0 -/obj/item/weapon/ranged/bullet/revolver/deckhard/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/revolver/deckhard/get_skill_spread(mob/living/L) return max(0,0.0075 - (0.0075 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/revolver/defender.dm b/code/_core/obj/item/weapon/ranged/bullet/revolver/defender.dm index 1c4d31d9ee..9b51f8fbff 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/revolver/defender.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/revolver/defender.dm @@ -73,5 +73,5 @@ /obj/item/weapon/ranged/bullet/revolver/defender/get_static_spread() return 0 -/obj/item/weapon/ranged/bullet/revolver/defender/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/revolver/defender/get_skill_spread(mob/living/L) return max(0,0.005 - (0.02 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/revolver/detective.dm b/code/_core/obj/item/weapon/ranged/bullet/revolver/detective.dm index e28c95fc7f..18db0b319e 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/revolver/detective.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/revolver/detective.dm @@ -74,5 +74,5 @@ /obj/item/weapon/ranged/bullet/revolver/detective/get_static_spread() return 0.005 -/obj/item/weapon/ranged/bullet/revolver/detective/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/revolver/detective/get_skill_spread(mob/living/L) return max(0,0.005 - (0.02 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/revolver/fiendish_revolver.dm b/code/_core/obj/item/weapon/ranged/bullet/revolver/fiendish_revolver.dm index 2dd475b998..36aefe8980 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/revolver/fiendish_revolver.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/revolver/fiendish_revolver.dm @@ -85,10 +85,10 @@ /obj/item/weapon/ranged/bullet/revolver/fiendish/get_static_spread() return 0 -/obj/item/weapon/ranged/bullet/revolver/fiendish/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/revolver/fiendish/get_skill_spread(mob/living/L) return max(0,0.01 - (0.01 * L.get_skill_power(SKILL_RANGED))) -/obj/item/weapon/ranged/bullet/revolver/fiendish/click_self(var/mob/caller,location,control,params) +/obj/item/weapon/ranged/bullet/revolver/fiendish/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(1) diff --git a/code/_core/obj/item/weapon/ranged/bullet/revolver/flintlock.dm b/code/_core/obj/item/weapon/ranged/bullet/revolver/flintlock.dm index 4ae8c389b0..eee2236520 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/revolver/flintlock.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/revolver/flintlock.dm @@ -82,5 +82,5 @@ /obj/item/weapon/ranged/bullet/revolver/flintlock/get_static_spread() return 0.01 //Smoothbore -/obj/item/weapon/ranged/bullet/revolver/flintlock/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/revolver/flintlock/get_skill_spread(mob/living/L) return max(0,0.02 - (0.02 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/bullet/revolver/gauss.dm b/code/_core/obj/item/weapon/ranged/bullet/revolver/gauss.dm index a52614e3cc..8207439137 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/revolver/gauss.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/revolver/gauss.dm @@ -43,5 +43,5 @@ /obj/item/weapon/ranged/bullet/magazine/rifle/gauss_gun/get_static_spread() return 0.03 -/obj/item/weapon/ranged/bullet/magazine/rifle/gauss_gun/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/magazine/rifle/gauss_gun/get_skill_spread(mob/living/L) return max(0.01 - (0.02 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/revolver/grenade_launcher.dm b/code/_core/obj/item/weapon/ranged/bullet/revolver/grenade_launcher.dm index 4cebfef33d..0be02c15e1 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/revolver/grenade_launcher.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/revolver/grenade_launcher.dm @@ -75,7 +75,7 @@ /obj/item/weapon/ranged/bullet/revolver/grenade_launcher/get_static_spread() return 0.01 -/obj/item/weapon/ranged/bullet/revolver/grenade_launcher/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/revolver/grenade_launcher/get_skill_spread(mob/living/L) return max(0,0.03 - (0.12 * L.get_skill_power(SKILL_RANGED))) @@ -85,7 +85,7 @@ open = TRUE can_shoot_while_open = TRUE -/obj/item/weapon/ranged/bullet/revolver/grenade_launcher/undermount/click_self(var/mob/caller,location,control,params) +/obj/item/weapon/ranged/bullet/revolver/grenade_launcher/undermount/click_self(mob/caller,location,control,params) return TRUE /obj/item/weapon/ranged/bullet/revolver/grenade_launcher/multibarrel diff --git a/code/_core/obj/item/weapon/ranged/bullet/revolver/horse.dm b/code/_core/obj/item/weapon/ranged/bullet/revolver/horse.dm index 120cbb813d..17a6526952 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/revolver/horse.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/revolver/horse.dm @@ -78,10 +78,10 @@ /obj/item/weapon/ranged/bullet/revolver/horse/get_static_spread() return 0 -/obj/item/weapon/ranged/bullet/revolver/horse/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/revolver/horse/get_skill_spread(mob/living/L) return max(0,0.01 - (0.01 * L.get_skill_power(SKILL_RANGED))) -/obj/item/weapon/ranged/bullet/revolver/horse/click_self(var/mob/caller,location,control,params) +/obj/item/weapon/ranged/bullet/revolver/horse/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(1) diff --git a/code/_core/obj/item/weapon/ranged/bullet/revolver/musket.dm b/code/_core/obj/item/weapon/ranged/bullet/revolver/musket.dm index 860bc9fb47..a04b08cbed 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/revolver/musket.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/revolver/musket.dm @@ -92,7 +92,7 @@ /obj/item/weapon/ranged/bullet/revolver/musket/get_static_spread() return 0.005 //Smoothbore -/obj/item/weapon/ranged/bullet/revolver/flintlock/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/revolver/flintlock/get_skill_spread(mob/living/L) return max(0,0.012 - (0.012 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/bullet/revolver/nagant.dm b/code/_core/obj/item/weapon/ranged/bullet/revolver/nagant.dm index 55796c3efc..dd39aa58a7 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/revolver/nagant.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/revolver/nagant.dm @@ -76,5 +76,5 @@ /obj/item/weapon/ranged/bullet/revolver/nagant/get_static_spread() return 0 -/obj/item/weapon/ranged/bullet/revolver/nagant/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/revolver/nagant/get_skill_spread(mob/living/L) return max(0,0.02 - (0.02 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/revolver/rocket.dm b/code/_core/obj/item/weapon/ranged/bullet/revolver/rocket.dm index 5a87976300..f15b618e5e 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/revolver/rocket.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/revolver/rocket.dm @@ -50,9 +50,9 @@ /obj/item/weapon/ranged/bullet/revolver/rocket/get_static_spread() return 0.005 -/obj/item/weapon/ranged/bullet/revolver/rocket/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/revolver/rocket/get_skill_spread(mob/living/L) return max(0,0.03 - (0.12 * L.get_skill_power(SKILL_RANGED))) -/obj/item/weapon/ranged/bullet/revolver/rocket/use_condition(var/amount_to_use=1) +/obj/item/weapon/ranged/bullet/revolver/rocket/use_condition(amount_to_use=1) adjust_quality(-10) return TRUE diff --git a/code/_core/obj/item/weapon/ranged/bullet/revolver/sbarrel.dm b/code/_core/obj/item/weapon/ranged/bullet/revolver/sbarrel.dm index a901b0d11d..61bcf5942c 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/revolver/sbarrel.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/revolver/sbarrel.dm @@ -48,7 +48,7 @@ /obj/item/weapon/ranged/bullet/revolver/sbarrel/get_static_spread() return 0.005 -/obj/item/weapon/ranged/bullet/revolver/sbarrel/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/revolver/sbarrel/get_skill_spread(mob/living/L) return max(0,0.02 - (0.08 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/bullet/revolver/sweep.dm b/code/_core/obj/item/weapon/ranged/bullet/revolver/sweep.dm index fd30565b9b..dfdb098ad2 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/revolver/sweep.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/revolver/sweep.dm @@ -84,10 +84,10 @@ /obj/item/weapon/ranged/bullet/revolver/sweep/get_static_spread() return 0.005 -/obj/item/weapon/ranged/bullet/revolver/sweep/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/revolver/sweep/get_skill_spread(mob/living/L) return max(0,0.01 - (0.01 * L.get_skill_power(SKILL_RANGED))) -/obj/item/weapon/ranged/bullet/revolver/sweep/click_self(var/mob/caller,location,control,params) +/obj/item/weapon/ranged/bullet/revolver/sweep/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(1) diff --git a/code/_core/obj/item/weapon/ranged/bullet/revolver/traitor.dm b/code/_core/obj/item/weapon/ranged/bullet/revolver/traitor.dm index d42f220ffd..4a898e272f 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/revolver/traitor.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/revolver/traitor.dm @@ -75,5 +75,5 @@ /obj/item/weapon/ranged/bullet/revolver/traitor_357/get_static_spread() return 0.001 -/obj/item/weapon/ranged/bullet/revolver/traitor_357/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/revolver/traitor_357/get_skill_spread(mob/living/L) return max(0,0.01 - (0.01 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/bullet/revolver/tribarrel_shotgun.dm b/code/_core/obj/item/weapon/ranged/bullet/revolver/tribarrel_shotgun.dm index 290b342714..79cce98a1b 100644 --- a/code/_core/obj/item/weapon/ranged/bullet/revolver/tribarrel_shotgun.dm +++ b/code/_core/obj/item/weapon/ranged/bullet/revolver/tribarrel_shotgun.dm @@ -76,5 +76,5 @@ /obj/item/weapon/ranged/bullet/revolver/tribarrel/get_static_spread() return 0.01 -/obj/item/weapon/ranged/bullet/revolver/tribarrel/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/bullet/revolver/tribarrel/get_skill_spread(mob/living/L) return max(0,0.03 - (0.12 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/laser/_laser.dm b/code/_core/obj/item/weapon/ranged/laser/_laser.dm index b066abb224..29e1c69bb0 100644 --- a/code/_core/obj/item/weapon/ranged/laser/_laser.dm +++ b/code/_core/obj/item/weapon/ranged/laser/_laser.dm @@ -25,11 +25,11 @@ . = ..() if(battery) . += battery.get_value() -/obj/item/weapon/ranged/energy/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/weapon/ranged/energy/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEATOM("battery") -/obj/item/weapon/ranged/energy/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/weapon/ranged/energy/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADATOM("battery") @@ -60,7 +60,7 @@ charge_cost = get_charge_cost() -/obj/item/weapon/ranged/energy/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/weapon/ranged/energy/clicked_on_by_object(mob/caller,atom/object,location,control,params) @@ -119,7 +119,7 @@ return battery -/obj/item/weapon/ranged/energy/New(var/desired_loc) +/obj/item/weapon/ranged/energy/New(desired_loc) charge_cost = FLOOR(charge_cost, 1) return ..() @@ -129,13 +129,13 @@ return 0 return FLOOR(battery.charge_current/charge_cost, 1) -/obj/item/weapon/ranged/energy/handle_ammo(var/mob/caller,var/bullet_position=1) +/obj/item/weapon/ranged/energy/handle_ammo(mob/caller,bullet_position=1) var/obj/item/powercell/PC = get_battery() if(istype(PC)) PC.charge_current -= charge_cost return null -/obj/item/weapon/ranged/energy/can_gun_shoot(var/mob/caller,var/atom/object,location,params,var/check_time=TRUE,var/messages=TRUE) +/obj/item/weapon/ranged/energy/can_gun_shoot(mob/caller,atom/object,location,params,check_time=TRUE,messages=TRUE) if(!..()) return FALSE @@ -152,7 +152,7 @@ return TRUE -/obj/item/weapon/ranged/energy/get_examine_list(var/mob/caller) +/obj/item/weapon/ranged/energy/get_examine_list(mob/caller) . = ..() diff --git a/code/_core/obj/item/weapon/ranged/laser/abductor.dm b/code/_core/obj/item/weapon/ranged/laser/abductor.dm index 1e8fbdb471..6aa44fbc43 100644 --- a/code/_core/obj/item/weapon/ranged/laser/abductor.dm +++ b/code/_core/obj/item/weapon/ranged/laser/abductor.dm @@ -50,10 +50,10 @@ /obj/item/weapon/ranged/energy/abductor/get_static_spread() return 0 -/obj/item/weapon/ranged/energy/abductor/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/energy/abductor/get_skill_spread(mob/living/L) return max(0,0.05 - (0.02 * L.get_skill_power(SKILL_RANGED))) -/obj/item/weapon/ranged/energy/abductor/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/weapon/ranged/energy/abductor/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(is_item(object)) var/obj/item/I = object diff --git a/code/_core/obj/item/weapon/ranged/laser/captain.dm b/code/_core/obj/item/weapon/ranged/laser/captain.dm index 33430e3f7f..ddc8901575 100644 --- a/code/_core/obj/item/weapon/ranged/laser/captain.dm +++ b/code/_core/obj/item/weapon/ranged/laser/captain.dm @@ -51,10 +51,10 @@ /obj/item/weapon/ranged/energy/captain/get_static_spread() return 0 -/obj/item/weapon/ranged/energy/captain/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/energy/captain/get_skill_spread(mob/living/L) return max(0,0.01 - (0.02 * L.get_skill_power(SKILL_RANGED))) -/obj/item/weapon/ranged/energy/captain/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/weapon/ranged/energy/captain/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(is_item(object)) var/obj/item/I = object diff --git a/code/_core/obj/item/weapon/ranged/laser/chronogun.dm b/code/_core/obj/item/weapon/ranged/laser/chronogun.dm index 709202fa1f..3c0d57d617 100644 --- a/code/_core/obj/item/weapon/ranged/laser/chronogun.dm +++ b/code/_core/obj/item/weapon/ranged/laser/chronogun.dm @@ -31,5 +31,5 @@ /obj/item/weapon/ranged/energy/chronogun/get_static_spread() return 0 -/obj/item/weapon/ranged/energy/chronogun/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/energy/chronogun/get_skill_spread(mob/living/L) return max(0,0.04 - (0.04 * L.get_skill_power(SKILL_RANGED))) \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/laser/clockwork_turret.dm b/code/_core/obj/item/weapon/ranged/laser/clockwork_turret.dm index 9330bad575..e95970ee52 100644 --- a/code/_core/obj/item/weapon/ranged/laser/clockwork_turret.dm +++ b/code/_core/obj/item/weapon/ranged/laser/clockwork_turret.dm @@ -35,7 +35,7 @@ /obj/item/weapon/ranged/energy/clockwork_turret/get_static_spread() return 0.003 -/obj/item/weapon/ranged/energy/clockwork_turret/can_owner_shoot(var/mob/caller,var/atom/object,location,params) +/obj/item/weapon/ranged/energy/clockwork_turret/can_owner_shoot(mob/caller,atom/object,location,params) if(caller.is_player_controlled()) return FALSE return ..() \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/laser/dynamic.dm b/code/_core/obj/item/weapon/ranged/laser/dynamic.dm index 371cfd0667..2170f37448 100644 --- a/code/_core/obj/item/weapon/ranged/laser/dynamic.dm +++ b/code/_core/obj/item/weapon/ranged/laser/dynamic.dm @@ -71,5 +71,5 @@ /obj/item/weapon/ranged/energy/dynamic/get_static_spread() return 0 -/obj/item/weapon/ranged/energy/dynamic/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/energy/dynamic/get_skill_spread(mob/living/L) return max(0,0.02 - (0.02 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/laser/fed/_fed.dm b/code/_core/obj/item/weapon/ranged/laser/fed/_fed.dm index 75333cf3eb..5fe8eae558 100644 --- a/code/_core/obj/item/weapon/ranged/laser/fed/_fed.dm +++ b/code/_core/obj/item/weapon/ranged/laser/fed/_fed.dm @@ -7,7 +7,7 @@ var/fed_item = null var/feed_delay = 1 -/obj/item/weapon/ranged/energy/fed/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/weapon/ranged/energy/fed/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(is_item(object)) if(istype(object,fed_item)) diff --git a/code/_core/obj/item/weapon/ranged/laser/flamethrower.dm b/code/_core/obj/item/weapon/ranged/laser/flamethrower.dm index 27030fe30d..6e0850c4dd 100644 --- a/code/_core/obj/item/weapon/ranged/laser/flamethrower.dm +++ b/code/_core/obj/item/weapon/ranged/laser/flamethrower.dm @@ -29,7 +29,7 @@ can_save = FALSE -/obj/item/weapon/ranged/energy/flamethrower/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/weapon/ranged/energy/flamethrower/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(is_item(object)) var/obj/item/I = object diff --git a/code/_core/obj/item/weapon/ranged/laser/freezegun.dm b/code/_core/obj/item/weapon/ranged/laser/freezegun.dm index f2fc600f0a..23eea3c647 100644 --- a/code/_core/obj/item/weapon/ranged/laser/freezegun.dm +++ b/code/_core/obj/item/weapon/ranged/laser/freezegun.dm @@ -71,7 +71,7 @@ /obj/item/weapon/ranged/energy/freezegun/get_static_spread() return 0.001 -/obj/item/weapon/ranged/energy/freezegun/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/energy/freezegun/get_skill_spread(mob/living/L) return max(0,0.01 - (0.02 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/energy/freezegun/update_icon() diff --git a/code/_core/obj/item/weapon/ranged/laser/gatling.dm b/code/_core/obj/item/weapon/ranged/laser/gatling.dm index 04931a8222..4af609305a 100644 --- a/code/_core/obj/item/weapon/ranged/laser/gatling.dm +++ b/code/_core/obj/item/weapon/ranged/laser/gatling.dm @@ -44,13 +44,13 @@ rarity = RARITY_MYTHICAL -/obj/item/weapon/ranged/energy/gatling/get_static_spread(var/mob/living/L) +/obj/item/weapon/ranged/energy/gatling/get_static_spread(mob/living/L) return 0.05 /obj/item/weapon/ranged/energy/gatling/get_base_spread() return 0.2 -/obj/item/weapon/ranged/energy/gatling/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/energy/gatling/get_skill_spread(mob/living/L) return max(0,0.15 - (0.1 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/energy/gatling/update_icon() diff --git a/code/_core/obj/item/weapon/ranged/laser/hybrid/_hybrid.dm b/code/_core/obj/item/weapon/ranged/laser/hybrid/_hybrid.dm index d6e07d29b5..a55713efcc 100644 --- a/code/_core/obj/item/weapon/ranged/laser/hybrid/_hybrid.dm +++ b/code/_core/obj/item/weapon/ranged/laser/hybrid/_hybrid.dm @@ -15,7 +15,7 @@ var/list/shoot_sounds_kill = list() var/list/shoot_sounds_stun = list() -/obj/item/weapon/ranged/energy/hybrid/New(var/desired_loc) +/obj/item/weapon/ranged/energy/hybrid/New(desired_loc) . = ..() //Set to kill. @@ -28,7 +28,7 @@ update_sprite() -/obj/item/weapon/ranged/energy/hybrid/click_self(var/mob/caller,location,control,params) +/obj/item/weapon/ranged/energy/hybrid/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(1) diff --git a/code/_core/obj/item/weapon/ranged/laser/hybrid/carbine.dm b/code/_core/obj/item/weapon/ranged/laser/hybrid/carbine.dm index bc98edf63c..f0a5de9526 100644 --- a/code/_core/obj/item/weapon/ranged/laser/hybrid/carbine.dm +++ b/code/_core/obj/item/weapon/ranged/laser/hybrid/carbine.dm @@ -72,7 +72,7 @@ /obj/item/weapon/ranged/energy/hybrid/carbine/get_static_spread() return 0.001 -/obj/item/weapon/ranged/energy/hybrid/carbine/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/energy/hybrid/carbine/get_skill_spread(mob/living/L) return max(0,0.02 - (0.08 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/energy/hybrid/carbine/small diff --git a/code/_core/obj/item/weapon/ranged/laser/iongun.dm b/code/_core/obj/item/weapon/ranged/laser/iongun.dm index 9b4887b6b8..6808730f59 100644 --- a/code/_core/obj/item/weapon/ranged/laser/iongun.dm +++ b/code/_core/obj/item/weapon/ranged/laser/iongun.dm @@ -43,7 +43,7 @@ if(wielded) return 0 return 0.001 -/obj/item/weapon/ranged/energy/iongun/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/energy/iongun/get_skill_spread(mob/living/L) return max(0,0.005 - (0.01 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/energy/iongun/update_icon() diff --git a/code/_core/obj/item/weapon/ranged/laser/laser_rifle.dm b/code/_core/obj/item/weapon/ranged/laser/laser_rifle.dm index aba2e7e481..79d4327039 100644 --- a/code/_core/obj/item/weapon/ranged/laser/laser_rifle.dm +++ b/code/_core/obj/item/weapon/ranged/laser/laser_rifle.dm @@ -80,10 +80,10 @@ /obj/item/weapon/ranged/energy/rifle/get_static_spread() return 0.005 -/obj/item/weapon/ranged/energy/rifle/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/energy/rifle/get_skill_spread(mob/living/L) return max(0,0.05 - (0.02 * L.get_skill_power(SKILL_RANGED))) -/obj/item/weapon/ranged/energy/rifle/New(var/desired_loc) +/obj/item/weapon/ranged/energy/rifle/New(desired_loc) . = ..() update_sprite() diff --git a/code/_core/obj/item/weapon/ranged/laser/laser_sniper.dm b/code/_core/obj/item/weapon/ranged/laser/laser_sniper.dm index 07df592106..313878f09d 100644 --- a/code/_core/obj/item/weapon/ranged/laser/laser_sniper.dm +++ b/code/_core/obj/item/weapon/ranged/laser/laser_sniper.dm @@ -72,7 +72,7 @@ /obj/item/weapon/ranged/energy/sniper/get_static_spread() return 0 -/obj/item/weapon/ranged/energy/sniper/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/energy/sniper/get_skill_spread(mob/living/L) return max(0,0.005 - (0.01 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/energy/sniper/update_icon() diff --git a/code/_core/obj/item/weapon/ranged/laser/mech/_mech.dm b/code/_core/obj/item/weapon/ranged/laser/mech/_mech.dm index e49ad9fb78..5675fe6b4f 100644 --- a/code/_core/obj/item/weapon/ranged/laser/mech/_mech.dm +++ b/code/_core/obj/item/weapon/ranged/laser/mech/_mech.dm @@ -26,7 +26,7 @@ plane = PLANE_ABSTRACT value_burgerbux = -1 -/obj/item/weapon/ranged/energy/mech/can_owner_shoot(var/mob/caller,var/atom/object,location,params) +/obj/item/weapon/ranged/energy/mech/can_owner_shoot(mob/caller,atom/object,location,params) if(!istype(loc?.loc,/mob/living/vehicle/)) caller?.to_chat(span("warning","This weapon can only be fired in a vehicle!")) @@ -73,7 +73,7 @@ /obj/item/weapon/ranged/energy/mech/smg/get_static_spread() return 0.005 -/obj/item/weapon/ranged/energy/mech/smg/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/energy/mech/smg/get_skill_spread(mob/living/L) return 0 /obj/item/weapon/ranged/energy/mech/lmg @@ -105,7 +105,7 @@ /obj/item/weapon/ranged/energy/mech/lmg/get_static_spread() return 0.002 -/obj/item/weapon/ranged/energy/mech/lmg/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/energy/mech/lmg/get_skill_spread(mob/living/L) return 0 @@ -139,7 +139,7 @@ /obj/item/weapon/ranged/energy/mech/laser/get_static_spread() return 0 -/obj/item/weapon/ranged/energy/mech/laser/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/energy/mech/laser/get_skill_spread(mob/living/L) return 0 @@ -175,7 +175,7 @@ /obj/item/weapon/ranged/energy/mech/ion/get_static_spread() return 0 -/obj/item/weapon/ranged/energy/mech/ion/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/energy/mech/ion/get_skill_spread(mob/living/L) return 0 @@ -210,5 +210,5 @@ /obj/item/weapon/ranged/energy/mech/missile_pod/get_static_spread() return 0.01 -/obj/item/weapon/ranged/energy/mech/missile_pod/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/energy/mech/missile_pod/get_skill_spread(mob/living/L) return 0 diff --git a/code/_core/obj/item/weapon/ranged/laser/mech/smg.dm b/code/_core/obj/item/weapon/ranged/laser/mech/smg.dm index 48b7e948e7..f9d9ae93cb 100644 --- a/code/_core/obj/item/weapon/ranged/laser/mech/smg.dm +++ b/code/_core/obj/item/weapon/ranged/laser/mech/smg.dm @@ -8,6 +8,6 @@ /obj/item/weapon/ranged/energy/mech/smg/get_static_spread() //Base spread return 0.005 -/obj/item/weapon/ranged/energy/mech/smg/get_skill_spread(var/mob/living/L) //Base spread +/obj/item/weapon/ranged/energy/mech/smg/get_skill_spread(mob/living/L) //Base spread return 0 diff --git a/code/_core/obj/item/weapon/ranged/laser/nanotrasen_turret.dm b/code/_core/obj/item/weapon/ranged/laser/nanotrasen_turret.dm index 96be73df0b..47295f6569 100644 --- a/code/_core/obj/item/weapon/ranged/laser/nanotrasen_turret.dm +++ b/code/_core/obj/item/weapon/ranged/laser/nanotrasen_turret.dm @@ -35,7 +35,7 @@ /obj/item/weapon/ranged/energy/nanotrasen_turret/get_static_spread() return 0.003 -/obj/item/weapon/ranged/energy/nanotrasen_turret/can_owner_shoot(var/mob/caller,var/atom/object,location,params) +/obj/item/weapon/ranged/energy/nanotrasen_turret/can_owner_shoot(mob/caller,atom/object,location,params) if(caller.is_player_controlled()) return FALSE return ..() \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/laser/opticor.dm b/code/_core/obj/item/weapon/ranged/laser/opticor.dm index 55678c2cc9..d59056382b 100644 --- a/code/_core/obj/item/weapon/ranged/laser/opticor.dm +++ b/code/_core/obj/item/weapon/ranged/laser/opticor.dm @@ -76,7 +76,7 @@ /obj/item/weapon/ranged/energy/opticor/get_static_spread() return 0 -/obj/item/weapon/ranged/energy/opticor/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/energy/opticor/get_skill_spread(mob/living/L) return max(0,0.005 - (0.01 * L.get_skill_power(SKILL_RANGED))) /obj/item/weapon/ranged/energy/opticor/update_icon() @@ -107,7 +107,7 @@ return ..() -/obj/item/weapon/ranged/energy/opticor/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/weapon/ranged/energy/opticor/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(is_item(object)) var/obj/item/I = object diff --git a/code/_core/obj/item/weapon/ranged/laser/pump/_pump.dm b/code/_core/obj/item/weapon/ranged/laser/pump/_pump.dm index 85e34c98f0..f2f55361ff 100644 --- a/code/_core/obj/item/weapon/ranged/laser/pump/_pump.dm +++ b/code/_core/obj/item/weapon/ranged/laser/pump/_pump.dm @@ -12,7 +12,7 @@ /obj/item/weapon/ranged/energy/pump/get_charge_cost() return initial(charge_cost) -/obj/item/weapon/ranged/energy/pump/click_self(var/mob/caller,location,control,params) +/obj/item/weapon/ranged/energy/pump/click_self(mob/caller,location,control,params) if(next_shoot_time > world.time + 1) return TRUE @@ -26,7 +26,7 @@ return TRUE -/obj/item/weapon/ranged/energy/pump/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/weapon/ranged/energy/pump/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(is_item(object)) var/obj/item/I = object @@ -42,7 +42,7 @@ . = ..() -/obj/item/weapon/ranged/energy/pump/proc/pump(var/mob/caller,var/silent=FALSE) +/obj/item/weapon/ranged/energy/pump/proc/pump(mob/caller,silent=FALSE) var/turf/T = get_turf(src) diff --git a/code/_core/obj/item/weapon/ranged/laser/recharging/captain.dm b/code/_core/obj/item/weapon/ranged/laser/recharging/captain.dm index 6b53525a64..eb64db2d6c 100644 --- a/code/_core/obj/item/weapon/ranged/laser/recharging/captain.dm +++ b/code/_core/obj/item/weapon/ranged/laser/recharging/captain.dm @@ -42,5 +42,5 @@ /obj/item/weapon/ranged/energy/recharging/captain/get_static_spread() //Base spread return 0.02 -/obj/item/weapon/ranged/energy/recharging/captain/get_skill_spread(var/mob/living/L) //Base spread +/obj/item/weapon/ranged/energy/recharging/captain/get_skill_spread(mob/living/L) //Base spread return max(0,0.03 - (0.6 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/laser/sentry.dm b/code/_core/obj/item/weapon/ranged/laser/sentry.dm index 11e6f1be08..389e789a13 100644 --- a/code/_core/obj/item/weapon/ranged/laser/sentry.dm +++ b/code/_core/obj/item/weapon/ranged/laser/sentry.dm @@ -35,7 +35,7 @@ /obj/item/weapon/ranged/energy/sentry_turret/get_static_spread() return 0.005 -/obj/item/weapon/ranged/energy/sentry_turret/can_owner_shoot(var/mob/caller,var/atom/object,location,params) +/obj/item/weapon/ranged/energy/sentry_turret/can_owner_shoot(mob/caller,atom/object,location,params) if(caller.is_player_controlled()) return FALSE return ..() \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/laser/syndicate_turret.dm b/code/_core/obj/item/weapon/ranged/laser/syndicate_turret.dm index cc59258d37..6375fc777c 100644 --- a/code/_core/obj/item/weapon/ranged/laser/syndicate_turret.dm +++ b/code/_core/obj/item/weapon/ranged/laser/syndicate_turret.dm @@ -30,7 +30,7 @@ /obj/item/weapon/ranged/energy/syndicate_turret/get_static_spread() return 0.005 -/obj/item/weapon/ranged/energy/syndicate_turret/can_owner_shoot(var/mob/caller,var/atom/object,location,params) +/obj/item/weapon/ranged/energy/syndicate_turret/can_owner_shoot(mob/caller,atom/object,location,params) if(caller.is_player_controlled()) return FALSE return ..() diff --git a/code/_core/obj/item/weapon/ranged/magic/_magic.dm b/code/_core/obj/item/weapon/ranged/magic/_magic.dm index ba2f383eaa..e0c658de63 100644 --- a/code/_core/obj/item/weapon/ranged/magic/_magic.dm +++ b/code/_core/obj/item/weapon/ranged/magic/_magic.dm @@ -26,7 +26,7 @@ . = ..() -/obj/item/weapon/ranged/magic/get_examine_list(var/mob/examiner) +/obj/item/weapon/ranged/magic/get_examine_list(mob/examiner) . = ..() @@ -36,7 +36,7 @@ . += div("notice","It has an empty gem slot.") -/obj/item/weapon/ranged/magic/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/weapon/ranged/magic/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(is_item(object)) var/obj/item/I = object @@ -70,18 +70,18 @@ return ..() -/obj/item/weapon/ranged/magic/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/weapon/ranged/magic/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEATOM("stored_powergem") -/obj/item/weapon/ranged/magic/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/weapon/ranged/magic/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADATOM("stored_powergem") /obj/item/weapon/ranged/magic/get_static_spread() return 0 -/obj/item/weapon/ranged/magic/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/magic/get_skill_spread(mob/living/L) return 0.05 - (0.1 * L.get_skill_power(SKILL_MAGIC)) /obj/item/weapon/ranged/magic/get_base_spread() diff --git a/code/_core/obj/item/weapon/ranged/magic/rune.dm b/code/_core/obj/item/weapon/ranged/magic/rune.dm index 93d937df55..4ea6cde04f 100644 --- a/code/_core/obj/item/weapon/ranged/magic/rune.dm +++ b/code/_core/obj/item/weapon/ranged/magic/rune.dm @@ -11,7 +11,7 @@ var/stored_modifier var/stored_modifier_color -/obj/item/weapon/ranged/magic/rune/New(var/new_loc,var/mob/owner,var/desired_effect,var/desired_modifer,var/desired_buff,var/desired_effect_color,var/desired_modifier_color,var/desired_buff_color) +/obj/item/weapon/ranged/magic/rune/New(new_loc,mob/owner,desired_effect,desired_modifer,desired_buff,desired_effect_color,desired_modifier_color,desired_buff_color) stored_effect = desired_effect stored_effect_color = desired_effect_color @@ -51,12 +51,12 @@ icon = new_icon -/obj/item/weapon/ranged/magic/rune/on_drop(var/obj/hud/inventory/old_inventory,var/atom/new_loc) +/obj/item/weapon/ranged/magic/rune/on_drop(obj/hud/inventory/old_inventory,atom/new_loc) if(!is_inventory(new_loc) || is_dynamic_inventory(new_loc)) qdel(src) return -/obj/item/weapon/ranged/magic/rune/shoot(var/mob/caller as mob,var/atom/object,location,params) +/obj/item/weapon/ranged/magic/rune/shoot(mob/caller as mob,atom/object,location,params) var/spellcraft/effect/E = all_effects[stored_effect] @@ -69,14 +69,14 @@ return TRUE -/obj/item/weapon/ranged/magic/rune/can_be_held(var/mob/living/advanced/owner,var/obj/hud/inventory/I) +/obj/item/weapon/ranged/magic/rune/can_be_held(mob/living/advanced/owner,obj/hud/inventory/I) var/spellcraft/effect/E = all_effects[stored_effect] return E.can_be_held -/obj/item/weapon/ranged/magic/rune/can_be_worn(var/mob/living/advanced/owner,var/obj/hud/inventory/I) +/obj/item/weapon/ranged/magic/rune/can_be_worn(mob/living/advanced/owner,obj/hud/inventory/I) return FALSE -/obj/item/weapon/ranged/magic/rune/clicked_on_by_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/weapon/ranged/magic/rune/clicked_on_by_object(mob/caller as mob,atom/object,location,control,params) if(!can_be_held(caller,object)) var/spellcraft/effect/E = all_effects[stored_effect] diff --git a/code/_core/obj/item/weapon/ranged/magic/scrolls.dm b/code/_core/obj/item/weapon/ranged/magic/scrolls.dm index 2dc98d4d16..630222e1a0 100644 --- a/code/_core/obj/item/weapon/ranged/magic/scrolls.dm +++ b/code/_core/obj/item/weapon/ranged/magic/scrolls.dm @@ -18,11 +18,11 @@ weight = 0.1 -/obj/item/weapon/ranged/magic/scroll/save_item_data(var/save_inventory = TRUE) +/obj/item/weapon/ranged/magic/scroll/save_item_data(save_inventory = TRUE) . = ..() SAVEVAR("scroll_count") -/obj/item/weapon/ranged/magic/scroll/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data) +/obj/item/weapon/ranged/magic/scroll/load_item_data_pre(mob/living/advanced/player/P,list/object_data) . = ..() LOADVAR("scroll_count") @@ -30,11 +30,11 @@ . = ..() . *= (1 + scroll_count) -/obj/item/weapon/ranged/magic/scroll/quick(var/mob/caller as mob,var/atom/object,location,params) +/obj/item/weapon/ranged/magic/scroll/quick(mob/caller as mob,atom/object,location,params) shoot(caller,object,location,params) return TRUE -/obj/item/weapon/ranged/magic/scroll/click_self(var/mob/caller) +/obj/item/weapon/ranged/magic/scroll/click_self(mob/caller) INTERACT_CHECK INTERACT_DELAY(1) open = !open @@ -42,7 +42,7 @@ update_sprite() return TRUE -/obj/item/weapon/ranged/magic/scroll/can_gun_shoot(var/mob/caller) +/obj/item/weapon/ranged/magic/scroll/can_gun_shoot(mob/caller) if(!open) caller.to_chat(span("notice","You need to unravel the scroll before firing it!")) @@ -69,14 +69,14 @@ ..() -/obj/item/weapon/ranged/magic/scroll/handle_empty(var/mob/caller) +/obj/item/weapon/ranged/magic/scroll/handle_empty(mob/caller) if(!open) caller.to_chat(span("warning","You must unravel the scroll before using it!")) else caller.to_chat(span("warning","This scroll is blank and void of magic!")) return TRUE //No melee -/obj/item/weapon/ranged/magic/scroll/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/item/weapon/ranged/magic/scroll/click_on_object(mob/caller as mob,atom/object,location,control,params) object = object.defer_click_on_object(location,control,params) @@ -113,7 +113,7 @@ return ..() -/obj/item/weapon/ranged/magic/scroll/handle_ammo(var/mob/caller,var/bullet_position=1) +/obj/item/weapon/ranged/magic/scroll/handle_ammo(mob/caller,bullet_position=1) scroll_count-- update_sprite() return ..() diff --git a/code/_core/obj/item/weapon/ranged/magic/spellblade.dm b/code/_core/obj/item/weapon/ranged/magic/spellblade.dm index 9d38a51b05..0df5f3916a 100644 --- a/code/_core/obj/item/weapon/ranged/magic/spellblade.dm +++ b/code/_core/obj/item/weapon/ranged/magic/spellblade.dm @@ -30,7 +30,7 @@ return ..() -/obj/item/weapon/ranged/magic/spellblade/click_self(var/mob/caller,location,control,params) +/obj/item/weapon/ranged/magic/spellblade/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(1) @@ -46,7 +46,7 @@ return TRUE -/obj/item/weapon/ranged/magic/spellblade/shoot(var/mob/caller,var/atom/object,location,params,var/damage_multiplier=1,var/click_called=FALSE) +/obj/item/weapon/ranged/magic/spellblade/shoot(mob/caller,atom/object,location,params,damage_multiplier=1,click_called=FALSE) if(get_dist(caller,object) <= 1) return FALSE @@ -60,7 +60,7 @@ src.attack_next = world.time + shoot_delay -/obj/item/weapon/ranged/magic/spellblade/can_gun_shoot(var/mob/caller,var/atom/object,location,params,var/check_time=TRUE,var/messages=TRUE) +/obj/item/weapon/ranged/magic/spellblade/can_gun_shoot(mob/caller,atom/object,location,params,check_time=TRUE,messages=TRUE) if(caller.attack_next > world.time) return FALSE if(!active) diff --git a/code/_core/obj/item/weapon/ranged/magic/staff.dm b/code/_core/obj/item/weapon/ranged/magic/staff.dm index 5fc25728c5..20a4d3fcbe 100644 --- a/code/_core/obj/item/weapon/ranged/magic/staff.dm +++ b/code/_core/obj/item/weapon/ranged/magic/staff.dm @@ -8,7 +8,7 @@ total_charge = CEILING(total_charge,100) return ..() -/obj/item/weapon/ranged/magic/staff/get_examine_list(var/mob/examiner) +/obj/item/weapon/ranged/magic/staff/get_examine_list(mob/examiner) . = ..() @@ -16,16 +16,16 @@ . += span("warning","Overcharged: Uses twice as many charge as it is above capacity.") -/obj/item/weapon/ranged/magic/staff/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/weapon/ranged/magic/staff/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEVAR("total_charge") -/obj/item/weapon/ranged/magic/staff/load_item_data_pre(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/weapon/ranged/magic/staff/load_item_data_pre(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADVAR("total_charge") -/obj/item/weapon/ranged/magic/staff/can_gun_shoot(var/mob/caller,var/atom/object,location,params,var/check_time=TRUE,var/messages=TRUE) +/obj/item/weapon/ranged/magic/staff/can_gun_shoot(mob/caller,atom/object,location,params,check_time=TRUE,messages=TRUE) if(total_charge < cost_charge) handle_empty(caller) @@ -33,10 +33,10 @@ return ..() -/obj/item/weapon/ranged/magic/staff/get_examine_list(var/mob/caller) +/obj/item/weapon/ranged/magic/staff/get_examine_list(mob/caller) return ..() + div("notice","It has [get_ammo_count()] charges ([total_charge]) remaining.") -/obj/item/weapon/ranged/magic/staff/handle_ammo(var/mob/caller,var/bullet_position=1) +/obj/item/weapon/ranged/magic/staff/handle_ammo(mob/caller,bullet_position=1) var/charge_to_remove = cost_charge if(total_charge > initial(total_charge)*2) charge_to_remove *= 2 @@ -107,7 +107,7 @@ rarity = RARITY_UNCOMMON -/obj/item/weapon/ranged/magic/staff/chaos/get_projectile_offset(var/initial_offset_x,var/initial_offset_y,var/bullet_num,var/bullet_num_max,var/accuracy) +/obj/item/weapon/ranged/magic/staff/chaos/get_projectile_offset(initial_offset_x,initial_offset_y,bullet_num,bullet_num_max,accuracy) var/num = bullet_num/bullet_num_max diff --git a/code/_core/obj/item/weapon/ranged/magic/tomes/_tome.dm b/code/_core/obj/item/weapon/ranged/magic/tomes/_tome.dm index 21b04fe437..a8dba31c94 100644 --- a/code/_core/obj/item/weapon/ranged/magic/tomes/_tome.dm +++ b/code/_core/obj/item/weapon/ranged/magic/tomes/_tome.dm @@ -7,7 +7,7 @@ weight = 6 -/obj/item/weapon/ranged/magic/tome/get_shoot_delay(var/mob/caller,var/atom/target,location,params) +/obj/item/weapon/ranged/magic/tome/get_shoot_delay(mob/caller,atom/target,location,params) . = ..() @@ -20,13 +20,13 @@ /obj/item/weapon/ranged/magic/tome/get_static_spread() return 0 -/obj/item/weapon/ranged/magic/tome/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/magic/tome/get_skill_spread(mob/living/L) return 0 -/obj/item/weapon/ranged/magic/tome/quick(var/mob/caller,var/atom/object,location,params) +/obj/item/weapon/ranged/magic/tome/quick(mob/caller,atom/object,location,params) return shoot(caller,object,location,params) -/obj/item/weapon/ranged/magic/tome/proc/get_mana_cost(var/mob/living/caster) +/obj/item/weapon/ranged/magic/tome/proc/get_mana_cost(mob/living/caster) return cost_mana /obj/item/weapon/ranged/magic/tome/get_owner() @@ -37,7 +37,7 @@ return null -/obj/item/weapon/ranged/magic/tome/can_gun_shoot(var/mob/caller) +/obj/item/weapon/ranged/magic/tome/can_gun_shoot(mob/caller) if(get_ammo_count() < 1) return FALSE @@ -62,7 +62,7 @@ return owner && actual_mana_cost ? FLOOR(owner.health.mana_current / actual_mana_cost, 1) : 0 -/obj/item/weapon/ranged/magic/tome/handle_ammo(var/mob/caller,var/bullet_position=1) +/obj/item/weapon/ranged/magic/tome/handle_ammo(mob/caller,bullet_position=1) if(!is_advanced(caller)) return ..() @@ -83,7 +83,7 @@ /* -/obj/item/weapon/ranged/magic/tome/do_automatic(var/mob/caller,var/atom/object,location,params) +/obj/item/weapon/ranged/magic/tome/do_automatic(mob/caller,atom/object,location,params) if(!automatic || (object && object.plane >= PLANE_HUD) || !is_advanced(caller)) return TRUE @@ -103,7 +103,7 @@ */ /* -/obj/item/weapon/ranged/magic/tome/on_mouse_up(var/mob/caller,var/atom/object,location,control,params,var/secret_bypass=FALSE) +/obj/item/weapon/ranged/magic/tome/on_mouse_up(mob/caller,atom/object,location,control,params,secret_bypass=FALSE) if(!automatic || !is_advanced(caller)) return TRUE diff --git a/code/_core/obj/item/weapon/ranged/magic/tomes/chaos.dm b/code/_core/obj/item/weapon/ranged/magic/tomes/chaos.dm index 87ae21699b..7f61c501d6 100644 --- a/code/_core/obj/item/weapon/ranged/magic/tomes/chaos.dm +++ b/code/_core/obj/item/weapon/ranged/magic/tomes/chaos.dm @@ -17,7 +17,7 @@ value = 200 -/obj/item/weapon/ranged/magic/tome/chaos/get_projectile_offset(var/initial_offset_x,var/initial_offset_y,var/bullet_num,var/bullet_num_max,var/accuracy) +/obj/item/weapon/ranged/magic/tome/chaos/get_projectile_offset(initial_offset_x,initial_offset_y,bullet_num,bullet_num_max,accuracy) var/num = bullet_num/bullet_num_max diff --git a/code/_core/obj/item/weapon/ranged/magic/tomes/healing.dm b/code/_core/obj/item/weapon/ranged/magic/tomes/healing.dm index 1fc54e0706..1ca47b86e3 100644 --- a/code/_core/obj/item/weapon/ranged/magic/tomes/healing.dm +++ b/code/_core/obj/item/weapon/ranged/magic/tomes/healing.dm @@ -17,5 +17,5 @@ /obj/item/weapon/ranged/magic/tome/heal/get_static_spread() //Base spread return 0 -/obj/item/weapon/ranged/magic/tome/heal/get_skill_spread(var/mob/living/L) //Base spread +/obj/item/weapon/ranged/magic/tome/heal/get_skill_spread(mob/living/L) //Base spread return 0 \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/magic/tomes/summon.dm b/code/_core/obj/item/weapon/ranged/magic/tomes/summon.dm index a70057168f..165c44d7e8 100644 --- a/code/_core/obj/item/weapon/ranged/magic/tomes/summon.dm +++ b/code/_core/obj/item/weapon/ranged/magic/tomes/summon.dm @@ -17,5 +17,5 @@ /obj/item/weapon/ranged/magic/tome/holy_warrior/get_static_spread() //Base spread return 0 -/obj/item/weapon/ranged/magic/tome/holy_warrior/get_skill_spread(var/mob/living/L) //Base spread +/obj/item/weapon/ranged/magic/tome/holy_warrior/get_skill_spread(mob/living/L) //Base spread return 0 \ No newline at end of file diff --git a/code/_core/obj/item/weapon/ranged/magic/tomes/summon/_summon.dm b/code/_core/obj/item/weapon/ranged/magic/tomes/summon/_summon.dm index de74a55643..979f9242c5 100644 --- a/code/_core/obj/item/weapon/ranged/magic/tomes/summon/_summon.dm +++ b/code/_core/obj/item/weapon/ranged/magic/tomes/summon/_summon.dm @@ -7,7 +7,7 @@ var/atom/movable/object_to_summon var/duration = 300 SECONDS //In deciseconds. Only applies to summoning mobs. -/obj/item/weapon/ranged/magic/tome/summon/on_projectile_hit(var/obj/projectile/P,var/atom/hit_atom) +/obj/item/weapon/ranged/magic/tome/summon/on_projectile_hit(obj/projectile/P,atom/hit_atom) if(istype(P,/obj/projectile/bullet/thrown/)) return ..() diff --git a/code/_core/obj/item/weapon/ranged/ranged_attachments.dm b/code/_core/obj/item/weapon/ranged/ranged_attachments.dm index 77fd120ade..507b2000a6 100644 --- a/code/_core/obj/item/weapon/ranged/ranged_attachments.dm +++ b/code/_core/obj/item/weapon/ranged/ranged_attachments.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/ranged/proc/add_attachment(var/mob/caller,var/obj/item/attachment/A) +/obj/item/weapon/ranged/proc/add_attachment(mob/caller,obj/item/attachment/A) if(!length(attachment_whitelist)) caller.to_chat(span("warning","This weapon does not accept attachments!")) @@ -42,7 +42,7 @@ return FALSE -/obj/item/weapon/ranged/proc/remove_attachment(var/mob/caller) +/obj/item/weapon/ranged/proc/remove_attachment(mob/caller) var/list/attachment_variables = list( "attachment_barrel", @@ -112,7 +112,7 @@ return TRUE -/obj/item/weapon/ranged/get_examine_list(var/mob/caller) +/obj/item/weapon/ranged/get_examine_list(mob/caller) . = ..() diff --git a/code/_core/obj/item/weapon/ranged/reagent_ammo/flamethrower.dm b/code/_core/obj/item/weapon/ranged/reagent_ammo/flamethrower.dm index 4bcb6589fb..0766e0ffc3 100644 --- a/code/_core/obj/item/weapon/ranged/reagent_ammo/flamethrower.dm +++ b/code/_core/obj/item/weapon/ranged/reagent_ammo/flamethrower.dm @@ -70,7 +70,7 @@ var/obj/projectile/P = k P.damage_multiplier += average_flammability -/obj/item/weapon/ranged/reagent_ammo/flamethrower/proc/airblast(var/mob/caller,var/atom/object,location,params) +/obj/item/weapon/ranged/reagent_ammo/flamethrower/proc/airblast(mob/caller,atom/object,location,params) var/desired_dir = get_dir(caller,object) var/turf/desired_loc = get_step(caller,desired_dir) diff --git a/code/_core/obj/item/weapon/ranged/reagent_sprayer/_reagent_sprayer.dm b/code/_core/obj/item/weapon/ranged/reagent_sprayer/_reagent_sprayer.dm index 4d4ff7534d..eb87c9cd09 100644 --- a/code/_core/obj/item/weapon/ranged/reagent_sprayer/_reagent_sprayer.dm +++ b/code/_core/obj/item/weapon/ranged/reagent_sprayer/_reagent_sprayer.dm @@ -24,7 +24,7 @@ /obj/item/weapon/ranged/reagent_sprayer/get_ammo_count() return CEILING(reagents.volume_current / (reagent_per_shot*bullet_count),1) -/obj/item/weapon/ranged/reagent_sprayer/can_gun_shoot(var/mob/caller,var/atom/object,location,params,var/check_time=TRUE,var/messages=TRUE) +/obj/item/weapon/ranged/reagent_sprayer/can_gun_shoot(mob/caller,atom/object,location,params,check_time=TRUE,messages=TRUE) if(get_ammo_count() <= 0) handle_empty(caller) @@ -32,7 +32,7 @@ return ..() -/obj/item/weapon/ranged/reagent_sprayer/shoot_projectile(var/atom/caller,var/atom/target,location,params,var/obj/projectile/projectile_to_use,var/damage_type_to_use,var/icon_pos_x=0,var/icon_pos_y=0,var/accuracy_loss=0,var/projectile_speed_to_use=0,var/bullet_count_to_use=1,var/bullet_color,var/view_punch=0,var/damage_multiplier=1,var/desired_iff_tag,var/desired_loyalty_tag,var/desired_inaccuracy_modifier=1,var/base_spread = get_base_spread()) +/obj/item/weapon/ranged/reagent_sprayer/shoot_projectile(atom/caller,atom/target,location,params,obj/projectile/projectile_to_use,damage_type_to_use,icon_pos_x=0,icon_pos_y=0,accuracy_loss=0,projectile_speed_to_use=0,bullet_count_to_use=1,bullet_color,view_punch=0,damage_multiplier=1,desired_iff_tag,desired_loyalty_tag,desired_inaccuracy_modifier=1,base_spread = get_base_spread()) . = ..() @@ -103,7 +103,7 @@ reagents = /reagent_container/beaker/bucket -/obj/item/weapon/ranged/reagent_sprayer/fire_extinguisher/click_on_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/weapon/ranged/reagent_sprayer/fire_extinguisher/click_on_object(mob/caller,atom/object,location,control,params) if(istype(object,/obj/structure/interactive/fire_closet)) INTERACT_CHECK diff --git a/code/_core/obj/item/weapon/ranged/spellgem/_spellgem.dm b/code/_core/obj/item/weapon/ranged/spellgem/_spellgem.dm index d67ad9b018..9e4b22d10f 100644 --- a/code/_core/obj/item/weapon/ranged/spellgem/_spellgem.dm +++ b/code/_core/obj/item/weapon/ranged/spellgem/_spellgem.dm @@ -24,7 +24,7 @@ requires_bullets = FALSE -/obj/item/weapon/ranged/spellgem/get_examine_list(var/mob/examiner) +/obj/item/weapon/ranged/spellgem/get_examine_list(mob/examiner) . = ..() . += div("notice","Base mana cost: [get_base_mana_cost()]") @@ -91,13 +91,13 @@ /obj/item/weapon/ranged/spellgem/get_static_spread() return 0 -/obj/item/weapon/ranged/spellgem/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/spellgem/get_skill_spread(mob/living/L) return 0 -/obj/item/weapon/ranged/spellgem/get_movement_spread(var/mob/living/L) +/obj/item/weapon/ranged/spellgem/get_movement_spread(mob/living/L) return 0 -/obj/item/weapon/ranged/spellgem/pre_shoot(var/mob/caller,var/atom/object,location,params,var/damage_multiplier=1) +/obj/item/weapon/ranged/spellgem/pre_shoot(mob/caller,atom/object,location,params,damage_multiplier=1) . = ..() @@ -135,7 +135,7 @@ add_overlay(I) -/obj/item/weapon/ranged/spellgem/get_projectile_offset(var/initial_offset_x,var/initial_offset_y,var/bullet_num,var/bullet_num_max,var/accuracy) +/obj/item/weapon/ranged/spellgem/get_projectile_offset(initial_offset_x,initial_offset_y,bullet_num,bullet_num_max,accuracy) if(bullet_num_max <= 1) return list(initial_offset_x,initial_offset_y) @@ -146,5 +146,5 @@ return list(cos(angle),sin(angle)) -/obj/item/weapon/ranged/spellgem/quick(var/mob/caller,var/atom/object,location,params) +/obj/item/weapon/ranged/spellgem/quick(mob/caller,atom/object,location,params) return shoot(caller,object,location,params) diff --git a/code/_core/obj/item/weapon/ranged/spellgem/metronome.dm b/code/_core/obj/item/weapon/ranged/spellgem/metronome.dm index cd0be7e23d..d6ae909cbb 100644 --- a/code/_core/obj/item/weapon/ranged/spellgem/metronome.dm +++ b/code/_core/obj/item/weapon/ranged/spellgem/metronome.dm @@ -25,7 +25,7 @@ value = 2700 -/obj/item/weapon/ranged/spellgem/metronome/pre_shoot(var/mob/caller,var/atom/object,location,params,var/damage_multiplier=1) +/obj/item/weapon/ranged/spellgem/metronome/pre_shoot(mob/caller,atom/object,location,params,damage_multiplier=1) ranged_damage_type = pick(damage_list) projectile = pick(projectile_list) shoot_delay = rand(8, 40) / 10 diff --git a/code/_core/obj/item/weapon/ranged/stamina_use/_stamina_use.dm b/code/_core/obj/item/weapon/ranged/stamina_use/_stamina_use.dm index 67f45f2f2c..1c4f6145a9 100644 --- a/code/_core/obj/item/weapon/ranged/stamina_use/_stamina_use.dm +++ b/code/_core/obj/item/weapon/ranged/stamina_use/_stamina_use.dm @@ -13,7 +13,7 @@ use_loyalty_tag = TRUE use_iff_tag = FALSE -/obj/item/weapon/ranged/stamina_use/can_gun_shoot(var/mob/caller,var/atom/object,location,params,var/check_time=TRUE,var/messages=TRUE) +/obj/item/weapon/ranged/stamina_use/can_gun_shoot(mob/caller,atom/object,location,params,check_time=TRUE,messages=TRUE) if(get_ammo_count() < 1) return FALSE @@ -35,7 +35,7 @@ return owner && cost_stamina ? FLOOR(owner.health.stamina_current / cost_stamina, 1) : 0 -/obj/item/weapon/ranged/stamina_use/handle_ammo(var/mob/caller,var/bullet_position=1) +/obj/item/weapon/ranged/stamina_use/handle_ammo(mob/caller,bullet_position=1) if(!is_advanced(caller)) return ..() @@ -55,14 +55,14 @@ /obj/item/weapon/ranged/stamina_use/get_static_spread() return 0 -/obj/item/weapon/ranged/stamina_use/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/stamina_use/get_skill_spread(mob/living/L) return 0 -/obj/item/weapon/ranged/stamina_use/get_movement_spread(var/mob/living/L) +/obj/item/weapon/ranged/stamina_use/get_movement_spread(mob/living/L) return 0 -/obj/item/weapon/ranged/stamina_use/get_projectile_offset(var/initial_offset_x,var/initial_offset_y,var/bullet_num,var/bullet_num_max,var/accuracy) +/obj/item/weapon/ranged/stamina_use/get_projectile_offset(initial_offset_x,initial_offset_y,bullet_num,bullet_num_max,accuracy) if(bullet_num_max <= 1) return list(initial_offset_x,initial_offset_y) diff --git a/code/_core/obj/item/weapon/ranged/stamina_use/ling_tentacle.dm b/code/_core/obj/item/weapon/ranged/stamina_use/ling_tentacle.dm index 6c273cf4b9..638e2045e4 100644 --- a/code/_core/obj/item/weapon/ranged/stamina_use/ling_tentacle.dm +++ b/code/_core/obj/item/weapon/ranged/stamina_use/ling_tentacle.dm @@ -36,7 +36,7 @@ return ..() -/obj/item/weapon/ranged/stamina_use/tentacle/click_self(var/mob/caller,location,control,params) +/obj/item/weapon/ranged/stamina_use/tentacle/click_self(mob/caller,location,control,params) INTERACT_CHECK INTERACT_DELAY(1) toggle = !toggle diff --git a/code/_core/obj/item/weapon/ranged/temp/_temp.dm b/code/_core/obj/item/weapon/ranged/temp/_temp.dm index 02c4aa0a37..a87af8e853 100644 --- a/code/_core/obj/item/weapon/ranged/temp/_temp.dm +++ b/code/_core/obj/item/weapon/ranged/temp/_temp.dm @@ -14,7 +14,7 @@ /obj/item/weapon/ranged/temporary/handle_empty() Destroy() -/obj/item/weapon/ranged/temporary/can_gun_shoot(var/mob/caller) +/obj/item/weapon/ranged/temporary/can_gun_shoot(mob/caller) if(total_charge < cost_charge) handle_empty() @@ -22,10 +22,10 @@ return ..() -/obj/item/weapon/ranged/temporary/get_examine_list(var/mob/caller) +/obj/item/weapon/ranged/temporary/get_examine_list(mob/caller) return ..() + div("notice","[get_ammo_count()] uses left.") -/obj/item/weapon/ranged/temporary/handle_ammo(var/mob/caller,var/bullet_position=1) +/obj/item/weapon/ranged/temporary/handle_ammo(mob/caller,bullet_position=1) var/charge_to_remove = cost_charge total_charge -= charge_to_remove update_sprite() @@ -63,5 +63,5 @@ /obj/item/weapon/ranged/temporary/revolver/get_static_spread() return 0 -/obj/item/weapon/ranged/temporary/revolver/get_skill_spread(var/mob/living/L) +/obj/item/weapon/ranged/temporary/revolver/get_skill_spread(mob/living/L) return max(0,0.01 - (0.01 * L.get_skill_power(SKILL_RANGED))) diff --git a/code/_core/obj/item/weapon/ranged/thrown/_thrown.dm b/code/_core/obj/item/weapon/ranged/thrown/_thrown.dm index 9180441109..9914413cf0 100644 --- a/code/_core/obj/item/weapon/ranged/thrown/_thrown.dm +++ b/code/_core/obj/item/weapon/ranged/thrown/_thrown.dm @@ -28,7 +28,7 @@ if(!one_icon) icon_state = "[min(amount,amount_max)]" -/obj/item/weapon/ranged/thrown/shoot_projectile(var/atom/caller,var/atom/target,location,params,var/obj/projectile/projectile_to_use,var/damage_type_to_use,var/icon_pos_x=0,var/icon_pos_y=0,var/accuracy_loss=0,var/projectile_speed_to_use=0,var/bullet_count_to_use=1,var/bullet_color="#FFFFFF",var/view_punch=0,var/damage_multiplier=1,var/desired_iff_tag,var/desired_loyalty_tag,var/desired_inaccuracy_modifier=1,var/base_spread = get_base_spread(),var/penetrations_left=0) +/obj/item/weapon/ranged/thrown/shoot_projectile(atom/caller,atom/target,location,params,obj/projectile/projectile_to_use,damage_type_to_use,icon_pos_x=0,icon_pos_y=0,accuracy_loss=0,projectile_speed_to_use=0,bullet_count_to_use=1,bullet_color="#FFFFFF",view_punch=0,damage_multiplier=1,desired_iff_tag,desired_loyalty_tag,desired_inaccuracy_modifier=1,base_spread = get_base_spread(),penetrations_left=0) . = ..() diff --git a/code/_core/obj/item/weapon/ranged/wand/_wand.dm b/code/_core/obj/item/weapon/ranged/wand/_wand.dm index 31aaa21402..236d5bf5fa 100644 --- a/code/_core/obj/item/weapon/ranged/wand/_wand.dm +++ b/code/_core/obj/item/weapon/ranged/wand/_wand.dm @@ -172,7 +172,7 @@ . = CEILING(.,1) -/obj/item/weapon/ranged/wand/get_examine_list(var/mob/examiner) +/obj/item/weapon/ranged/wand/get_examine_list(mob/examiner) . = ..() . += div("notice","Has 1 slot(s) for spell gems.") . += div("notice","Has [sockets] slot(s) for support gems.") @@ -190,25 +190,25 @@ . += div("notice","Socketed with [english_list(support_gem_names)].") -/obj/item/weapon/ranged/wand/save_item_data(var/mob/living/advanced/player/P,var/save_inventory = TRUE,var/died=FALSE,var/loadout=FALSE) +/obj/item/weapon/ranged/wand/save_item_data(mob/living/advanced/player/P,save_inventory = TRUE,died=FALSE,loadout=FALSE) RUN_PARENT_SAFE SAVEATOM("socketed_spellgem") SAVEVAR("sockets") SAVELISTATOM("socketed_supportgems") -/obj/item/weapon/ranged/wand/load_item_data_post(var/mob/living/advanced/player/P,var/list/object_data,var/loadout=FALSE) +/obj/item/weapon/ranged/wand/load_item_data_post(mob/living/advanced/player/P,list/object_data,loadout=FALSE) RUN_PARENT_SAFE LOADATOM("socketed_spellgem") LOADVAR("sockets") LOADLISTATOM("socketed_supportgems") -/obj/item/weapon/ranged/wand/shoot(var/mob/caller,var/atom/object,location,params,var/damage_multiplier=1,var/click_called=FALSE) +/obj/item/weapon/ranged/wand/shoot(mob/caller,atom/object,location,params,damage_multiplier=1,click_called=FALSE) if(!socketed_spellgem) return FALSE damage_multiplier *= get_quality_mod() return socketed_spellgem.shoot(caller,object,location,params,damage_multiplier,click_called) -/obj/item/weapon/ranged/wand/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/weapon/ranged/wand/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(is_inventory(object) && caller.attack_flags & CONTROL_MOD_DISARM) diff --git a/code/_core/obj/light_sprite/_light_sprite.dm b/code/_core/obj/light_sprite/_light_sprite.dm index 69bfda54cc..14e4c2555b 100644 --- a/code/_core/obj/light_sprite/_light_sprite.dm +++ b/code/_core/obj/light_sprite/_light_sprite.dm @@ -25,7 +25,7 @@ owner = null . = ..() -/obj/light_sprite/set_dir(var/desired_dir,var/force = FALSE) //Override default +/obj/light_sprite/set_dir(desired_dir,force = FALSE) //Override default if(!desired_dir) return null if(icon_state == "cone" && is_living(top_atom)) @@ -35,11 +35,11 @@ dir = desired_dir return dir -/obj/light_sprite/force_move(var/atom/new_loc) +/obj/light_sprite/force_move(atom/new_loc) if(top_atom) glide_size = top_atom.glide_size . = ..() -/obj/light_sprite/proc/set_top_atom(var/atom/movable/new_top_atom) +/obj/light_sprite/proc/set_top_atom(atom/movable/new_top_atom) if(top_atom == new_top_atom) return FALSE //No need. Even if it's null. diff --git a/code/_core/obj/map_node.dm b/code/_core/obj/map_node.dm index 4a37dd1cef..dee9d9eef8 100644 --- a/code/_core/obj/map_node.dm +++ b/code/_core/obj/map_node.dm @@ -23,7 +23,7 @@ var/automatic = FALSE /* RIP failed code. -/obj/marker/map_node/proc/get_dir_to_this(var/atom/M,var/obj/marker/map_node/source_node) +/obj/marker/map_node/proc/get_dir_to_this(atom/M,obj/marker/map_node/source_node) var/lowest_precision = src.precision - 1 if(source_node) @@ -50,7 +50,7 @@ return angle2dir_cardinal(found_angle) -/obj/marker/map_node/proc/get_dist_to(var/atom/M) +/obj/marker/map_node/proc/get_dist_to(atom/M) var/lowest_precision = src.precision - 1 @@ -71,7 +71,7 @@ */ -/obj/marker/map_node/get_examine_list(var/mob/examiner) +/obj/marker/map_node/get_examine_list(mob/examiner) . = ..() @@ -79,7 +79,7 @@ var/obj/marker/map_node/MN = adjacent_map_nodes[k] . += div("notice",MN.get_debug_name()) -/obj/marker/map_node/New(var/desired_loc,var/desired_automatic=FALSE) +/obj/marker/map_node/New(desired_loc,desired_automatic=FALSE) . = ..() SSnodes.all_map_nodes += src automatic = desired_automatic @@ -122,7 +122,7 @@ return found -/proc/get_obstructions(var/atom/point_A,var/atom/point_B,var/check_contents=TRUE,var/ignore_living=FALSE) //Supports point_B being a node +/proc/get_obstructions(atom/point_A,atom/point_B,check_contents=TRUE,ignore_living=FALSE) //Supports point_B being a node . = list() @@ -212,7 +212,7 @@ -/proc/find_closest_node(var/atom/A,var/distance = VIEW_RANGE*2,var/check_view=FALSE) +/proc/find_closest_node(atom/A,distance = VIEW_RANGE*2,check_view=FALSE) var/obj/marker/map_node/best_node = null var/best_distance = INFINITY diff --git a/code/_core/obj/markers/alchemy_plants.dm b/code/_core/obj/markers/alchemy_plants.dm index 66a81d7026..c36c4912a0 100644 --- a/code/_core/obj/markers/alchemy_plants.dm +++ b/code/_core/obj/markers/alchemy_plants.dm @@ -1,7 +1,7 @@ /obj/marker/alchemy_plant/ var/to_spawn = null var/allowed_turfs = list() -/obj/marker/alchemy_plant/New(var/desired_loc) +/obj/marker/alchemy_plant/New(desired_loc) new to_spawn(desired_loc) /obj/marker/alchemy_plant/forest_nut diff --git a/code/_core/obj/markers/antag.dm b/code/_core/obj/markers/antag.dm index 94de789f86..47b5fdc2c5 100644 --- a/code/_core/obj/markers/antag.dm +++ b/code/_core/obj/markers/antag.dm @@ -4,7 +4,7 @@ var/global/list/all_antag_markers = list() name = "antag marker" var/spawn_type -/obj/marker/antag/New(var/desired_loc) +/obj/marker/antag/New(desired_loc) if(spawn_type && name) if(!all_antag_markers[name]) diff --git a/code/_core/obj/markers/blob.dm b/code/_core/obj/markers/blob.dm index 7fabb1a241..0ab9219c34 100644 --- a/code/_core/obj/markers/blob.dm +++ b/code/_core/obj/markers/blob.dm @@ -3,6 +3,6 @@ var/global/list/possible_blob_locations = list() /obj/marker/blob //For the zombie gamemode. name = "possible blob location" -/obj/marker/blob/New(var/desired_loc) +/obj/marker/blob/New(desired_loc) . = ..() possible_blob_locations += src diff --git a/code/_core/obj/markers/clown_planet.dm b/code/_core/obj/markers/clown_planet.dm index aeeb66deae..35e4f8dc01 100644 --- a/code/_core/obj/markers/clown_planet.dm +++ b/code/_core/obj/markers/clown_planet.dm @@ -4,7 +4,7 @@ var/global/list/clown_planet_markers = list() name = "clown planet marker" icon_state = "goal" -/obj/marker/clown_planet/New(var/desired_loc) +/obj/marker/clown_planet/New(desired_loc) clown_planet_markers += src . = ..() diff --git a/code/_core/obj/markers/drop_pod_locations.dm b/code/_core/obj/markers/drop_pod_locations.dm index af57b80948..6240cb7be5 100644 --- a/code/_core/obj/markers/drop_pod_locations.dm +++ b/code/_core/obj/markers/drop_pod_locations.dm @@ -4,6 +4,6 @@ var/global/list/drop_pod_locations = list() name = "drop pod location" icon_state = "pod" -/obj/marker/drop_pod_location/New(var/desired_loc) +/obj/marker/drop_pod_location/New(desired_loc) drop_pod_locations += get_turf(src) return ..() \ No newline at end of file diff --git a/code/_core/obj/markers/generation.dm b/code/_core/obj/markers/generation.dm index 29c0667c18..dc61d9e83e 100644 --- a/code/_core/obj/markers/generation.dm +++ b/code/_core/obj/markers/generation.dm @@ -37,7 +37,7 @@ var/global/list/all_generation_markers = list() var/custom_object_to_place = FALSE -/obj/marker/generation/New(var/desired_loc) +/obj/marker/generation/New(desired_loc) . = ..() all_generation_markers += src @@ -46,7 +46,7 @@ var/global/list/all_generation_markers = list() . = ..() -/obj/marker/generation/proc/get_object_to_place(var/turf/T,var/objects_placed=0,var/grow_left=0) +/obj/marker/generation/proc/get_object_to_place(turf/T,objects_placed=0,grow_left=0) CRASH("[src.type] was improperly setup with var custom_object_to_place!") /obj/marker/generation/proc/generate_marker() diff --git a/code/_core/obj/markers/generation_ore.dm b/code/_core/obj/markers/generation_ore.dm index 578747602c..c2120a76d3 100644 --- a/code/_core/obj/markers/generation_ore.dm +++ b/code/_core/obj/markers/generation_ore.dm @@ -30,7 +30,7 @@ var/global/list/ore_deposit_weights = list( ignore_existing = TRUE -/obj/marker/generation/ore/New(var/desired_loc) +/obj/marker/generation/ore/New(desired_loc) . = ..() selected_ore_type = pickweight(ore_deposit_weights) objects_max *= 0.5 + (ore_deposit_weights[object_to_place]/100)*0.5 @@ -40,7 +40,7 @@ var/global/list/ore_deposit_weights = list( turf_whitelist = /turf/simulated/floor/ object_to_place = /obj/structure/interactive/ore_deposit/floor -/obj/marker/generation/ore/floor/get_object_to_place(var/turf/T,var/objects_placed=0,var/grow_left=0) +/obj/marker/generation/ore/floor/get_object_to_place(turf/T,objects_placed=0,grow_left=0) var/ore_amount = (objects_max*2 - objects_placed) + 5 + grow_left*5 ore_amount *= (ore_deposit_weights[selected_ore_type]/100) ore_amount = CEILING(ore_amount,1) @@ -56,12 +56,12 @@ var/global/list/ore_deposit_weights = list( turf_whitelist = /turf/simulated/wall/rock object_to_place = /obj/structure/interactive/ore_deposit/wall -/obj/marker/generation/ore/wall/New(var/atom/desired_loc) +/obj/marker/generation/ore/wall/New(atom/desired_loc) . = ..() if(desired_loc && is_wall(desired_loc)) turf_whitelist = desired_loc.type -/obj/marker/generation/ore/wall/get_object_to_place(var/turf/T,var/objects_placed=0,var/grow_left=0) +/obj/marker/generation/ore/wall/get_object_to_place(turf/T,objects_placed=0,grow_left=0) var/obj/structure/interactive/ore_deposit/OD = new object_to_place(T) OD.material_id = selected_ore_type OD.ore_amount = 5 diff --git a/code/_core/obj/markers/generation_turf.dm b/code/_core/obj/markers/generation_turf.dm index 9087bd8ab8..7d81289392 100644 --- a/code/_core/obj/markers/generation_turf.dm +++ b/code/_core/obj/markers/generation_turf.dm @@ -8,7 +8,7 @@ var/global/list/obj/marker/smart_clear_turf/smart_clear_turfs = list() /obj/marker/smart_clear_turf/large checks_allowed = 80 -/obj/marker/smart_clear_turf/New(var/desired_loc) +/obj/marker/smart_clear_turf/New(desired_loc) smart_clear_turfs += src . = ..() diff --git a/code/_core/obj/markers/ghost.dm b/code/_core/obj/markers/ghost.dm index 09bbefdf00..23645e65cf 100644 --- a/code/_core/obj/markers/ghost.dm +++ b/code/_core/obj/markers/ghost.dm @@ -3,7 +3,7 @@ var/global/list/turf/ghost_markers = list() /obj/marker/ghost name = "ghost marker" -/obj/marker/ghost/New(var/desired_loc) +/obj/marker/ghost/New(desired_loc) ghost_markers += loc return ..() diff --git a/code/_core/obj/markers/horde.dm b/code/_core/obj/markers/horde.dm index 61844ee602..3702af9d9b 100644 --- a/code/_core/obj/markers/horde.dm +++ b/code/_core/obj/markers/horde.dm @@ -5,7 +5,7 @@ var/global/list/obj/marker/horde/all_horde_markers = list() icon = 'icons/obj/markers/markers.dmi' icon_state = "horde" -/obj/marker/horde/New(var/desired_loc) +/obj/marker/horde/New(desired_loc) . = ..() all_horde_markers += src diff --git a/code/_core/obj/markers/horde_test.dm b/code/_core/obj/markers/horde_test.dm index 7244c5bfe8..f5cf4da302 100644 --- a/code/_core/obj/markers/horde_test.dm +++ b/code/_core/obj/markers/horde_test.dm @@ -3,7 +3,7 @@ var/global/list/turf/horde_test_turfs = list() /obj/marker/horde_test name = "horde test" -/obj/marker/horde_test/New(var/desired_loc) +/obj/marker/horde_test/New(desired_loc) horde_test_turfs += loc return ..() @@ -17,7 +17,7 @@ var/global/list/turf/horde_test_target_turfs = list() /obj/marker/horde_test_target name = "horde test target" -/obj/marker/horde_test_target/New(var/desired_loc) +/obj/marker/horde_test_target/New(desired_loc) horde_test_target_turfs += loc return ..() @@ -31,7 +31,7 @@ var/global/list/turf/horde_test_survivor_spawn_turfs = list() /obj/marker/horde_test_survivor name = "horde test survivor spawn" -/obj/marker/horde_test_survivor/New(var/desired_loc) +/obj/marker/horde_test_survivor/New(desired_loc) horde_test_survivor_spawn_turfs += loc return ..() diff --git a/code/_core/obj/markers/hostage.dm b/code/_core/obj/markers/hostage.dm index bca50e05da..097c7827b2 100644 --- a/code/_core/obj/markers/hostage.dm +++ b/code/_core/obj/markers/hostage.dm @@ -6,7 +6,7 @@ var/global/list/possible_hostage_rest_markers = list() name = "possible hostage spawn" icon_state = "hostage" -/obj/marker/hostage_spawn/New(var/desired_loc) +/obj/marker/hostage_spawn/New(desired_loc) if(!SSdmm_suite.is_pvp_coord(loc.x,loc.y,loc.z)) possible_hostage_spawns += src return ..() @@ -18,6 +18,6 @@ var/global/list/possible_hostage_rest_markers = list() /obj/marker/hostage_rest name = "hostage rest location" -/obj/marker/hostage_rest/New(var/desired_loc) +/obj/marker/hostage_rest/New(desired_loc) possible_hostage_rest_markers += src return ..() \ No newline at end of file diff --git a/code/_core/obj/markers/invasion.dm b/code/_core/obj/markers/invasion.dm index 455098c331..0f1a74aead 100644 --- a/code/_core/obj/markers/invasion.dm +++ b/code/_core/obj/markers/invasion.dm @@ -3,6 +3,6 @@ var/global/list/all_invasion_markers = list() /obj/marker/invasion name = "invasion marker" -/obj/marker/invasion/New(var/desired_loc) +/obj/marker/invasion/New(desired_loc) all_invasion_markers += src . = ..() diff --git a/code/_core/obj/markers/landmark.dm b/code/_core/obj/markers/landmark.dm index cdda1d9c5e..6d51348fc5 100644 --- a/code/_core/obj/markers/landmark.dm +++ b/code/_core/obj/markers/landmark.dm @@ -5,6 +5,6 @@ var/global/list/all_landmarks = list() name = "landmark" icon_state = "landmark" -/obj/marker/landmark/New(var/desired_loc) +/obj/marker/landmark/New(desired_loc) all_landmarks += src return ..() \ No newline at end of file diff --git a/code/_core/obj/markers/mission_mob.dm b/code/_core/obj/markers/mission_mob.dm index 4383cad77d..cfe1ba969f 100644 --- a/code/_core/obj/markers/mission_mob.dm +++ b/code/_core/obj/markers/mission_mob.dm @@ -6,7 +6,7 @@ var/global/list/mission_mob_markers = list() icon_state = "mission_spawn" -/obj/marker/mission_mob/New(var/desired_loc) +/obj/marker/mission_mob/New(desired_loc) . = ..() mission_mob_markers += src @@ -29,7 +29,7 @@ var/global/list/rogue_crewmember_markers = list() icon_state = "syndie" -/obj/marker/rogue_crewmember_marker/New(var/desired_loc) +/obj/marker/rogue_crewmember_marker/New(desired_loc) . = ..() rogue_crewmember_markers += src @@ -47,7 +47,7 @@ var/global/list/turf/corpse_markers = list() icon = 'icons/obj/markers/markers.dmi' icon_state = "corpse" -/obj/marker/mission_corpse/New(var/desired_loc) +/obj/marker/mission_corpse/New(desired_loc) . = ..() corpse_markers += src diff --git a/code/_core/obj/markers/objective_spawn.dm b/code/_core/obj/markers/objective_spawn.dm index cf7be34a74..9a7c716baf 100644 --- a/code/_core/obj/markers/objective_spawn.dm +++ b/code/_core/obj/markers/objective_spawn.dm @@ -4,7 +4,7 @@ var/global/list/possible_objective_spawns = list() name = "possible objective spawn" icon_state = "goal" -/obj/marker/objective_spawn/New(var/desired_loc) +/obj/marker/objective_spawn/New(desired_loc) if(!SSdmm_suite.is_pvp_coord(loc.x,loc.y,loc.z)) possible_objective_spawns += src return ..() @@ -17,6 +17,6 @@ var/global/list/possible_abnormality_spawns = list() icon_state = "goal" color = "#FF0000" -/obj/marker/abnormality_spawn/New(var/desired_loc) +/obj/marker/abnormality_spawn/New(desired_loc) possible_abnormality_spawns += src return ..() \ No newline at end of file diff --git a/code/_core/obj/markers/ore.dm b/code/_core/obj/markers/ore.dm index cf4281e561..7662787b14 100644 --- a/code/_core/obj/markers/ore.dm +++ b/code/_core/obj/markers/ore.dm @@ -1,13 +1,13 @@ /obj/marker/ore name = "ore spawn" -/obj/marker/ore/New(var/desired_loc) +/obj/marker/ore/New(desired_loc) new /obj/structure/interactive/ore_deposit/random(src.loc) return ..() /obj/marker/ore_deep name = "deep ore spawn" -/obj/marker/ore_deep/New(var/desired_loc) +/obj/marker/ore_deep/New(desired_loc) new /obj/structure/interactive/ore_deposit_ground/random(src.loc) return ..() diff --git a/code/_core/obj/markers/player.dm b/code/_core/obj/markers/player.dm index e00c25b495..f3dbbc9954 100644 --- a/code/_core/obj/markers/player.dm +++ b/code/_core/obj/markers/player.dm @@ -3,6 +3,6 @@ var/global/list/obj/marker/backup_spawn/backup_spawnpoints = list() /obj/marker/backup_spawn name = "backup spawnpoint" -/obj/marker/backup_spawn/New(var/desired_loc) +/obj/marker/backup_spawn/New(desired_loc) backup_spawnpoints += src return ..() diff --git a/code/_core/obj/markers/portal.dm b/code/_core/obj/markers/portal.dm index 3e0b3c4ec7..9f6124c8db 100644 --- a/code/_core/obj/markers/portal.dm +++ b/code/_core/obj/markers/portal.dm @@ -4,7 +4,7 @@ var/global/list/portal_markers = list() name = "portal marker" var/loyalty_tag -/obj/marker/portal/New(var/desired_loc) +/obj/marker/portal/New(desired_loc) if(loyalty_tag) if(!portal_markers[loyalty_tag]) portal_markers[loyalty_tag] = list() diff --git a/code/_core/obj/markers/prefab.dm b/code/_core/obj/markers/prefab.dm index fb4b8e5c12..bb1340e80a 100644 --- a/code/_core/obj/markers/prefab.dm +++ b/code/_core/obj/markers/prefab.dm @@ -20,7 +20,7 @@ //var/chosen_file_below //For debug only. -/obj/marker/prefab/on_dmm_suite_rotate(var/angle_offset=0) +/obj/marker/prefab/on_dmm_suite_rotate(angle_offset=0) . = ..() switch(angle_offset) if(90) @@ -34,7 +34,7 @@ /obj/marker/prefab/proc/prepare_prefab() return TRUE -/obj/marker/prefab/New(var/desired_loc) +/obj/marker/prefab/New(desired_loc) if(prob(chance_none)) qdel(src) @@ -122,7 +122,7 @@ chance_none = 25 rotational_offset = 32 -/obj/marker/prefab/forest/New(var/desired_loc) +/obj/marker/prefab/forest/New(desired_loc) . = ..() dir = pick(DIRECTIONS_CARDINAL) @@ -227,7 +227,7 @@ category = "city_street_intersection" unique = TRUE -/obj/marker/prefab/city/intersection/New(var/desired_loc) +/obj/marker/prefab/city/intersection/New(desired_loc) . = ..() dir = pick(NORTH,EAST,SOUTH,WEST) diff --git a/code/_core/obj/markers/random/_random.dm b/code/_core/obj/markers/random/_random.dm index 75f1d862ce..7a4140dc99 100644 --- a/code/_core/obj/markers/random/_random.dm +++ b/code/_core/obj/markers/random/_random.dm @@ -6,7 +6,7 @@ icon = 'icons/obj/markers/random.dmi' icon_state = "random" -/obj/marker/random/New(var/desired_loc) +/obj/marker/random/New(desired_loc) if(loot_to_spawn && all_loot[loot_to_spawn]) var/loot/L = all_loot[loot_to_spawn] diff --git a/code/_core/obj/markers/rift_locations.dm b/code/_core/obj/markers/rift_locations.dm index ae83506dea..f31f246494 100644 --- a/code/_core/obj/markers/rift_locations.dm +++ b/code/_core/obj/markers/rift_locations.dm @@ -3,7 +3,7 @@ var/global/list/bluepace_rift_markers = list() /obj/marker/bluepace_rift_location name = "rift location" -/obj/marker/bluepace_rift_location/New(var/desired_loc) +/obj/marker/bluepace_rift_location/New(desired_loc) . = ..() bluepace_rift_markers += src @@ -12,6 +12,6 @@ var/global/list/wizard_rift_markers = list() /obj/marker/wizard_rift_location name = "wizard rift location" -/obj/marker/wizard_rift_location/New(var/desired_loc) +/obj/marker/wizard_rift_location/New(desired_loc) . = ..() wizard_rift_markers += src diff --git a/code/_core/obj/markers/shuttle.dm b/code/_core/obj/markers/shuttle.dm index 4c72430aba..4abedce85f 100644 --- a/code/_core/obj/markers/shuttle.dm +++ b/code/_core/obj/markers/shuttle.dm @@ -9,6 +9,6 @@ var/global/list/shuttle_markers = list() mouse_opacity = 2 alpha = 255 -/obj/marker/shuttle/New(var/desired_loc) +/obj/marker/shuttle/New(desired_loc) . = ..() shuttle_markers += src \ No newline at end of file diff --git a/code/_core/obj/markers/spawning.dm b/code/_core/obj/markers/spawning.dm index 72d73a6891..38e6520779 100644 --- a/code/_core/obj/markers/spawning.dm +++ b/code/_core/obj/markers/spawning.dm @@ -13,7 +13,7 @@ . = ..() qdel(src) -/obj/marker/spawning/proc/do_spawn(var/turf/T) +/obj/marker/spawning/proc/do_spawn(turf/T) return TRUE /obj/marker/spawning/window/ @@ -49,7 +49,7 @@ /obj/marker/spawning/window/ color = "#6E9CAD" -/obj/marker/spawning/window/do_spawn(var/turf/T) +/obj/marker/spawning/window/do_spawn(turf/T) var/obj/structure/table/window/G = new(T) var/obj/structure/window/W = new(T) LATE_INIT(G) @@ -59,7 +59,7 @@ /obj/marker/spawning/window/tinted color = "#353535" -/obj/marker/spawning/window/tinted/do_spawn(var/turf/T) +/obj/marker/spawning/window/tinted/do_spawn(turf/T) var/obj/structure/table/window/G = new(T) var/obj/structure/window/W = new(T) LATE_INIT(G) @@ -68,7 +68,7 @@ W.opacity = 0 setup_airlock() -/obj/marker/spawning/window/rcd/do_spawn(var/turf/T) +/obj/marker/spawning/window/rcd/do_spawn(turf/T) var/obj/structure/interactive/construction/grille/G = new(T) var/obj/structure/window/W = new(T) INITIALIZE(G) @@ -84,7 +84,7 @@ icon_state = "window_grille_reinforced" color = "#345A68" -/obj/marker/spawning/window/reinforced/do_spawn(var/turf/T) +/obj/marker/spawning/window/reinforced/do_spawn(turf/T) var/obj/structure/table/window/G = new(T) var/obj/structure/window/reinforced/W = new(T) LATE_INIT(G) @@ -95,7 +95,7 @@ icon_state = "window_grille_reinforced" color = "#FFFF00" -/obj/marker/spawning/window/reinforced/grilled/do_spawn(var/turf/T) +/obj/marker/spawning/window/reinforced/grilled/do_spawn(turf/T) var/obj/structure/table/window/G = new(T) var/obj/structure/interactive/construction/grille/A = new(T) var/obj/structure/window/reinforced/W = new(T) @@ -108,7 +108,7 @@ icon_state = "window_grille_reinforced" color = "#394D5B" -/obj/marker/spawning/window/shuttle/do_spawn(var/turf/T) +/obj/marker/spawning/window/shuttle/do_spawn(turf/T) var/obj/structure/table/window/G = new(T) G.plane = PLANE_SHUTTLE G.color = "#FFFFFF" @@ -124,7 +124,7 @@ icon_state = "window_grille_extra" color = "#E423C9" -/obj/marker/spawning/window/extra/do_spawn(var/turf/T) +/obj/marker/spawning/window/extra/do_spawn(turf/T) var/obj/structure/table/window/G = new(T) var/obj/structure/window/reinforced/plasma/W = new(T) LATE_INIT(G) @@ -136,7 +136,7 @@ var/chance_none = 0 -/obj/marker/spawning/random/do_spawn(var/turf/T) +/obj/marker/spawning/random/do_spawn(turf/T) if(!prob(chance_none)) var/datum/D = pickweight(possible_objects) diff --git a/code/_core/obj/markers/spawnpoint.dm b/code/_core/obj/markers/spawnpoint.dm index 3141292e10..a3f7300406 100644 --- a/code/_core/obj/markers/spawnpoint.dm +++ b/code/_core/obj/markers/spawnpoint.dm @@ -15,7 +15,7 @@ var/global/list/vr_lobby_spawnpoints = list() name = "ghost spawnpoint" desc = "This is where ghosts spawn." -/obj/marker/spawnpoint/ghost/New(var/desired_loc) +/obj/marker/spawnpoint/ghost/New(desired_loc) observer_spawnpoints += get_turf(src) . = ..() @@ -23,7 +23,7 @@ var/global/list/vr_lobby_spawnpoints = list() name = "chargen spawnpoint" desc = "This is where new chargen players spawn." -/obj/marker/spawnpoint/chargen/New(var/desired_loc) +/obj/marker/spawnpoint/chargen/New(desired_loc) chargen_spawnpoints += get_turf(src) . = ..() @@ -31,7 +31,7 @@ var/global/list/vr_lobby_spawnpoints = list() name = "world point" desc = "This is where you enter the world (via cryo)." -/obj/marker/spawnpoint/world_point/New(var/desired_loc) +/obj/marker/spawnpoint/world_point/New(desired_loc) world_spawnpoints += get_turf(src) /obj/marker/spawnpoint/horde @@ -51,7 +51,7 @@ var/global/list/vr_lobby_spawnpoints = list() desc = "For the free for all VR gamemode." color = "#00FF00" -/obj/marker/spawnpoint/vr/free_for_all/New(var/desired_loc) +/obj/marker/spawnpoint/vr/free_for_all/New(desired_loc) free_for_all_spawnpoints += get_turf(src) . = ..() @@ -60,7 +60,7 @@ var/global/list/vr_lobby_spawnpoints = list() desc = "For the team deathmatch gamemode" color = "#0000FF" -/obj/marker/spawnpoint/vr/team_deathmatch/New(var/desired_loc) +/obj/marker/spawnpoint/vr/team_deathmatch/New(desired_loc) tdm_spawnpoints += get_turf(src) /obj/marker/spawnpoint/vr/lobby @@ -68,6 +68,6 @@ var/global/list/vr_lobby_spawnpoints = list() desc = "For placing people in the lobby." color = "#FF0000" -/obj/marker/spawnpoint/vr/lobby/New(var/desired_loc) +/obj/marker/spawnpoint/vr/lobby/New(desired_loc) vr_lobby_spawnpoints += get_turf(src) . = ..() \ No newline at end of file diff --git a/code/_core/obj/markers/supermatter_spawn.dm b/code/_core/obj/markers/supermatter_spawn.dm index 66c2e3d660..bb338e9c77 100644 --- a/code/_core/obj/markers/supermatter_spawn.dm +++ b/code/_core/obj/markers/supermatter_spawn.dm @@ -4,6 +4,6 @@ var/global/list/possible_supermatter_spawns = list() name = "possible supermatter spawn" icon_state = "goal" -/obj/marker/supermatter_spawn/New(var/desired_loc) +/obj/marker/supermatter_spawn/New(desired_loc) possible_supermatter_spawns += src return ..() \ No newline at end of file diff --git a/code/_core/obj/markers/syndicate.dm b/code/_core/obj/markers/syndicate.dm index b20b828111..a19266b677 100644 --- a/code/_core/obj/markers/syndicate.dm +++ b/code/_core/obj/markers/syndicate.dm @@ -6,6 +6,6 @@ var/global/list/turf/all_syndicate_spawns = list() icon = 'icons/obj/markers/markers.dmi' icon_state = "syndie" -/obj/marker/syndicate/New(var/desired_loc) +/obj/marker/syndicate/New(desired_loc) all_syndicate_spawns += get_turf(src) return ..() \ No newline at end of file diff --git a/code/_core/obj/node.dm b/code/_core/obj/node.dm index 2c2a7b6097..a5a8f28d1a 100644 --- a/code/_core/obj/node.dm +++ b/code/_core/obj/node.dm @@ -26,7 +26,7 @@ var/map -/pathfinder/New(var/desired_width,var/desired_height,var/desired_map) +/pathfinder/New(desired_width,desired_height,desired_map) level_width = desired_width level_height = desired_height @@ -38,7 +38,7 @@ initialize_search_nodes() -/pathfinder/proc/heuristic(var/obj/node/point_a,var/obj/node/point_b) +/pathfinder/proc/heuristic(obj/node/point_a,obj/node/point_b) return abs(point_a.x - point_b.x) + abs(point_a.y - point_b.y) /pathfinder/proc/reset_search_nodes() @@ -72,7 +72,7 @@ return current_tile -/pathfinder/proc/find_final_path(var/node_search/start_node,var/node_search/end_node) +/pathfinder/proc/find_final_path(node_search/start_node,node_search/end_node) closed_list.Add(end_node) var/node_search/parent_tile = end_node.parent @@ -89,7 +89,7 @@ return final_path -/pathfinder/proc/find_path(var/obj/node/start_point,var/obj/node/end_point) +/pathfinder/proc/find_path(obj/node/start_point,obj/node/end_point) if(start_point == end_point) return null @@ -188,7 +188,7 @@ NS.neighbors[i] = neighbor -/pathfinder/proc/simplify_vectors(var/list/Vector2D/path) +/pathfinder/proc/simplify_vectors(list/Vector2D/path) world.log << "The simplyify is [length(path)]." diff --git a/code/_core/obj/overlay/chat_text.dm b/code/_core/obj/overlay/chat_text.dm index 89bbae6704..52f0215886 100644 --- a/code/_core/obj/overlay/chat_text.dm +++ b/code/_core/obj/overlay/chat_text.dm @@ -18,7 +18,7 @@ #define CHAT_TEXT_CHARACTER_LIMIT 288 //maximum displayed for above character text -/obj/effect/chat_text/New(var/atom/desired_loc,var/desired_text,var/bypass_length=FALSE) +/obj/effect/chat_text/New(atom/desired_loc,desired_text,bypass_length=FALSE) if(ismob(desired_loc)) owner = desired_loc diff --git a/code/_core/obj/parallax/_parallax.dm b/code/_core/obj/parallax/_parallax.dm index 75c705972c..6c58816fac 100644 --- a/code/_core/obj/parallax/_parallax.dm +++ b/code/_core/obj/parallax/_parallax.dm @@ -15,7 +15,7 @@ last_turf = null . = ..() -/obj/parallax/New(var/desired_loc) +/obj/parallax/New(desired_loc) if(auto_resize) transform *= ((VIEW_RANGE*2 + 1)*TILE_SIZE)/(480) return ..() @@ -41,7 +41,7 @@ . = ..() -/obj/parallax/defer_click_on_object(var/mob/caller,location,control,params) +/obj/parallax/defer_click_on_object(mob/caller,location,control,params) if(owner && params && length(params) && params["screen-loc"]) var/turf/T = get_turf(owner) diff --git a/code/_core/obj/plane_master/_plane_master.dm b/code/_core/obj/plane_master/_plane_master.dm index 5e98466bb0..76c2427e14 100644 --- a/code/_core/obj/plane_master/_plane_master.dm +++ b/code/_core/obj/plane_master/_plane_master.dm @@ -8,7 +8,7 @@ alpha = 255 var/mob/owner -/obj/plane_master/New(var/desired_loc) +/obj/plane_master/New(desired_loc) . = ..() owner = desired_loc apply_post_processing() diff --git a/code/_core/obj/projectile/_projectile.dm b/code/_core/obj/projectile/_projectile.dm index f647ede2e6..8b59d14548 100644 --- a/code/_core/obj/projectile/_projectile.dm +++ b/code/_core/obj/projectile/_projectile.dm @@ -105,7 +105,7 @@ projectile_blacklist?.Cut() . = ..() -/obj/projectile/New(var/desired_loc,var/atom/desired_owner,var/atom/desired_weapon,var/desired_vel_x,var/desired_vel_y,var/desired_shoot_x = 0,var/desired_shoot_y = 0, var/turf/desired_turf, var/desired_damage_type, var/desired_target, var/desired_color, var/desired_blamed, var/desired_damage_multiplier=1,var/desired_iff_tag,var/desired_loyalty_tag,var/desired_inaccuracy_modifier=1,var/desired_penetrations_left=0) +/obj/projectile/New(desired_loc,atom/desired_owner,atom/desired_weapon,desired_vel_x,desired_vel_y,desired_shoot_x = 0,desired_shoot_y = 0, turf/desired_turf, desired_damage_type, desired_target, desired_color, desired_blamed, desired_damage_multiplier=1,desired_iff_tag,desired_loyalty_tag,desired_inaccuracy_modifier=1,desired_penetrations_left=0) if(!desired_owner) log_error("WARNING: PROJECTILE [src.get_debug_name()] DID NOT HAVE AN OWNER!") @@ -202,7 +202,7 @@ . = ..() SSprojectiles.all_projectiles += src -/obj/projectile/proc/on_enter_tile(var/turf/old_loc,var/turf/new_loc) +/obj/projectile/proc/on_enter_tile(turf/old_loc,turf/new_loc) if(!new_loc) log_error("Warning: [src.get_debug_name()] didn't have a new loc!") @@ -281,7 +281,7 @@ return TRUE //No hits. Do not destroy. -/obj/projectile/proc/update_projectile(var/tick_rate=1) +/obj/projectile/proc/update_projectile(tick_rate=1) //Return FALSE here to make it delete. @@ -357,7 +357,7 @@ return TRUE -/obj/projectile/on_projectile_hit(var/atom/hit_atom,var/turf/old_loc,var/turf/new_loc) +/obj/projectile/on_projectile_hit(atom/hit_atom,turf/old_loc,turf/new_loc) if(projectile_blacklist[hit_atom]) return FALSE @@ -480,7 +480,7 @@ return . -/obj/projectile/get_inaccuracy(var/atom/source,var/atom/target,var/inaccuracy_modifier=1) +/obj/projectile/get_inaccuracy(atom/source,atom/target,inaccuracy_modifier=1) if(!source || !target || source.qdeleting || target.qdeleting) return 100 if(inaccuracy_modifier <= 0) diff --git a/code/_core/obj/projectile/beam.dm b/code/_core/obj/projectile/beam.dm index 9fb45519fc..29118c6aa4 100644 --- a/code/_core/obj/projectile/beam.dm +++ b/code/_core/obj/projectile/beam.dm @@ -12,7 +12,7 @@ collision_bullet_flags = FLAG_COLLISION_BULLET_LIGHT -/obj/projectile/beam/on_enter_tile(var/turf/old_loc,var/turf/new_loc) +/obj/projectile/beam/on_enter_tile(turf/old_loc,turf/new_loc) . = ..() diff --git a/code/_core/obj/projectile/bullet.dm b/code/_core/obj/projectile/bullet.dm index 7fb0d61bfc..bde4913280 100644 --- a/code/_core/obj/projectile/bullet.dm +++ b/code/_core/obj/projectile/bullet.dm @@ -48,7 +48,7 @@ icon_state = "syringe" reagents = /reagent_container/syringe_gun_syringe -/obj/projectile/bullet/syringe/on_projectile_hit(var/atom/hit_atom,var/turf/old_loc,var/turf/new_loc) +/obj/projectile/bullet/syringe/on_projectile_hit(atom/hit_atom,turf/old_loc,turf/new_loc) . = ..() @@ -67,7 +67,7 @@ icon_state = "rocket_he" hit_target_turf = TRUE -/obj/projectile/bullet/rocket_he/on_projectile_hit(var/atom/hit_atom,var/turf/old_loc,var/turf/new_loc) +/obj/projectile/bullet/rocket_he/on_projectile_hit(atom/hit_atom,turf/old_loc,turf/new_loc) . = ..() if(. && old_loc) explode(old_loc,6,owner,weapon,iff_tag,multiplier = 5) @@ -78,7 +78,7 @@ icon_state = "rocket_nuke" hit_target_turf = TRUE -/obj/projectile/bullet/rocket_nuclear/on_projectile_hit(var/atom/hit_atom,var/turf/old_loc,var/turf/new_loc) +/obj/projectile/bullet/rocket_nuclear/on_projectile_hit(atom/hit_atom,turf/old_loc,turf/new_loc) . = ..() if(. && old_loc) explode(old_loc,10,owner,weapon,iff_tag) @@ -88,7 +88,7 @@ icon = 'icons/obj/projectiles/rocket.dmi' icon_state = "rocket_ap" -/obj/projectile/bullet/rocket_ap/on_projectile_hit(var/atom/hit_atom,var/turf/old_loc,var/turf/new_loc) +/obj/projectile/bullet/rocket_ap/on_projectile_hit(atom/hit_atom,turf/old_loc,turf/new_loc) . = ..() if(. && old_loc) explode(old_loc,3,owner,weapon,iff_tag) @@ -98,7 +98,7 @@ icon = 'icons/obj/projectiles/rocket.dmi' icon_state = "rocket_wp" -/obj/projectile/bullet/rocket_wp/update_projectile(var/tick_rate=1) +/obj/projectile/bullet/rocket_wp/update_projectile(tick_rate=1) . = ..() if(.) vel_x *= 0.99 @@ -109,13 +109,13 @@ on_projectile_hit(current_loc) return FALSE -/obj/projectile/bullet/rocket_wp/on_projectile_hit(var/atom/hit_atom,var/turf/old_loc,var/turf/new_loc) +/obj/projectile/bullet/rocket_wp/on_projectile_hit(atom/hit_atom,turf/old_loc,turf/new_loc) . = ..() if(. && old_loc) explode(old_loc,3,owner,weapon,iff_tag,multiplier = 2) firebomb(old_loc,22,owner,weapon,iff_tag,multiplier = 1.5) -/obj/projectile/bullet/rocket_wp/on_enter_tile(var/turf/old_loc,var/turf/new_loc) +/obj/projectile/bullet/rocket_wp/on_enter_tile(turf/old_loc,turf/new_loc) . = ..() var/obj/effect/temp/hazard/flamethrowerfire = locate() in new_loc @@ -127,13 +127,13 @@ icon = 'icons/obj/projectiles/rocket.dmi' icon_state = "gyrojet" -/obj/projectile/bullet/gyrojet/on_projectile_hit(var/atom/hit_atom,var/turf/old_loc,var/turf/new_loc) +/obj/projectile/bullet/gyrojet/on_projectile_hit(atom/hit_atom,turf/old_loc,turf/new_loc) . = ..() if(. && old_loc) explode(old_loc,3,owner,weapon,iff_tag) -/obj/projectile/bullet/gyrojet/update_projectile(var/tick_rate=1) +/obj/projectile/bullet/gyrojet/update_projectile(tick_rate=1) . = ..() diff --git a/code/_core/obj/projectile/bullet/firearm.dm b/code/_core/obj/projectile/bullet/firearm.dm index 38d19a3853..6dcbd605b9 100644 --- a/code/_core/obj/projectile/bullet/firearm.dm +++ b/code/_core/obj/projectile/bullet/firearm.dm @@ -9,7 +9,7 @@ name = "sniper bullet" icon_state = "bullet_massive" -/obj/projectile/bullet/firearm/sniper/explosive/on_projectile_hit(var/atom/hit_atom,var/turf/old_loc,var/turf/new_loc) +/obj/projectile/bullet/firearm/sniper/explosive/on_projectile_hit(atom/hit_atom,turf/old_loc,turf/new_loc) . = ..() if(. && old_loc) explode(old_loc,3,owner,weapon,iff_tag) @@ -32,7 +32,7 @@ icon_state = "bullet_small" var/smart = FALSE -/obj/projectile/bullet/firearm/pistol/smart/New(var/desired_loc,var/atom/desired_owner,var/atom/desired_weapon,var/desired_vel_x,var/desired_vel_y,var/desired_shoot_x = 0,var/desired_shoot_y = 0, var/turf/desired_turf, var/desired_damage_type, var/desired_target, var/desired_color, var/desired_blamed, var/desired_damage_multiplier=1,var/desired_iff_tag,var/desired_loyalty_tag,var/desired_inaccuracy_modifier=1,var/desired_penetrations_left=0) +/obj/projectile/bullet/firearm/pistol/smart/New(desired_loc,atom/desired_owner,atom/desired_weapon,desired_vel_x,desired_vel_y,desired_shoot_x = 0,desired_shoot_y = 0, turf/desired_turf, desired_damage_type, desired_target, desired_color, desired_blamed, desired_damage_multiplier=1,desired_iff_tag,desired_loyalty_tag,desired_inaccuracy_modifier=1,desired_penetrations_left=0) . = ..() if(istype(weapon,/obj/item/weapon/ranged/bullet/magazine/smg/smart)) @@ -57,7 +57,7 @@ smart = FALSE -/obj/projectile/bullet/firearm/pistol/smart/update_projectile(var/tick_rate=1) +/obj/projectile/bullet/firearm/pistol/smart/update_projectile(tick_rate=1) . = ..() @@ -82,7 +82,7 @@ name = "shotgun pellet" icon_state = "pellet" -/obj/projectile/bullet/firearm/shotgun_pellet/New(var/loc,var/atom/desired_owner,var/atom/desired_weapon,var/desired_vel_x,var/desired_vel_y,var/desired_shoot_x = 0,var/desired_shoot_y = 0, var/turf/desired_turf, var/desired_damage_type, var/desired_target, var/desired_color, var/desired_blamed, var/desired_damage_multiplier=1) +/obj/projectile/bullet/firearm/shotgun_pellet/New(loc,atom/desired_owner,atom/desired_weapon,desired_vel_x,desired_vel_y,desired_shoot_x = 0,desired_shoot_y = 0, turf/desired_turf, desired_damage_type, desired_target, desired_color, desired_blamed, desired_damage_multiplier=1) icon_state = "pellets_[rand(1,4)]" return ..() @@ -90,7 +90,7 @@ name = "shotgun flechette" icon_state = "flechette" -/obj/projectile/bullet/firearm/shotgun_flechette/New(var/loc,var/atom/desired_owner,var/atom/desired_weapon,var/desired_vel_x,var/desired_vel_y,var/desired_shoot_x = 0,var/desired_shoot_y = 0, var/turf/desired_turf, var/desired_damage_type, var/desired_target, var/desired_color, var/desired_blamed, var/desired_damage_multiplier=1) +/obj/projectile/bullet/firearm/shotgun_flechette/New(loc,atom/desired_owner,atom/desired_weapon,desired_vel_x,desired_vel_y,desired_shoot_x = 0,desired_shoot_y = 0, turf/desired_turf, desired_damage_type, desired_target, desired_color, desired_blamed, desired_damage_multiplier=1) icon_state = "flechettes_[rand(1,4)]" return ..() diff --git a/code/_core/obj/projectile/cleaning_shot.dm b/code/_core/obj/projectile/cleaning_shot.dm index fc5f9cb21d..91ab0f2f18 100644 --- a/code/_core/obj/projectile/cleaning_shot.dm +++ b/code/_core/obj/projectile/cleaning_shot.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/projectiles/bullet.dmi' icon_state = "bullet_large" -/obj/projectile/bullet/cleaning_shot/on_projectile_hit(var/atom/hit_atom,var/turf/old_loc,var/turf/new_loc) +/obj/projectile/bullet/cleaning_shot/on_projectile_hit(atom/hit_atom,turf/old_loc,turf/new_loc) . = ..() diff --git a/code/_core/obj/projectile/collisions.dm b/code/_core/obj/projectile/collisions.dm index 1922d5ec55..d72ddd2971 100644 --- a/code/_core/obj/projectile/collisions.dm +++ b/code/_core/obj/projectile/collisions.dm @@ -1,4 +1,4 @@ -/atom/proc/projectile_should_collide(var/obj/projectile/P,var/turf/old_turf,var/turf/new_turf) +/atom/proc/projectile_should_collide(obj/projectile/P,turf/old_turf,turf/new_turf) if(P.owner == src && P.target_atom != P.owner) return FALSE @@ -18,7 +18,7 @@ return TRUE -/obj/structure/interactive/scanner/projectile_should_collide(var/obj/projectile/P,var/turf/old_turf,var/turf/new_turf) +/obj/structure/interactive/scanner/projectile_should_collide(obj/projectile/P,turf/old_turf,turf/new_turf) . = ..() @@ -32,10 +32,10 @@ return FALSE -/atom/movable/lighting_overlay/projectile_should_collide(var/obj/projectile/P,var/turf/old_turf,var/turf/new_turf) +/atom/movable/lighting_overlay/projectile_should_collide(obj/projectile/P,turf/old_turf,turf/new_turf) return null -/mob/living/vehicle/projectile_should_collide(var/obj/projectile/P,var/turf/old_turf,var/turf/new_turf) +/mob/living/vehicle/projectile_should_collide(obj/projectile/P,turf/old_turf,turf/new_turf) if(is_advanced(P.owner)) var/mob/living/advanced/A = P.owner @@ -44,11 +44,11 @@ . = ..() -/obj/effect/projectile_should_collide(var/obj/projectile/P,var/turf/old_turf,var/turf/new_turf) +/obj/effect/projectile_should_collide(obj/projectile/P,turf/old_turf,turf/new_turf) return FALSE -/mob/living/projectile_should_collide(var/obj/projectile/P,var/turf/old_turf,var/turf/new_turf) +/mob/living/projectile_should_collide(obj/projectile/P,turf/old_turf,turf/new_turf) if(P.ignore_living) return FALSE @@ -64,7 +64,7 @@ . = ..() -/turf/projectile_should_collide(var/obj/projectile/P,var/turf/old_turf,var/turf/new_turf) +/turf/projectile_should_collide(obj/projectile/P,turf/old_turf,turf/new_turf) if(src.allow_bullet_pass) return FALSE @@ -93,10 +93,10 @@ return FALSE -/obj/projectile/projectile_should_collide(var/obj/projectile/P,var/turf/old_turf,var/turf/new_turf) +/obj/projectile/projectile_should_collide(obj/projectile/P,turf/old_turf,turf/new_turf) return FALSE -/obj/structure/projectile_should_collide(var/obj/projectile/P,var/turf/old_turf,var/turf/new_turf) +/obj/structure/projectile_should_collide(obj/projectile/P,turf/old_turf,turf/new_turf) if(P.target_atom != src && bullet_block_chance <= 0) return FALSE diff --git a/code/_core/obj/projectile/fire_breath.dm b/code/_core/obj/projectile/fire_breath.dm index 3775c577bb..7e515ddb31 100644 --- a/code/_core/obj/projectile/fire_breath.dm +++ b/code/_core/obj/projectile/fire_breath.dm @@ -10,7 +10,7 @@ ignore_living = TRUE -/obj/projectile/fire_breath/on_enter_tile(var/turf/old_loc,var/turf/new_loc) +/obj/projectile/fire_breath/on_enter_tile(turf/old_loc,turf/new_loc) . = ..() @@ -25,7 +25,7 @@ ) -/obj/projectile/fire_breath/on_projectile_hit(var/atom/hit_atom,var/turf/old_loc,var/turf/new_loc) +/obj/projectile/fire_breath/on_projectile_hit(atom/hit_atom,turf/old_loc,turf/new_loc) . = ..() diff --git a/code/_core/obj/projectile/grenade.dm b/code/_core/obj/projectile/grenade.dm index d4f8b25610..25532f35c9 100644 --- a/code/_core/obj/projectile/grenade.dm +++ b/code/_core/obj/projectile/grenade.dm @@ -7,7 +7,7 @@ /obj/projectile/bullet/grenade/he icon_state = "HE" -/obj/projectile/bullet/grenade/he/on_projectile_hit(var/atom/hit_atom,var/turf/old_loc,var/turf/new_loc) +/obj/projectile/bullet/grenade/he/on_projectile_hit(atom/hit_atom,turf/old_loc,turf/new_loc) . = ..() if(. && old_loc) explode(old_loc,4,owner,weapon,iff_tag,multiplier = 1.5) @@ -15,7 +15,7 @@ /obj/projectile/bullet/grenade/hv icon_state = "HV" -/obj/projectile/bullet/grenade/hv/on_projectile_hit(var/atom/hit_atom,var/turf/old_loc,var/turf/new_loc) +/obj/projectile/bullet/grenade/hv/on_projectile_hit(atom/hit_atom,turf/old_loc,turf/new_loc) . = ..() if(. && old_loc) explode(old_loc,2,owner,weapon,iff_tag) @@ -23,7 +23,7 @@ /obj/projectile/bullet/grenade/du icon_state = "DU" -/obj/projectile/bullet/grenade/du/on_projectile_hit(var/atom/hit_atom,var/turf/old_loc,var/turf/new_loc) +/obj/projectile/bullet/grenade/du/on_projectile_hit(atom/hit_atom,turf/old_loc,turf/new_loc) . = ..() if(. && old_loc) explode(old_loc,6,owner,weapon,iff_tag,multiplier = 1.5) @@ -40,7 +40,7 @@ /obj/projectile/bullet/grenade/cleaning icon_state = "CLEANING" -/obj/projectile/bullet/grenade/cleaning/on_projectile_hit(var/atom/hit_atom,var/turf/old_loc,var/turf/new_loc) +/obj/projectile/bullet/grenade/cleaning/on_projectile_hit(atom/hit_atom,turf/old_loc,turf/new_loc) . = ..() if(. && old_loc) explode(old_loc,1,owner,weapon,iff_tag,multiplier = 1.5) diff --git a/code/_core/obj/projectile/laser.dm b/code/_core/obj/projectile/laser.dm index 6373d2a931..fdbfb52352 100644 --- a/code/_core/obj/projectile/laser.dm +++ b/code/_core/obj/projectile/laser.dm @@ -42,7 +42,7 @@ /obj/projectile/bullet/laser/kinetic icon_state = "kinetic" -/obj/projectile/bullet/laser/kinetic/update_projectile(var/tick_rate=1) +/obj/projectile/bullet/laser/kinetic/update_projectile(tick_rate=1) . = ..() if(.) vel_x *= 0.95 @@ -61,7 +61,7 @@ /* It also doesn't work that way so yeh //So it basically accelerates and then self-obliterates to act as some funny alternative to KA. -/obj/projectile/bullet/laser/plasma_cutter/update_projectile(var/tick_rate=1) +/obj/projectile/bullet/laser/plasma_cutter/update_projectile(tick_rate=1) . = ..() if(.) @@ -82,7 +82,7 @@ icon = 'icons/obj/projectiles/spray.dmi' icon_state = "flamer" -/obj/projectile/bullet/flamer/update_projectile(var/tick_rate=1) +/obj/projectile/bullet/flamer/update_projectile(tick_rate=1) . = ..() if(.) vel_x *= 0.95 diff --git a/code/_core/obj/projectile/magic.dm b/code/_core/obj/projectile/magic.dm index 96eb782617..638e1c70ea 100644 --- a/code/_core/obj/projectile/magic.dm +++ b/code/_core/obj/projectile/magic.dm @@ -29,7 +29,7 @@ var/extra_lifetime = 0 //How long should we persist before starting to decay by velocity_degrade? (In deciseconds) -/obj/projectile/magic/New(var/desired_loc,var/atom/desired_owner,var/atom/desired_weapon,var/desired_vel_x,var/desired_vel_y,var/desired_shoot_x = 0,var/desired_shoot_y = 0, var/turf/desired_turf, var/desired_damage_type, var/desired_target, var/desired_color, var/desired_blamed, var/desired_damage_multiplier=1,var/desired_iff_tag,var/desired_loyalty_tag,var/desired_inaccuracy_modifier=1,var/desired_penetrations_left=0) +/obj/projectile/magic/New(desired_loc,atom/desired_owner,atom/desired_weapon,desired_vel_x,desired_vel_y,desired_shoot_x = 0,desired_shoot_y = 0, turf/desired_turf, desired_damage_type, desired_target, desired_color, desired_blamed, desired_damage_multiplier=1,desired_iff_tag,desired_loyalty_tag,desired_inaccuracy_modifier=1,desired_penetrations_left=0) . = ..() homing_maximum_acceleration = clamp(homing_maximum_acceleration,0.01,0.25) @@ -54,13 +54,13 @@ -/obj/projectile/magic/on_projectile_hit(var/atom/hit_atom,var/turf/old_loc,var/turf/new_loc) +/obj/projectile/magic/on_projectile_hit(atom/hit_atom,turf/old_loc,turf/new_loc) . = ..() if(. && old_loc && explode_power > 0) explode(old_loc,explode_power,owner,src,loyalty_tag) -/obj/projectile/magic/update_projectile(var/tick_rate=1) +/obj/projectile/magic/update_projectile(tick_rate=1) . = ..() @@ -179,7 +179,7 @@ /obj/projectile/magic/fireball/lava hit_target_turf = TRUE -/obj/projectile/magic/fireball/lava/on_projectile_hit(var/atom/hit_atom,var/turf/old_loc,var/turf/new_loc) +/obj/projectile/magic/fireball/lava/on_projectile_hit(atom/hit_atom,turf/old_loc,turf/new_loc) . = ..() @@ -195,12 +195,12 @@ icon_state = "chaos" var/angle_to_add = 0 -/obj/projectile/magic/chaos/New(var/desired_loc,var/atom/desired_owner,var/atom/desired_weapon,var/desired_vel_x,var/desired_vel_y,var/desired_shoot_x = 0,var/desired_shoot_y = 0, var/turf/desired_turf, var/desired_damage_type, var/desired_target, var/desired_color, var/desired_blamed, var/desired_damage_multiplier=1,var/desired_iff_tag,var/desired_loyalty_tag,var/desired_inaccuracy_modifier=1,var/desired_penetrations_left=0) +/obj/projectile/magic/chaos/New(desired_loc,atom/desired_owner,atom/desired_weapon,desired_vel_x,desired_vel_y,desired_shoot_x = 0,desired_shoot_y = 0, turf/desired_turf, desired_damage_type, desired_target, desired_color, desired_blamed, desired_damage_multiplier=1,desired_iff_tag,desired_loyalty_tag,desired_inaccuracy_modifier=1,desired_penetrations_left=0) . = ..() angle_to_add = pick(-1,1) -/obj/projectile/magic/chaos/update_projectile(var/tick_rate=1) +/obj/projectile/magic/chaos/update_projectile(tick_rate=1) . = ..() @@ -255,7 +255,7 @@ name = "revival rift" hit_laying = TRUE -/obj/projectile/magic/rift/revive/on_projectile_hit(var/atom/hit_atom,var/turf/old_loc,var/turf/new_loc) +/obj/projectile/magic/rift/revive/on_projectile_hit(atom/hit_atom,turf/old_loc,turf/new_loc) . = ..() @@ -268,7 +268,7 @@ name = "healing rift" hit_laying = TRUE -/obj/projectile/magic/rift/heal/on_projectile_hit(var/atom/hit_atom,var/turf/old_loc,var/turf/new_loc) +/obj/projectile/magic/rift/heal/on_projectile_hit(atom/hit_atom,turf/old_loc,turf/new_loc) . = ..() @@ -297,7 +297,7 @@ name = "tesla bolt" icon_state = "tesla_01" -/obj/projectile/magic/tesla_bolt/New(var/desired_loc,var/atom/desired_owner,var/atom/desired_weapon,var/desired_vel_x,var/desired_vel_y,var/desired_shoot_x = 0,var/desired_shoot_y = 0, var/turf/desired_turf, var/desired_damage_type, var/desired_target, var/desired_color, var/desired_blamed, var/desired_damage_multiplier=1,var/desired_iff_tag,var/desired_loyalty_tag,var/desired_inaccuracy_modifier=1) +/obj/projectile/magic/tesla_bolt/New(desired_loc,atom/desired_owner,atom/desired_weapon,desired_vel_x,desired_vel_y,desired_shoot_x = 0,desired_shoot_y = 0, turf/desired_turf, desired_damage_type, desired_target, desired_color, desired_blamed, desired_damage_multiplier=1,desired_iff_tag,desired_loyalty_tag,desired_inaccuracy_modifier=1) icon_state = pick("tesla_01","tesla_02","tesla_03") return ..() @@ -306,7 +306,7 @@ icon_state = "lightning_01" velocity_degrade = 0.8 -/obj/projectile/magic/lightning/New(var/desired_loc,var/atom/desired_owner,var/atom/desired_weapon,var/desired_vel_x,var/desired_vel_y,var/desired_shoot_x = 0,var/desired_shoot_y = 0, var/turf/desired_turf, var/desired_damage_type, var/desired_target, var/desired_color, var/desired_blamed, var/desired_damage_multiplier=1,var/desired_iff_tag,var/desired_loyalty_tag,var/desired_inaccuracy_modifier=1) +/obj/projectile/magic/lightning/New(desired_loc,atom/desired_owner,atom/desired_weapon,desired_vel_x,desired_vel_y,desired_shoot_x = 0,desired_shoot_y = 0, turf/desired_turf, desired_damage_type, desired_target, desired_color, desired_blamed, desired_damage_multiplier=1,desired_iff_tag,desired_loyalty_tag,desired_inaccuracy_modifier=1) icon_state = pick("lightning_01","lightning_02","lightning_03","lightning_04","lightning_05") return ..() @@ -326,7 +326,7 @@ icon_state = "lightning" var/has_cleaved = FALSE -/obj/projectile/magic/lightning_bolt/on_projectile_hit(var/atom/hit_atom,var/turf/old_loc,var/turf/new_loc) +/obj/projectile/magic/lightning_bolt/on_projectile_hit(atom/hit_atom,turf/old_loc,turf/new_loc) . = ..() @@ -400,7 +400,7 @@ velocity_degrade = 0.7 -/obj/projectile/magic/cultist/on_enter_tile(var/turf/old_loc,var/turf/new_loc) +/obj/projectile/magic/cultist/on_enter_tile(turf/old_loc,turf/new_loc) . = ..() @@ -480,7 +480,7 @@ hit_target_turf = TRUE -/obj/projectile/magic/inferno/on_projectile_hit(var/atom/hit_atom,var/turf/old_loc,var/turf/new_loc) +/obj/projectile/magic/inferno/on_projectile_hit(atom/hit_atom,turf/old_loc,turf/new_loc) . = ..() firebomb(old_loc,6,owner,weapon,src.loyalty_tag) @@ -492,7 +492,7 @@ /obj/projectile/magic/buff/mending name = "mending" -/obj/projectile/magic/buff/mending/on_projectile_hit(var/atom/hit_atom,var/turf/old_loc,var/turf/new_loc) +/obj/projectile/magic/buff/mending/on_projectile_hit(atom/hit_atom,turf/old_loc,turf/new_loc) . = ..() if(. && is_living(hit_atom)) var/mob/living/L = hit_atom @@ -502,7 +502,7 @@ /obj/projectile/magic/buff/armor name = "armor" -/obj/projectile/magic/buff/armor/on_projectile_hit(var/atom/hit_atom,var/turf/old_loc,var/turf/new_loc) +/obj/projectile/magic/buff/armor/on_projectile_hit(atom/hit_atom,turf/old_loc,turf/new_loc) . = ..() if(. && is_living(hit_atom)) var/mob/living/L = hit_atom diff --git a/code/_core/obj/projectile/shitcode.dm b/code/_core/obj/projectile/shitcode.dm index 7d3b00e3c6..b563b0c73d 100644 --- a/code/_core/obj/projectile/shitcode.dm +++ b/code/_core/obj/projectile/shitcode.dm @@ -7,7 +7,7 @@ collision_flags = FLAG_COLLISION_NONE -/obj/projectile/bullet/laser/penetrating/on_hit(var/atom/hit_atom) +/obj/projectile/bullet/laser/penetrating/on_hit(atom/hit_atom) if(hit_atom != target_atom && is_living(hit_atom)) var/mob/living/L = hit_atom diff --git a/code/_core/obj/projectile/slime_ball.dm b/code/_core/obj/projectile/slime_ball.dm index 7bb612586c..3762183103 100644 --- a/code/_core/obj/projectile/slime_ball.dm +++ b/code/_core/obj/projectile/slime_ball.dm @@ -8,7 +8,7 @@ lifetime = 4 SECONDS /* -/obj/projectile/slime_ball/on_projectile_hit(var/atom/hit_atom,var/turf/old_loc,var/turf/new_loc) +/obj/projectile/slime_ball/on_projectile_hit(atom/hit_atom,turf/old_loc,turf/new_loc) . = ..() diff --git a/code/_core/obj/projectile/spray.dm b/code/_core/obj/projectile/spray.dm index fe68c1aa01..b74aea731d 100644 --- a/code/_core/obj/projectile/spray.dm +++ b/code/_core/obj/projectile/spray.dm @@ -19,7 +19,7 @@ hostile = reagents.contains_lethal -/obj/projectile/spray/on_enter_tile(var/turf/old_loc,var/turf/new_loc) +/obj/projectile/spray/on_enter_tile(turf/old_loc,turf/new_loc) . = ..() if(. && new_loc && reagents) reagents.splash(owner,new_loc,2.5,TRUE,0.25) @@ -27,12 +27,12 @@ on_projectile_hit(new_loc) return FALSE -/obj/projectile/spray/on_projectile_hit(var/atom/hit_atom,var/turf/old_loc,var/turf/new_loc) +/obj/projectile/spray/on_projectile_hit(atom/hit_atom,turf/old_loc,turf/new_loc) . = ..() if(. && hit_atom && reagents.volume_current > 0) reagents.splash(owner,hit_atom,reagents.volume_current,TRUE,0.5) -/obj/projectile/spray/update_projectile(var/tick_rate=1) +/obj/projectile/spray/update_projectile(tick_rate=1) . = ..() if(.) vel_x *= 0.9 @@ -57,7 +57,7 @@ hit_target_turf = TRUE hit_laying = TRUE -/obj/projectile/extinguisher_spray/on_enter_tile(var/turf/old_loc,var/turf/new_loc) +/obj/projectile/extinguisher_spray/on_enter_tile(turf/old_loc,turf/new_loc) . = ..() if(. && new_loc && reagents) reagents.splash(owner,new_loc,1,TRUE,0.25) @@ -65,13 +65,13 @@ on_projectile_hit(new_loc) return FALSE -/obj/projectile/extinguisher_spray/on_projectile_hit(var/atom/hit_atom,var/turf/old_loc,var/turf/new_loc) +/obj/projectile/extinguisher_spray/on_projectile_hit(atom/hit_atom,turf/old_loc,turf/new_loc) . = ..() if(. && hit_atom && reagents.volume_current) reagents.splash(owner,hit_atom,reagents.volume_current,TRUE,0.5) -/obj/projectile/extinguisher_spray/update_projectile(var/tick_rate=1) +/obj/projectile/extinguisher_spray/update_projectile(tick_rate=1) . = ..() if(.) vel_x *= 0.95 diff --git a/code/_core/obj/projectile/thrown.dm b/code/_core/obj/projectile/thrown.dm index 0819934ca9..9d414d3c0c 100644 --- a/code/_core/obj/projectile/thrown.dm +++ b/code/_core/obj/projectile/thrown.dm @@ -28,7 +28,7 @@ pixel_z = steps_allowed -/obj/projectile/thrown/on_enter_tile(var/turf/old_loc,var/turf/new_loc) +/obj/projectile/thrown/on_enter_tile(turf/old_loc,turf/new_loc) if(new_loc && ignore_shuttles && new_loc.plane != PLANE_SHUTTLE) //Feels like shitcode, but it works. return TRUE @@ -43,7 +43,7 @@ vel_x *= 0.9 vel_y *= 0.9 -/obj/projectile/thrown/on_projectile_hit(var/atom/hit_atom,var/turf/old_loc,var/turf/new_loc) +/obj/projectile/thrown/on_projectile_hit(atom/hit_atom,turf/old_loc,turf/new_loc) . = ..() @@ -133,7 +133,7 @@ . = ..() -/obj/projectile/thrown/proc/animate_hit(var/atom/movable/A) +/obj/projectile/thrown/proc/animate_hit(atom/movable/A) var/matrix/M = A.get_base_transform() var/new_angle = -ATAN2(vel_x,vel_y) + 90 M.Turn(new_angle) diff --git a/code/_core/obj/radio/_radio.dm b/code/_core/obj/radio/_radio.dm index cbaae6b8dc..134dc44bbf 100644 --- a/code/_core/obj/radio/_radio.dm +++ b/code/_core/obj/radio/_radio.dm @@ -20,12 +20,12 @@ value = 10 -/obj/radio/click_self(var/mob/caller,location,control,params) +/obj/radio/click_self(mob/caller,location,control,params) broadcasting = !broadcasting caller.to_chat(span("notice","You toggle the receiver to [broadcasting ? "always broadcast." : "only broadcast when pressed."]")) return TRUE -/obj/radio/clicked_on_by_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/radio/clicked_on_by_object(mob/caller as mob,atom/object,location,control,params) if(!is_inventory(object)) return ..() receiving = !receiving @@ -33,7 +33,7 @@ return TRUE -/obj/radio/on_mouse_wheel(var/mob/caller,delta_x,delta_y,location,control,params) +/obj/radio/on_mouse_wheel(mob/caller,delta_x,delta_y,location,control,params) var/fixed_delta = delta_y > 0 ? 1 : -1 @@ -59,7 +59,7 @@ return TRUE -/obj/radio/New(var/desired_loc) +/obj/radio/New(desired_loc) all_radios += src return ..() diff --git a/code/_core/obj/reflector.dm b/code/_core/obj/reflector.dm index d8f2be717d..a0cc459d75 100644 --- a/code/_core/obj/reflector.dm +++ b/code/_core/obj/reflector.dm @@ -28,7 +28,7 @@ vis_flags = VIS_INHERIT_PLANE | VIS_INHERIT_ID -/obj/reflector/New(var/atom/desired_loc,var/atom/desired_owner,var/desired_loyalty_tag,var/time_to_live=10) +/obj/reflector/New(atom/desired_loc,atom/desired_owner,desired_loyalty_tag,time_to_live=10) owner = desired_owner loyalty_tag = desired_loyalty_tag @@ -43,19 +43,19 @@ return TRUE -/obj/reflector/projectile_should_collide(var/obj/projectile/P,var/turf/old_turf,var/turf/new_turf) +/obj/reflector/projectile_should_collide(obj/projectile/P,turf/old_turf,turf/new_turf) if(src.loyalty_tag && P.loyalty_tag != src.loyalty_tag) return FALSE . = ..() -/obj/reflector/can_be_attacked(var/atom/attacker,var/atom/weapon,var/params,var/damagetype/damage_type) +/obj/reflector/can_be_attacked(atom/attacker,atom/weapon,params,damagetype/damage_type) //Can still be hit. return FALSE -/obj/reflector/on_projectile_hit(var/obj/projectile/P,var/turf/old_loc,var/turf/new_loc) +/obj/reflector/on_projectile_hit(obj/projectile/P,turf/old_loc,turf/new_loc) . = ..() diff --git a/code/_core/obj/shuttle_controler/_shuttle_controller.dm b/code/_core/obj/shuttle_controler/_shuttle_controller.dm index f598c02b9b..313646663e 100644 --- a/code/_core/obj/shuttle_controler/_shuttle_controller.dm +++ b/code/_core/obj/shuttle_controler/_shuttle_controller.dm @@ -43,7 +43,7 @@ SSshuttle.all_shuttle_controlers -= src return ..() -/obj/shuttle_controller/New(var/desired_loc) +/obj/shuttle_controller/New(desired_loc) SSshuttle.all_shuttle_controlers += src @@ -110,7 +110,7 @@ set_doors(TRUE,TRUE,TRUE) //Open and bolt all the doors! -/obj/shuttle_controller/proc/set_destination(var/mob/caller,var/obj/marker/shuttle_landing/desired_marker) +/obj/shuttle_controller/proc/set_destination(mob/caller,obj/marker/shuttle_landing/desired_marker) if(!is_safe_to_land(caller,desired_marker)) return FALSE diff --git a/code/_core/obj/shuttle_controler/shuttle_controller_doors.dm b/code/_core/obj/shuttle_controler/shuttle_controller_doors.dm index eedd3a656d..fac9798cf1 100644 --- a/code/_core/obj/shuttle_controler/shuttle_controller_doors.dm +++ b/code/_core/obj/shuttle_controler/shuttle_controller_doors.dm @@ -1,4 +1,4 @@ -/obj/shuttle_controller/proc/set_doors(var/open = TRUE,var/lock = FALSE,var/force = FALSE) +/obj/shuttle_controller/proc/set_doors(open = TRUE,lock = FALSE,force = FALSE) . = TRUE //TRUE if nothing went wrong. False if something went wrong. diff --git a/code/_core/obj/shuttle_controler/shuttle_controller_landing.dm b/code/_core/obj/shuttle_controler/shuttle_controller_landing.dm index 51115dae04..25f806e6bc 100644 --- a/code/_core/obj/shuttle_controler/shuttle_controller_landing.dm +++ b/code/_core/obj/shuttle_controler/shuttle_controller_landing.dm @@ -1,4 +1,4 @@ -/obj/shuttle_controller/proc/signal_landing(var/obj/marker/shuttle) +/obj/shuttle_controller/proc/signal_landing(obj/marker/shuttle) var/area/A = get_area(src) @@ -17,7 +17,7 @@ return TRUE -/obj/shuttle_controller/proc/is_safe_to_land(var/mob/caller,var/obj/marker/shuttle_landing/desired_marker) +/obj/shuttle_controller/proc/is_safe_to_land(mob/caller,obj/marker/shuttle_landing/desired_marker) if(!SSgamemode?.active_gamemode?.allow_launch) caller?.to_chat(span("warning","Error: Shuttles are not ready to launch yet.")) diff --git a/code/_core/obj/shuttle_controler/shuttle_controller_launch.dm b/code/_core/obj/shuttle_controler/shuttle_controller_launch.dm index 83561d88aa..711bed52c4 100644 --- a/code/_core/obj/shuttle_controler/shuttle_controller_launch.dm +++ b/code/_core/obj/shuttle_controler/shuttle_controller_launch.dm @@ -1,4 +1,4 @@ -/obj/shuttle_controller/proc/start_flight(var/mob/caller) +/obj/shuttle_controller/proc/start_flight(mob/caller) if(!is_safe_to_land(caller,src.transit_marker_destination)) return FALSE @@ -9,7 +9,7 @@ return TRUE -/obj/shuttle_controller/proc/launch(var/mob/caller,var/desired_transit_time) //In deciseconds. This proc will always be called to bluespace. +/obj/shuttle_controller/proc/launch(mob/caller,desired_transit_time) //In deciseconds. This proc will always be called to bluespace. if(!set_doors(FALSE,TRUE,TRUE)) //This will return false if something is blocking the doors. time = time - 5 //Go back 5 seconds. diff --git a/code/_core/obj/shuttle_controler/shuttle_controller_transit.dm b/code/_core/obj/shuttle_controler/shuttle_controller_transit.dm index afd0eea53d..001c6c0b86 100644 --- a/code/_core/obj/shuttle_controler/shuttle_controller_transit.dm +++ b/code/_core/obj/shuttle_controler/shuttle_controller_transit.dm @@ -1,4 +1,4 @@ -/obj/shuttle_controller/proc/transit(var/obj/marker/shuttle_landing/desired_marker,var/accelerating=FALSE) +/obj/shuttle_controller/proc/transit(obj/marker/shuttle_landing/desired_marker,accelerating=FALSE) var/list/areas_to_upate = list() diff --git a/code/_core/obj/spawn/_spawn.dm b/code/_core/obj/spawn/_spawn.dm index b2482f24ce..83221baa7e 100644 --- a/code/_core/obj/spawn/_spawn.dm +++ b/code/_core/obj/spawn/_spawn.dm @@ -15,14 +15,14 @@ enable_chunk_clean = TRUE enable_chunk_handling = TRUE -/obj/marker/mob_spawn/New(var/loc,var/mob/living/desired_mob_stored) +/obj/marker/mob_spawn/New(loc,mob/living/desired_mob_stored) . = ..() mob_stored = desired_mob_stored mob_type = desired_mob_stored.type time_to_respawn = desired_mob_stored.respawn_time force_spawn = desired_mob_stored.force_spawn -/obj/marker/mob_spawn/proc/do_spawn(var/turf/T) +/obj/marker/mob_spawn/proc/do_spawn(turf/T) var/mob/living/L = new mob_type(T) INITIALIZE(L) GENERATE(L) diff --git a/code/_core/obj/structure/_structure.dm b/code/_core/obj/structure/_structure.dm index a2765b6d23..d58c418e26 100644 --- a/code/_core/obj/structure/_structure.dm +++ b/code/_core/obj/structure/_structure.dm @@ -38,7 +38,7 @@ var/turf/simulated/attached_to //The simulated turf this object is attached to. -/obj/structure/proc/try_attach_to(var/desired_direction=0x0) +/obj/structure/proc/try_attach_to(desired_direction=0x0) var/turf/simulated/T = get_step(src,desired_direction) if(!T || !is_simulated(T)) @@ -66,7 +66,7 @@ I.alpha = 100 add_overlay(I) -/obj/structure/on_crush(var/message=TRUE) +/obj/structure/on_crush(message=TRUE) . = ..() if(message) loc.visible_message(span("warning","\The [src.name] is crushed under \the [src.loc.name]!")) qdel(src) @@ -116,13 +116,13 @@ pixel_y = (TILE_SIZE - I.Height())/2 + initial(pixel_y) -/obj/structure/proc/on_active(var/mob/living/advanced/player/P) +/obj/structure/proc/on_active(mob/living/advanced/player/P) return TRUE -/obj/structure/proc/on_inactive(var/mob/living/advanced/player/P) +/obj/structure/proc/on_inactive(mob/living/advanced/player/P) return TRUE -/obj/structure/proc/buckle(var/mob/living/victim,var/mob/caller,var/silent = FALSE) +/obj/structure/proc/buckle(mob/living/victim,mob/caller,silent = FALSE) if(victim.anchored) if(caller && !silent) caller.to_chat(span("notice","You cannot buckle \the [victim.name] to \the [src.name]!")) @@ -142,7 +142,7 @@ return TRUE -/obj/structure/proc/unbuckle(var/mob/caller,var/silent=FALSE,var/force=FALSE) +/obj/structure/proc/unbuckle(mob/caller,silent=FALSE,force=FALSE) if(!buckled) return FALSE @@ -174,7 +174,7 @@ return TRUE -/obj/structure/Uncross(var/atom/movable/O,atom/newloc) +/obj/structure/Uncross(atom/movable/O,atom/newloc) if(!O || O.collision_flags & src.collision_flags) var/direction = get_dir(src,newloc) @@ -186,7 +186,7 @@ return TRUE -/obj/structure/can_be_attacked(var/atom/attacker,var/atom/weapon,var/params,var/damagetype/damage_type) +/obj/structure/can_be_attacked(atom/attacker,atom/weapon,params,damagetype/damage_type) if(!creator_ckey) var/area/A = get_area(src) diff --git a/code/_core/obj/structure/carpet/_carpet.dm b/code/_core/obj/structure/carpet/_carpet.dm index f414c0c3bb..a177f79333 100644 --- a/code/_core/obj/structure/carpet/_carpet.dm +++ b/code/_core/obj/structure/carpet/_carpet.dm @@ -21,7 +21,7 @@ appearance_flags = PIXEL_SCALE | LONG_GLIDE | KEEP_TOGETHER -/obj/structure/carpet/on_destruction(var/damage = TRUE) +/obj/structure/carpet/on_destruction(damage = TRUE) . = ..() qdel(src) diff --git a/code/_core/obj/structure/interactive/_interactive.dm b/code/_core/obj/structure/interactive/_interactive.dm index 96ae0f001a..5ad219087a 100644 --- a/code/_core/obj/structure/interactive/_interactive.dm +++ b/code/_core/obj/structure/interactive/_interactive.dm @@ -77,7 +77,7 @@ obj/structure/interactive/proc/link_power(var/area/A,var/link=TRUE) . = ..() -/obj/structure/interactive/post_move(var/atom/old_loc) +/obj/structure/interactive/post_move(atom/old_loc) . = ..() if(connected_wire) @@ -173,7 +173,7 @@ obj/structure/interactive/clicked_on_by_object(var/mob/caller,var/atom/object,lo return ..() -/obj/structure/interactive/proc/power_process(var/power_multiplier=1) +/obj/structure/interactive/proc/power_process(power_multiplier=1) return TRUE obj/structure/interactive/proc/check_interactables(var/mob/caller,var/atom/object,location,control,params) @@ -207,7 +207,7 @@ obj/structure/interactive/proc/check_interactables(var/mob/caller,var/atom/objec -/obj/structure/interactive/proc/update_power_draw(var/desired_power_draw,var/reset=FALSE) +/obj/structure/interactive/proc/update_power_draw(desired_power_draw,reset=FALSE) var/area/A = null @@ -238,7 +238,7 @@ obj/structure/interactive/proc/check_interactables(var/mob/caller,var/atom/objec return TRUE -/obj/structure/interactive/proc/update_power_supply(var/desired_power_supply,var/reset=FALSE) +/obj/structure/interactive/proc/update_power_supply(desired_power_supply,reset=FALSE) if(!wire_powered) power_supply = 0 diff --git a/code/_core/obj/structure/interactive/ability_machine.dm b/code/_core/obj/structure/interactive/ability_machine.dm index 0e891c34f9..ffe0cb0795 100644 --- a/code/_core/obj/structure/interactive/ability_machine.dm +++ b/code/_core/obj/structure/interactive/ability_machine.dm @@ -25,7 +25,7 @@ -/obj/structure/interactive/ability_machine/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/ability_machine/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(caller.ckey && is_advanced(caller) && is_inventory(object)) INTERACT_CHECK diff --git a/code/_core/obj/structure/interactive/atm.dm b/code/_core/obj/structure/interactive/atm.dm index 5dc3d5eb7c..1a4f30d6f0 100644 --- a/code/_core/obj/structure/interactive/atm.dm +++ b/code/_core/obj/structure/interactive/atm.dm @@ -28,7 +28,7 @@ I.plane = PLANE_LIGHTING_EFFECT add_overlay(I) -/obj/structure/interactive/atm/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/atm/clicked_on_by_object(mob/caller,atom/object,location,control,params) INTERACT_CHECK INTERACT_DELAY(5) diff --git a/code/_core/obj/structure/interactive/barbed_wire.dm b/code/_core/obj/structure/interactive/barbed_wire.dm index 9f45a60d16..8ee58a88a6 100644 --- a/code/_core/obj/structure/interactive/barbed_wire.dm +++ b/code/_core/obj/structure/interactive/barbed_wire.dm @@ -26,6 +26,6 @@ if(L.health.organic) L.add_status_effect(SLOW,40,40) -/obj/structure/interactive/barbed_wire/on_destruction(var/damage = TRUE) +/obj/structure/interactive/barbed_wire/on_destruction(damage = TRUE) . = ..() qdel(src) \ No newline at end of file diff --git a/code/_core/obj/structure/interactive/barricade.dm b/code/_core/obj/structure/interactive/barricade.dm index 081e7c1613..61a99a6193 100644 --- a/code/_core/obj/structure/interactive/barricade.dm +++ b/code/_core/obj/structure/interactive/barricade.dm @@ -41,7 +41,7 @@ return TRUE return ..() -/obj/structure/interactive/barricade/proc/can_climb_over(var/mob/caller) +/obj/structure/interactive/barricade/proc/can_climb_over(mob/caller) INTERACT_CHECK_NO_DELAY(src) @@ -56,7 +56,7 @@ return TRUE -/obj/structure/interactive/barricade/proc/climb_over(var/mob/caller) +/obj/structure/interactive/barricade/proc/climb_over(mob/caller) climbers[caller] = TRUE @@ -70,7 +70,7 @@ return TRUE -/obj/structure/interactive/barricade/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/barricade/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(is_advanced(caller) && is_inventory(object) && can_climb_over(caller)) INTERACT_CHECK @@ -87,7 +87,7 @@ obj/structure/interactive/barricade/Finalize() . = ..() update_sprite() -/obj/structure/interactive/barricade/set_dir(var/desired_dir,var/force=FALSE) +/obj/structure/interactive/barricade/set_dir(desired_dir,force=FALSE) . = ..() @@ -115,7 +115,7 @@ obj/structure/interactive/barricade/Finalize() -/obj/structure/interactive/barricade/on_destruction(var/damage = TRUE) +/obj/structure/interactive/barricade/on_destruction(damage = TRUE) create_destruction(get_turf(src),list(/obj/item/material/sheet/ = 2),/material/steel) . = ..() qdel(src) diff --git a/code/_core/obj/structure/interactive/barrier.dm b/code/_core/obj/structure/interactive/barrier.dm index b54e463d84..5535f2d744 100644 --- a/code/_core/obj/structure/interactive/barrier.dm +++ b/code/_core/obj/structure/interactive/barrier.dm @@ -17,6 +17,6 @@ health_base = 800 -/obj/structure/interactive/barrier/on_destruction(var/damage = TRUE) +/obj/structure/interactive/barrier/on_destruction(damage = TRUE) . = ..() qdel(src) \ No newline at end of file diff --git a/code/_core/obj/structure/interactive/bed.dm b/code/_core/obj/structure/interactive/bed.dm index f782b75ea6..c3965dac72 100644 --- a/code/_core/obj/structure/interactive/bed.dm +++ b/code/_core/obj/structure/interactive/bed.dm @@ -38,7 +38,7 @@ obj/structure/interactive/bed if(found) L.add_disease(/disease/hrp) -/obj/structure/interactive/bed/buckle(var/mob/living/victim,var/mob/caller,var/silent=FALSE) +/obj/structure/interactive/bed/buckle(mob/living/victim,mob/caller,silent=FALSE) . = ..() @@ -47,7 +47,7 @@ obj/structure/interactive/bed victim.pixel_x = pixel_offset_x victim.pixel_y = pixel_offset_y -/obj/structure/interactive/bed/unbuckle(var/mob/caller,var/silent=FALSE,var/force=FALSE) +/obj/structure/interactive/bed/unbuckle(mob/caller,silent=FALSE,force=FALSE) var/mob/living/L = buckled diff --git a/code/_core/obj/structure/interactive/bed_sleeper.dm b/code/_core/obj/structure/interactive/bed_sleeper.dm index b7cd960ed8..c043d3378e 100644 --- a/code/_core/obj/structure/interactive/bed_sleeper.dm +++ b/code/_core/obj/structure/interactive/bed_sleeper.dm @@ -69,7 +69,7 @@ I.appearance_flags = appearance_flags | RESET_COLOR | RESET_ALPHA add_overlay(I) -/obj/structure/interactive/bed/sleeper/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/bed/sleeper/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(door_state == SLEEPER_CLOSING || door_state == SLEEPER_OPENING) return TRUE @@ -93,14 +93,14 @@ return FALSE -/obj/structure/interactive/bed/sleeper/buckle(var/mob/living/victim,var/mob/caller,var/silent=FALSE) +/obj/structure/interactive/bed/sleeper/buckle(mob/living/victim,mob/caller,silent=FALSE) if(door_state != SLEEPER_OPENED) return FALSE return ..() -/obj/structure/interactive/bed/sleeper/unbuckle(var/mob/caller,var/silent=FALSE,var/force=FALSE) +/obj/structure/interactive/bed/sleeper/unbuckle(mob/caller,silent=FALSE,force=FALSE) if(force) return ..() @@ -113,14 +113,14 @@ return ..() -/obj/structure/interactive/bed/sleeper/proc/open(var/mob/caller) +/obj/structure/interactive/bed/sleeper/proc/open(mob/caller) if(open_sound) play_sound(open_sound,src.loc,range_max=VIEW_RANGE) door_state = SLEEPER_OPENING flick("opening",src) CALLBACK("on_open_\ref[src]",open_time,src,src::on_open(),caller) -/obj/structure/interactive/bed/sleeper/proc/on_open(var/mob/caller) +/obj/structure/interactive/bed/sleeper/proc/on_open(mob/caller) door_state = SLEEPER_OPENED opened_time = 0 icon_state = "opened" @@ -128,17 +128,17 @@ START_THINKING(src) return TRUE -/obj/structure/interactive/bed/sleeper/proc/on_close(var/mob/caller) +/obj/structure/interactive/bed/sleeper/proc/on_close(mob/caller) door_state = SLEEPER_CLOSED opened_time = 0 icon_state = "closed" check_collisions() return TRUE -/obj/structure/interactive/bed/sleeper/proc/can_buckle(var/mob/living/advanced/A,var/mob/caller) +/obj/structure/interactive/bed/sleeper/proc/can_buckle(mob/living/advanced/A,mob/caller) return TRUE -/obj/structure/interactive/bed/sleeper/proc/close(var/mob/caller) +/obj/structure/interactive/bed/sleeper/proc/close(mob/caller) if(!buckled) var/mob/living/advanced/A = locate() in get_turf(src) if(A && can_buckle(A,caller)) diff --git a/code/_core/obj/structure/interactive/bed_sleeper_cryo.dm b/code/_core/obj/structure/interactive/bed_sleeper_cryo.dm index 3299d82568..ee8c941dbb 100644 --- a/code/_core/obj/structure/interactive/bed_sleeper_cryo.dm +++ b/code/_core/obj/structure/interactive/bed_sleeper_cryo.dm @@ -7,7 +7,7 @@ tertiary_color = "#008800" var/spawnpoint = TRUE -/obj/structure/interactive/bed/sleeper/cryo/New(var/desired_loc) +/obj/structure/interactive/bed/sleeper/cryo/New(desired_loc) if(spawnpoint) SSobj.cryo_spawnpoints += src return ..() @@ -16,14 +16,14 @@ if(spawnpoint) SSobj.cryo_spawnpoints -= src -/obj/structure/interactive/bed/sleeper/can_buckle(var/mob/living/advanced/A,var/mob/caller) +/obj/structure/interactive/bed/sleeper/can_buckle(mob/living/advanced/A,mob/caller) if(!is_player(A)) return FALSE . = ..() -/obj/structure/interactive/bed/sleeper/cryo/buckle(var/mob/living/victim,var/mob/caller,var/silent=FALSE) +/obj/structure/interactive/bed/sleeper/cryo/buckle(mob/living/victim,mob/caller,silent=FALSE) . = ..() @@ -45,7 +45,7 @@ if(buckled) return TRUE -/obj/structure/interactive/bed/sleeper/cryo/on_close(var/mob/caller) +/obj/structure/interactive/bed/sleeper/cryo/on_close(mob/caller) . = ..() diff --git a/code/_core/obj/structure/interactive/bed_sleeper_medical.dm b/code/_core/obj/structure/interactive/bed_sleeper_medical.dm index 5214612cd5..069c76c4da 100644 --- a/code/_core/obj/structure/interactive/bed_sleeper_medical.dm +++ b/code/_core/obj/structure/interactive/bed_sleeper_medical.dm @@ -43,7 +43,7 @@ return TRUE -/obj/structure/interactive/bed/sleeper/medical/close(var/mob/caller) +/obj/structure/interactive/bed/sleeper/medical/close(mob/caller) if(!buckled) var/mob/living/advanced/A = locate() in get_turf(src) if(A) @@ -54,7 +54,7 @@ update_icon() CALLBACK("on_close_\ref[src]",close_time,src,src::on_close(),caller) -/obj/structure/interactive/bed/sleeper/medical/on_open(var/mob/caller) +/obj/structure/interactive/bed/sleeper/medical/on_open(mob/caller) door_state = SLEEPER_OPENED opened_time = 0 update_icon() @@ -62,7 +62,7 @@ STOP_THINKING(src) return TRUE -/obj/structure/interactive/bed/sleeper/medical/on_close(var/mob/caller) +/obj/structure/interactive/bed/sleeper/medical/on_close(mob/caller) door_state = SLEEPER_CLOSED opened_time = 0 update_icon() diff --git a/code/_core/obj/structure/interactive/blob/_blob.dm b/code/_core/obj/structure/interactive/blob/_blob.dm index 9eb090f5d6..cee3ef91d6 100644 --- a/code/_core/obj/structure/interactive/blob/_blob.dm +++ b/code/_core/obj/structure/interactive/blob/_blob.dm @@ -47,7 +47,7 @@ . = ..() -/obj/structure/interactive/blob/proc/grow_charge(var/obj/structure/interactive/blob/original_blob,var/obj/structure/interactive/blob/last_blob,var/tolerance=1,var/turf/priority_turf) +/obj/structure/interactive/blob/proc/grow_charge(obj/structure/interactive/blob/original_blob,obj/structure/interactive/blob/last_blob,tolerance=1,turf/priority_turf) if(src.qdeleting || !original_blob || original_blob.qdeleting || !linked_core || linked_core.qdeleting) return FALSE @@ -146,7 +146,7 @@ return TRUE -/obj/structure/interactive/blob/New(var/desired_loc,var/obj/structure/interactive/blob/core/desired_owner) +/obj/structure/interactive/blob/New(desired_loc,obj/structure/interactive/blob/core/desired_owner) adjacent_blobs = list() . = ..() turn_angle = pick(0,90,180,270) @@ -173,10 +173,10 @@ . = ..() icon_state = "[initial(icon_state)]_[last_state]" -/obj/structure/interactive/blob/can_be_attacked(var/atom/attacker,var/atom/weapon,var/params,var/damagetype/damage_type) +/obj/structure/interactive/blob/can_be_attacked(atom/attacker,atom/weapon,params,damagetype/damage_type) return TRUE -/obj/structure/interactive/blob/can_attack(var/atom/attacker,var/atom/victim,var/atom/weapon,var/params,var/damagetype/damage_type) +/obj/structure/interactive/blob/can_attack(atom/attacker,atom/victim,atom/weapon,params,damagetype/damage_type) if(!health || health.health_current <= 0 || !color || color == "#FFFFFF") return FALSE @@ -200,7 +200,7 @@ . = 1 //Increasing last_state = current_state -/obj/structure/interactive/blob/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/obj/structure/interactive/blob/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) if(!src.z) return ..() @@ -215,7 +215,7 @@ play_sound(pick('sound/effects/impacts/flesh_01.ogg','sound/effects/impacts/flesh_02.ogg','sound/effects/impacts/flesh_03.ogg'),T) update_sprite() -/obj/structure/interactive/blob/on_destruction(var/damage = TRUE) +/obj/structure/interactive/blob/on_destruction(damage = TRUE) . = ..() qdel(src) diff --git a/code/_core/obj/structure/interactive/blob/blob_core.dm b/code/_core/obj/structure/interactive/blob/blob_core.dm index ae469cd027..39c9ea70fd 100644 --- a/code/_core/obj/structure/interactive/blob/blob_core.dm +++ b/code/_core/obj/structure/interactive/blob/blob_core.dm @@ -19,7 +19,7 @@ var/blob_limit = 700 -/obj/structure/interactive/blob/core/New(var/desired_loc,var/obj/structure/interactive/blob/core/desired_owner) +/obj/structure/interactive/blob/core/New(desired_loc,obj/structure/interactive/blob/core/desired_owner) color = random_color() if(!color) color = "#00FF00" @@ -82,7 +82,7 @@ . = ..() -/obj/structure/interactive/blob/core/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/obj/structure/interactive/blob/core/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) . = ..() if(.) fast_grows_left += damage_table[BRUTE] + damage_table[BURN] diff --git a/code/_core/obj/structure/interactive/blob/blob_node.dm b/code/_core/obj/structure/interactive/blob/blob_node.dm index 4fbe703258..d281d4a46a 100644 --- a/code/_core/obj/structure/interactive/blob/blob_node.dm +++ b/code/_core/obj/structure/interactive/blob/blob_node.dm @@ -15,7 +15,7 @@ . = ..() linked_blobbernaught = null -/obj/structure/interactive/blob/node/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/obj/structure/interactive/blob/node/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) . = ..() if(.) check_jugs() @@ -38,7 +38,7 @@ return FALSE -/obj/structure/interactive/blob/node/New(var/desired_loc,var/obj/structure/interactive/blob/core/desired_owner) +/obj/structure/interactive/blob/node/New(desired_loc,obj/structure/interactive/blob/core/desired_owner) . = ..() diff --git a/code/_core/obj/structure/interactive/bookcase.dm b/code/_core/obj/structure/interactive/bookcase.dm index 434f4d6318..154df14a38 100644 --- a/code/_core/obj/structure/interactive/bookcase.dm +++ b/code/_core/obj/structure/interactive/bookcase.dm @@ -49,7 +49,7 @@ if(chance_of_scroll > 0) icon_state = "[icon_state]-[chance_of_scroll]" -/obj/structure/interactive/bookcase/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/bookcase/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(!is_inventory(object)) return ..() @@ -61,7 +61,7 @@ return TRUE -/obj/structure/interactive/bookcase/proc/can_search_case(var/mob/caller) +/obj/structure/interactive/bookcase/proc/can_search_case(mob/caller) INTERACT_CHECK_NO_DELAY(src) @@ -74,7 +74,7 @@ return TRUE -/obj/structure/interactive/bookcase/proc/search_case(var/mob/caller) +/obj/structure/interactive/bookcase/proc/search_case(mob/caller) if(prob(chance_of_scroll*10)) var/rarity = 0 diff --git a/code/_core/obj/structure/interactive/boss_loot.dm b/code/_core/obj/structure/interactive/boss_loot.dm index 76e1ca34dc..ecc394b5d9 100644 --- a/code/_core/obj/structure/interactive/boss_loot.dm +++ b/code/_core/obj/structure/interactive/boss_loot.dm @@ -38,7 +38,7 @@ allowed_users?.Cut() return ..() -/obj/structure/interactive/boss_loot/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/boss_loot/clicked_on_by_object(mob/caller,atom/object,location,control,params) INTERACT_CHECK INTERACT_DELAY(10) diff --git a/code/_core/obj/structure/interactive/botany/_plant.dm b/code/_core/obj/structure/interactive/botany/_plant.dm index acdc66abaa..7e8e9b8fed 100644 --- a/code/_core/obj/structure/interactive/botany/_plant.dm +++ b/code/_core/obj/structure/interactive/botany/_plant.dm @@ -50,7 +50,7 @@ var/active = FALSE -/obj/structure/interactive/plant/proc/set_active(var/desired_active=TRUE) +/obj/structure/interactive/plant/proc/set_active(desired_active=TRUE) if(active == desired_active) return FALSE active = desired_active @@ -60,7 +60,7 @@ SSbotany.all_plants -= src return TRUE -/obj/structure/interactive/plant/get_examine_list(var/mob/examiner) +/obj/structure/interactive/plant/get_examine_list(mob/examiner) . = ..() if(dead) @@ -118,7 +118,7 @@ . += span("danger","It looks severely overfertilized!") -/obj/structure/interactive/plant/on_destruction(var/damage = TRUE) +/obj/structure/interactive/plant/on_destruction(damage = TRUE) var/should_delete = dead || !damage if(damage && !dead) @@ -133,11 +133,11 @@ if(should_delete) qdel(src) -/obj/structure/interactive/plant/proc/add_nutrition(var/nutrition_amount) +/obj/structure/interactive/plant/proc/add_nutrition(nutrition_amount) nutrition = clamp(nutrition + nutrition_amount,0,200) return TRUE -/obj/structure/interactive/plant/proc/add_hydration(var/hydration_amount) +/obj/structure/interactive/plant/proc/add_hydration(hydration_amount) hydration = clamp(hydration + hydration_amount,0,200) return TRUE @@ -177,7 +177,7 @@ C.plants -= src . = ..() -/obj/structure/interactive/plant/on_chunk_cross(var/chunk/old_chunk,var/chunk/new_chunk) +/obj/structure/interactive/plant/on_chunk_cross(chunk/old_chunk,chunk/new_chunk) . = ..() @@ -187,7 +187,7 @@ if(new_chunk) new_chunk.plants += src -/obj/structure/interactive/plant/proc/on_life(var/tick_rate=1) //Measured in game ticks. +/obj/structure/interactive/plant/proc/on_life(tick_rate=1) //Measured in game ticks. var/rate = TICKS2DS(tick_rate) var/plant_type/P = SSbotany.all_plant_types[plant_type] @@ -268,7 +268,7 @@ desc = "Icon state: [icon_state]" -/obj/structure/interactive/plant/proc/harvest(var/mob/living/advanced/caller,var/obj/item/harvest_item) +/obj/structure/interactive/plant/proc/harvest(mob/living/advanced/caller,obj/item/harvest_item) if(dead) caller.to_chat(span("warning","\The [src.name] is dead!")) @@ -359,7 +359,7 @@ return TRUE -/obj/structure/interactive/plant/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/plant/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(!is_advanced(caller)) return ..() diff --git a/code/_core/obj/structure/interactive/cannon.dm b/code/_core/obj/structure/interactive/cannon.dm index fa3f215cbe..678b68e0d1 100644 --- a/code/_core/obj/structure/interactive/cannon.dm +++ b/code/_core/obj/structure/interactive/cannon.dm @@ -41,7 +41,7 @@ var/total_size = 0 -/obj/structure/interactive/cannon/New(var/desired_loc) +/obj/structure/interactive/cannon/New(desired_loc) . = ..() icon_state = "idle" @@ -58,7 +58,7 @@ set_dir(dir,TRUE) -/obj/structure/interactive/cannon/set_dir(var/desired_dir,var/force = FALSE) +/obj/structure/interactive/cannon/set_dir(desired_dir,force = FALSE) . = ..() @@ -68,13 +68,13 @@ transform = M -/obj/structure/interactive/cannon/proc/insert_item(var/mob/living/caller,var/obj/item/I) +/obj/structure/interactive/cannon/proc/insert_item(mob/living/caller,obj/item/I) I.drop_item(src) total_size += I.size caller?.visible_message(span("notice","\The [caller.name] inserts \the [I.name] into \the [src.name]."),span("notice","You insert \the [I.name] into \the [src.name].")) return TRUE -/obj/structure/interactive/cannon/proc/fire(var/mob/living/caller) +/obj/structure/interactive/cannon/proc/fire(mob/living/caller) var/turf/T = get_step(src,dir) if(!T) @@ -109,7 +109,7 @@ if(BT) src.Move(BT) -/obj/structure/interactive/cannon/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/cannon/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() @@ -149,7 +149,7 @@ -/obj/structure/interactive/cannon/proc/can_insert_item(var/mob/caller,var/obj/item/I) +/obj/structure/interactive/cannon/proc/can_insert_item(mob/caller,obj/item/I) if(caller) INTERACT_CHECK_NO_DELAY(src) @@ -187,7 +187,7 @@ var/image/I = new/image(icon,"fuse") add_overlay(I) -/obj/structure/interactive/cannon/proc/light_fuse(var/mob/living/caller) +/obj/structure/interactive/cannon/proc/light_fuse(mob/living/caller) caller.visible_message(span("danger","\The [caller.name] lights the fuse of \the [src.name]!"),span("danger","You light the fuse of \the [src.name]!")) CALLBACK("\ref[src]_fire_cannon",3 SECONDS,src,src::fire(),caller) update_sprite() @@ -195,7 +195,7 @@ play_sound('sound/effects/fuse.ogg',get_turf(src)) return TRUE -/obj/structure/interactive/cannon/proc/can_light_fuse(var/mob/caller,var/obj/item/I) +/obj/structure/interactive/cannon/proc/can_light_fuse(mob/caller,obj/item/I) INTERACT_CHECK_NO_DELAY(src) diff --git a/code/_core/obj/structure/interactive/chair.dm b/code/_core/obj/structure/interactive/chair.dm index e050f3adae..fef9b1f17e 100644 --- a/code/_core/obj/structure/interactive/chair.dm +++ b/code/_core/obj/structure/interactive/chair.dm @@ -56,7 +56,7 @@ obj/structure/interactive/chair/proc/sit_your_ass_down(var/mob/living/L) return TRUE -/obj/structure/interactive/chair/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/chair/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(caller.loc == src.loc) src.buckle(caller) diff --git a/code/_core/obj/structure/interactive/coin_drop.dm b/code/_core/obj/structure/interactive/coin_drop.dm index bbbd364adb..8dd2a16ee9 100644 --- a/code/_core/obj/structure/interactive/coin_drop.dm +++ b/code/_core/obj/structure/interactive/coin_drop.dm @@ -17,7 +17,7 @@ var/falling = FALSE -/obj/structure/interactive/coin_drop/get_examine_list(var/mob/examiner) +/obj/structure/interactive/coin_drop/get_examine_list(mob/examiner) . = ..() if(amount > 1) . += div("weightsize","Quantity: [amount].") @@ -35,7 +35,7 @@ cached_sparkle = null . = ..() -/obj/structure/interactive/coin_drop/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/coin_drop/clicked_on_by_object(mob/caller,atom/object,location,control,params) INTERACT_CHECK INTERACT_DELAY(3) @@ -140,7 +140,7 @@ else icon_state = "[clamp(amount,1,5)]_fall" -/obj/structure/interactive/coin_drop/proc/fly(var/turf/from_turf) +/obj/structure/interactive/coin_drop/proc/fly(turf/from_turf) if(amount > 5) return FALSE @@ -174,7 +174,7 @@ update_sprite() return TRUE -/proc/create_gold_drop(var/turf/T,var/amount=5,var/list/valid_ckeys) +/proc/create_gold_drop(turf/T,amount=5,list/valid_ckeys) amount = min(amount,GOLD_DROP_AMOUNT_MAX) //Enforce a limit, just in case. diff --git a/code/_core/obj/structure/interactive/computer/mech.dm b/code/_core/obj/structure/interactive/computer/mech.dm index 83882ca513..b7547b93ab 100644 --- a/code/_core/obj/structure/interactive/computer/mech.dm +++ b/code/_core/obj/structure/interactive/computer/mech.dm @@ -20,7 +20,7 @@ -/obj/structure/interactive/computer/console/mech_fabricator/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/computer/console/mech_fabricator/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(!is_player(caller) || !caller.client) return ..() diff --git a/code/_core/obj/structure/interactive/computer/remote_flight.dm b/code/_core/obj/structure/interactive/computer/remote_flight.dm index e77853e964..b1a8df355b 100644 --- a/code/_core/obj/structure/interactive/computer/remote_flight.dm +++ b/code/_core/obj/structure/interactive/computer/remote_flight.dm @@ -12,7 +12,7 @@ var/global/list/obj/structure/interactive/computer/console/remote_flight/all_rem all_remote_flight_consoles += src return ..() -/obj/structure/interactive/computer/console/remote_flight/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/computer/console/remote_flight/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(!is_advanced(caller)) return ..() diff --git a/code/_core/obj/structure/interactive/computer/shuttle_landing.dm b/code/_core/obj/structure/interactive/computer/shuttle_landing.dm index 28a9af40a8..eff8a13c0f 100644 --- a/code/_core/obj/structure/interactive/computer/shuttle_landing.dm +++ b/code/_core/obj/structure/interactive/computer/shuttle_landing.dm @@ -19,7 +19,7 @@ SSshuttle.all_shuttle_landing_consoles += src . = ..() -/obj/structure/interactive/computer/console/shuttle_landing/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/computer/console/shuttle_landing/clicked_on_by_object(mob/caller,atom/object,location,control,params) var/mob/living/L = caller @@ -177,7 +177,7 @@ anchored = 2 -/obj/marker/shuttle_landing/proc/set_reserved(var/desired_reserved=TRUE) +/obj/marker/shuttle_landing/proc/set_reserved(desired_reserved=TRUE) if(reserved_by_shuttle == desired_reserved) CRASH("Tried setting [src.get_debug_name()] reserved var to [desired_reserved], but it was already [desired_reserved]!") diff --git a/code/_core/obj/structure/interactive/computer/wall.dm b/code/_core/obj/structure/interactive/computer/wall.dm index 861b58d239..ae87dadcef 100644 --- a/code/_core/obj/structure/interactive/computer/wall.dm +++ b/code/_core/obj/structure/interactive/computer/wall.dm @@ -50,7 +50,7 @@ obj/structure/interactive/computer/wall/dorms desired_shuttle_controller = locate(desired_shuttle_controller) in world return ..() -/obj/structure/interactive/computer/wall/remote_flight/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/computer/wall/remote_flight/clicked_on_by_object(mob/caller,atom/object,location,control,params) INTERACT_CHECK INTERACT_CHECK_OBJECT @@ -79,7 +79,7 @@ obj/structure/interactive/computer/wall/dorms desc = "Beep boop." desc_extended = "Operates things, depending on what the console is. This one controls a shuttle." -/obj/structure/interactive/computer/wall/flight/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/computer/wall/flight/clicked_on_by_object(mob/caller,atom/object,location,control,params) INTERACT_CHECK INTERACT_CHECK_OBJECT diff --git a/code/_core/obj/structure/interactive/construction/frame.dm b/code/_core/obj/structure/interactive/construction/frame.dm index 639a949f0d..f892d27bed 100644 --- a/code/_core/obj/structure/interactive/construction/frame.dm +++ b/code/_core/obj/structure/interactive/construction/frame.dm @@ -6,7 +6,7 @@ health_base = 25 -/obj/structure/interactive/construction/frame/proc/can_construct_girder(var/mob/caller,var/obj/item/material/sheet/S) +/obj/structure/interactive/construction/frame/proc/can_construct_girder(mob/caller,obj/item/material/sheet/S) INTERACT_CHECK_NO_DELAY(src) INTERACT_CHECK_NO_DELAY(S) @@ -22,12 +22,12 @@ return FALSE return TRUE -/obj/structure/interactive/construction/frame/on_destruction(var/damage = TRUE) +/obj/structure/interactive/construction/frame/on_destruction(damage = TRUE) create_destruction(get_turf(src),list(/obj/item/material/rod/ = 1),material_id) . = ..() qdel(src) -/obj/structure/interactive/construction/frame/proc/construct_girder(var/mob/caller,var/obj/item/material/sheet/S) +/obj/structure/interactive/construction/frame/proc/construct_girder(mob/caller,obj/item/material/sheet/S) var/obj/structure/interactive/construction/girder/G = new(src.loc) G.material_id = S.material_id G.color = S.color @@ -38,7 +38,7 @@ qdel(src) return TRUE -/obj/structure/interactive/construction/frame/proc/can_construct_lattice(var/mob/caller,var/obj/item/material/rod/R) +/obj/structure/interactive/construction/frame/proc/can_construct_lattice(mob/caller,obj/item/material/rod/R) INTERACT_CHECK_NO_DELAY(src) INTERACT_CHECK_NO_DELAY(R) @@ -51,7 +51,7 @@ return FALSE return TRUE -/obj/structure/interactive/construction/frame/proc/construct_lattice(var/mob/caller,var/obj/item/material/rod/R) +/obj/structure/interactive/construction/frame/proc/construct_lattice(mob/caller,obj/item/material/rod/R) var/obj/structure/interactive/construction/lattice/L = new(src.loc) L.material_id = R.material_id L.color = R.color @@ -63,7 +63,7 @@ qdel(src) return TRUE -/obj/structure/interactive/construction/frame/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/construction/frame/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(is_item(object)) var/obj/item/I = object diff --git a/code/_core/obj/structure/interactive/construction/girder.dm b/code/_core/obj/structure/interactive/construction/girder.dm index a7e94799f2..64085a57e1 100644 --- a/code/_core/obj/structure/interactive/construction/girder.dm +++ b/code/_core/obj/structure/interactive/construction/girder.dm @@ -13,7 +13,7 @@ bullet_block_chance = 90 -/obj/structure/interactive/construction/girder/proc/can_construct_wall(var/mob/caller,var/obj/item/material/sheet/S) +/obj/structure/interactive/construction/girder/proc/can_construct_wall(mob/caller,obj/item/material/sheet/S) INTERACT_CHECK_NO_DELAY(src) INTERACT_CHECK_NO_DELAY(S) @@ -28,7 +28,7 @@ caller.to_chat(span("warning","You don't have the correct material for this!")) return FALSE return TRUE -/obj/structure/interactive/construction/girder/proc/can_construct_door(var/mob/caller,var/obj/item/material/sheet/S) +/obj/structure/interactive/construction/girder/proc/can_construct_door(mob/caller,obj/item/material/sheet/S) INTERACT_CHECK_NO_DELAY(src) INTERACT_CHECK_NO_DELAY(S) @@ -43,7 +43,7 @@ caller.to_chat(span("warning","You don't have the correct material for this!")) return FALSE return TRUE -/obj/structure/interactive/construction/girder/proc/construct_door(var/mob/caller,var/obj/item/material/sheet/S) +/obj/structure/interactive/construction/girder/proc/construct_door(mob/caller,obj/item/material/sheet/S) var/obj/structure/interactive/door/airlock/glass/W = new(src.loc) //W.material_id = S.material_id NYI //W.color = S.color NYI @@ -55,7 +55,7 @@ qdel(src) return TRUE -/obj/structure/interactive/construction/girder/proc/construct_wall(var/mob/caller,var/obj/item/material/sheet/S) +/obj/structure/interactive/construction/girder/proc/construct_wall(mob/caller,obj/item/material/sheet/S) var/turf/simulated/T = src.loc T.change_turf(/turf/simulated/wall/metal/) T.material_id = material_id @@ -65,13 +65,13 @@ qdel(src) return TRUE -/obj/structure/interactive/construction/girder/on_destruction(var/damage = TRUE) +/obj/structure/interactive/construction/girder/on_destruction(damage = TRUE) create_destruction(get_turf(src),list(/obj/item/material/rod/ = 1),material_id) . = ..() qdel(src) -/obj/structure/interactive/construction/girder/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/construction/girder/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(istype(object,/obj/item/material/sheet/)) INTERACT_CHECK diff --git a/code/_core/obj/structure/interactive/construction/grille.dm b/code/_core/obj/structure/interactive/construction/grille.dm index ea81c1c46f..5e867710dd 100644 --- a/code/_core/obj/structure/interactive/construction/grille.dm +++ b/code/_core/obj/structure/interactive/construction/grille.dm @@ -22,7 +22,7 @@ layer = LAYER_OBJ_WINDOW - 0.1 -/obj/structure/interactive/construction/grille/proc/can_construct_window(var/mob/caller,var/obj/item/material/sheet/S) +/obj/structure/interactive/construction/grille/proc/can_construct_window(mob/caller,obj/item/material/sheet/S) INTERACT_CHECK_NO_DELAY(src) INTERACT_CHECK_NO_DELAY(S) @@ -35,7 +35,7 @@ return FALSE return TRUE -/obj/structure/interactive/construction/grille/proc/construct_window(var/mob/caller,var/obj/item/material/sheet/S) +/obj/structure/interactive/construction/grille/proc/construct_window(mob/caller,obj/item/material/sheet/S) var/obj/structure/window/W = new(src.loc) W.material_id = S.material_id W.color = S.color @@ -46,7 +46,7 @@ S.add_item_count(-1) return TRUE -/obj/structure/interactive/construction/grille/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/construction/grille/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(is_item(object)) var/obj/item/I = object @@ -75,7 +75,7 @@ return TRUE return ..() -/obj/structure/interactive/construction/grille/on_destruction(var/damage = TRUE) +/obj/structure/interactive/construction/grille/on_destruction(damage = TRUE) create_destruction(get_turf(src),list(/obj/item/material/rod/ = 2),material_id) . = ..() qdel(src) diff --git a/code/_core/obj/structure/interactive/construction/lattice.dm b/code/_core/obj/structure/interactive/construction/lattice.dm index 3889e73439..4212ae56f1 100644 --- a/code/_core/obj/structure/interactive/construction/lattice.dm +++ b/code/_core/obj/structure/interactive/construction/lattice.dm @@ -6,7 +6,7 @@ health_base = 50 -/obj/structure/interactive/construction/lattice/proc/can_construct_grille(var/mob/caller,var/obj/item/material/rod/R) +/obj/structure/interactive/construction/lattice/proc/can_construct_grille(mob/caller,obj/item/material/rod/R) INTERACT_CHECK_NO_DELAY(src) INTERACT_CHECK_NO_DELAY(R) @@ -22,12 +22,12 @@ return FALSE return TRUE -/obj/structure/interactive/construction/lattice/on_destruction(var/damage = TRUE) +/obj/structure/interactive/construction/lattice/on_destruction(damage = TRUE) create_destruction(get_turf(src),list(/obj/item/material/rod/ = 1),material_id) . = ..() qdel(src) -/obj/structure/interactive/construction/lattice/proc/construct_grille(var/mob/caller,var/obj/item/material/rod/R) +/obj/structure/interactive/construction/lattice/proc/construct_grille(mob/caller,obj/item/material/rod/R) var/obj/structure/interactive/construction/grille/G = new(src.loc) G.material_id = R.material_id G.color = R.color @@ -39,7 +39,7 @@ qdel(src) return TRUE -/obj/structure/interactive/construction/lattice/proc/can_construct_reinf_wall(var/mob/caller,var/obj/item/material/sheet/S) +/obj/structure/interactive/construction/lattice/proc/can_construct_reinf_wall(mob/caller,obj/item/material/sheet/S) INTERACT_CHECK_NO_DELAY(src) INTERACT_CHECK_NO_DELAY(S) @@ -55,7 +55,7 @@ return FALSE return TRUE -/obj/structure/interactive/construction/lattice/proc/construct_floor_plating(var/mob/caller,var/obj/item/material/sheet/S) +/obj/structure/interactive/construction/lattice/proc/construct_floor_plating(mob/caller,obj/item/material/sheet/S) var/turf/simulated/T = src.loc T.change_turf(/turf/simulated/floor/plating/,TRUE) T.color = S.color @@ -65,7 +65,7 @@ qdel(src) return TRUE -/obj/structure/interactive/construction/lattice/proc/can_construct_floor_plating(var/mob/caller,var/obj/item/material/sheet/S) +/obj/structure/interactive/construction/lattice/proc/can_construct_floor_plating(mob/caller,obj/item/material/sheet/S) INTERACT_CHECK_NO_DELAY(src) INTERACT_CHECK_NO_DELAY(S) @@ -81,7 +81,7 @@ return FALSE return TRUE -/obj/structure/interactive/construction/lattice/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/construction/lattice/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(is_item(object)) var/obj/item/I = object diff --git a/code/_core/obj/structure/interactive/construction/machine_frame.dm b/code/_core/obj/structure/interactive/construction/machine_frame.dm index 92e9d99210..a0e795d55b 100644 --- a/code/_core/obj/structure/interactive/construction/machine_frame.dm +++ b/code/_core/obj/structure/interactive/construction/machine_frame.dm @@ -12,14 +12,14 @@ var/electronics = FALSE bullet_block_chance = 90 -/obj/structure/interactive/construction/machine_frame/proc/make_machine(var/mob/caller,var/obj/item/S,var/machine_to_make) +/obj/structure/interactive/construction/machine_frame/proc/make_machine(mob/caller,obj/item/S,machine_to_make) var/turf/T = src.loc new machine_to_make(T) S.add_item_count(-1) qdel(src) return TRUE -/obj/structure/interactive/construction/machine_frame/on_destruction(var/damage = TRUE) +/obj/structure/interactive/construction/machine_frame/on_destruction(damage = TRUE) create_destruction(get_turf(src),list(/obj/item/material/rod/ = 1),material_id) . = ..() qdel(src) diff --git a/code/_core/obj/structure/interactive/construction/reinf_girder.dm b/code/_core/obj/structure/interactive/construction/reinf_girder.dm index 7b08e0db60..bc77407dab 100644 --- a/code/_core/obj/structure/interactive/construction/reinf_girder.dm +++ b/code/_core/obj/structure/interactive/construction/reinf_girder.dm @@ -12,7 +12,7 @@ bullet_block_chance = 90 -/obj/structure/interactive/construction/reinf_girder/proc/can_construct_reinf_wall(var/mob/caller,var/obj/item/material/sheet/S) +/obj/structure/interactive/construction/reinf_girder/proc/can_construct_reinf_wall(mob/caller,obj/item/material/sheet/S) INTERACT_CHECK_NO_DELAY(src) INTERACT_CHECK_NO_DELAY(S) @@ -28,7 +28,7 @@ return FALSE return TRUE -/obj/structure/interactive/construction/reinf_girder/proc/construct_reinf_wall(var/mob/caller,var/obj/item/material/sheet/S) +/obj/structure/interactive/construction/reinf_girder/proc/construct_reinf_wall(mob/caller,obj/item/material/sheet/S) var/turf/T = src.loc T.change_turf(/turf/simulated/wall/metal/reinforced) caller?.visible_message(span("notice","\The [caller.name] places \the [T.name]."),span("notice","You place \the [T.name].")) @@ -36,7 +36,7 @@ qdel(src) return TRUE -/obj/structure/interactive/construction/reinf_girder/on_destruction(var/damage = TRUE) +/obj/structure/interactive/construction/reinf_girder/on_destruction(damage = TRUE) create_destruction(get_turf(src),list(/obj/item/material/rod/ = 2),material_id) . = ..() qdel(src) diff --git a/code/_core/obj/structure/interactive/conveyor_new.dm b/code/_core/obj/structure/interactive/conveyor_new.dm index b3180a1b85..1f91ff1736 100644 --- a/code/_core/obj/structure/interactive/conveyor_new.dm +++ b/code/_core/obj/structure/interactive/conveyor_new.dm @@ -16,7 +16,7 @@ density = TRUE anchored = TRUE -/obj/structure/interactive/conveyor/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/conveyor/clicked_on_by_object(mob/caller,atom/object,location,control,params) INTERACT_CHECK INTERACT_CHECK_OBJECT @@ -63,7 +63,7 @@ . = ..() -/obj/structure/interactive/conveyor/set_anchored(var/desired_anchored=TRUE,var/force=FALSE) +/obj/structure/interactive/conveyor/set_anchored(desired_anchored=TRUE,force=FALSE) . = ..() if(.) if(anchored) diff --git a/code/_core/obj/structure/interactive/crate/_crate.dm b/code/_core/obj/structure/interactive/crate/_crate.dm index ed6459e5c1..013da51863 100644 --- a/code/_core/obj/structure/interactive/crate/_crate.dm +++ b/code/_core/obj/structure/interactive/crate/_crate.dm @@ -38,7 +38,7 @@ interaction_flags = FLAG_INTERACTION_LIVING | FLAG_INTERACTION_NO_TURF_CHECKING -/obj/structure/interactive/crate/post_move(var/atom/old_loc) +/obj/structure/interactive/crate/post_move(atom/old_loc) . = ..() @@ -47,7 +47,7 @@ M.post_move(old_loc) -/obj/structure/interactive/crate/on_crush(var/message=TRUE) +/obj/structure/interactive/crate/on_crush(message=TRUE) for(var/k in contents) var/atom/movable/M = k @@ -64,7 +64,7 @@ return TRUE -/obj/structure/interactive/crate/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/obj/structure/interactive/crate/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) if(!open && damage_amount > 20 & luck(src,20 + damage_amount,FALSE)) visible_message(span("warning","\The [src.name] shoots open!")) @@ -72,7 +72,7 @@ return ..() -/obj/structure/interactive/crate/Cross(var/atom/movable/O,atom/oldloc) +/obj/structure/interactive/crate/Cross(atom/movable/O,atom/oldloc) if(istype(O,/obj/structure/interactive/crate)) return FALSE @@ -85,7 +85,7 @@ return ..() -/obj/structure/interactive/crate/Uncross(var/atom/movable/O,atom/newloc) +/obj/structure/interactive/crate/Uncross(atom/movable/O,atom/newloc) if(open) return TRUE @@ -99,7 +99,7 @@ return ..() -/obj/structure/interactive/crate/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/crate/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(!(caller.attack_flags & CONTROL_MOD_GRAB)) INTERACT_CHECK @@ -128,10 +128,10 @@ return ..() -/obj/structure/interactive/crate/proc/toggle(var/mob/caller) +/obj/structure/interactive/crate/proc/toggle(mob/caller) return open ? close(caller) : open(caller) -/obj/structure/interactive/crate/proc/can_store(var/atom/movable/M) +/obj/structure/interactive/crate/proc/can_store(atom/movable/M) if(M.anchored) return FALSE if(M.size > src.size) @@ -145,14 +145,14 @@ return FALSE return TRUE -/obj/structure/interactive/crate/proc/can_prevent_close(var/atom/movable/M) +/obj/structure/interactive/crate/proc/can_prevent_close(atom/movable/M) if(is_living(M)) var/mob/living/L = M if(!L.horizontal || L.size > size) return TRUE return FALSE -/obj/structure/interactive/crate/proc/close(var/mob/caller) +/obj/structure/interactive/crate/proc/close(mob/caller) if(qdeleting) return FALSE @@ -198,7 +198,7 @@ return TRUE -/obj/structure/interactive/crate/proc/open(var/mob/caller) +/obj/structure/interactive/crate/proc/open(mob/caller) if(!src.z) if(loc) caller?.to_chat(span("warning","\The [loc.name] is preventing \the [src.name] from being opened!")) diff --git a/code/_core/obj/structure/interactive/crate/bodybag.dm b/code/_core/obj/structure/interactive/crate/bodybag.dm index 5e8438add9..5e1ae59dd6 100644 --- a/code/_core/obj/structure/interactive/crate/bodybag.dm +++ b/code/_core/obj/structure/interactive/crate/bodybag.dm @@ -16,11 +16,11 @@ density = TRUE -/obj/structure/interactive/crate/bodybag/get_examine_list(var/mob/examiner) +/obj/structure/interactive/crate/bodybag/get_examine_list(mob/examiner) . = ..() . += span("notice","ALT+Click this with an empty hand to pack up and retrieve.") -/obj/structure/interactive/crate/bodybag/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/crate/bodybag/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(caller.attack_flags & CONTROL_MOD_DISARM) @@ -33,7 +33,7 @@ return ..() -/obj/structure/interactive/crate/bodybag/proc/can_pack_up(var/mob/caller) +/obj/structure/interactive/crate/bodybag/proc/can_pack_up(mob/caller) INTERACT_CHECK_NO_DELAY(src) if(length(src.contents)) @@ -46,7 +46,7 @@ return TRUE -/obj/structure/interactive/crate/bodybag/proc/pack_up(var/mob/caller) +/obj/structure/interactive/crate/bodybag/proc/pack_up(mob/caller) caller.visible_message(span("warning","\The [caller.name] packs up \the [src.name]."),span("notice","You pack up \the [src.name].")) @@ -72,10 +72,10 @@ size = SIZE_3 -/obj/item/deployable/bodybag/get_deploy_time(var/mob/caller) +/obj/item/deployable/bodybag/get_deploy_time(mob/caller) return 1 SECONDS -/obj/item/deployable/bodybag/can_deploy_to(var/mob/caller,var/turf/T) +/obj/item/deployable/bodybag/can_deploy_to(mob/caller,turf/T) if(amount <= 0) qdel(src) diff --git a/code/_core/obj/structure/interactive/crate/chest.dm b/code/_core/obj/structure/interactive/crate/chest.dm index 6c0f28d83a..02099621f7 100644 --- a/code/_core/obj/structure/interactive/crate/chest.dm +++ b/code/_core/obj/structure/interactive/crate/chest.dm @@ -26,7 +26,7 @@ DIFFICULTY_NIGHTMARE = 2 ) -/obj/structure/interactive/crate/chest/get_examine_list(var/mob/examiner) +/obj/structure/interactive/crate/chest/get_examine_list(mob/examiner) . = ..() if(locked == TRUE) . += span("notice","It's locked, but you could try your hand at picking the lock...") @@ -44,7 +44,7 @@ update_sprite() return TRUE -/obj/structure/interactive/crate/chest/proc/picked(var/mob/living/advanced/A) +/obj/structure/interactive/crate/chest/proc/picked(mob/living/advanced/A) boot_lockpicker() locked = FALSE open() @@ -52,7 +52,7 @@ create_gold_drop(get_turf(src),gold_count) return TRUE -/obj/structure/interactive/crate/chest/proc/create_lockpicker(var/mob/living/advanced/A) +/obj/structure/interactive/crate/chest/proc/create_lockpicker(mob/living/advanced/A) current_user = A var/obj/hud/button/lockpicking/L = new L.update_owner(A) @@ -84,7 +84,7 @@ return TRUE -/obj/structure/interactive/crate/chest/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/crate/chest/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(!is_advanced(caller)) return TRUE @@ -108,7 +108,7 @@ loot = /loot/treasure var/chance_none = 0 -/obj/structure/interactive/crate/chest/filled/New(var/desired_loc) +/obj/structure/interactive/crate/chest/filled/New(desired_loc) if(prob(chance_none)) qdel(src) diff --git a/code/_core/obj/structure/interactive/crate/crate.dm b/code/_core/obj/structure/interactive/crate/crate.dm index db351613c7..63f16dbc89 100644 --- a/code/_core/obj/structure/interactive/crate/crate.dm +++ b/code/_core/obj/structure/interactive/crate/crate.dm @@ -15,7 +15,7 @@ pixel_y = 4 -/obj/structure/interactive/crate/closet/can_prevent_close(var/atom/movable/M) +/obj/structure/interactive/crate/closet/can_prevent_close(atom/movable/M) if(is_living(M)) var/mob/living/L = M if(L.size > size) diff --git a/code/_core/obj/structure/interactive/crate/secure.dm b/code/_core/obj/structure/interactive/crate/secure.dm index 3e6a43f2a6..81f7972548 100644 --- a/code/_core/obj/structure/interactive/crate/secure.dm +++ b/code/_core/obj/structure/interactive/crate/secure.dm @@ -14,29 +14,29 @@ add_overlay(I) -/obj/structure/interactive/crate/secure/open(var/mob/caller) +/obj/structure/interactive/crate/secure/open(mob/caller) if(locked) return FALSE . = ..() -/obj/structure/interactive/crate/secure/close(var/mob/caller) +/obj/structure/interactive/crate/secure/close(mob/caller) if(locked) return FALSE . = ..() -/obj/structure/interactive/crate/secure/proc/lock(var/mob/caller) +/obj/structure/interactive/crate/secure/proc/lock(mob/caller) locked = TRUE caller?.to_chat(span("notice","You lock \the [src.name].")) update_sprite() return TRUE -/obj/structure/interactive/crate/secure/proc/unlock(var/mob/caller) +/obj/structure/interactive/crate/secure/proc/unlock(mob/caller) locked = FALSE caller?.to_chat(span("notice","You unlock \the [src.name].")) update_sprite() return TRUE -/obj/structure/interactive/crate/secure/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/crate/secure/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(caller.attack_flags & CONTROL_MOD_DISARM) INTERACT_CHECK @@ -56,7 +56,7 @@ var/credits_required -/obj/structure/interactive/crate/secure/cargo/get_examine_details_list(var/mob/examiner) +/obj/structure/interactive/crate/secure/cargo/get_examine_details_list(mob/examiner) . = ..() @@ -74,7 +74,7 @@ . += div("notice","It contains: [english_list(contents_to_display)].") -/obj/structure/interactive/crate/secure/cargo/lock(var/mob/caller) +/obj/structure/interactive/crate/secure/cargo/lock(mob/caller) if(!owner_name) return ..() @@ -95,7 +95,7 @@ return ..() -/obj/structure/interactive/crate/secure/cargo/unlock(var/mob/caller) +/obj/structure/interactive/crate/secure/cargo/unlock(mob/caller) if(!owner_name) return ..() diff --git a/code/_core/obj/structure/interactive/crate/supply_pod.dm b/code/_core/obj/structure/interactive/crate/supply_pod.dm index b5646d1857..ca685d8e68 100644 --- a/code/_core/obj/structure/interactive/crate/supply_pod.dm +++ b/code/_core/obj/structure/interactive/crate/supply_pod.dm @@ -38,14 +38,14 @@ explode(get_turf(src),1,src,src) return TRUE -/obj/structure/interactive/crate/closet/supply_pod/close(var/mob/caller) +/obj/structure/interactive/crate/closet/supply_pod/close(mob/caller) if(caller && auto_open) return FALSE return ..() -/obj/structure/interactive/crate/closet/supply_pod/open(var/mob/caller) +/obj/structure/interactive/crate/closet/supply_pod/open(mob/caller) if(caller && auto_open) return FALSE diff --git a/code/_core/obj/structure/interactive/disposals/machine/chute.dm b/code/_core/obj/structure/interactive/disposals/machine/chute.dm index 99da5c9d72..7a99c75700 100644 --- a/code/_core/obj/structure/interactive/disposals/machine/chute.dm +++ b/code/_core/obj/structure/interactive/disposals/machine/chute.dm @@ -43,7 +43,7 @@ O.Move(src) return ..() -/obj/structure/interactive/disposals/machine/chute/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/disposals/machine/chute/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(is_item(object)) INTERACT_CHECK @@ -55,7 +55,7 @@ return ..() -/obj/structure/interactive/disposals/machine/chute/drop_on_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/disposals/machine/chute/drop_on_object(mob/caller,atom/object,location,control,params) //Todo, interact delay. if(ismob(object) && caller == object) INTERACT_CHECK diff --git a/code/_core/obj/structure/interactive/disposals/machine/inlet.dm b/code/_core/obj/structure/interactive/disposals/machine/inlet.dm index a02df23cc9..5fe818c166 100644 --- a/code/_core/obj/structure/interactive/disposals/machine/inlet.dm +++ b/code/_core/obj/structure/interactive/disposals/machine/inlet.dm @@ -13,7 +13,7 @@ density = TRUE -/obj/structure/interactive/disposals/machine/inlet/set_dir(var/desired_dir,var/force = FALSE) +/obj/structure/interactive/disposals/machine/inlet/set_dir(desired_dir,force = FALSE) . = ..() diff --git a/code/_core/obj/structure/interactive/disposals/machine/outlet.dm b/code/_core/obj/structure/interactive/disposals/machine/outlet.dm index ee89667301..15f908764a 100644 --- a/code/_core/obj/structure/interactive/disposals/machine/outlet.dm +++ b/code/_core/obj/structure/interactive/disposals/machine/outlet.dm @@ -26,7 +26,7 @@ . = ..() -/obj/structure/interactive/disposals/machine/outlet/Entered(var/atom/A,var/oldloc) +/obj/structure/interactive/disposals/machine/outlet/Entered(atom/A,oldloc) if(istype(A,/obj/disposals_container/)) diff --git a/code/_core/obj/structure/interactive/disposals/pipe.dm b/code/_core/obj/structure/interactive/disposals/pipe.dm index fb793e59b7..3e49166cc7 100644 --- a/code/_core/obj/structure/interactive/disposals/pipe.dm +++ b/code/_core/obj/structure/interactive/disposals/pipe.dm @@ -8,7 +8,7 @@ alpha = 100 -/obj/structure/interactive/disposals/pipe/New(var/desired_loc) +/obj/structure/interactive/disposals/pipe/New(desired_loc) plane = PLANE_FLOOR . = ..() alpha = 255 diff --git a/code/_core/obj/structure/interactive/diverter.dm b/code/_core/obj/structure/interactive/diverter.dm index f09e54f048..4cc8af3e38 100644 --- a/code/_core/obj/structure/interactive/diverter.dm +++ b/code/_core/obj/structure/interactive/diverter.dm @@ -28,7 +28,7 @@ density = TRUE -/obj/structure/interactive/diverter/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/diverter/clicked_on_by_object(mob/caller,atom/object,location,control,params) INTERACT_CHECK INTERACT_CHECK_OBJECT @@ -78,7 +78,7 @@ . = ..() icon_state = "diverter_on" -/obj/structure/interactive/diverter/proc/should_push(var/atom/movable/M) +/obj/structure/interactive/diverter/proc/should_push(atom/movable/M) if(!anchored) return FALSE switch(mode) diff --git a/code/_core/obj/structure/interactive/door/_door.dm b/code/_core/obj/structure/interactive/door/_door.dm index 6a76612bb5..f7e1ed05a3 100644 --- a/code/_core/obj/structure/interactive/door/_door.dm +++ b/code/_core/obj/structure/interactive/door/_door.dm @@ -114,14 +114,14 @@ obj/structure/interactive/door/proc/close(var/mob/caller,var/lock = FALSE,var/fo door_state = DOOR_STATE_CLOSED update_sprite() -/obj/structure/interactive/door/proc/unlock(var/mob/caller,var/force = FALSE) +/obj/structure/interactive/door/proc/unlock(mob/caller,force = FALSE) locked = FALSE if(initial(allow_path)) allow_path = TRUE update_sprite() return TRUE -/obj/structure/interactive/door/proc/lock(var/mob/caller,var/force = FALSE) +/obj/structure/interactive/door/proc/lock(mob/caller,force = FALSE) locked = TRUE allow_path = FALSE update_sprite() @@ -156,7 +156,7 @@ obj/structure/interactive/door/metal return 10 /* -/obj/structure/interactive/door/update_power_draw(var/desired_power_draw,var/reset=FALSE) +/obj/structure/interactive/door/update_power_draw(desired_power_draw,reset=FALSE) var/area/A = get_area(src) diff --git a/code/_core/obj/structure/interactive/door/airlock/_airlock.dm b/code/_core/obj/structure/interactive/door/airlock/_airlock.dm index 3ebc8adfea..f3fcc38b9d 100644 --- a/code/_core/obj/structure/interactive/door/airlock/_airlock.dm +++ b/code/_core/obj/structure/interactive/door/airlock/_airlock.dm @@ -42,7 +42,7 @@ /obj/structure/interactive/door/airlock/locked locked = TRUE -/obj/structure/interactive/door/airlock/on_destruction(var/damage = TRUE) +/obj/structure/interactive/door/airlock/on_destruction(damage = TRUE) if(door_state != DOOR_STATE_BROKEN) set_door_state(null,DOOR_STATE_BROKEN,TRUE) @@ -53,7 +53,7 @@ qdel(src) -/obj/structure/interactive/door/airlock/trigger(var/mob/caller,var/atom/source,var/signal_freq,var/signal_code) +/obj/structure/interactive/door/airlock/trigger(mob/caller,atom/source,signal_freq,signal_code) if(door_state == DOOR_STATE_BROKEN) return FALSE @@ -96,7 +96,7 @@ return TRUE -/obj/structure/interactive/door/airlock/should_smooth_with(var/turf/T) +/obj/structure/interactive/door/airlock/should_smooth_with(turf/T) . = ..() @@ -144,7 +144,7 @@ obj/structure/interactive/door/airlock/close(var/mob/caller,var/lock = FALSE,var set_door_state(caller,DOOR_STATE_CLOSING_01,lock) return TRUE -/obj/structure/interactive/door/airlock/proc/set_door_state(var/mob/caller=null,var/desired_door_state,var/should_lock=FALSE) +/obj/structure/interactive/door/airlock/proc/set_door_state(mob/caller=null,desired_door_state,should_lock=FALSE) . = FALSE diff --git a/code/_core/obj/structure/interactive/door/alarmlock/_alarmlock.dm b/code/_core/obj/structure/interactive/door/alarmlock/_alarmlock.dm index 087c8fe659..bc8ae5615d 100644 --- a/code/_core/obj/structure/interactive/door/alarmlock/_alarmlock.dm +++ b/code/_core/obj/structure/interactive/door/alarmlock/_alarmlock.dm @@ -15,6 +15,6 @@ open_time = 3.8 close_time = 3.8 -/obj/structure/interactive/door/alarm/New(var/desired_loc) +/obj/structure/interactive/door/alarm/New(desired_loc) alpha = 255 . = ..() \ No newline at end of file diff --git a/code/_core/obj/structure/interactive/door/fire/_fire.dm b/code/_core/obj/structure/interactive/door/fire/_fire.dm index b83d08b664..48aadc7862 100644 --- a/code/_core/obj/structure/interactive/door/fire/_fire.dm +++ b/code/_core/obj/structure/interactive/door/fire/_fire.dm @@ -12,6 +12,6 @@ alpha = 100 -/obj/structure/interactive/door/fire/New(var/desired_loc) +/obj/structure/interactive/door/fire/New(desired_loc) alpha = 255 return ..() \ No newline at end of file diff --git a/code/_core/obj/structure/interactive/door/vault.dm b/code/_core/obj/structure/interactive/door/vault.dm index df0863ab7e..320001ed48 100644 --- a/code/_core/obj/structure/interactive/door/vault.dm +++ b/code/_core/obj/structure/interactive/door/vault.dm @@ -28,7 +28,7 @@ GENERATE(stored_keypad) FINALIZE(stored_keypad) -/obj/structure/interactive/door/vault/syndicate/defer_click_on_object(var/mob/caller,location,control,params) +/obj/structure/interactive/door/vault/syndicate/defer_click_on_object(mob/caller,location,control,params) if(stored_keypad) return stored_keypad @@ -40,7 +40,7 @@ SSobj.all_vault_doors += src -/obj/structure/interactive/door/vault/syndicate/trigger(var/mob/caller,var/atom/source,var/signal_freq,var/signal_code) +/obj/structure/interactive/door/vault/syndicate/trigger(mob/caller,atom/source,signal_freq,signal_code) if(door_state == DOOR_STATE_BROKEN) return FALSE diff --git a/code/_core/obj/structure/interactive/drop_pod.dm b/code/_core/obj/structure/interactive/drop_pod.dm index 9b69d63c14..12480a75b8 100644 --- a/code/_core/obj/structure/interactive/drop_pod.dm +++ b/code/_core/obj/structure/interactive/drop_pod.dm @@ -19,7 +19,7 @@ density = TRUE -/obj/structure/interactive/drop_pod/post_move(var/atom/old_loc) +/obj/structure/interactive/drop_pod/post_move(atom/old_loc) . = ..() @@ -55,7 +55,7 @@ SSshuttle.all_drop_pods += src return ..() -/obj/structure/interactive/drop_pod/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/drop_pod/clicked_on_by_object(mob/caller,atom/object,location,control,params) INTERACT_CHECK INTERACT_DELAY(10) @@ -84,7 +84,7 @@ return ..() -/obj/structure/interactive/drop_pod/proc/set_state(var/mob/caller,var/desired_state,var/turf/desired_loc) //desired_loc is optional, same with caller. +/obj/structure/interactive/drop_pod/proc/set_state(mob/caller,desired_state,turf/desired_loc) //desired_loc is optional, same with caller. if(state == desired_state) return FALSE diff --git a/code/_core/obj/structure/interactive/emitter.dm b/code/_core/obj/structure/interactive/emitter.dm index 58cf645c37..d36c12f8d0 100644 --- a/code/_core/obj/structure/interactive/emitter.dm +++ b/code/_core/obj/structure/interactive/emitter.dm @@ -68,7 +68,7 @@ -/obj/structure/interactive/emitter/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/emitter/clicked_on_by_object(mob/caller,atom/object,location,control,params) diff --git a/code/_core/obj/structure/interactive/enchantment_circle.dm b/code/_core/obj/structure/interactive/enchantment_circle.dm index 0ad9d94e96..6acb66a5f9 100644 --- a/code/_core/obj/structure/interactive/enchantment_circle.dm +++ b/code/_core/obj/structure/interactive/enchantment_circle.dm @@ -32,12 +32,12 @@ . = ..() -/obj/structure/interactive/enchantment_circle/New(var/desired_loc) +/obj/structure/interactive/enchantment_circle/New(desired_loc) color = random_color() alpha = rand(200,255) return ..() -/obj/structure/interactive/enchantment_circle/proc/store_item(var/obj/item/I) +/obj/structure/interactive/enchantment_circle/proc/store_item(obj/item/I) if(!stored_book && istype(I,/obj/item/paper/book/enchanting/)) stored_book = I stored_items += I @@ -46,7 +46,7 @@ I.visible_message(span("notice","\The [I.name] glows faintly...")) return TRUE -/obj/structure/interactive/enchantment_circle/proc/unstore_item(var/obj/item/I) +/obj/structure/interactive/enchantment_circle/proc/unstore_item(obj/item/I) if(I == stored_book) stored_book = null stored_items -= I @@ -56,7 +56,7 @@ I.visible_message(span("warning","\The [I.name] stops glowing...")) return TRUE -/obj/structure/interactive/enchantment_circle/proc/set_active(var/desired_active=TRUE) +/obj/structure/interactive/enchantment_circle/proc/set_active(desired_active=TRUE) if(active == desired_active) return FALSE @@ -85,7 +85,7 @@ icon_state = "[active]" return ..() -/obj/structure/interactive/enchantment_circle/clicked_on_by_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/structure/interactive/enchantment_circle/clicked_on_by_object(mob/caller as mob,atom/object,location,control,params) INTERACT_CHECK INTERACT_CHECK_OBJECT @@ -107,7 +107,7 @@ if(I) . += I -/obj/structure/interactive/enchantment_circle/proc/try_enchant(var/mob/living/caller) +/obj/structure/interactive/enchantment_circle/proc/try_enchant(mob/living/caller) var/obj/item/soulgem/soulgem = locate() in stored_items var/obj/item/weapon/weapon_to_enchant = locate() in stored_items @@ -142,7 +142,7 @@ -/obj/structure/interactive/enchantment_circle/on_listen(var/atom/speaker,var/datum/source,var/text,var/raw_text,var/language_text,var/talk_type,var/frequency, var/language = LANGUAGE_BASIC,var/talk_range=TALK_RANGE) +/obj/structure/interactive/enchantment_circle/on_listen(atom/speaker,datum/source,text,raw_text,language_text,talk_type,frequency, language = LANGUAGE_BASIC,talk_range=TALK_RANGE) if(is_living(speaker) && active && stored_book && raw_text) diff --git a/code/_core/obj/structure/interactive/fax_machine.dm b/code/_core/obj/structure/interactive/fax_machine.dm index 038b295eaa..93c528a7bd 100644 --- a/code/_core/obj/structure/interactive/fax_machine.dm +++ b/code/_core/obj/structure/interactive/fax_machine.dm @@ -16,7 +16,7 @@ QDEL_NULL(stored_paper) . = ..() -/obj/structure/interactive/fax_machine/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/fax_machine/clicked_on_by_object(mob/caller,atom/object,location,control,params) @@ -79,15 +79,15 @@ return ..() -/obj/structure/interactive/fax_machine/proc/process_data(var/mob/caller,var/list/data_to_process = list()) +/obj/structure/interactive/fax_machine/proc/process_data(mob/caller,list/data_to_process = list()) return TRUE -/obj/structure/interactive/fax_machine/proc/finish_processing(var/mob/caller) +/obj/structure/interactive/fax_machine/proc/finish_processing(mob/caller) processing = FALSE update_sprite() return TRUE -/obj/structure/interactive/fax_machine/cargo/process_data(var/mob/caller,var/list/data_to_process = list()) +/obj/structure/interactive/fax_machine/cargo/process_data(mob/caller,list/data_to_process = list()) var/list/required_data = list( "Requisitioners Name", //Real-name of the player. It's basically a lock saying only this person can open it. Leave blank for anyone to open. diff --git a/code/_core/obj/structure/interactive/fence.dm b/code/_core/obj/structure/interactive/fence.dm index 7e95407632..8672555a6c 100644 --- a/code/_core/obj/structure/interactive/fence.dm +++ b/code/_core/obj/structure/interactive/fence.dm @@ -18,7 +18,7 @@ obj/structure/interactive/fence density = TRUE -/obj/structure/interactive/fence/on_destruction(var/damage = TRUE) +/obj/structure/interactive/fence/on_destruction(damage = TRUE) create_destruction(get_turf(src),list(/obj/item/material/rod/ = 4),/material/steel) . = ..() qdel(src) diff --git a/code/_core/obj/structure/interactive/field_gen.dm b/code/_core/obj/structure/interactive/field_gen.dm index bf1b7f24ad..e07d377efc 100644 --- a/code/_core/obj/structure/interactive/field_gen.dm +++ b/code/_core/obj/structure/interactive/field_gen.dm @@ -26,13 +26,13 @@ set_active(FALSE,force=TRUE) . = ..() -/obj/structure/interactive/field_generator/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/field_generator/clicked_on_by_object(mob/caller,atom/object,location,control,params) INTERACT_CHECK INTERACT_DELAY(10) set_active(!active) return TRUE -/obj/structure/interactive/field_generator/on_destruction(var/damage = TRUE) +/obj/structure/interactive/field_generator/on_destruction(damage = TRUE) . = ..() qdel(src) @@ -43,7 +43,7 @@ . = ..() set_active(active,force=TRUE) -/obj/structure/interactive/field_generator/proc/set_active(var/desired_active,var/force=FALSE,var/mob/caller) //caller is optional. +/obj/structure/interactive/field_generator/proc/set_active(desired_active,force=FALSE,mob/caller) //caller is optional. if(!force && desired_active == active) return FALSE @@ -73,14 +73,14 @@ return TRUE -/obj/structure/interactive/field_generator/set_anchored(var/desired_anchored=TRUE,var/force=FALSE) +/obj/structure/interactive/field_generator/set_anchored(desired_anchored=TRUE,force=FALSE) . = ..() if(. && !desired_anchored) clear_linkages() if(active) set_active(FALSE) -/obj/structure/interactive/field_generator/post_move(var/atom/old_loc) +/obj/structure/interactive/field_generator/post_move(atom/old_loc) . = ..() if(. && anchored) //Must be a shuttle or something special clear_linkages() @@ -93,7 +93,7 @@ return TRUE -/obj/structure/interactive/field_generator/proc/clear_linkage(var/d) //d is a num. +/obj/structure/interactive/field_generator/proc/clear_linkage(d) //d is a num. var/rd = turn(d,180) var/obj/structure/interactive/field_generator/FG = src.linked_field_gens["[d]"] @@ -132,7 +132,7 @@ W.alpha = 0 W.set_density(0) -/obj/structure/interactive/field_generator/proc/setup_barrier_chain(var/obj/structure/interactive/field_generator/FG,var/d) //FG is the target FG +/obj/structure/interactive/field_generator/proc/setup_barrier_chain(obj/structure/interactive/field_generator/FG,d) //FG is the target FG var/turf/T = get_turf(src) var/limit = get_dist(FG,src) + 2 @@ -219,7 +219,7 @@ return TRUE -/obj/structure/interactive/field_generator/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/obj/structure/interactive/field_generator/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) . = ..() if(istype(weapon,/obj/structure/interactive/emitter)) emitter_hit() diff --git a/code/_core/obj/structure/interactive/fire_closet.dm b/code/_core/obj/structure/interactive/fire_closet.dm index c6eab2778a..c013d87d8b 100644 --- a/code/_core/obj/structure/interactive/fire_closet.dm +++ b/code/_core/obj/structure/interactive/fire_closet.dm @@ -11,7 +11,7 @@ QDEL_NULL(stored_extinguisher) . = ..() -/obj/structure/interactive/fire_closet/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/fire_closet/clicked_on_by_object(mob/caller,atom/object,location,control,params) //Putting the object back in is handled in the weapon itself. diff --git a/code/_core/obj/structure/interactive/fountain.dm b/code/_core/obj/structure/interactive/fountain.dm index 9f01baa3b6..ffabbdd867 100644 --- a/code/_core/obj/structure/interactive/fountain.dm +++ b/code/_core/obj/structure/interactive/fountain.dm @@ -28,7 +28,7 @@ return ..() -/obj/structure/interactive/fountain/get_examine_list(var/mob/examiner) +/obj/structure/interactive/fountain/get_examine_list(mob/examiner) . = ..() @@ -74,7 +74,7 @@ return ..() -/obj/structure/interactive/fountain/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/fountain/clicked_on_by_object(mob/caller,atom/object,location,control,params) var/mob/living/L = caller diff --git a/code/_core/obj/structure/interactive/fulton.dm b/code/_core/obj/structure/interactive/fulton.dm index 2d82316fe8..dc7bde8590 100644 --- a/code/_core/obj/structure/interactive/fulton.dm +++ b/code/_core/obj/structure/interactive/fulton.dm @@ -115,7 +115,7 @@ stored_movable = null qdel(src) -/obj/structure/interactive/fulton/proc/can_be_extracted(var/mob/caller,var/atom/movable/M) +/obj/structure/interactive/fulton/proc/can_be_extracted(mob/caller,atom/movable/M) if(is_player(M)) var/mob/living/advanced/player/P = M @@ -133,7 +133,7 @@ return FALSE return TRUE -/obj/structure/interactive/fulton/proc/add_movable(var/mob/caller,var/atom/movable/M) +/obj/structure/interactive/fulton/proc/add_movable(mob/caller,atom/movable/M) if(stored_movable) return FALSE diff --git a/code/_core/obj/structure/interactive/gamemode_nuke.dm b/code/_core/obj/structure/interactive/gamemode_nuke.dm index 6b6eb8d39c..50f86992c7 100644 --- a/code/_core/obj/structure/interactive/gamemode_nuke.dm +++ b/code/_core/obj/structure/interactive/gamemode_nuke.dm @@ -55,7 +55,7 @@ return TRUE -/obj/structure/interactive/nukies_nuke/get_examine_list(var/mob/examiner) +/obj/structure/interactive/nukies_nuke/get_examine_list(mob/examiner) . = ..() if(is_living(examiner)) @@ -63,7 +63,7 @@ if(L.loyalty_tag == "Syndicate") . += div("notice","\The [src.name] indicates it can only be anchored in \the [nuke_area.name].") -/obj/structure/interactive/nukies_nuke/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/nukies_nuke/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(istype(object,/obj/item/disk/nuke)) INTERACT_CHECK @@ -97,7 +97,7 @@ return TRUE -/obj/structure/interactive/nukies_nuke/proc/can_unlock(var/mob/living/caller) +/obj/structure/interactive/nukies_nuke/proc/can_unlock(mob/living/caller) INTERACT_CHECK_NO_DELAY(src) @@ -109,7 +109,7 @@ return TRUE -/obj/structure/interactive/nukies_nuke/proc/can_disarm(var/mob/living/caller) +/obj/structure/interactive/nukies_nuke/proc/can_disarm(mob/living/caller) INTERACT_CHECK_NO_DELAY(src) @@ -122,7 +122,7 @@ return TRUE -/obj/structure/interactive/nukies_nuke/proc/can_arm(var/mob/living/caller) +/obj/structure/interactive/nukies_nuke/proc/can_arm(mob/living/caller) INTERACT_CHECK_NO_DELAY(src) @@ -134,13 +134,13 @@ return TRUE -/obj/structure/interactive/nukies_nuke/proc/unlock(var/mob/living/caller) +/obj/structure/interactive/nukies_nuke/proc/unlock(mob/living/caller) caller.visible_message(span("danger","\The [caller.name] unlocks \the [src.name]!"),span("warning","You unlock \the [src.name].")) nuke_state = 1 anchored = TRUE return TRUE -/obj/structure/interactive/nukies_nuke/proc/arm(var/mob/living/caller) +/obj/structure/interactive/nukies_nuke/proc/arm(mob/living/caller) caller.visible_message(span("danger","\The [caller.name] arms \the [src.name]!"),span("warning","You arm \the [src.name].")) nuke_state = 2 next_explode = world.time + 1200 //Decieconds @@ -154,7 +154,7 @@ START_THINKING(src) return TRUE -/obj/structure/interactive/nukies_nuke/proc/disarm(var/mob/caller) +/obj/structure/interactive/nukies_nuke/proc/disarm(mob/caller) caller.visible_message(span("danger","\The [caller.name] disarms \the [src.name]!"),span("warning","You disarm \the [src.name].")) nuke_state = 3 if(istype(SSgamemode.active_gamemode,/gamemode/nuke_ops/)) diff --git a/code/_core/obj/structure/interactive/gateway.dm b/code/_core/obj/structure/interactive/gateway.dm index 05a70bcfdb..f49f41caeb 100644 --- a/code/_core/obj/structure/interactive/gateway.dm +++ b/code/_core/obj/structure/interactive/gateway.dm @@ -38,7 +38,7 @@ G.linked_gateway = src break -/obj/structure/interactive/gateway/proc/set_active(var/active=TRUE,var/recursive=TRUE) +/obj/structure/interactive/gateway/proc/set_active(active=TRUE,recursive=TRUE) if(!linked_gateway) active = FALSE enabled = active diff --git a/code/_core/obj/structure/interactive/ground_ore_deposit.dm b/code/_core/obj/structure/interactive/ground_ore_deposit.dm index 2fceab39ce..78ef060f8f 100644 --- a/code/_core/obj/structure/interactive/ground_ore_deposit.dm +++ b/code/_core/obj/structure/interactive/ground_ore_deposit.dm @@ -12,7 +12,7 @@ desired_light_color = "#FFFFFF" -/obj/structure/interactive/ground_ore_deposit/New(var/desired_loc) +/obj/structure/interactive/ground_ore_deposit/New(desired_loc) if(!is_floor(loc)) qdel(src) @@ -20,7 +20,7 @@ . = ..() -/obj/structure/interactive/ground_ore_deposit/Initialize(var/desired_loc) +/obj/structure/interactive/ground_ore_deposit/Initialize(desired_loc) var/turf/simulated/floor/F = loc F.has_ore = TRUE @@ -73,7 +73,7 @@ update_sprite() return TRUE -/obj/structure/interactive/ground_ore_deposit/get_examine_list(var/mob/examiner) +/obj/structure/interactive/ground_ore_deposit/get_examine_list(mob/examiner) . = ..() . += div("notice","The meter detects an ore concentration of [ore_score]%.") @@ -107,7 +107,7 @@ /obj/structure/interactive/ground_ore_deposit/map/carbon material_id = /material/carbon -/obj/structure/interactive/ground_ore_deposit/map/random/New(var/desired_loc) +/obj/structure/interactive/ground_ore_deposit/map/random/New(desired_loc) var/list/possible_materials = list( /material/iron = 100, diff --git a/code/_core/obj/structure/interactive/implanter.dm b/code/_core/obj/structure/interactive/implanter.dm index b298b7bbea..e5807debf8 100644 --- a/code/_core/obj/structure/interactive/implanter.dm +++ b/code/_core/obj/structure/interactive/implanter.dm @@ -12,13 +12,13 @@ var/removes_existing = FALSE var/should_save_on_implant = FALSE -/obj/structure/interactive/hand_implanter/New(var/desired_loc) +/obj/structure/interactive/hand_implanter/New(desired_loc) . = ..() if(stored_implant) name = "[initial(name)] ([initial(stored_implant.name)])" -/obj/structure/interactive/hand_implanter/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/hand_implanter/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(!is_advanced(caller)) return ..() diff --git a/code/_core/obj/structure/interactive/intercom.dm b/code/_core/obj/structure/interactive/intercom.dm index 0e9597a400..b23a7f87bf 100644 --- a/code/_core/obj/structure/interactive/intercom.dm +++ b/code/_core/obj/structure/interactive/intercom.dm @@ -17,7 +17,7 @@ QDEL_NULL(stored_radio) . = ..() -/obj/structure/interactive/intercom/New(var/desired_loc) +/obj/structure/interactive/intercom/New(desired_loc) stored_radio = new stored_radio(src) //Initialized somewhere else. Don't know where, though, honestly. stored_radio.set_anchored(TRUE) stored_radio.broadcasting = FALSE @@ -39,7 +39,7 @@ . = ..() update_sprite() -/obj/structure/interactive/intercom/clicked_on_by_object(var/mob/caller as mob,var/atom/object,location,control,params) +/obj/structure/interactive/intercom/clicked_on_by_object(mob/caller as mob,atom/object,location,control,params) if(!stored_radio) return ..() diff --git a/code/_core/obj/structure/interactive/light_switch.dm b/code/_core/obj/structure/interactive/light_switch.dm index 3929b9217d..2b3384e3c2 100644 --- a/code/_core/obj/structure/interactive/light_switch.dm +++ b/code/_core/obj/structure/interactive/light_switch.dm @@ -41,7 +41,7 @@ update_sprite() update_atom_light() -/obj/structure/interactive/light_switch/post_move(var/atom/old_loc) +/obj/structure/interactive/light_switch/post_move(atom/old_loc) . = ..() if(is_turf(old_loc)) var/area/A = old_loc.loc @@ -81,7 +81,7 @@ I.plane = initial(plane) add_underlay(I) -/obj/structure/interactive/light_switch/proc/toggle(var/mob/caller) +/obj/structure/interactive/light_switch/proc/toggle(mob/caller) var/area/A = get_area(src) if(!A || !A.linked_apc || !A.linked_apc.cell || !A.linked_apc.cell.charge_current) caller.to_chat(span("warning","This doesn't seem to be working...")) @@ -95,7 +95,7 @@ return TRUE -/obj/structure/interactive/light_switch/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/light_switch/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(next_interact >= world.time) return TRUE diff --git a/code/_core/obj/structure/interactive/lighting/_lighting.dm b/code/_core/obj/structure/interactive/lighting/_lighting.dm index 5a0a48beb4..a517179510 100644 --- a/code/_core/obj/structure/interactive/lighting/_lighting.dm +++ b/code/_core/obj/structure/interactive/lighting/_lighting.dm @@ -8,7 +8,7 @@ return CEILING(desired_light_power*desired_light_range*30,1) /* -/obj/structure/interactive/lighting/update_power_draw(var/desired_power_draw,var/reset=FALSE) +/obj/structure/interactive/lighting/update_power_draw(desired_power_draw,reset=FALSE) var/area/A = get_area(src) diff --git a/code/_core/obj/structure/interactive/lighting/bulb.dm b/code/_core/obj/structure/interactive/lighting/bulb.dm index fc2e0f5826..89aa07dd78 100644 --- a/code/_core/obj/structure/interactive/lighting/bulb.dm +++ b/code/_core/obj/structure/interactive/lighting/bulb.dm @@ -27,7 +27,7 @@ lightswitch = TRUE -/obj/structure/interactive/lighting/bulb/on_destruction(var/mob/caller,var/damage = FALSE) +/obj/structure/interactive/lighting/bulb/on_destruction(mob/caller,damage = FALSE) var/turf/T = get_turf(src) diff --git a/code/_core/obj/structure/interactive/lighting/fireplace.dm b/code/_core/obj/structure/interactive/lighting/fireplace.dm index 5c52fcbb3c..45852cf9cd 100644 --- a/code/_core/obj/structure/interactive/lighting/fireplace.dm +++ b/code/_core/obj/structure/interactive/lighting/fireplace.dm @@ -17,7 +17,7 @@ . = ..() update_sprite() -/obj/structure/interactive/lighting/fireplace/set_dir(var/desired_dir,var/force=FALSE) +/obj/structure/interactive/lighting/fireplace/set_dir(desired_dir,force=FALSE) . = ..() if(.) if(dir == SOUTH) diff --git a/code/_core/obj/structure/interactive/lighting/fixture/_fixture.dm b/code/_core/obj/structure/interactive/lighting/fixture/_fixture.dm index 0d7e311e4a..ac81560c6f 100644 --- a/code/_core/obj/structure/interactive/lighting/fixture/_fixture.dm +++ b/code/_core/obj/structure/interactive/lighting/fixture/_fixture.dm @@ -22,7 +22,7 @@ desired_light_color = color return ..() -/obj/structure/interactive/lighting/fixture/on_destruction(var/damage = TRUE) +/obj/structure/interactive/lighting/fixture/on_destruction(damage = TRUE) var/turf/T = get_turf(src) diff --git a/code/_core/obj/structure/interactive/lighting/floor.dm b/code/_core/obj/structure/interactive/lighting/floor.dm index ac3fb2bfe4..5bba2434ac 100644 --- a/code/_core/obj/structure/interactive/lighting/floor.dm +++ b/code/_core/obj/structure/interactive/lighting/floor.dm @@ -25,7 +25,7 @@ lightswitch = TRUE -/obj/structure/interactive/lighting/floor/on_destruction(var/mob/caller,var/damage = FALSE) +/obj/structure/interactive/lighting/floor/on_destruction(mob/caller,damage = FALSE) var/turf/T = get_turf(src) diff --git a/code/_core/obj/structure/interactive/loaout_vendor.dm b/code/_core/obj/structure/interactive/loaout_vendor.dm index 71ce6ff5b9..a99f86a55c 100644 --- a/code/_core/obj/structure/interactive/loaout_vendor.dm +++ b/code/_core/obj/structure/interactive/loaout_vendor.dm @@ -19,7 +19,7 @@ pixel_y = 6 -/obj/structure/interactive/loadout_vendor/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/loadout_vendor/clicked_on_by_object(mob/caller,atom/object,location,control,params) INTERACT_CHECK INTERACT_DELAY(10) diff --git a/code/_core/obj/structure/interactive/local_machine/_local_machine.dm b/code/_core/obj/structure/interactive/local_machine/_local_machine.dm index 8460c61e86..81e1ef65cc 100644 --- a/code/_core/obj/structure/interactive/local_machine/_local_machine.dm +++ b/code/_core/obj/structure/interactive/local_machine/_local_machine.dm @@ -28,7 +28,7 @@ SSclient.local_machines += src update_sprite() -/obj/structure/interactive/localmachine/proc/update_for_mob(var/mob/M) +/obj/structure/interactive/localmachine/proc/update_for_mob(mob/M) if(M in disallowed_mobs) return @@ -45,7 +45,7 @@ var/mob/M = k update_for_mob(M) -/obj/structure/interactive/localmachine/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/localmachine/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(ismob(caller)) INTERACT_CHECK @@ -59,7 +59,7 @@ return ..() -/obj/structure/interactive/localmachine/proc/clear_existing_images(var/mob/M) +/obj/structure/interactive/localmachine/proc/clear_existing_images(mob/M) if(!M.client) return diff --git a/code/_core/obj/structure/interactive/local_machine/flora.dm b/code/_core/obj/structure/interactive/local_machine/flora.dm index 66a3e19f2a..b7a9706431 100644 --- a/code/_core/obj/structure/interactive/local_machine/flora.dm +++ b/code/_core/obj/structure/interactive/local_machine/flora.dm @@ -5,7 +5,7 @@ var/obj/item/item_to_harvest -/obj/structure/interactive/localmachine/harvestable_flora/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/localmachine/harvestable_flora/clicked_on_by_object(mob/caller,atom/object,location,control,params) INTERACT_CHECK @@ -39,7 +39,7 @@ item_to_harvest = /obj/item/container/food/plant/nitrogen_flower -/obj/structure/interactive/localmachine/harvestable_flora/nitrogen_flower/New(var/desired_loc) +/obj/structure/interactive/localmachine/harvestable_flora/nitrogen_flower/New(desired_loc) icon_state = "[rand(1,4)]" return ..() diff --git a/code/_core/obj/structure/interactive/local_machine/snowflake/_snowflake.dm b/code/_core/obj/structure/interactive/local_machine/snowflake/_snowflake.dm index ce70a527d4..1e8a82160e 100644 --- a/code/_core/obj/structure/interactive/local_machine/snowflake/_snowflake.dm +++ b/code/_core/obj/structure/interactive/local_machine/snowflake/_snowflake.dm @@ -6,7 +6,7 @@ var/list/mob_to_image = list() -/obj/structure/interactive/localmachine/snowflake/clear_existing_images(var/mob/M) +/obj/structure/interactive/localmachine/snowflake/clear_existing_images(mob/M) . = ..() @@ -17,7 +17,7 @@ mob_to_image[M] = null -/obj/structure/interactive/localmachine/snowflake/proc/set_icon_state_mob(var/mob/M,var/icon_state) +/obj/structure/interactive/localmachine/snowflake/proc/set_icon_state_mob(mob/M,icon_state) clear_existing_images(M) @@ -29,7 +29,7 @@ return TRUE -/obj/structure/interactive/localmachine/snowflake/update_for_mob(var/mob/M) +/obj/structure/interactive/localmachine/snowflake/update_for_mob(mob/M) if(mob_to_image[M]) M << mob_to_image[M] diff --git a/code/_core/obj/structure/interactive/local_machine/snowflake/airlock.dm b/code/_core/obj/structure/interactive/local_machine/snowflake/airlock.dm index e1a344eb7d..e7f5ac1fe0 100644 --- a/code/_core/obj/structure/interactive/local_machine/snowflake/airlock.dm +++ b/code/_core/obj/structure/interactive/local_machine/snowflake/airlock.dm @@ -38,21 +38,21 @@ return TRUE -/obj/structure/interactive/localmachine/snowflake/airlock/proc/open_for(var/mob/M) +/obj/structure/interactive/localmachine/snowflake/airlock/proc/open_for(mob/M) mob_to_door_state[M] = DOOR_STATE_OPENING_01 set_icon_state_mob(M,"opening") spawn(open_time) mob_to_door_state[M] = DOOR_STATE_OPENED set_icon_state_mob(M,"open") -/obj/structure/interactive/localmachine/snowflake/airlock/proc/close_for(var/mob/M) +/obj/structure/interactive/localmachine/snowflake/airlock/proc/close_for(mob/M) mob_to_door_state[M] = DOOR_STATE_CLOSING_01 set_icon_state_mob(M,"closing") spawn(close_time) mob_to_door_state[M] = DOOR_STATE_CLOSED set_icon_state_mob(M,"closed") -/obj/structure/interactive/localmachine/snowflake/airlock/proc/bolt_for(var/mob/M) +/obj/structure/interactive/localmachine/snowflake/airlock/proc/bolt_for(mob/M) if(mob_to_door_state[M] == DOOR_STATE_OPENED) mob_to_door_state[M] = DOOR_STATE_CLOSING_01 @@ -65,7 +65,7 @@ mob_to_door_state[M] = DOOR_STATE_LOCKED set_icon_state_mob(M,"closed") -/obj/structure/interactive/localmachine/snowflake/airlock/Cross(var/atom/movable/O,var/atom/NewLoc,var/atom/OldLoc) +/obj/structure/interactive/localmachine/snowflake/airlock/Cross(atom/movable/O,atom/NewLoc,atom/OldLoc) if(!ismob(O)) return ..() @@ -91,7 +91,7 @@ var/global/list/obj/structure/interactive/localmachine/snowflake/airlock/external/tutorial_dock/tutorial_docks = list() -/obj/structure/interactive/localmachine/snowflake/airlock/external/tutorial_dock/New(var/desired_loc) +/obj/structure/interactive/localmachine/snowflake/airlock/external/tutorial_dock/New(desired_loc) . = ..() tutorial_docks += src \ No newline at end of file diff --git a/code/_core/obj/structure/interactive/local_machine/snowflake/hint.dm b/code/_core/obj/structure/interactive/local_machine/snowflake/hint.dm index 668fc45d12..1e0b62ef18 100644 --- a/code/_core/obj/structure/interactive/local_machine/snowflake/hint.dm +++ b/code/_core/obj/structure/interactive/local_machine/snowflake/hint.dm @@ -11,14 +11,14 @@ plane = PLANE_EFFECT -/obj/structure/interactive/localmachine/snowflake/hint/Crossed(var/atom/movable/O,var/atom/new_loc,var/atom/old_loc) +/obj/structure/interactive/localmachine/snowflake/hint/Crossed(atom/movable/O,atom/new_loc,atom/old_loc) if(ismob(O)) set_icon_state_mob(O,icon_state_enter) return ..() -/obj/structure/interactive/localmachine/snowflake/hint/Uncrossed(var/atom/movable/O,var/atom/new_loc,var/atom/old_loc) +/obj/structure/interactive/localmachine/snowflake/hint/Uncrossed(atom/movable/O,atom/new_loc,atom/old_loc) if(ismob(O)) set_icon_state_mob(O,icon_state_exit) diff --git a/code/_core/obj/structure/interactive/local_machine/snowflake/wishgranter/_wishgranter.dm b/code/_core/obj/structure/interactive/local_machine/snowflake/wishgranter/_wishgranter.dm index 05af06e399..18a67b534c 100644 --- a/code/_core/obj/structure/interactive/local_machine/snowflake/wishgranter/_wishgranter.dm +++ b/code/_core/obj/structure/interactive/local_machine/snowflake/wishgranter/_wishgranter.dm @@ -14,7 +14,7 @@ desired_light_power = 0.5 desired_light_color = "#FFFFFF" -/obj/structure/interactive/localmachine/snowflake/wishgranter/New(var/desired_loc) +/obj/structure/interactive/localmachine/snowflake/wishgranter/New(desired_loc) if(desired_light_range && desired_light_power && desired_light_color) set_light(desired_light_range,desired_light_power,desired_light_color) @@ -47,7 +47,7 @@ return TRUE -/obj/structure/interactive/localmachine/snowflake/wishgranter/Crossed(var/atom/crosser) +/obj/structure/interactive/localmachine/snowflake/wishgranter/Crossed(atom/crosser) if(!is_player(crosser)) return FALSE @@ -74,7 +74,7 @@ return TRUE -/obj/structure/interactive/localmachine/snowflake/wishgranter/Uncrossed(var/atom/crosser) +/obj/structure/interactive/localmachine/snowflake/wishgranter/Uncrossed(atom/crosser) if(!is_player(crosser)) return TRUE diff --git a/code/_core/obj/structure/interactive/local_machine/vendor/_vendor.dm b/code/_core/obj/structure/interactive/local_machine/vendor/_vendor.dm index 3b785a68da..839b314c8b 100644 --- a/code/_core/obj/structure/interactive/local_machine/vendor/_vendor.dm +++ b/code/_core/obj/structure/interactive/local_machine/vendor/_vendor.dm @@ -58,7 +58,7 @@ var/use_unlock_requirements = TRUE -/obj/structure/interactive/vending/proc/vend_random(var/count=1) //For malfunctions/hacking/destruction +/obj/structure/interactive/vending/proc/vend_random(count=1) //For malfunctions/hacking/destruction if(!length(stored_objects)) return FALSE @@ -78,7 +78,7 @@ return TRUE -/obj/structure/interactive/vending/on_destruction(var/damage = TRUE) +/obj/structure/interactive/vending/on_destruction(damage = TRUE) . = ..() if(!broken) create_destruction(get_turf(src),list(/obj/item/material/shard/ = 2),/material/glass) @@ -121,7 +121,7 @@ QDEL_NULL(accepts_item) . = ..() -/obj/structure/interactive/vending/proc/spend_currency(var/mob/living/advanced/player/P,var/amount=0) +/obj/structure/interactive/vending/proc/spend_currency(mob/living/advanced/player/P,amount=0) if(accepts_item) var/success = FALSE @@ -142,10 +142,10 @@ return TRUE -/obj/structure/interactive/vending/proc/modify_item(var/obj/item/I,var/obj/item/base_item) +/obj/structure/interactive/vending/proc/modify_item(obj/item/I,obj/item/base_item) return TRUE -/obj/structure/interactive/vending/proc/purchase_item(var/mob/living/advanced/player/caller,var/params,var/obj/item/associated_item,var/item_value=0) +/obj/structure/interactive/vending/proc/purchase_item(mob/living/advanced/player/caller,params,obj/item/associated_item,item_value=0) INTERACT_CHECK INTERACT_DELAY(3) @@ -194,14 +194,14 @@ . = ..() -/obj/structure/interactive/vending/proc/create_item(var/obj/item/item_path,var/turf/turf_spawn) //Create item for the vendor (in initialization only). +/obj/structure/interactive/vending/proc/create_item(obj/item/item_path,turf/turf_spawn) //Create item for the vendor (in initialization only). var/obj/item/I = new item_path(turf_spawn) INITIALIZE(I) GENERATE(I) FINALIZE(I) return I -/obj/structure/interactive/vending/proc/get_bullshit_price(var/desired_price) +/obj/structure/interactive/vending/proc/get_bullshit_price(desired_price) if(accepts_item) return CEILING(desired_price,1) @@ -258,7 +258,7 @@ update_sprite() -/obj/structure/interactive/vending/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/vending/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(!caller.client || !powered || !is_player(caller) && !is_inventory(object)) return ..() @@ -276,7 +276,7 @@ return TRUE -/obj/structure/interactive/vending/proc/show_buttons_to(var/mob/living/advanced/A) +/obj/structure/interactive/vending/proc/show_buttons_to(mob/living/advanced/A) var/stored_objects_length = length(stored_objects) @@ -308,7 +308,7 @@ CV.update_owner(A) CV.update_sprite() -/obj/structure/interactive/vending/proc/hide_buttons_from(var/mob/living/advanced/A) +/obj/structure/interactive/vending/proc/hide_buttons_from(mob/living/advanced/A) for(var/obj/hud/button/vendor/V in A.buttons) V.update_owner(null) @@ -316,17 +316,17 @@ for(var/obj/hud/button/close_vendor/V in A.buttons) V.update_owner(null) -/obj/structure/interactive/vending/on_active(var/mob/living/advanced/player/P) +/obj/structure/interactive/vending/on_active(mob/living/advanced/player/P) show_buttons_to(P) return ..() -/obj/structure/interactive/vending/on_inactive(var/mob/living/advanced/player/P) +/obj/structure/interactive/vending/on_inactive(mob/living/advanced/player/P) hide_buttons_from(P) return ..() /obj/structure/interactive/vending/get_power_draw() return 180 -/obj/structure/interactive/vending/get_examine_list(var/mob/examiner) +/obj/structure/interactive/vending/get_examine_list(mob/examiner) . = ..() . += span("notice","To buy from a vendor, simply left or right click any of the available items in the vendor menu.
Credits will be automatically deducted from your account, but special currencies such as dosh or gold coins must be held in one of your hands to use.") \ No newline at end of file diff --git a/code/_core/obj/structure/interactive/local_machine/vendor/contract.dm b/code/_core/obj/structure/interactive/local_machine/vendor/contract.dm index 869d9dcb29..fabcaedb10 100644 --- a/code/_core/obj/structure/interactive/local_machine/vendor/contract.dm +++ b/code/_core/obj/structure/interactive/local_machine/vendor/contract.dm @@ -35,7 +35,7 @@ markup = 1 -/obj/structure/interactive/vending/contract/New(var/desired_loc) +/obj/structure/interactive/vending/contract/New(desired_loc) var/list/possible_contracts = subtypesof(/obj/item/contract) for(var/k in possible_contracts) //First pass @@ -66,7 +66,7 @@ . = ..() -/obj/structure/interactive/vending/contract/create_item(var/obj/item/item_path,var/turf/turf_spawn) +/obj/structure/interactive/vending/contract/create_item(obj/item/item_path,turf/turf_spawn) if(!ispath(item_path,/obj/item/contract)) return ..() @@ -83,7 +83,7 @@ return I -/obj/structure/interactive/vending/contract/modify_item(var/obj/item/I,var/obj/item/base_item) +/obj/structure/interactive/vending/contract/modify_item(obj/item/I,obj/item/base_item) if(istype(I,/obj/item/contract)) var/obj/item/contract/C = I @@ -94,5 +94,5 @@ -/obj/structure/interactive/vending/contract/get_bullshit_price(var/desired_price) +/obj/structure/interactive/vending/contract/get_bullshit_price(desired_price) return CEILING(desired_price,10) \ No newline at end of file diff --git a/code/_core/obj/structure/interactive/local_machine/vendor/junk.dm b/code/_core/obj/structure/interactive/local_machine/vendor/junk.dm index c3d69d4bd7..00f0181623 100644 --- a/code/_core/obj/structure/interactive/local_machine/vendor/junk.dm +++ b/code/_core/obj/structure/interactive/local_machine/vendor/junk.dm @@ -2,7 +2,7 @@ name = "snack vendor" icon_state = "snack" -/obj/structure/interactive/vending/junk/New(var/desired_loc) +/obj/structure/interactive/vending/junk/New(desired_loc) icon_state = pick("snack","snackblue","snackorange","snackgreen","snackteal") return ..() diff --git a/code/_core/obj/structure/interactive/local_machine/vendor/soda.dm b/code/_core/obj/structure/interactive/local_machine/vendor/soda.dm index f95f6bf54e..4c5a44537b 100644 --- a/code/_core/obj/structure/interactive/local_machine/vendor/soda.dm +++ b/code/_core/obj/structure/interactive/local_machine/vendor/soda.dm @@ -2,7 +2,7 @@ name = "soda vendor" icon_state = "soda" -/obj/structure/interactive/vending/soda/New(var/desired_loc) +/obj/structure/interactive/vending/soda/New(desired_loc) icon_state = pick("soda","sodablue","sodablack","sodapurple","sodaorange") return ..() diff --git a/code/_core/obj/structure/interactive/local_machine/vendor/vendor_types.dm b/code/_core/obj/structure/interactive/local_machine/vendor/vendor_types.dm index b01dff4b86..e540f08266 100644 --- a/code/_core/obj/structure/interactive/local_machine/vendor/vendor_types.dm +++ b/code/_core/obj/structure/interactive/local_machine/vendor/vendor_types.dm @@ -37,13 +37,13 @@ is_free = TRUE free_text = "choose" -/obj/structure/interactive/vending/autolocker/can_purchase_item(var/mob/living/advanced/player/P,var/params,var/obj/item/associated_item,var/item_value=0,var/obj/hud/inventory/I) +/obj/structure/interactive/vending/autolocker/can_purchase_item(mob/living/advanced/player/P,params,obj/item/associated_item,item_value=0,obj/hud/inventory/I) . = ..() if(. && P && (P in equipped_players)) P.to_chat(span("notice","You already selected your equipment!")) return FALSE -/obj/structure/interactive/vending/autolocker/purchase_item(var/mob/living/advanced/player/P,var/params,var/obj/item/associated_item,var/item_value=0,var/obj/hud/inventory/I) +/obj/structure/interactive/vending/autolocker/purchase_item(mob/living/advanced/player/P,params,obj/item/associated_item,item_value=0,obj/hud/inventory/I) . = ..() if(. && P && !(P in equipped_players)) equipped_players += P diff --git a/code/_core/obj/structure/interactive/local_machine/vendor/vendor_vr.dm b/code/_core/obj/structure/interactive/local_machine/vendor/vendor_vr.dm index 73e1cd7112..9a64c4b234 100644 --- a/code/_core/obj/structure/interactive/local_machine/vendor/vendor_vr.dm +++ b/code/_core/obj/structure/interactive/local_machine/vendor/vendor_vr.dm @@ -27,7 +27,7 @@ . = ..() -/obj/structure/interactive/vr_shop/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/vr_shop/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(!is_advanced(caller)) return ..() @@ -92,10 +92,10 @@ special = TRUE -/obj/structure/interactive/vending/virtual_reality/get_bullshit_price(var/desired_price) +/obj/structure/interactive/vending/virtual_reality/get_bullshit_price(desired_price) return CEILING(desired_price,10) -/obj/structure/interactive/vending/virtual_reality/modify_item(var/obj/item/I,var/obj/item/base_item) +/obj/structure/interactive/vending/virtual_reality/modify_item(obj/item/I,obj/item/base_item) . = ..() diff --git a/code/_core/obj/structure/interactive/meme.dm b/code/_core/obj/structure/interactive/meme.dm index d13bda9494..fd23a32238 100644 --- a/code/_core/obj/structure/interactive/meme.dm +++ b/code/_core/obj/structure/interactive/meme.dm @@ -22,7 +22,7 @@ check_look() //I mean, it's an admin item. Who care if it's intensive? . = ..() -/obj/structure/interactive/dont_look/post_move(var/atom/old_loc) +/obj/structure/interactive/dont_look/post_move(atom/old_loc) . = ..() if(is_turf(src.loc) && !is_turf(old_loc)) START_THINKING(src) diff --git a/code/_core/obj/structure/interactive/mining_drill.dm b/code/_core/obj/structure/interactive/mining_drill.dm index 808f62e4f3..0709043938 100644 --- a/code/_core/obj/structure/interactive/mining_drill.dm +++ b/code/_core/obj/structure/interactive/mining_drill.dm @@ -41,7 +41,7 @@ -/obj/structure/interactive/mining_drill/on_destruction(var/damage = TRUE) +/obj/structure/interactive/mining_drill/on_destruction(damage = TRUE) create_destruction(get_turf(src),list(/obj/item/material/sheet/ = 5),/material/steel) . = ..() qdel(src) @@ -59,7 +59,7 @@ -/obj/structure/interactive/mining_drill/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/mining_drill/clicked_on_by_object(mob/caller,atom/object,location,control,params) INTERACT_CHECK INTERACT_CHECK_OBJECT @@ -72,11 +72,11 @@ return TRUE -/obj/structure/interactive/mining_drill/post_move(var/atom/old_loc) +/obj/structure/interactive/mining_drill/post_move(atom/old_loc) . = ..() if(. && CALLBACK_EXISTS("\ref[src]_do_drill")) deactivate() -/obj/structure/interactive/mining_drill/proc/activate(var/mob/caller) +/obj/structure/interactive/mining_drill/proc/activate(mob/caller) if(!check_braces()) caller.to_chat(span("warning","\The [src] doesn't seem to want to turn on!")) @@ -94,7 +94,7 @@ return TRUE -/obj/structure/interactive/mining_drill/proc/deactivate(var/mob/caller) +/obj/structure/interactive/mining_drill/proc/deactivate(mob/caller) if(caller) visible_message(span("notice","\The [caller.name] turns off \the [src.name]."),span("notice","You turn off \the [src.name].")) @@ -111,7 +111,7 @@ return TRUE -/obj/structure/interactive/mining_drill/proc/is_valid_brace(var/obj/structure/interactive/mining_brace/MB) +/obj/structure/interactive/mining_drill/proc/is_valid_brace(obj/structure/interactive/mining_brace/MB) return MB && MB.anchored && get_step(MB,MB.dir) == src.loc /obj/structure/interactive/mining_drill/proc/check_braces() @@ -211,12 +211,12 @@ density = TRUE -/obj/structure/interactive/mining_brace/on_destruction(var/damage = TRUE) +/obj/structure/interactive/mining_brace/on_destruction(damage = TRUE) create_destruction(get_turf(src),list(/obj/item/material/sheet/ = 5),/material/steel) . = ..() qdel(src) -/obj/structure/interactive/mining_brace/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/mining_brace/clicked_on_by_object(mob/caller,atom/object,location,control,params) INTERACT_CHECK INTERACT_CHECK_OBJECT diff --git a/code/_core/obj/structure/interactive/mountable/browning.dm b/code/_core/obj/structure/interactive/mountable/browning.dm index 0ac00fb36d..aef3faa22e 100644 --- a/code/_core/obj/structure/interactive/mountable/browning.dm +++ b/code/_core/obj/structure/interactive/mountable/browning.dm @@ -93,7 +93,7 @@ . = ..() //prototyped from defib paddles -/obj/item/browning_handle/click_on_object(var/mob/caller,var/atom/object,location,control,params) +/obj/item/browning_handle/click_on_object(mob/caller,atom/object,location,control,params) if(is_inventory(object)) return ..() @@ -124,7 +124,7 @@ return ..() -/obj/item/browning_handle/on_unequip(var/obj/hud/inventory/old_inventory,var/silent=TRUE) +/obj/item/browning_handle/on_unequip(obj/hud/inventory/old_inventory,silent=TRUE) . = ..() @@ -145,7 +145,7 @@ CALLBACK("sit_down_\ref[src]",1 SECONDS,src,src::mount_your_ass(),O) -/obj/structure/interactive/mountable/browning/proc/mount_your_ass(var/mob/living/L) +/obj/structure/interactive/mountable/browning/proc/mount_your_ass(mob/living/L) if(L.loc != src.loc) return FALSE @@ -154,7 +154,7 @@ return TRUE -/obj/structure/interactive/mountable/browning/proc/mag_check(var/structure/interactive/mountable/browning/M) +/obj/structure/interactive/mountable/browning/proc/mag_check(structure/interactive/mountable/browning/M) if(stored_magazine) if(length(stored_magazine.get_ammo_count()) < 1) icon_state = "empty" @@ -167,7 +167,7 @@ return TRUE //pack 'em up, from turret -/obj/structure/interactive/mountable/browning/proc/can_pack_up(var/mob/caller) +/obj/structure/interactive/mountable/browning/proc/can_pack_up(mob/caller) if(qdeleting) return FALSE @@ -180,7 +180,7 @@ return TRUE -/obj/structure/interactive/mountable/browning/proc/pack_up(var/mob/caller) +/obj/structure/interactive/mountable/browning/proc/pack_up(mob/caller) caller.visible_message(span("warning","\The [caller.name] packs up \the [src.name]."),span("notice","You pack up \the [src.name].")) @@ -205,7 +205,7 @@ return TRUE -/obj/structure/interactive/mountable/browning/drop_on_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/mountable/browning/drop_on_object(mob/caller,atom/object,location,control,params) if(caller != object) return ..() @@ -222,7 +222,7 @@ return TRUE //shows ammo count -/obj/structure/interactive/mountable/browning/get_examine_list(var/mob/examiner) +/obj/structure/interactive/mountable/browning/get_examine_list(mob/examiner) . = ..() if(stored_magazine) . += div("notice","It has a magazine latched on, with [stored_magazine.get_ammo_count()]/[stored_magazine.bullet_count_max] bullets left.") @@ -230,7 +230,7 @@ . += div("warning","It is missing a magazine.") //clickies by player on the gun -/obj/structure/interactive/mountable/browning/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/mountable/browning/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(istype(object,/obj/item/magazine/)) INTERACT_CHECK INTERACT_CHECK_OBJECT diff --git a/code/_core/obj/structure/interactive/nature/alchemy_plant.dm b/code/_core/obj/structure/interactive/nature/alchemy_plant.dm index a971749b6f..306a51ec06 100644 --- a/code/_core/obj/structure/interactive/nature/alchemy_plant.dm +++ b/code/_core/obj/structure/interactive/nature/alchemy_plant.dm @@ -15,7 +15,7 @@ SSbotany_alchemy.all_alchemy_plants -= src . = ..() -/obj/structure/interactive/alchemy_plant/proc/harvest(var/mob/living/advanced/caller) +/obj/structure/interactive/alchemy_plant/proc/harvest(mob/living/advanced/caller) if(!grown) caller.to_chat(span("warning","\The [src.name] doesnt look ready to be harvested yet....")) @@ -43,15 +43,15 @@ update_sprite() return TRUE -/obj/structure/interactive/alchemy_plant/on_destruction(var/damage = TRUE) +/obj/structure/interactive/alchemy_plant/on_destruction(damage = TRUE) . = ..() qdel(src) -/obj/structure/interactive/alchemy_plant/New(var/desired_loc) +/obj/structure/interactive/alchemy_plant/New(desired_loc) SSbotany_alchemy.all_alchemy_plants += src . = ..() -/obj/structure/interactive/alchemy_plant/proc/on_life(var/tick_rate = 1) +/obj/structure/interactive/alchemy_plant/proc/on_life(tick_rate = 1) if(!grown) if(prob(1)) grown = TRUE @@ -65,7 +65,7 @@ icon_state = "[initial(icon_state)]_h" -/obj/structure/interactive/alchemy_plant/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/alchemy_plant/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(!is_advanced(caller)) return ..() diff --git a/code/_core/obj/structure/interactive/nature/snow.dm b/code/_core/obj/structure/interactive/nature/snow.dm index 52d07fb98b..6f7e36336b 100644 --- a/code/_core/obj/structure/interactive/nature/snow.dm +++ b/code/_core/obj/structure/interactive/nature/snow.dm @@ -51,14 +51,14 @@ obj/structure/scenery/bush/snow/New() icon_state = "pine_2" pixel_x = -16 -/obj/structure/interactive/tree/pine/on_destruction(var/damage = TRUE) +/obj/structure/interactive/tree/pine/on_destruction(damage = TRUE) . = ..() QDEL_NULL(health) icon_state = "pine_stump" collision_flags = FLAG_COLLISION_CRAWLING collision_bullet_flags = FLAG_COLLISION_BULLET_SPECIFIC -/obj/structure/interactive/tree/pine/New(var/desired_loc) +/obj/structure/interactive/tree/pine/New(desired_loc) icon_state = "pine_[rand(1,3)]" return ..() @@ -70,14 +70,14 @@ obj/structure/scenery/bush/snow/New() color = "#d4d2ab" -/obj/structure/interactive/tree/evergreen/on_destruction(var/damage = TRUE) +/obj/structure/interactive/tree/evergreen/on_destruction(damage = TRUE) . = ..() QDEL_NULL(health) icon_state = "evergreen_stump" collision_flags = FLAG_COLLISION_NONE collision_bullet_flags = FLAG_COLLISION_BULLET_SPECIFIC -/obj/structure/interactive/tree/evergreen/New(var/desired_loc) +/obj/structure/interactive/tree/evergreen/New(desired_loc) icon_state = "evergreen_[rand(1,3)]" return ..() @@ -88,14 +88,14 @@ obj/structure/scenery/bush/snow/New() pixel_x = -32 pixel_y = 0 -/obj/structure/interactive/tree/jungle_small/on_destruction(var/damage = TRUE) +/obj/structure/interactive/tree/jungle_small/on_destruction(damage = TRUE) . = ..() QDEL_NULL(health) icon_state = "stump" collision_flags = FLAG_COLLISION_CRAWLING collision_bullet_flags = FLAG_COLLISION_BULLET_SPECIFIC -/obj/structure/interactive/tree/jungle_small/New(var/desired_loc) +/obj/structure/interactive/tree/jungle_small/New(desired_loc) icon_state = "tree[rand(1,6)]" return ..() @@ -106,14 +106,14 @@ obj/structure/scenery/bush/snow/New() pixel_x = -48 pixel_y = -16 -/obj/structure/interactive/tree/jungle_large/on_destruction(var/damage = TRUE) +/obj/structure/interactive/tree/jungle_large/on_destruction(damage = TRUE) . = ..() QDEL_NULL(health) //Important icon_state = "stump" collision_flags = FLAG_COLLISION_CRAWLING collision_bullet_flags = FLAG_COLLISION_BULLET_SPECIFIC -/obj/structure/interactive/tree/jungle_large/New(var/desired_loc) +/obj/structure/interactive/tree/jungle_large/New(desired_loc) icon_state = "tree[rand(1,6)]" return ..() @@ -124,6 +124,6 @@ obj/structure/scenery/bush/snow/New() icon = 'icons/obj/structure/flora/palm.dmi' icon_state = "palm1" -/obj/structure/interactive/tree/palm/New(var/desired_loc) +/obj/structure/interactive/tree/palm/New(desired_loc) icon_state = "palm[rand(1,2)]" return ..() diff --git a/code/_core/obj/structure/interactive/ore_box.dm b/code/_core/obj/structure/interactive/ore_box.dm index 14a6b706e3..3668de2141 100644 --- a/code/_core/obj/structure/interactive/ore_box.dm +++ b/code/_core/obj/structure/interactive/ore_box.dm @@ -24,7 +24,7 @@ var/material/M = MATERIAL(k) . += amount*1*M.value_per_unit -/obj/structure/interactive/ore_box/proc/can_dump_some_ore(var/mob/caller) +/obj/structure/interactive/ore_box/proc/can_dump_some_ore(mob/caller) if(get_dist(caller,src) > 1) return FALSE @@ -36,7 +36,7 @@ -/obj/structure/interactive/ore_box/proc/dump_some_ore(var/mob/caller) +/obj/structure/interactive/ore_box/proc/dump_some_ore(mob/caller) var/turf/T = get_turf(caller) if(!T) @@ -60,7 +60,7 @@ return TRUE -/obj/structure/interactive/ore_box/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/ore_box/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(is_advanced(caller)) var/mob/living/advanced/C = caller @@ -82,7 +82,7 @@ . = ..() -/obj/structure/interactive/ore_box/proc/stack(var/obj/item/material/ore/O) +/obj/structure/interactive/ore_box/proc/stack(obj/item/material/ore/O) if(!O.material_id) return FALSE @@ -95,7 +95,7 @@ qdel(O) return TRUE -/obj/structure/interactive/ore_box/get_examine_list(var/mob/examiner) +/obj/structure/interactive/ore_box/get_examine_list(mob/examiner) . = ..() var/total_value = 0 var/total_objects = 0 diff --git a/code/_core/obj/structure/interactive/ore_deposit.dm b/code/_core/obj/structure/interactive/ore_deposit.dm index fd0806a10f..587f48a2fa 100644 --- a/code/_core/obj/structure/interactive/ore_deposit.dm +++ b/code/_core/obj/structure/interactive/ore_deposit.dm @@ -33,7 +33,7 @@ M.Turn(pick(90,180,270)) transform = M -/obj/structure/interactive/ore_deposit/proc/create_ore(var/atom/caller,var/atom/drop_location,var/ore_to_create = 1) +/obj/structure/interactive/ore_deposit/proc/create_ore(atom/caller,atom/drop_location,ore_to_create = 1) ore_to_create = CEILING(ore_to_create,1) //Round up. ore_to_create = min(ore_to_create,ore_amount) //Don't make more than what is possible. @@ -80,7 +80,7 @@ if(.) update_alpha() -/obj/structure/interactive/ore_deposit/floor/create_ore(var/atom/caller,var/atom/drop_location,var/ore_to_create = 1) +/obj/structure/interactive/ore_deposit/floor/create_ore(atom/caller,atom/drop_location,ore_to_create = 1) . = ..() if(.) update_alpha() diff --git a/code/_core/obj/structure/interactive/ore_storage.dm b/code/_core/obj/structure/interactive/ore_storage.dm index 1172290d3b..1182501a83 100644 --- a/code/_core/obj/structure/interactive/ore_storage.dm +++ b/code/_core/obj/structure/interactive/ore_storage.dm @@ -8,7 +8,7 @@ density = TRUE -/obj/structure/interactive/ore_storage/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/ore_storage/clicked_on_by_object(mob/caller,atom/object,location,control,params) INTERACT_CHECK INTERACT_CHECK_OBJECT @@ -48,7 +48,7 @@ return ..() -/obj/structure/interactive/ore_storage/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/ore_storage/clicked_on_by_object(mob/caller,atom/object,location,control,params) @@ -60,7 +60,7 @@ return TRUE -/obj/structure/interactive/ore_storage/proc/store_ore(var/atom/movable/M) +/obj/structure/interactive/ore_storage/proc/store_ore(atom/movable/M) if(istype(M,/obj/item/material/ore/)) var/obj/item/material/ore/O = M diff --git a/code/_core/obj/structure/interactive/piano.dm b/code/_core/obj/structure/interactive/piano.dm index 2ca22081e3..f969149004 100644 --- a/code/_core/obj/structure/interactive/piano.dm +++ b/code/_core/obj/structure/interactive/piano.dm @@ -9,7 +9,7 @@ return ..() -/obj/structure/interactive/piano/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/piano/clicked_on_by_object(mob/caller,atom/object,location,control,params) INTERACT_CHECK diff --git a/code/_core/obj/structure/interactive/portal/_portal.dm b/code/_core/obj/structure/interactive/portal/_portal.dm index 43d2c088a7..2d6925ae97 100644 --- a/code/_core/obj/structure/interactive/portal/_portal.dm +++ b/code/_core/obj/structure/interactive/portal/_portal.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/effects/effects.dmi' icon_state = "anom" -/obj/structure/interactive/portal/Crossed(var/atom/movable/O,var/atom/new_loc,var/atom/old_loc) +/obj/structure/interactive/portal/Crossed(atom/movable/O,atom/new_loc,atom/old_loc) if(!id) return ..() diff --git a/code/_core/obj/structure/interactive/power/apc.dm b/code/_core/obj/structure/interactive/power/apc.dm index 9ab8fce5fb..f1345062e0 100644 --- a/code/_core/obj/structure/interactive/power/apc.dm +++ b/code/_core/obj/structure/interactive/power/apc.dm @@ -17,7 +17,7 @@ var/list/area/linked_areas = list() -/obj/structure/interactive/power/apc/get_examine_list(var/mob/examiner) +/obj/structure/interactive/power/apc/get_examine_list(mob/examiner) . = ..() . += div("notice","Area Power Draw: [src.power_draw]w.") . += div("notice","\The [cell.name] has [cell.charge_current] out of [cell.charge_max] charge remaining.") @@ -61,7 +61,7 @@ else link_area(A) -/obj/structure/interactive/power/apc/proc/link_area(var/area/A) +/obj/structure/interactive/power/apc/proc/link_area(area/A) if(A.linked_apc) A.linked_apc.unlink_area(A) A.linked_apc = src @@ -70,7 +70,7 @@ update_sprite() return TRUE -/obj/structure/interactive/power/apc/proc/unlink_area(var/area/A) +/obj/structure/interactive/power/apc/proc/unlink_area(area/A) src.linked_areas -= A if(A.linked_apc == src) A.linked_apc = null @@ -102,7 +102,7 @@ /obj/structure/interactive/power/apc/get_power_draw() return cell ? min(max(0,cell.charge_max - cell.charge_current),CEILING(cell.charge_max*0.25,1)) : 0 -/obj/structure/interactive/power/apc/power_process(var/power_multiplier=1) +/obj/structure/interactive/power/apc/power_process(power_multiplier=1) . = ..() update_power_draw(get_power_draw()) cell.charge_current += FLOOR(power_draw*power_multiplier,1) diff --git a/code/_core/obj/structure/interactive/power/smes.dm b/code/_core/obj/structure/interactive/power/smes.dm index a04d9b7fb8..e45be411ac 100644 --- a/code/_core/obj/structure/interactive/power/smes.dm +++ b/code/_core/obj/structure/interactive/power/smes.dm @@ -53,7 +53,7 @@ FINALIZE(I) stored_cells += I -/obj/structure/interactive/power/smes/get_examine_list(var/mob/caller) +/obj/structure/interactive/power/smes/get_examine_list(mob/caller) . = ..() . += div("notice","Power Input: [terminal.power_draw]w.") @@ -69,7 +69,7 @@ return 0 //Handled in power process. -/obj/structure/interactive/power/smes/power_process(var/power_multiplier=1) +/obj/structure/interactive/power/smes/power_process(power_multiplier=1) . = ..() diff --git a/code/_core/obj/structure/interactive/powerbutton.dm b/code/_core/obj/structure/interactive/powerbutton.dm index 7be4982b63..4614953c26 100644 --- a/code/_core/obj/structure/interactive/powerbutton.dm +++ b/code/_core/obj/structure/interactive/powerbutton.dm @@ -31,7 +31,7 @@ . = ..() -/obj/structure/interactive/powerbutton/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/powerbutton/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(!is_advanced(caller)) return ..() diff --git a/code/_core/obj/structure/interactive/powered/apc.dm b/code/_core/obj/structure/interactive/powered/apc.dm index 5cf5790592..56cd5a72d2 100644 --- a/code/_core/obj/structure/interactive/powered/apc.dm +++ b/code/_core/obj/structure/interactive/powered/apc.dm @@ -14,7 +14,7 @@ wire_powered = TRUE -/obj/structure/interactive/powered/apc/get_examine_list(var/mob/examiner) +/obj/structure/interactive/powered/apc/get_examine_list(mob/examiner) . = ..() . += div("notice","\The [cell.name] has [cell.charge_current] out of [cell.charge_max] charge remaining.") @@ -68,7 +68,7 @@ /obj/structure/interactive/powered/apc/get_power_draw() return cell ? min(CEILING(cell.charge_max*0.01,1),cell.charge_max - cell.charge_current) : 0 -/obj/structure/interactive/powered/apc/power_process(var/power_multiplier=1) +/obj/structure/interactive/powered/apc/power_process(power_multiplier=1) . = ..() cell.charge_current += FLOOR(power_draw*power_multiplier,1) update_power_draw(get_power_draw()) \ No newline at end of file diff --git a/code/_core/obj/structure/interactive/powered/smes.dm b/code/_core/obj/structure/interactive/powered/smes.dm index 486ed36f1e..9432013482 100644 --- a/code/_core/obj/structure/interactive/powered/smes.dm +++ b/code/_core/obj/structure/interactive/powered/smes.dm @@ -17,7 +17,7 @@ FINALIZE(I) stored_cells |= I -/obj/structure/interactive/powered/smes/get_examine_list(var/mob/caller) +/obj/structure/interactive/powered/smes/get_examine_list(mob/caller) . = ..() for(var/i=1,i<=length(stored_cells),i++) @@ -28,7 +28,7 @@ return max(0,connected_wire.power_network.power_draw - (connected_wire.power_network.power_supply-power_supply)) -/obj/structure/interactive/powered/smes/power_process(var/power_multiplier=1) +/obj/structure/interactive/powered/smes/power_process(power_multiplier=1) . = ..() diff --git a/code/_core/obj/structure/interactive/recycling.dm b/code/_core/obj/structure/interactive/recycling.dm index bb66715e94..0f4abc7b85 100644 --- a/code/_core/obj/structure/interactive/recycling.dm +++ b/code/_core/obj/structure/interactive/recycling.dm @@ -19,7 +19,7 @@ placing_turf = null . = ..() -/obj/structure/interactive/recycler/New(var/desired_loc) +/obj/structure/interactive/recycler/New(desired_loc) var/image/I1b = new/image(icon,"grinder_bottom") I1b.pixel_x = -TILE_SIZE @@ -43,7 +43,7 @@ recycle(O) . = ..() -/obj/structure/interactive/recycler/proc/recycle(var/atom/movable/O,var/process = TRUE) +/obj/structure/interactive/recycler/proc/recycle(atom/movable/O,process = TRUE) if(is_item(O)) var/obj/item/I = O diff --git a/code/_core/obj/structure/interactive/restocker.dm b/code/_core/obj/structure/interactive/restocker.dm index 7519287602..dc74eb58fe 100644 --- a/code/_core/obj/structure/interactive/restocker.dm +++ b/code/_core/obj/structure/interactive/restocker.dm @@ -25,7 +25,7 @@ var/premium = FALSE //Is this a premium ammo restocker? var/currency_left = 0 //For premium ammo restockers -/obj/structure/interactive/restocker/ammo/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/restocker/ammo/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(istype(object,/obj/item/magazine/)) INTERACT_CHECK @@ -122,7 +122,7 @@ premium = TRUE currency_left = 5000 -/obj/structure/interactive/restocker/ammo/premium/get_examine_list(var/mob/examiner) +/obj/structure/interactive/restocker/ammo/premium/get_examine_list(mob/examiner) . = ..() . += div("notice","This restocker has [currency_left] credits worth of ammo left.") diff --git a/code/_core/obj/structure/interactive/scanner.dm b/code/_core/obj/structure/interactive/scanner.dm index 27fb90bf0d..50bf69cd72 100644 --- a/code/_core/obj/structure/interactive/scanner.dm +++ b/code/_core/obj/structure/interactive/scanner.dm @@ -70,7 +70,7 @@ desc = "YOU. SHALL NOT. PASS. Unless the conditions are met." desc_extended = "A very invasive full body scanner that magically blocks movement based on the conditions coded inside. This one is programmed to prevent those WITH IFF implants from accessing the area." -/obj/structure/interactive/scanner/iff_reverse/Cross/(var/atom/movable/M) +/obj/structure/interactive/scanner/iff_reverse/Cross/(atom/movable/M) if(is_advanced(M)) var/mob/living/advanced/A = M @@ -91,7 +91,7 @@ desired_light_power = 0 -/obj/structure/interactive/scanner/living/trigger(var/mob/caller,var/atom/source,var/signal_freq,var/signal_code) +/obj/structure/interactive/scanner/living/trigger(mob/caller,atom/source,signal_freq,signal_code) for(var/mob/living/L in loc.contents) source.trigger(L,src,signal_freq,signal_code) @@ -109,7 +109,7 @@ desc = "YOU. SHALL NOT. PASS. Unless the conditions are met." desc_extended = "A very invasive full body scanner that magically blocks movement based on the conditions coded inside. This one is programmed to only allow living silicons and carbons." -/obj/structure/interactive/scanner/anti_dead/Cross/(var/atom/movable/M) +/obj/structure/interactive/scanner/anti_dead/Cross/(atom/movable/M) if(!is_living(M)) return FALSE @@ -125,7 +125,7 @@ desc = "YOU. SHALL NOT. PASS. Unless the conditions are met." desc_extended = "A very invasive full body scanner that magically blocks movement based on the conditions coded inside. This one is programmed to only allow secure crates." -/obj/structure/interactive/scanner/crate_only/Cross/(var/atom/movable/M) +/obj/structure/interactive/scanner/crate_only/Cross/(atom/movable/M) if(!istype(M,/obj/structure/interactive/crate/secure)) return FALSE @@ -144,7 +144,7 @@ desired_light_power = 0 -/obj/structure/interactive/scanner/cop/Cross/(var/atom/movable/M) +/obj/structure/interactive/scanner/cop/Cross/(atom/movable/M) if(!is_living(M)) return FALSE @@ -162,7 +162,7 @@ desc_extended = "A proximity door scanner that prevents those with less than 20,000 credits from entering. Or leaving..." icon_state = "door" -/obj/structure/interactive/scanner/rich/Cross/(var/atom/movable/M) +/obj/structure/interactive/scanner/rich/Cross/(atom/movable/M) if(!is_player(M)) return FALSE diff --git a/code/_core/obj/structure/interactive/shop/_shop.dm b/code/_core/obj/structure/interactive/shop/_shop.dm index a8e9123970..9e88e15086 100644 --- a/code/_core/obj/structure/interactive/shop/_shop.dm +++ b/code/_core/obj/structure/interactive/shop/_shop.dm @@ -111,7 +111,7 @@ pixel_y = 0 -/obj/structure/interactive/shop/get_examine_list(var/mob/examiner) +/obj/structure/interactive/shop/get_examine_list(mob/examiner) . = list() . += stored_item.get_examine_list(examiner) @@ -126,7 +126,7 @@ . += div("notice","This item is being sold for [stored_item_cost] credits.") -/obj/structure/interactive/shop/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/shop/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(!is_player(caller) || !caller.client) return ..() diff --git a/code/_core/obj/structure/interactive/shopholder/_shopholder.dm b/code/_core/obj/structure/interactive/shopholder/_shopholder.dm index 7e867313b9..17238a462a 100644 --- a/code/_core/obj/structure/interactive/shopholder/_shopholder.dm +++ b/code/_core/obj/structure/interactive/shopholder/_shopholder.dm @@ -30,7 +30,7 @@ name = "[name] - [item_cost] crystals" ..() -/obj/structure/interactive/shop_holder/get_examine_text(var/mob/examiner) +/obj/structure/interactive/shop_holder/get_examine_text(mob/examiner) var/returning_text = stored_item.get_examine_text(examiner) diff --git a/code/_core/obj/structure/interactive/short_wall.dm b/code/_core/obj/structure/interactive/short_wall.dm index 3d1bb49e9d..9e99a01300 100644 --- a/code/_core/obj/structure/interactive/short_wall.dm +++ b/code/_core/obj/structure/interactive/short_wall.dm @@ -21,7 +21,7 @@ health_base = 400 -/obj/structure/short_wall/on_destruction(var/damage = TRUE) +/obj/structure/short_wall/on_destruction(damage = TRUE) create_destruction(get_turf(src),list(/obj/item/material/sheet/ = 2),material_id) . = ..() qdel(src) diff --git a/code/_core/obj/structure/interactive/shower.dm b/code/_core/obj/structure/interactive/shower.dm index 37c079744a..4eca514ed5 100644 --- a/code/_core/obj/structure/interactive/shower.dm +++ b/code/_core/obj/structure/interactive/shower.dm @@ -38,7 +38,7 @@ obj/structure/interactive/shower/PreDestroy() CALLBACK_REMOVE("\ref[src]_shower") . = ..() -/obj/structure/interactive/shower/proc/set_active(var/desired_active=TRUE) +/obj/structure/interactive/shower/proc/set_active(desired_active=TRUE) if(desired_active) showers_left = 40 diff --git a/code/_core/obj/structure/interactive/shrine.dm b/code/_core/obj/structure/interactive/shrine.dm index d868945e75..781b4cc8b9 100644 --- a/code/_core/obj/structure/interactive/shrine.dm +++ b/code/_core/obj/structure/interactive/shrine.dm @@ -35,7 +35,7 @@ /mob/living/simple/spider/twilight = 15 ) -/obj/structure/interactive/ritual/New(var/desired_loc) +/obj/structure/interactive/ritual/New(desired_loc) . = ..() SSobj.all_rituals += src @@ -57,7 +57,7 @@ valid_turfs = null . = ..() -/obj/structure/interactive/ritual/proc/remove_mob(var/mob/living/L,args) +/obj/structure/interactive/ritual/proc/remove_mob(mob/living/L,args) tracked_enemies -= L HOOK_REMOVE("post_death","\ref[src]_post_death",L) HOOK_REMOVE("Destroy","\ref[src]_destroy",L) @@ -66,7 +66,7 @@ end_ritual(TRUE) return TRUE -/obj/structure/interactive/ritual/proc/remove_player(var/mob/living/advanced/player/P,args) +/obj/structure/interactive/ritual/proc/remove_player(mob/living/advanced/player/P,args) tracked_players -= P HOOK_REMOVE("post_death","\ref[src]_post_death",P) HOOK_REMOVE("Destroy","\ref[src]_destroy",P) @@ -75,12 +75,12 @@ end_ritual() return TRUE -/obj/structure/interactive/ritual/proc/check_valid_mob_position(var/mob/living/L,args) +/obj/structure/interactive/ritual/proc/check_valid_mob_position(mob/living/L,args) var/turf/T = get_turf(L) if(T.z != src.z || get_dist(T,src) > VIEW_RANGE) remove_mob(L) -/obj/structure/interactive/ritual/proc/check_valid_player_position(var/mob/living/advanced/player/P,args) +/obj/structure/interactive/ritual/proc/check_valid_player_position(mob/living/advanced/player/P,args) var/turf/T = get_turf(P) if(T.z != src.z || get_dist(T,src) > VIEW_RANGE) remove_player(P) @@ -110,7 +110,7 @@ return TRUE -/obj/structure/interactive/ritual/proc/start_ritual(var/mob/caller) +/obj/structure/interactive/ritual/proc/start_ritual(mob/caller) for(var/mob/living/advanced/player/P in range(src,ritual_size)) if(!P || P.dead || P.qdeleting) @@ -143,7 +143,7 @@ next_enemy_spawn = world.time + 6 SECONDS return TRUE -/obj/structure/interactive/ritual/proc/end_ritual(var/success = FALSE) +/obj/structure/interactive/ritual/proc/end_ritual(success = FALSE) STOP_THINKING(src) @@ -225,7 +225,7 @@ valid_turfs += T -/obj/structure/interactive/ritual/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/ritual/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(!is_living(caller)) return ..() diff --git a/code/_core/obj/structure/interactive/smelter.dm b/code/_core/obj/structure/interactive/smelter.dm index dbf5dfa083..a6996f9ddf 100644 --- a/code/_core/obj/structure/interactive/smelter.dm +++ b/code/_core/obj/structure/interactive/smelter.dm @@ -51,7 +51,7 @@ FINALIZE(I) O.add_item_count(-3) return -/obj/structure/interactive/smelter/proc/stack(var/obj/item/material/ore/O) +/obj/structure/interactive/smelter/proc/stack(obj/item/material/ore/O) for(var/obj/item/material/ore/C in contents) if(!C || C.qdeleting) diff --git a/code/_core/obj/structure/interactive/soapstone.dm b/code/_core/obj/structure/interactive/soapstone.dm index ab6fe90760..bebe522846 100644 --- a/code/_core/obj/structure/interactive/soapstone.dm +++ b/code/_core/obj/structure/interactive/soapstone.dm @@ -16,7 +16,7 @@ obj/structure/interactive/soapstone_message layer = LAYER_FLOOR_DECAL -/obj/structure/interactive/soapstone_message/New(var/desired_loc) +/obj/structure/interactive/soapstone_message/New(desired_loc) . = ..() /obj/structure/interactive/soapstone_message/Finalize() diff --git a/code/_core/obj/structure/interactive/solars.dm b/code/_core/obj/structure/interactive/solars.dm index 6503fd8b7f..3210a31719 100644 --- a/code/_core/obj/structure/interactive/solars.dm +++ b/code/_core/obj/structure/interactive/solars.dm @@ -22,7 +22,7 @@ pixel_z = 6 -/obj/structure/interactive/solar_panel/power_process(var/power_multiplier=1) +/obj/structure/interactive/solar_panel/power_process(power_multiplier=1) update_power_supply(get_power_supply()) . = ..() diff --git a/code/_core/obj/structure/interactive/stacker.dm b/code/_core/obj/structure/interactive/stacker.dm index aa03289066..e350cfdcb9 100644 --- a/code/_core/obj/structure/interactive/stacker.dm +++ b/code/_core/obj/structure/interactive/stacker.dm @@ -23,7 +23,7 @@ return ..() -/obj/structure/interactive/stacker/proc/stack(var/obj/item/I) +/obj/structure/interactive/stacker/proc/stack(obj/item/I) if(I.amount_max <= 1) //Not stackable. return FALSE diff --git a/code/_core/obj/structure/interactive/statue.dm b/code/_core/obj/structure/interactive/statue.dm index ae09465293..15fd766f3c 100644 --- a/code/_core/obj/structure/interactive/statue.dm +++ b/code/_core/obj/structure/interactive/statue.dm @@ -30,7 +30,7 @@ . = ..() color = "#FFFFFF" -/obj/structure/interactive/statue/proc/set_stored_object(var/atom/A) +/obj/structure/interactive/statue/proc/set_stored_object(atom/A) stored_object = A update_sprite() return TRUE @@ -75,7 +75,7 @@ /obj/structure/interactive/statue/debug/ color = "#FFCC69" -/obj/structure/interactive/statue/debug/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/statue/debug/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() offset_x = 0 offset_y = 17 diff --git a/code/_core/obj/structure/interactive/status_display.dm b/code/_core/obj/structure/interactive/status_display.dm index bef6a494d4..f57f16f5b7 100644 --- a/code/_core/obj/structure/interactive/status_display.dm +++ b/code/_core/obj/structure/interactive/status_display.dm @@ -1,6 +1,6 @@ -/proc/set_status_display(var/status_id,var/message) +/proc/set_status_display(status_id,message) if(!length(SSobj.status_displays)) return FALSE @@ -55,12 +55,12 @@ add_overlay(I2) -/obj/structure/interactive/status_display/New(var/desired_loc) +/obj/structure/interactive/status_display/New(desired_loc) . = ..() update_sprite() set_text("Hello") -/obj/structure/interactive/status_display/proc/set_text(var/desired_text) +/obj/structure/interactive/status_display/proc/set_text(desired_text) maptext = "
[desired_text]
" return TRUE diff --git a/code/_core/obj/structure/interactive/storage/_storage.dm b/code/_core/obj/structure/interactive/storage/_storage.dm index 6eae77afdd..9aec1c06ab 100644 --- a/code/_core/obj/structure/interactive/storage/_storage.dm +++ b/code/_core/obj/structure/interactive/storage/_storage.dm @@ -29,7 +29,7 @@ tracked_instance_ckeys = list() -/obj/structure/interactive/storage/proc/examine_storage(var/mob/living/advanced/caller) //caller wants to see inside src +/obj/structure/interactive/storage/proc/examine_storage(mob/living/advanced/caller) //caller wants to see inside src INTERACT_CHECK INTERACT_DELAY(10) @@ -63,7 +63,7 @@ return TRUE -/obj/structure/interactive/storage/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/storage/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(is_inventory(object) && is_advanced(caller)) examine_storage(caller) @@ -84,7 +84,7 @@ var/chance_none = 0 -/obj/structure/interactive/storage/trash_pile/New(var/desired_loc) +/obj/structure/interactive/storage/trash_pile/New(desired_loc) if(prob(chance_none)) qdel(src) @@ -108,7 +108,7 @@ if(prob(50)) stored_threat = TRUE -/obj/structure/interactive/storage/trash_pile/station/examine_storage(var/mob/living/advanced/caller) +/obj/structure/interactive/storage/trash_pile/station/examine_storage(mob/living/advanced/caller) . = ..() @@ -144,7 +144,7 @@ var/chance_none = 70 -/obj/structure/interactive/storage/safe/New(var/desired_loc) +/obj/structure/interactive/storage/safe/New(desired_loc) if(prob(chance_none)) qdel(src) @@ -152,7 +152,7 @@ . = ..() -/obj/structure/interactive/storage/safe/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/storage/safe/clicked_on_by_object(mob/caller,atom/object,location,control,params) . = ..() diff --git a/code/_core/obj/structure/interactive/supermatter.dm b/code/_core/obj/structure/interactive/supermatter.dm index 57684aae58..888e3da3cc 100644 --- a/code/_core/obj/structure/interactive/supermatter.dm +++ b/code/_core/obj/structure/interactive/supermatter.dm @@ -39,7 +39,7 @@ var/queue_power_update = FALSE -/obj/structure/interactive/supermatter/can_be_attacked(var/atom/attacker,var/atom/weapon,var/params,var/damagetype/damage_type) +/obj/structure/interactive/supermatter/can_be_attacked(atom/attacker,atom/weapon,params,damagetype/damage_type) return health && health.health_max && !qdeleting && loc /obj/structure/interactive/supermatter/Finalize() @@ -47,7 +47,7 @@ update_sprite() queue_power_update = TRUE -/obj/structure/interactive/supermatter/power_process(var/power_multiplier=1) +/obj/structure/interactive/supermatter/power_process(power_multiplier=1) if(queue_power_update) update_power_supply(get_power_supply()) @@ -102,7 +102,7 @@ return FALSE -/obj/structure/interactive/supermatter/proc/add_charge(var/charge_amount=0) +/obj/structure/interactive/supermatter/proc/add_charge(charge_amount=0) if(charge_max <= 0) return FALSE if(!charge_amount) @@ -124,7 +124,7 @@ return TRUE -/obj/structure/interactive/supermatter/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/damagetype/DT,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE) +/obj/structure/interactive/supermatter/on_damage_received(atom/atom_damaged,atom/attacker,atom/weapon,damagetype/DT,list/damage_table,damage_amount,critical_hit_multiplier,stealthy=FALSE) . = ..() if(damage_amount > 0) add_charge(damage_amount) @@ -152,12 +152,12 @@ var/turf/T = get_turf(src) explode(T,4,src,src,"Supermatter") -/obj/structure/interactive/supermatter/act_explode(var/atom/owner,var/atom/source,var/atom/epicenter,var/magnitude,var/desired_loyalty_tag) +/obj/structure/interactive/supermatter/act_explode(atom/owner,atom/source,atom/epicenter,magnitude,desired_loyalty_tag) if(source == src) return FALSE . = ..() -/obj/structure/interactive/supermatter/on_destruction(var/damage = TRUE) +/obj/structure/interactive/supermatter/on_destruction(damage = TRUE) charge = 0 var/turf/T = get_turf(src) qdel(src) @@ -196,13 +196,13 @@ health_base = 5000 charge_max = 900 SECONDS //15 minutes -/obj/structure/interactive/supermatter/defense/add_charge(var/charge_amount=0) +/obj/structure/interactive/supermatter/defense/add_charge(charge_amount=0) . = ..() if(. && charge >= charge_max) src.visible_message(span("notice","\The [src.name] disappears in a vibrant flash!")) qdel(src) -/obj/structure/interactive/supermatter/defense/can_be_attacked(var/atom/attacker,var/atom/weapon,var/params,var/damagetype/damage_type) +/obj/structure/interactive/supermatter/defense/can_be_attacked(atom/attacker,atom/weapon,params,damagetype/damage_type) if(is_living(attacker)) var/mob/living/L = attacker @@ -211,7 +211,7 @@ . = ..() -/obj/structure/interactive/supermatter/defense/projectile_should_collide(var/obj/projectile/P,var/turf/old_turf,var/turf/new_turf) +/obj/structure/interactive/supermatter/defense/projectile_should_collide(obj/projectile/P,turf/old_turf,turf/new_turf) if(is_living(P.owner)) var/mob/living/L = P.owner @@ -220,6 +220,6 @@ . = ..() -/obj/structure/interactive/supermatter/defense/get_examine_list(var/mob/examiner) +/obj/structure/interactive/supermatter/defense/get_examine_list(mob/examiner) . = ..() . += div("notice","It is [FLOOR(charge,1)]/[charge_max]([FLOOR(100*(charge/charge_max),1)]%) charged.") diff --git a/code/_core/obj/structure/interactive/supplies.dm b/code/_core/obj/structure/interactive/supplies.dm index 3adb770ecc..897afd48ce 100644 --- a/code/_core/obj/structure/interactive/supplies.dm +++ b/code/_core/obj/structure/interactive/supplies.dm @@ -15,7 +15,7 @@ var/chance_none = 90 -/obj/structure/interactive/supplies/New(var/desired_loc) +/obj/structure/interactive/supplies/New(desired_loc) if(prob(chance_none)) qdel(src) . = ..() @@ -33,7 +33,7 @@ return ..() -/obj/structure/interactive/supplies/proc/open(var/mob/caller) +/obj/structure/interactive/supplies/proc/open(mob/caller) opened = TRUE update_sprite() @@ -50,7 +50,7 @@ return TRUE -/obj/structure/interactive/supplies/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/supplies/clicked_on_by_object(mob/caller,atom/object,location,control,params) INTERACT_CHECK INTERACT_DELAY(5) diff --git a/code/_core/obj/structure/interactive/table/_table.dm b/code/_core/obj/structure/interactive/table/_table.dm index 9d007dd437..9c0c432a5c 100644 --- a/code/_core/obj/structure/interactive/table/_table.dm +++ b/code/_core/obj/structure/interactive/table/_table.dm @@ -49,7 +49,7 @@ return ..() -/obj/structure/table/dropped_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/table/dropped_on_by_object(mob/caller,atom/object,location,control,params) if(is_item(object) || is_structure(object)) INTERACT_CHECK diff --git a/code/_core/obj/structure/interactive/table/cooking/_cooking.dm b/code/_core/obj/structure/interactive/table/cooking/_cooking.dm index feb15f4d9a..297e7440a8 100644 --- a/code/_core/obj/structure/interactive/table/cooking/_cooking.dm +++ b/code/_core/obj/structure/interactive/table/cooking/_cooking.dm @@ -11,7 +11,7 @@ enabled = FALSE set_enabled(old_enabled,TRUE) -/obj/structure/table/cooking/proc/set_enabled(var/desired_enabled=TRUE,var/force=FALSE) +/obj/structure/table/cooking/proc/set_enabled(desired_enabled=TRUE,force=FALSE) if(enabled == desired_enabled && !force) return FALSE @@ -31,11 +31,11 @@ return TRUE -/obj/structure/table/cooking/get_examine_details_list(var/mob/examiner) +/obj/structure/table/cooking/get_examine_details_list(mob/examiner) . = ..() . += span("notice","It is currently [enabled ? "on" : "off"].") -/obj/structure/table/cooking/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/table/cooking/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(is_item(object)) INTERACT_CHECK @@ -56,7 +56,7 @@ . = ..() -/obj/structure/table/cooking/post_move(var/atom/old_loc) +/obj/structure/table/cooking/post_move(atom/old_loc) . = ..() diff --git a/code/_core/obj/structure/interactive/telecomms.dm b/code/_core/obj/structure/interactive/telecomms.dm index 105ac9810f..9a736600d6 100644 --- a/code/_core/obj/structure/interactive/telecomms.dm +++ b/code/_core/obj/structure/interactive/telecomms.dm @@ -21,7 +21,7 @@ . = ..() -/obj/structure/interactive/telecomms/proc/add_telecomm(var/area_identifier) +/obj/structure/interactive/telecomms/proc/add_telecomm(area_identifier) if(!SSradio.all_telecomms[area_identifier]) SSradio.all_telecomms[area_identifier] = list() @@ -31,7 +31,7 @@ return TRUE -/obj/structure/interactive/telecomms/proc/remove_telecomm(var/area_identifier) +/obj/structure/interactive/telecomms/proc/remove_telecomm(area_identifier) if(!SSradio.all_telecomms[area_identifier]) SSradio.all_telecomms[area_identifier] = list() @@ -43,7 +43,7 @@ return TRUE -/obj/structure/interactive/telecomms/proc/add_data(var/data_identifier,var/list/data_to_add) +/obj/structure/interactive/telecomms/proc/add_data(data_identifier,list/data_to_add) ASSERT(data_identifier) ASSERT(data_to_add) queued_data[data_identifier] = data_to_add @@ -59,7 +59,7 @@ queued_data.Cut() return TRUE -/obj/structure/interactive/telecomms/proc/process_data(var/list/data_to_process = list()) +/obj/structure/interactive/telecomms/proc/process_data(list/data_to_process = list()) for(var/k in SSradio.all_radios) CHECK_TICK(75,FPS_SERVER) @@ -102,7 +102,7 @@ . = ..() /* -/obj/structure/interactive/telecomms/process_data(var/list/data_to_process = list()) //Meme shitcode. +/obj/structure/interactive/telecomms/process_data(list/data_to_process = list()) //Meme shitcode. . = ..() diff --git a/code/_core/obj/structure/interactive/tendril.dm b/code/_core/obj/structure/interactive/tendril.dm index 33a8d6b41d..5a74fb351e 100644 --- a/code/_core/obj/structure/interactive/tendril.dm +++ b/code/_core/obj/structure/interactive/tendril.dm @@ -37,7 +37,7 @@ /mob/living/simple/watcher ) -/obj/structure/interactive/tendril/get_examine_list(var/mob/examiner) +/obj/structure/interactive/tendril/get_examine_list(mob/examiner) . = ..() . += div("notice","\The [src.name] has [max(deaths_until_loot,0)] spawns left, with [length(tracked_mobs_length)] monsters protecting it...") diff --git a/code/_core/obj/structure/interactive/the_curse.dm b/code/_core/obj/structure/interactive/the_curse.dm index 149aad7d9e..d962e14a08 100644 --- a/code/_core/obj/structure/interactive/the_curse.dm +++ b/code/_core/obj/structure/interactive/the_curse.dm @@ -39,7 +39,7 @@ . = ..() start_advanced_thinking(src) -/proc/is_seen_by(var/atom/A,var/mob/living/L) //For SCP stuff. +/proc/is_seen_by(atom/A,mob/living/L) //For SCP stuff. if(L.dead) return FALSE if(!L.ai && !L.client) diff --git a/code/_core/obj/structure/interactive/virtual_reality.dm b/code/_core/obj/structure/interactive/virtual_reality.dm index 6ae1761527..2a92fa06e1 100644 --- a/code/_core/obj/structure/interactive/virtual_reality.dm +++ b/code/_core/obj/structure/interactive/virtual_reality.dm @@ -16,7 +16,7 @@ name = "ready up" maptext = "
Ready Up!
" -/obj/structure/interactive/virtual_reality/join_game/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/virtual_reality/join_game/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(istype(caller,/mob/living/advanced/player/virtual)) var/mob/living/advanced/player/virtual/V = caller diff --git a/code/_core/obj/structure/interactive/vr_pod.dm b/code/_core/obj/structure/interactive/vr_pod.dm index 9c70c71524..726b8d3470 100644 --- a/code/_core/obj/structure/interactive/vr_pod.dm +++ b/code/_core/obj/structure/interactive/vr_pod.dm @@ -76,7 +76,7 @@ else icon_state = "open" -/obj/structure/interactive/vr_pod/Entered(var/atom/movable/enterer,var/atom/oldloc) +/obj/structure/interactive/vr_pod/Entered(atom/movable/enterer,atom/oldloc) if(is_player(enterer)) var/mob/living/advanced/player/P = enterer if(P.client) @@ -85,7 +85,7 @@ update_sprite() . = ..() -/obj/structure/interactive/vr_pod/Exited(var/atom/movable/exiter,var/atom/newloc) +/obj/structure/interactive/vr_pod/Exited(atom/movable/exiter,atom/newloc) if(exiter == user) remove_buttons() exit_virtual_reality() @@ -99,7 +99,7 @@ return TRUE return FALSE -/obj/structure/interactive/vr_pod/proc/can_enter_pod(var/mob/caller) +/obj/structure/interactive/vr_pod/proc/can_enter_pod(mob/caller) INTERACT_CHECK_NO_DELAY(src) @@ -114,12 +114,12 @@ return TRUE -/obj/structure/interactive/vr_pod/proc/enter_pod(var/mob/living/advanced/player/P) +/obj/structure/interactive/vr_pod/proc/enter_pod(mob/living/advanced/player/P) force_eject_user() //Just in case. P.Move(src) return TRUE -/obj/structure/interactive/vr_pod/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/vr_pod/clicked_on_by_object(mob/caller,atom/object,location,control,params) INTERACT_CHECK diff --git a/code/_core/obj/structure/interactive/window.dm b/code/_core/obj/structure/interactive/window.dm index b094b3615b..7a4ac323ff 100644 --- a/code/_core/obj/structure/interactive/window.dm +++ b/code/_core/obj/structure/interactive/window.dm @@ -25,7 +25,7 @@ var/no_queue = FALSE -/obj/structure/window/should_smooth_with(var/turf/T) +/obj/structure/window/should_smooth_with(turf/T) . = ..() @@ -59,7 +59,7 @@ I.appearance_flags = T.appearance_flags | RESET_COLOR | RESET_ALPHA | KEEP_APART add_overlay(I) -/obj/structure/window/on_destruction(var/damage = TRUE) +/obj/structure/window/on_destruction(damage = TRUE) if(damage) create_destruction(get_turf(src),list(/obj/item/material/shard/ = 2),material_id) no_queue = TRUE @@ -136,7 +136,7 @@ . = ..() set_dir(dir,force=TRUE) -/obj/structure/window/directional/set_dir(var/desired_dir,var/force = FALSE) +/obj/structure/window/directional/set_dir(desired_dir,force = FALSE) if(force_corner) switch(desired_dir) diff --git a/code/_core/obj/structure/interactive/wire/_wire.dm b/code/_core/obj/structure/interactive/wire/_wire.dm index 6aa4f31cc8..45196a1192 100644 --- a/code/_core/obj/structure/interactive/wire/_wire.dm +++ b/code/_core/obj/structure/interactive/wire/_wire.dm @@ -17,7 +17,7 @@ alpha = 100 -/obj/structure/interactive/wire/New(var/desired_loc) +/obj/structure/interactive/wire/New(desired_loc) . = ..() var/wire_count = 0 for(var/obj/structure/interactive/wire/W in src.loc.contents) @@ -33,13 +33,13 @@ alpha = 255 -/obj/structure/interactive/wire/get_examine_list(var/mob/examiner) +/obj/structure/interactive/wire/get_examine_list(mob/examiner) . = ..() . += div("notice","It is connected to [length(connections)] other wire(s).") if(connected_machine) . += div("notice","It is connected to \the [connected_machine].") -/obj/structure/interactive/wire/proc/find_wire_connection(var/mob/caller) +/obj/structure/interactive/wire/proc/find_wire_connection(mob/caller) if(connected_machine) caller?.to_chat(span("warning","\The [src.name] is already connected to \a [connected_machine.name]! Remove it first before adding a new connection.")) @@ -88,7 +88,7 @@ . = ..() connections.Cut() -/obj/structure/interactive/wire/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/obj/structure/interactive/wire/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(is_item(object)) var/obj/item/I = object @@ -122,7 +122,7 @@ var/obj/structure/interactive/wire/W = k power_network.add_wire(W) -/obj/structure/interactive/wire/proc/get_new_connections(var/list/existing_list) +/obj/structure/interactive/wire/proc/get_new_connections(list/existing_list) if(!existing_list) existing_list = list() @@ -219,7 +219,7 @@ return FALSE -/obj/structure/interactive/wire/proc/merge_networks(var/list/possible_power_networks) +/obj/structure/interactive/wire/proc/merge_networks(list/possible_power_networks) var/power_network/best_network for(var/k in possible_power_networks) diff --git a/code/_core/obj/structure/metal_foam.dm b/code/_core/obj/structure/metal_foam.dm index 019dd93b3e..7cd6859bb1 100644 --- a/code/_core/obj/structure/metal_foam.dm +++ b/code/_core/obj/structure/metal_foam.dm @@ -19,7 +19,7 @@ health_base = 100 -/obj/structure/metal_foam/New(var/desired_loc) +/obj/structure/metal_foam/New(desired_loc) . = ..() icon_state = "[rand(0,7)],[rand(0,7)]" @@ -39,6 +39,6 @@ CALLBACK("\ref[src]_cut_overlays",3 SECONDS,src,src::cut_overlays()) -/obj/structure/metal_foam/on_destruction(var/damage = TRUE) +/obj/structure/metal_foam/on_destruction(damage = TRUE) . = ..() qdel(src) diff --git a/code/_core/obj/structure/smoothing.dm b/code/_core/obj/structure/smoothing.dm index 1d19293d11..9eda07a006 100644 --- a/code/_core/obj/structure/smoothing.dm +++ b/code/_core/obj/structure/smoothing.dm @@ -1,4 +1,4 @@ -/obj/structure/proc/should_smooth_with(var/turf/simulated/T) +/obj/structure/proc/should_smooth_with(turf/simulated/T) if(!is_simulated(T)) return null diff --git a/code/_core/obj/teleport/chargen.dm b/code/_core/obj/teleport/chargen.dm index 919878e3cf..5fab4ece15 100644 --- a/code/_core/obj/teleport/chargen.dm +++ b/code/_core/obj/teleport/chargen.dm @@ -8,7 +8,7 @@ density = TRUE -/obj/trigger/leave_chargen/Cross(var/atom/movable/triggerer) +/obj/trigger/leave_chargen/Cross(atom/movable/triggerer) if(is_player(triggerer)) var/mob/living/advanced/player/A = triggerer @@ -41,7 +41,7 @@ density = TRUE -/obj/trigger/teleport_to_shuttle/Crossed(var/atom/movable/triggerer) +/obj/trigger/teleport_to_shuttle/Crossed(atom/movable/triggerer) . = ..() @@ -66,7 +66,7 @@ /* -/proc/play_the_fucking_tutorial(var/mob/living/advanced/A) +/proc/play_the_fucking_tutorial(mob/living/advanced/A) spawn(0) A.paralyze_time = -1 A.movement_flags = 0x0 @@ -81,7 +81,7 @@ for(var/obj/structure/interactive/localmachine/snowflake/airlock/external/tutorial_dock/TD in tutorial_docks) TD.open_for(A) -/proc/play_the_fucking_game(var/mob/living/advanced/A) +/proc/play_the_fucking_game(mob/living/advanced/A) var/client/C = A.client diff --git a/code/_core/obj/teleport/rift.dm b/code/_core/obj/teleport/rift.dm index 4def822893..4348b5f8bc 100644 --- a/code/_core/obj/teleport/rift.dm +++ b/code/_core/obj/teleport/rift.dm @@ -9,7 +9,7 @@ ..() queue_delete(src,ITEM_DELETION_TIME_DROPPED) -/obj/trigger/rift/on_trigger(var/atom/movable/triggerer) +/obj/trigger/rift/on_trigger(atom/movable/triggerer) if(!length(rift_markers)) return FALSE diff --git a/code/_core/obj/teleport/ship.dm b/code/_core/obj/teleport/ship.dm index 5faf1bd9a9..8fff3c840a 100644 --- a/code/_core/obj/teleport/ship.dm +++ b/code/_core/obj/teleport/ship.dm @@ -2,7 +2,7 @@ desired_marker = "ship_exit" -/obj/trigger/jumpmarker/ship_exit/on_trigger(var/atom/movable/triggerer) +/obj/trigger/jumpmarker/ship_exit/on_trigger(atom/movable/triggerer) if(is_player(triggerer)) var/mob/living/advanced/player/P = triggerer diff --git a/code/_core/obj/trigger/_trigger.dm b/code/_core/obj/trigger/_trigger.dm index d14033b67b..9c22fa383d 100644 --- a/code/_core/obj/trigger/_trigger.dm +++ b/code/_core/obj/trigger/_trigger.dm @@ -2,11 +2,11 @@ name = "trigger" invisibility = 101 -/obj/trigger/Crossed(var/atom/movable/O,var/atom/new_loc,var/atom/old_loc) +/obj/trigger/Crossed(atom/movable/O,atom/new_loc,atom/old_loc) . = ..() on_trigger(O) -/obj/trigger/proc/on_trigger(var/atom/triggerer) +/obj/trigger/proc/on_trigger(atom/triggerer) return TRUE /* @@ -14,7 +14,7 @@ name = "new character teleport trigger" desc = "turns the person into a player" -/obj/trigger/new_character/on_trigger(var/atom/triggerer) +/obj/trigger/new_character/on_trigger(atom/triggerer) if(is_observer(triggerer)) var/mob/abstract/observer/O = triggerer var/mob/living/advanced/player/P = new(pick(spawnpoints_new_character),O.client) @@ -28,7 +28,7 @@ name = "move to world" desc = "move to the world" -/obj/trigger/move_to_world/on_trigger(var/atom/triggerer) +/obj/trigger/move_to_world/on_trigger(atom/triggerer) if(is_advanced(triggerer)) var/mob/living/advanced/A = triggerer A.force_move(get_turf(pick(world_spawnpoints))) @@ -41,7 +41,7 @@ name = "no entry" var/message = "You cannot go that way." -/obj/trigger/no_entry/on_trigger(var/mob/triggerer) +/obj/trigger/no_entry/on_trigger(mob/triggerer) triggerer.to_chat(span("notice",message)) /obj/trigger/jumploc @@ -50,7 +50,7 @@ var/y_move = 0 var/dir_restriction = 0 -/obj/trigger/jumploc/on_trigger(var/atom/movable/triggerer) +/obj/trigger/jumploc/on_trigger(atom/movable/triggerer) if(!is_living(triggerer)) return FALSE @@ -90,7 +90,7 @@ var/desired_map = "" var/dir_restriction = 0 -/obj/trigger/jumplevel/on_trigger(var/atom/movable/triggerer) +/obj/trigger/jumplevel/on_trigger(atom/movable/triggerer) if(!ismob(triggerer)) return FALSE @@ -108,7 +108,7 @@ var/desired_marker = "" var/dir_restriction = 0 -/obj/trigger/jumpmarker/on_trigger(var/atom/movable/triggerer) +/obj/trigger/jumpmarker/on_trigger(atom/movable/triggerer) if(!ismob(triggerer)) return FALSE @@ -132,11 +132,11 @@ var/obj/structure/scenery/linked_object -/obj/trigger/transparency_trigger/New(var/new_loc,var/atom/new_linked_object) +/obj/trigger/transparency_trigger/New(new_loc,atom/new_linked_object) ..() linked_object = new_linked_object -/obj/trigger/transparency_trigger/Crossed(var/atom/movable/O,var/atom/new_loc,var/atom/old_loc) +/obj/trigger/transparency_trigger/Crossed(atom/movable/O,atom/new_loc,atom/old_loc) ..() linked_object.crossed_objects += O @@ -145,7 +145,7 @@ if(length(linked_object.crossed_objects)) animate(linked_object,alpha = 100, time = 0.7 SECONDS) -/obj/trigger/transparency_trigger/Uncrossed(var/atom/movable/O,var/atom/new_loc,var/atom/old_loc) +/obj/trigger/transparency_trigger/Uncrossed(atom/movable/O,atom/new_loc,atom/old_loc) ..() linked_object.crossed_objects -= O diff --git a/code/_core/obj/trigger/debug_message.dm b/code/_core/obj/trigger/debug_message.dm index a9b5ac68f2..787372279f 100644 --- a/code/_core/obj/trigger/debug_message.dm +++ b/code/_core/obj/trigger/debug_message.dm @@ -14,16 +14,16 @@ invisibility = 0 mouse_opacity = 1 -/obj/trigger/debug_message/clicked_on_by_object(var/mob/caller,object,location,control,params) +/obj/trigger/debug_message/clicked_on_by_object(mob/caller,object,location,control,params) if(is_player(caller)) talk_to(caller) return TRUE -/obj/trigger/debug_message/proc/talk_to(var/mob/living/advanced/player/P) +/obj/trigger/debug_message/proc/talk_to(mob/living/advanced/player/P) P.known_debug_messages[id] = TRUE return P.to_chat(span("debug_message",message)) -/obj/trigger/debug_message/Crossed(var/atom/movable/O,var/atom/new_loc,var/atom/old_loc) +/obj/trigger/debug_message/Crossed(atom/movable/O,atom/new_loc,atom/old_loc) if(is_player(O) && id) var/mob/living/advanced/player/P = O if(!P.known_debug_messages[id]) diff --git a/code/_core/obj/trigger/militart_trap.dm b/code/_core/obj/trigger/militart_trap.dm index 5b80c4920a..87791060e6 100644 --- a/code/_core/obj/trigger/militart_trap.dm +++ b/code/_core/obj/trigger/militart_trap.dm @@ -9,7 +9,7 @@ return . trap(TRUE) -/obj/trigger/military_trap/proc/trap(var/range_check=FALSE) +/obj/trigger/military_trap/proc/trap(range_check=FALSE) if(src.qdeleting) return FALSE diff --git a/code/_core/obj/vehicle/_vehicle.dm b/code/_core/obj/vehicle/_vehicle.dm index 35f9d721d3..1ff6a9d613 100644 --- a/code/_core/obj/vehicle/_vehicle.dm +++ b/code/_core/obj/vehicle/_vehicle.dm @@ -36,7 +36,7 @@ var/obj/item/I = k . += div("notice","It has \the [I.name] attached.") -/mob/living/vehicle/on_crush(var/message=TRUE) +/mob/living/vehicle/on_crush(message=TRUE) for(var/k in passengers) var/mob/living/advanced/A = k @@ -66,20 +66,20 @@ explode(get_turf(src),2,src,src) return ..() -/mob/living/vehicle/proc/add_buttons(var/mob/living/advanced/A) +/mob/living/vehicle/proc/add_buttons(mob/living/advanced/A) for(var/v in buttons_to_add) var/obj/hud/button/B = new v(src) B.update_owner(A) return TRUE -/mob/living/vehicle/proc/remove_buttons(var/mob/living/advanced/A) +/mob/living/vehicle/proc/remove_buttons(mob/living/advanced/A) for(var/k in A.buttons) var/obj/hud/button/B = k if(B.type in buttons_to_add) B.update_owner(null) return TRUE -/mob/living/vehicle/proc/attach_equipment(var/mob/caller,var/obj/item/I) +/mob/living/vehicle/proc/attach_equipment(mob/caller,obj/item/I) if(I in equipment) return FALSE if(I.unremovable) @@ -90,7 +90,7 @@ I.unremovable = TRUE update_sprite() -/mob/living/vehicle/proc/unattach_equipment(var/mob/caller,var/obj/item/I) +/mob/living/vehicle/proc/unattach_equipment(mob/caller,obj/item/I) if(!(I in equipment)) return FALSE caller?.visible_message(span("notice","\The [caller.name] detaches \the [I.name] from \the [src.name]."),span("notice","You detach \the [I.name] from \the [src.name].")) @@ -99,14 +99,14 @@ I.unremovable = initial(I.unremovable) update_sprite() -/mob/living/vehicle/New(var/desired_loc) +/mob/living/vehicle/New(desired_loc) ..() passengers = list() equipment = list() update_sprite() -/mob/living/vehicle/proc/can_attach_weapon(var/mob/caller,var/obj/item/weapon/W) +/mob/living/vehicle/proc/can_attach_weapon(mob/caller,obj/item/weapon/W) if(ai || length(passengers)) caller?.to_chat(span("warning","You can't add this while it's in use!")) @@ -117,7 +117,7 @@ return TRUE -/mob/living/vehicle/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/mob/living/vehicle/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(caller == src) return ..() @@ -155,7 +155,7 @@ return ..() -/mob/living/vehicle/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/mob/living/vehicle/click_on_object(mob/caller as mob,atom/object,location,control,params) if(is_hud(object)) return ..() @@ -177,7 +177,7 @@ return TRUE -/mob/living/vehicle/handle_movement(var/adjust_delay = 0) //Runs every tick for players. Runs every decisecond for mobs. +/mob/living/vehicle/handle_movement(adjust_delay = 0) //Runs every tick for players. Runs every decisecond for mobs. if(ai) return ..() @@ -194,7 +194,7 @@ return FALSE -/mob/living/vehicle/set_dir(var/desired_dir,var/force=FALSE) +/mob/living/vehicle/set_dir(desired_dir,force=FALSE) . = ..() @@ -263,7 +263,7 @@ return TRUE -/mob/living/vehicle/proc/can_enter_vehicle(var/mob/caller) +/mob/living/vehicle/proc/can_enter_vehicle(mob/caller) INTERACT_CHECK_NO_DELAY(src) diff --git a/code/_core/obj/vehicle/mech/_mech.dm b/code/_core/obj/vehicle/mech/_mech.dm index 3e0f07b704..8a76cd017c 100644 --- a/code/_core/obj/vehicle/mech/_mech.dm +++ b/code/_core/obj/vehicle/mech/_mech.dm @@ -16,10 +16,10 @@ blood_type = /reagent/blood/robot blood_volume = 1000 -/mob/living/vehicle/mech/get_footsteps(var/list/original_footsteps,var/enter=TRUE) +/mob/living/vehicle/mech/get_footsteps(list/original_footsteps,enter=TRUE) return original_footsteps + /footstep/mech_step -/mob/living/vehicle/mech/set_dir(var/desired_dir,var/force=FALSE) +/mob/living/vehicle/mech/set_dir(desired_dir,force=FALSE) . = ..() @@ -41,7 +41,7 @@ . = ..() update_sprite() -/mob/living/vehicle/mech/get_movement_delay(var/include_stance=TRUE) +/mob/living/vehicle/mech/get_movement_delay(include_stance=TRUE) return movement_delay /mob/living/vehicle/mech/update_icon() diff --git a/code/_core/obj/vehicle/mech/modular/_modular_mech.dm b/code/_core/obj/vehicle/mech/modular/_modular_mech.dm index 8cc6081b6f..4459cc47b7 100644 --- a/code/_core/obj/vehicle/mech/modular/_modular_mech.dm +++ b/code/_core/obj/vehicle/mech/modular/_modular_mech.dm @@ -40,7 +40,7 @@ /mob/living/vehicle/mech/modular/proc/get_battery() return battery -/mob/living/vehicle/mech/modular/handle_movement(var/adjust_delay = 1) +/mob/living/vehicle/mech/modular/handle_movement(adjust_delay = 1) if(!battery || battery.charge_current <= 0) return FALSE @@ -52,7 +52,7 @@ else battery.charge_current -= 1 -/mob/living/vehicle/mech/modular/get_examine_list(var/mob/caller) +/mob/living/vehicle/mech/modular/get_examine_list(mob/caller) . = ..() @@ -69,13 +69,13 @@ if(battery) . += span("notice","It has \the [battery.name] inserted in the chassis. It has a charge rating of ([battery.charge_current]/[battery.charge_max]).") -/mob/living/vehicle/mech/modular/attach_equipment(var/mob/caller,var/obj/item/I) +/mob/living/vehicle/mech/modular/attach_equipment(mob/caller,obj/item/I) return FALSE -/mob/living/vehicle/mech/modular/unattach_equipment(var/mob/caller,var/obj/item/I) +/mob/living/vehicle/mech/modular/unattach_equipment(mob/caller,obj/item/I) return FALSE -/mob/living/vehicle/mech/modular/can_attach_weapon(var/mob/caller,var/obj/item/I) +/mob/living/vehicle/mech/modular/can_attach_weapon(mob/caller,obj/item/I) if(!mech_arms) caller?.to_chat(span("notice","You must add a set of arms to this assembly before attaching weapons!")) @@ -84,7 +84,7 @@ return ..() -/mob/living/vehicle/mech/modular/click_on_object(var/mob/caller as mob,var/atom/object,location,control,params) +/mob/living/vehicle/mech/modular/click_on_object(mob/caller as mob,atom/object,location,control,params) if(object.plane >= PLANE_HUD) return ..() @@ -106,7 +106,7 @@ return TRUE -/mob/living/vehicle/mech/modular/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/mob/living/vehicle/mech/modular/clicked_on_by_object(mob/caller,atom/object,location,control,params) DEFER_OBJECT @@ -320,7 +320,7 @@ set_dir(SOUTH) -/mob/living/vehicle/mech/modular/set_dir(var/desired_dir,var/force=FALSE) +/mob/living/vehicle/mech/modular/set_dir(desired_dir,force=FALSE) if(!mech_body) desired_dir = SOUTH @@ -328,7 +328,7 @@ . = ..() -/mob/living/vehicle/mech/modular/get_object_to_damage(var/atom/attacker,var/atom/weapon,var/damage_type/damage_type,var/list/params = list(),var/accurate=FALSE,var/find_closest=FALSE,var/inaccuracy_modifier=1) +/mob/living/vehicle/mech/modular/get_object_to_damage(atom/attacker,atom/weapon,damage_type/damage_type,list/params = list(),accurate=FALSE,find_closest=FALSE,inaccuracy_modifier=1) var/x_attack = params[PARAM_ICON_X] ? params[PARAM_ICON_X] : 16 @@ -348,7 +348,7 @@ return src -/mob/living/vehicle/mech/modular/handle_movement(var/adjust_delay = 0) +/mob/living/vehicle/mech/modular/handle_movement(adjust_delay = 0) if(!mech_legs || (mech_legs.health && mech_legs.health.health_current <= 0)) return FALSE diff --git a/code/_core/turf/_turf.dm b/code/_core/turf/_turf.dm index a533f27ab0..3acfca1395 100644 --- a/code/_core/turf/_turf.dm +++ b/code/_core/turf/_turf.dm @@ -79,7 +79,7 @@ /turf/proc/pre_change() //When this turf is removed in favor of a new turf. return TRUE -/turf/proc/get_crossable_neighbors(var/atom/movable/crosser=null,var/cardinal=TRUE,var/intercardinal=TRUE,var/pathfinding=FALSE) +/turf/proc/get_crossable_neighbors(atom/movable/crosser=null,cardinal=TRUE,intercardinal=TRUE,pathfinding=FALSE) . = list() if(cardinal) @@ -175,13 +175,13 @@ return TRUE -/turf/proc/can_teleport_to(var/check_contents=TRUE) +/turf/proc/can_teleport_to(check_contents=TRUE) var/area/A = loc if(A && A.flags_area & FLAG_AREA_NO_TELEPORT) return FALSE return can_move_to(check_contents) -/turf/proc/can_move_to(var/check_contents=TRUE) +/turf/proc/can_move_to(check_contents=TRUE) return !is_space() /turf/New(loc) @@ -200,7 +200,7 @@ return FALSE /* -/turf/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/turf/clicked_on_by_object(mob/caller,atom/object,location,control,params) caller.face_atom(src) return ..() */ @@ -208,7 +208,7 @@ /turf/get_top_object() return src //This should always be the src. -/turf/change_victim(var/atom/attacker) +/turf/change_victim(atom/attacker) if(density && (density_north || density_south || density_east || density_west)) return src @@ -255,7 +255,7 @@ return best_target ? best_target : src -/turf/Entered(var/atom/movable/enterer,var/atom/old_loc) +/turf/Entered(atom/movable/enterer,atom/old_loc) if(src.loc && (!old_loc || src.loc != old_loc.loc)) src.loc.Entered(enterer) @@ -272,7 +272,7 @@ if(enterer.density && !enterer.abstract) has_dense_atom = "/turf/Entered() [enterer.type]." -/turf/Exited(var/atom/movable/exiter,var/atom/new_loc) +/turf/Exited(atom/movable/exiter,atom/new_loc) if(src.loc && (!new_loc || src.loc != new_loc.loc)) src.loc.Exited(exiter) @@ -285,7 +285,7 @@ if(exiter.hazardous) recalculate_atom_hazards() -/turf/Enter(var/atom/movable/enterer,var/atom/oldloc) +/turf/Enter(atom/movable/enterer,atom/oldloc) if(enterer && oldloc && length(contents) > TURF_CONTENT_LIMIT && !ismob(enterer)) return FALSE @@ -307,7 +307,7 @@ return ..() -/turf/act_explode(var/atom/owner,var/atom/source,var/atom/epicenter,var/magnitude,var/desired_loyalty_tag) +/turf/act_explode(atom/owner,atom/source,atom/epicenter,magnitude,desired_loyalty_tag) for(var/k in src.contents) var/atom/movable/M = k @@ -316,7 +316,7 @@ . = ..() -/turf/act_emp(var/atom/owner,var/atom/source,var/atom/epicenter,var/magnitude,var/desired_loyalty_tag) +/turf/act_emp(atom/owner,atom/source,atom/epicenter,magnitude,desired_loyalty_tag) . = ..() @@ -325,10 +325,10 @@ if(M.act_emp(owner,source,epicenter,magnitude,desired_loyalty_tag)) . = TRUE -/turf/proc/setup_turf_light(var/sunlight_freq) +/turf/proc/setup_turf_light(sunlight_freq) return FALSE -/turf/proc/is_occupied(var/plane_min=-INFINITY,var/plane_max=INFINITY,var/check_under_tile=FALSE) +/turf/proc/is_occupied(plane_min=-INFINITY,plane_max=INFINITY,check_under_tile=FALSE) for(var/atom/movable/A in src.contents) if(A.plane < plane_min || A.plane > plane_max) @@ -346,14 +346,14 @@ return null -/turf/proc/can_construct_on(var/atom/caller,var/obj/structure/structure_to_make = null) +/turf/proc/can_construct_on(atom/caller,obj/structure/structure_to_make = null) if(!is_living(caller)) return FALSE var/mob/living/C = caller C.to_chat(span("warning","You cannot deploy on this turf!")) return FALSE -/turf/proc/is_straight_path_to(var/turf/target_turf,var/check_vision=FALSE,var/check_density=TRUE) +/turf/proc/is_straight_path_to(turf/target_turf,check_vision=FALSE,check_density=TRUE) if(src == target_turf) return TRUE diff --git a/code/_core/turf/changeturf.dm b/code/_core/turf/changeturf.dm index 22d8d58669..e4f561f0f2 100644 --- a/code/_core/turf/changeturf.dm +++ b/code/_core/turf/changeturf.dm @@ -1,4 +1,4 @@ -/turf/proc/change_turf(var/turf/N, var/force_lighting_update = FALSE) //Stolen from /vg/. Don't use before INITIALIZE is called. +/turf/proc/change_turf(turf/N, force_lighting_update = FALSE) //Stolen from /vg/. Don't use before INITIALIZE is called. if(!N) CRASH("change_turf() was provided a null turf!") @@ -63,7 +63,7 @@ HOOK_CALL("change_turf") -/turf/simulated/change_turf(var/turf/N, var/force_lighting_update = FALSE) //Stolen from /vg/. Don't use before INITIALIZE is called. +/turf/simulated/change_turf(turf/N, force_lighting_update = FALSE) //Stolen from /vg/. Don't use before INITIALIZE is called. var/old_corner_icons = corner_icons @@ -77,7 +77,7 @@ else queue_smoothing_turf(src) -/turf/proc/change_area(var/area/N) //Remember to call A.generate_average() when done changing areas. +/turf/proc/change_area(area/N) //Remember to call A.generate_average() when done changing areas. if(!N) CRASH("change_area() was provided a null area!") @@ -94,5 +94,5 @@ return TRUE -/turf/proc/post_change_turf(var/old_turf_type) +/turf/proc/post_change_turf(old_turf_type) return TRUE \ No newline at end of file diff --git a/code/_core/turf/movement.dm b/code/_core/turf/movement.dm index 59fd946098..f291aa9030 100644 --- a/code/_core/turf/movement.dm +++ b/code/_core/turf/movement.dm @@ -1,5 +1,5 @@ /* -/turf/can_not_enter(var/atom/A,var/move_direction) +/turf/can_not_enter(atom/A,move_direction) if(src.density) //If you're stuck because of some odd bullshit. return src @@ -36,6 +36,6 @@ */ /* TODO: CHECK THIS -/turf/can_bump(var/atom/bumper,var/bump_direction,var/movement_override = 0) +/turf/can_bump(atom/bumper,bump_direction,movement_override = 0) return FALSE */ \ No newline at end of file diff --git a/code/_core/turf/simulated/_simulated.dm b/code/_core/turf/simulated/_simulated.dm index b76f1251c8..def6cbc843 100644 --- a/code/_core/turf/simulated/_simulated.dm +++ b/code/_core/turf/simulated/_simulated.dm @@ -64,7 +64,7 @@ if(wet_level > 0) add_wet(-wet_level) -/turf/simulated/proc/destroy_attachments(var/delete=TRUE) +/turf/simulated/proc/destroy_attachments(delete=TRUE) if(!length(linked_attachments)) return FALSE for(var/k in linked_attachments) @@ -74,7 +74,7 @@ qdel(O) return TRUE -/turf/simulated/proc/attach(var/obj/structure/O) +/turf/simulated/proc/attach(obj/structure/O) if(!linked_attachments) linked_attachments = list() if(linked_attachments[O]) @@ -88,7 +88,7 @@ O.density = 0 O.set_anchored(2) -/turf/simulated/proc/unattach(var/obj/structure/O) +/turf/simulated/proc/unattach(obj/structure/O) if(!linked_attachments) //No point. return FALSE O.attached_to = null @@ -96,7 +96,7 @@ O.set_anchored(initial(O.anchored)) return TRUE -/turf/simulated/can_move_to(var/check_contents=TRUE) +/turf/simulated/can_move_to(check_contents=TRUE) if(collision_flags & FLAG_COLLISION_WALKING) return FALSE @@ -110,10 +110,10 @@ return ..() -/turf/simulated/proc/get_slip_strength(var/mob/living/L) +/turf/simulated/proc/get_slip_strength(mob/living/L) return (wet_level > 0 ? 1 : 0) + (wet_level/100)*slip_factor -/turf/simulated/proc/add_wet(var/wet_to_add) +/turf/simulated/proc/add_wet(wet_to_add) var/old_wet = wet_level wet_level = clamp(wet_to_add + wet_level,0,100) if(old_wet <= 0) @@ -135,7 +135,7 @@ return TRUE -/turf/simulated/proc/add_blood_level(var/amount_to_add,var/minimus=0,var/desired_color) +/turf/simulated/proc/add_blood_level(amount_to_add,minimus=0,desired_color) if(desired_color && desired_color != blood_color) if(!blood_level || !blood_color) blood_color = desired_color @@ -144,11 +144,11 @@ blood_level = max(0,minimus,blood_level+amount_to_add) return TRUE -/turf/simulated/proc/add_blood_level_hard(var/amount_to_add,var/minimus=0) +/turf/simulated/proc/add_blood_level_hard(amount_to_add,minimus=0) blood_level_hard = max(0,minimus,blood_level_hard+amount_to_add) return TRUE -/turf/simulated/on_destruction(var/damage = TRUE) +/turf/simulated/on_destruction(damage = TRUE) for(var/obj/effect/temp/impact/I in src.contents) I.alpha = 0 @@ -244,7 +244,7 @@ add_overlay(I) -/turf/simulated/proc/set_exposed(var/desired_exposed = FALSE,var/force=FALSE) +/turf/simulated/proc/set_exposed(desired_exposed = FALSE,force=FALSE) if(desired_exposed == exposed && !force) return FALSE @@ -259,7 +259,7 @@ return TRUE -/turf/simulated/proc/do_footstep(var/mob/living/source,var/enter=FALSE) +/turf/simulated/proc/do_footstep(mob/living/source,enter=FALSE) var/list/returning_footsteps = source.get_footsteps(footstep ? list(footstep) : list(),enter) if(length(returning_footsteps)) diff --git a/code/_core/turf/simulated/floor/_floor.dm b/code/_core/turf/simulated/floor/_floor.dm index 88bf257e6e..79c7b28702 100644 --- a/code/_core/turf/simulated/floor/_floor.dm +++ b/code/_core/turf/simulated/floor/_floor.dm @@ -13,7 +13,7 @@ var/has_ore = FALSE -/turf/simulated/floor/can_be_attacked(var/atom/attacker,var/atom/weapon,var/params,var/damagetype/damage_type) +/turf/simulated/floor/can_be_attacked(atom/attacker,atom/weapon,params,damagetype/damage_type) if(!damage_type || !damage_type.target_floors) return FALSE @@ -48,7 +48,7 @@ */ -/turf/simulated/floor/Exited(var/atom/movable/O,var/atom/new_loc) +/turf/simulated/floor/Exited(atom/movable/O,atom/new_loc) . = ..() @@ -57,7 +57,7 @@ -/turf/simulated/floor/can_construct_on(var/atom/caller,var/obj/structure/structure_to_make = null) +/turf/simulated/floor/can_construct_on(atom/caller,obj/structure/structure_to_make = null) if(!is_living(caller)) return FALSE diff --git a/code/_core/turf/simulated/floor/basalt.dm b/code/_core/turf/simulated/floor/basalt.dm index 6898ddf9a7..7d444164d5 100644 --- a/code/_core/turf/simulated/floor/basalt.dm +++ b/code/_core/turf/simulated/floor/basalt.dm @@ -26,7 +26,7 @@ var/light_turf = FALSE -/turf/simulated/floor/basalt/setup_turf_light(var/sunlight_freq) +/turf/simulated/floor/basalt/setup_turf_light(sunlight_freq) if(light_turf) src.set_light(4,0.5,"#FF8300") return TRUE diff --git a/code/_core/turf/simulated/floor/carpet.dm b/code/_core/turf/simulated/floor/carpet.dm index 9698377aa0..6ed6c93f22 100644 --- a/code/_core/turf/simulated/floor/carpet.dm +++ b/code/_core/turf/simulated/floor/carpet.dm @@ -26,6 +26,6 @@ desc_extended = "Boring office floor; may or may not smell vaguely of urine" icon_state = "1" -/turf/simulated/floor/carpet/office/New(var/desired_loc) +/turf/simulated/floor/carpet/office/New(desired_loc) . = ..() icon_state = "[rand(1,4)]" diff --git a/code/_core/turf/simulated/floor/cave_dirt.dm b/code/_core/turf/simulated/floor/cave_dirt.dm index 6b39ff233f..fa5411a1bd 100644 --- a/code/_core/turf/simulated/floor/cave_dirt.dm +++ b/code/_core/turf/simulated/floor/cave_dirt.dm @@ -44,7 +44,7 @@ map_color = COLOR_BROWN -/turf/simulated/floor/desert_rock/New(var/desired_loc) +/turf/simulated/floor/desert_rock/New(desired_loc) var/desired_x = x % 10 var/desired_y = y % 10 icon_state = "[desired_x],[desired_y]" diff --git a/code/_core/turf/simulated/floor/clockwork.dm b/code/_core/turf/simulated/floor/clockwork.dm index 4aae9ef050..96eb3b6a47 100644 --- a/code/_core/turf/simulated/floor/clockwork.dm +++ b/code/_core/turf/simulated/floor/clockwork.dm @@ -22,7 +22,7 @@ /turf/simulated/floor/clockwork/alt3/ icon_state = "floor4" -/turf/simulated/floor/clockwork/special/New(var/desired_loc) +/turf/simulated/floor/clockwork/special/New(desired_loc) ..() if(x % 2 == y % 2) icon_state = "floor2" diff --git a/code/_core/turf/simulated/floor/cobblestone.dm b/code/_core/turf/simulated/floor/cobblestone.dm index 1955d47945..6ab49faa7d 100644 --- a/code/_core/turf/simulated/floor/cobblestone.dm +++ b/code/_core/turf/simulated/floor/cobblestone.dm @@ -34,7 +34,7 @@ health_base = 500 -/turf/simulated/floor/brick/New(var/desired_loc) +/turf/simulated/floor/brick/New(desired_loc) icon_state = "[x % 10],[y % 10]" . = ..() diff --git a/code/_core/turf/simulated/floor/colored/colored_snow.dm b/code/_core/turf/simulated/floor/colored/colored_snow.dm index 4a2f2c88cf..158641524b 100644 --- a/code/_core/turf/simulated/floor/colored/colored_snow.dm +++ b/code/_core/turf/simulated/floor/colored/colored_snow.dm @@ -22,7 +22,7 @@ health_base = 200 -/turf/simulated/floor/colored/snow/New(var/desired_loc) +/turf/simulated/floor/colored/snow/New(desired_loc) . = ..() if(depth == 0) depth = MAX_DEPTH diff --git a/code/_core/turf/simulated/floor/cult.dm b/code/_core/turf/simulated/floor/cult.dm index 572cf8482d..91858bd3ad 100644 --- a/code/_core/turf/simulated/floor/cult.dm +++ b/code/_core/turf/simulated/floor/cult.dm @@ -15,7 +15,7 @@ wet_floor_icon_state = "tile" -/turf/simulated/floor/cult/New(var/desired_loc) +/turf/simulated/floor/cult/New(desired_loc) icon_state = "floor[rand(1,4)]" diff --git a/code/_core/turf/simulated/floor/fake_space.dm b/code/_core/turf/simulated/floor/fake_space.dm index fc84391c33..6f5bfdca3b 100644 --- a/code/_core/turf/simulated/floor/fake_space.dm +++ b/code/_core/turf/simulated/floor/fake_space.dm @@ -6,6 +6,6 @@ var/generate = TRUE plane = PLANE_SPACE -/turf/simulated/floor/fake_space/New(var/desired_loc) +/turf/simulated/floor/fake_space/New(desired_loc) icon_state = "space" return ..() \ No newline at end of file diff --git a/code/_core/turf/simulated/floor/hierophant.dm b/code/_core/turf/simulated/floor/hierophant.dm index 3f3cf31cdc..0d82237e5c 100644 --- a/code/_core/turf/simulated/floor/hierophant.dm +++ b/code/_core/turf/simulated/floor/hierophant.dm @@ -8,7 +8,7 @@ footstep = /footstep/concrete -/turf/simulated/floor/hierophant/New(var/desired_loc) +/turf/simulated/floor/hierophant/New(desired_loc) . = ..() diff --git a/code/_core/turf/simulated/floor/plating.dm b/code/_core/turf/simulated/floor/plating.dm index b4326e93b5..16f9744ddc 100644 --- a/code/_core/turf/simulated/floor/plating.dm +++ b/code/_core/turf/simulated/floor/plating.dm @@ -87,7 +87,7 @@ /turf/simulated/floor/landing/is_safe() return FALSE -/turf/simulated/floor/landing/New(var/desired_loc) +/turf/simulated/floor/landing/New(desired_loc) . = ..() icon_state = "[rand(1,10)]" diff --git a/code/_core/turf/simulated/floor/riverbed.dm b/code/_core/turf/simulated/floor/riverbed.dm index 8acd920a10..4b6f477870 100644 --- a/code/_core/turf/simulated/floor/riverbed.dm +++ b/code/_core/turf/simulated/floor/riverbed.dm @@ -5,7 +5,7 @@ footstep_id = "asteroid" -/turf/simulated/floor/asteroid/New(var/desired_loc) +/turf/simulated/floor/asteroid/New(desired_loc) if(prob(25)) icon_state = "asteroid[rand(1,12)]" diff --git a/code/_core/turf/simulated/floor/road.dm b/code/_core/turf/simulated/floor/road.dm index 3fa3f3e194..1a09ee415f 100644 --- a/code/_core/turf/simulated/floor/road.dm +++ b/code/_core/turf/simulated/floor/road.dm @@ -31,7 +31,7 @@ health_base = 400 -/turf/simulated/floor/sidewalk/should_smooth_with(var/turf/simulated/T) +/turf/simulated/floor/sidewalk/should_smooth_with(turf/simulated/T) return T.type != /turf/simulated/floor/road /turf/simulated/floor/sidewalk/update_overlays() diff --git a/code/_core/turf/simulated/floor/sand.dm b/code/_core/turf/simulated/floor/sand.dm index e3bdf9b298..29426b7471 100644 --- a/code/_core/turf/simulated/floor/sand.dm +++ b/code/_core/turf/simulated/floor/sand.dm @@ -5,7 +5,7 @@ footstep = /footstep/sand -/turf/simulated/floor/sand/New(var/desired_loc) +/turf/simulated/floor/sand/New(desired_loc) icon_state = "sand[rand(1,4)]" . = ..() @@ -15,6 +15,6 @@ icon = 'icons/turf/floor/natural.dmi' icon_state = "ironsand1" -/turf/simulated/floor/red_sand/New(var/desired_loc) +/turf/simulated/floor/red_sand/New(desired_loc) icon_state = "ironsand[rand(1,15)]" . = ..() \ No newline at end of file diff --git a/code/_core/turf/simulated/floor/shrine.dm b/code/_core/turf/simulated/floor/shrine.dm index efc9496dda..a11804bc52 100644 --- a/code/_core/turf/simulated/floor/shrine.dm +++ b/code/_core/turf/simulated/floor/shrine.dm @@ -4,7 +4,7 @@ icon_state = "0" -/turf/simulated/floor/shrine/New(var/desired_loc) +/turf/simulated/floor/shrine/New(desired_loc) . = ..() if(prob(25)) icon_state = "[rand(1,4)]" \ No newline at end of file diff --git a/code/_core/turf/simulated/floor/tile_morphing.dm b/code/_core/turf/simulated/floor/tile_morphing.dm index c9f7809570..ec7debda1d 100644 --- a/code/_core/turf/simulated/floor/tile_morphing.dm +++ b/code/_core/turf/simulated/floor/tile_morphing.dm @@ -3,7 +3,7 @@ icon_state = "multi" corner_icons = TRUE -/turf/simulated/floor/tile/morphing/should_smooth_with(var/turf/T) +/turf/simulated/floor/tile/morphing/should_smooth_with(turf/T) if(istype(T,/turf/simulated/floor/tile/) && !istype(T,/turf/simulated/floor/tile/morphing)) return T diff --git a/code/_core/turf/simulated/hazard/_hazard.dm b/code/_core/turf/simulated/hazard/_hazard.dm index e242031f44..baa72a6c29 100644 --- a/code/_core/turf/simulated/hazard/_hazard.dm +++ b/code/_core/turf/simulated/hazard/_hazard.dm @@ -8,7 +8,7 @@ /turf/simulated/liquid/ -/turf/simulated/liquid/can_construct_on(var/mob/caller,var/obj/structure/structure_to_make) +/turf/simulated/liquid/can_construct_on(mob/caller,obj/structure/structure_to_make) if(ispath(structure_to_make,/obj/structure/interactive/construction/)) var/obj/structure/interactive/construction/C = locate() in contents diff --git a/code/_core/turf/simulated/hazard/lava.dm b/code/_core/turf/simulated/hazard/lava.dm index 1196a104bd..6e8c7a295c 100644 --- a/code/_core/turf/simulated/hazard/lava.dm +++ b/code/_core/turf/simulated/hazard/lava.dm @@ -37,14 +37,14 @@ lava_idiot(O) return ..() -/turf/simulated/liquid/lava/post_change_turf(var/old_turf_type) +/turf/simulated/liquid/lava/post_change_turf(old_turf_type) . = ..() for(var/mob/living/L in contents) lava_idiot(L) -/turf/simulated/liquid/lava/proc/lava_idiot(var/mob/living/L,var/check=FALSE) +/turf/simulated/liquid/lava/proc/lava_idiot(mob/living/L,check=FALSE) if(check && !istype(L.loc,src.type)) return FALSE diff --git a/code/_core/turf/simulated/smoothing.dm b/code/_core/turf/simulated/smoothing.dm index 25ea60f956..22b579b7a6 100644 --- a/code/_core/turf/simulated/smoothing.dm +++ b/code/_core/turf/simulated/smoothing.dm @@ -1,4 +1,4 @@ -/turf/simulated/proc/should_smooth_with(var/turf/simulated/T) +/turf/simulated/proc/should_smooth_with(turf/simulated/T) if(!is_simulated(T)) return null @@ -10,7 +10,7 @@ return null -/turf/simulated/wall/should_smooth_with(var/turf/simulated/T) +/turf/simulated/wall/should_smooth_with(turf/simulated/T) . = ..() diff --git a/code/_core/turf/simulated/space.dm b/code/_core/turf/simulated/space.dm index 2ba13cac27..80b5600ec2 100644 --- a/code/_core/turf/simulated/space.dm +++ b/code/_core/turf/simulated/space.dm @@ -6,7 +6,7 @@ plane = PLANE_SPACE dynamic_lighting = TRUE -/turf/simulated/space/New(var/desired_loc) +/turf/simulated/space/New(desired_loc) . = ..() icon = null icon_state = null diff --git a/code/_core/turf/simulated/wall/climbing.dm b/code/_core/turf/simulated/wall/climbing.dm index 3e1a3afb36..c36e26dd4c 100644 --- a/code/_core/turf/simulated/wall/climbing.dm +++ b/code/_core/turf/simulated/wall/climbing.dm @@ -1,4 +1,4 @@ -/turf/simulated/wall/proc/do_climb(var/mob/living/advanced/L,var/turf/actual_turf,var/turf/above_turf,var/turf/landing_turf) +/turf/simulated/wall/proc/do_climb(mob/living/advanced/L,turf/actual_turf,turf/above_turf,turf/landing_turf) L.force_move(landing_turf) L.visible_message( span("notice","\The [L.name] climbs up from \the [above_turf.name]."), @@ -10,7 +10,7 @@ return TRUE -/turf/simulated/wall/proc/can_climb(var/mob/living/advanced/L,var/turf/actual_turf,var/turf/above_turf,var/turf/landing_turf) +/turf/simulated/wall/proc/can_climb(mob/living/advanced/L,turf/actual_turf,turf/above_turf,turf/landing_turf) if(!actual_turf) //Huh. return FALSE @@ -41,7 +41,7 @@ return TRUE -/turf/simulated/wall/clicked_on_by_object(var/mob/caller,var/atom/object,location,control,params) +/turf/simulated/wall/clicked_on_by_object(mob/caller,atom/object,location,control,params) if(is_advanced(caller)) diff --git a/code/_core/turf/simulated/wall/metal.dm b/code/_core/turf/simulated/wall/metal.dm index 9689351348..0bff9d1a36 100644 --- a/code/_core/turf/simulated/wall/metal.dm +++ b/code/_core/turf/simulated/wall/metal.dm @@ -16,7 +16,7 @@ window_blend = TRUE reinforced_blend = BLEND_MULTIPLY -/turf/simulated/wall/metal/on_destruction(var/damage = TRUE) +/turf/simulated/wall/metal/on_destruction(damage = TRUE) var/obj/structure/interactive/construction/girder/G = new(src) G.material_id = material_id diff --git a/code/_core/turf/simulated/wall/rock.dm b/code/_core/turf/simulated/wall/rock.dm index f8b699e5dc..953cba9602 100644 --- a/code/_core/turf/simulated/wall/rock.dm +++ b/code/_core/turf/simulated/wall/rock.dm @@ -25,7 +25,7 @@ layer = LAYER_WALL_LARGE + 0.1 -/turf/simulated/wall/rock/on_destruction(var/damage = TRUE) +/turf/simulated/wall/rock/on_destruction(damage = TRUE) CREATE(/obj/structure/scenery/rocks,src) . = ..() @@ -154,5 +154,5 @@ layer = LAYER_WALL_LARGE + 0.17 -/turf/simulated/wall/rock/indestructable/can_be_attacked(var/atom/attacker,var/atom/weapon,var/params,var/damagetype/damage_type) +/turf/simulated/wall/rock/indestructable/can_be_attacked(atom/attacker,atom/weapon,params,damagetype/damage_type) return FALSE diff --git a/code/_core/turf/simulated/wall/wood.dm b/code/_core/turf/simulated/wall/wood.dm index dd69ccc71a..e8477ca69d 100644 --- a/code/_core/turf/simulated/wall/wood.dm +++ b/code/_core/turf/simulated/wall/wood.dm @@ -17,7 +17,7 @@ window_blend = TRUE reinforced_blend = BLEND_MULTIPLY -/turf/simulated/wall/wood/on_destruction(var/damage = TRUE) +/turf/simulated/wall/wood/on_destruction(damage = TRUE) var/obj/structure/interactive/construction/girder/G = new(src) G.material_id = material_id diff --git a/code/_core/turf/space.dm b/code/_core/turf/space.dm index 478b24d50d..cd1f39d752 100644 --- a/code/_core/turf/space.dm +++ b/code/_core/turf/space.dm @@ -4,7 +4,7 @@ opacity = 0 plane = PLANE_SPACE -/turf/bluespace/New(var/desired_loc) +/turf/bluespace/New(desired_loc) . = ..() icon = null icon_state = null diff --git a/code/_core/turf/unsimulated/generation/_generation.dm b/code/_core/turf/unsimulated/generation/_generation.dm index 6adecef856..548fd6fe22 100644 --- a/code/_core/turf/unsimulated/generation/_generation.dm +++ b/code/_core/turf/unsimulated/generation/_generation.dm @@ -72,7 +72,7 @@ return TRUE -/turf/unsimulated/generation/proc/generate(var/size = WORLD_SIZE) +/turf/unsimulated/generation/proc/generate(size = WORLD_SIZE) return TRUE /* diff --git a/code/_core/turf/unsimulated/generation/beach.dm b/code/_core/turf/unsimulated/generation/beach.dm index ba7e905d87..eed6e2e71b 100644 --- a/code/_core/turf/unsimulated/generation/beach.dm +++ b/code/_core/turf/unsimulated/generation/beach.dm @@ -8,7 +8,7 @@ icon_state = "beach_path" density = FALSE -/turf/unsimulated/generation/beach/generate(var/size = WORLD_SIZE) +/turf/unsimulated/generation/beach/generate(size = WORLD_SIZE) if(!density) new /turf/simulated/floor/colored/sand/beach(src) diff --git a/code/_core/turf/unsimulated/generation/cave.dm b/code/_core/turf/unsimulated/generation/cave.dm index ad765225ac..920d802e9d 100644 --- a/code/_core/turf/unsimulated/generation/cave.dm +++ b/code/_core/turf/unsimulated/generation/cave.dm @@ -8,7 +8,7 @@ icon_state = "caves_path" density = FALSE -/turf/unsimulated/generation/forest_cave/generate(var/size = WORLD_SIZE) +/turf/unsimulated/generation/forest_cave/generate(size = WORLD_SIZE) if(density && (x <= VIEW_RANGE || x >= size - VIEW_RANGE || y <= VIEW_RANGE || y >= size - VIEW_RANGE)) //Handle edges. new /turf/simulated/wall/rock(src) diff --git a/code/_core/turf/unsimulated/generation/desert.dm b/code/_core/turf/unsimulated/generation/desert.dm index c3c29c001c..a073ac37b8 100644 --- a/code/_core/turf/unsimulated/generation/desert.dm +++ b/code/_core/turf/unsimulated/generation/desert.dm @@ -8,7 +8,7 @@ icon_state = "desert_path" density = FALSE -/turf/unsimulated/generation/desert/generate(var/size = WORLD_SIZE) +/turf/unsimulated/generation/desert/generate(size = WORLD_SIZE) if(density && is_different && is_next_to_null_area && is_next_to_dense_turf && !is_next_to_simulated) new /turf/simulated/wall/rock/desert(src) diff --git a/code/_core/turf/unsimulated/generation/forest.dm b/code/_core/turf/unsimulated/generation/forest.dm index ca1706b135..f6f1ec98a5 100644 --- a/code/_core/turf/unsimulated/generation/forest.dm +++ b/code/_core/turf/unsimulated/generation/forest.dm @@ -8,7 +8,7 @@ icon_state = "forest_path" density = FALSE -/turf/unsimulated/generation/forest/generate(var/size = WORLD_SIZE) +/turf/unsimulated/generation/forest/generate(size = WORLD_SIZE) var/is_snow = y >= SSturf.snow_line - (x*0.05)**(SSturf.snow_num*2) + sin(x)*10 diff --git a/code/_core/turf/unsimulated/generation/jungle.dm b/code/_core/turf/unsimulated/generation/jungle.dm index 59cf8d3ec1..35087a50f1 100644 --- a/code/_core/turf/unsimulated/generation/jungle.dm +++ b/code/_core/turf/unsimulated/generation/jungle.dm @@ -8,7 +8,7 @@ icon_state = "jungle_path" density = FALSE -/turf/unsimulated/generation/jungle/generate(var/size = WORLD_SIZE) +/turf/unsimulated/generation/jungle/generate(size = WORLD_SIZE) if(!density) if(noise >= GENERATION_SEGMENT_HIGH && noise <= GENERATION_SEGMENT_HIGHEST) diff --git a/code/_core/turf/unsimulated/generation/jungle_deep.dm b/code/_core/turf/unsimulated/generation/jungle_deep.dm index 75db25e93c..099355f579 100644 --- a/code/_core/turf/unsimulated/generation/jungle_deep.dm +++ b/code/_core/turf/unsimulated/generation/jungle_deep.dm @@ -6,7 +6,7 @@ icon_state = "jungle_deep_path" density = FALSE -/turf/unsimulated/generation/jungle_deep/generate(var/size = WORLD_SIZE) +/turf/unsimulated/generation/jungle_deep/generate(size = WORLD_SIZE) var/x_seed = x / size var/y_seed = y / size diff --git a/code/_core/turf/unsimulated/generation/lava.dm b/code/_core/turf/unsimulated/generation/lava.dm index a66253c2af..6664ab6022 100644 --- a/code/_core/turf/unsimulated/generation/lava.dm +++ b/code/_core/turf/unsimulated/generation/lava.dm @@ -8,7 +8,7 @@ icon_state = "lava_path" density = FALSE -/turf/unsimulated/generation/lava/generate(var/size = WORLD_SIZE) +/turf/unsimulated/generation/lava/generate(size = WORLD_SIZE) var/range_times_noise = round(VIEW_RANGE*noise,1) diff --git a/code/_core/turf/unsimulated/generation/ocean.dm b/code/_core/turf/unsimulated/generation/ocean.dm index e43270a524..df64d4f7f9 100644 --- a/code/_core/turf/unsimulated/generation/ocean.dm +++ b/code/_core/turf/unsimulated/generation/ocean.dm @@ -8,7 +8,7 @@ icon_state = "ocean_path" density = FALSE -/turf/unsimulated/generation/ocean/generate(var/size = WORLD_SIZE) +/turf/unsimulated/generation/ocean/generate(size = WORLD_SIZE) if(!density) new /turf/simulated/floor/colored/sand/beach(src) diff --git a/code/_core/turf/unsimulated/generation/river.dm b/code/_core/turf/unsimulated/generation/river.dm index 23a9295591..947d7b9d7a 100644 --- a/code/_core/turf/unsimulated/generation/river.dm +++ b/code/_core/turf/unsimulated/generation/river.dm @@ -8,7 +8,7 @@ icon_state = "river_path" density = FALSE -/turf/unsimulated/generation/river/generate(var/size = WORLD_SIZE) +/turf/unsimulated/generation/river/generate(size = WORLD_SIZE) if(!density) new /turf/simulated/floor/colored/dirt(src) diff --git a/code/_core/turf/unsimulated/generation/snow.dm b/code/_core/turf/unsimulated/generation/snow.dm index 17ad897e2a..0e90f14475 100644 --- a/code/_core/turf/unsimulated/generation/snow.dm +++ b/code/_core/turf/unsimulated/generation/snow.dm @@ -4,7 +4,7 @@ name = "snow generation" icon_state = "snow" -/turf/unsimulated/generation/snow/generate(var/size = WORLD_SIZE) +/turf/unsimulated/generation/snow/generate(size = WORLD_SIZE) if(density && is_different && is_next_to_null_areas && is_next_to_dense_turfs && is_next_to_organic_turfs) new /turf/simulated/wall/rock/snow(src) @@ -105,7 +105,7 @@ icon_state = "snow_path" -/turf/unsimulated/generation/snow/path/generate(var/size = WORLD_SIZE) +/turf/unsimulated/generation/snow/path/generate(size = WORLD_SIZE) if(!density) new /turf/simulated/floor/colored/snow(src) diff --git a/code/_core/turf/unsimulated/generation/snow_cave.dm b/code/_core/turf/unsimulated/generation/snow_cave.dm index 72605e4ab2..a46bc066c5 100644 --- a/code/_core/turf/unsimulated/generation/snow_cave.dm +++ b/code/_core/turf/unsimulated/generation/snow_cave.dm @@ -6,7 +6,7 @@ icon_state = "snow_caves_path" density = FALSE -/turf/unsimulated/generation/snow_cave/generate(var/size = WORLD_SIZE) +/turf/unsimulated/generation/snow_cave/generate(size = WORLD_SIZE) var/shitfix = path_only diff --git a/code/_core/world/_world.dm b/code/_core/world/_world.dm index 3c241b8f7d..b335528880 100644 --- a/code/_core/world/_world.dm +++ b/code/_core/world/_world.dm @@ -190,7 +190,7 @@ var/global/world_state = STATE_STARTING sleep(1) CHECK_TICK_HARD -/world/proc/end(var/reason,var/shutdown=FALSE) +/world/proc/end(reason,shutdown=FALSE) if(world_state != STATE_RUNNING) log_error("Can't end now!") diff --git a/code/_core/world/announcement.dm b/code/_core/world/announcement.dm index c19e337948..817376ed08 100644 --- a/code/_core/world/announcement.dm +++ b/code/_core/world/announcement.dm @@ -1,4 +1,4 @@ -/proc/announce(var/announcement_sender = "Unknown", var/announcement_title = "Untitled",var/annoumcent_text = "NULL",var/announcement_type = ANNOUNCEMENT_STATION, var/language = LANGUAGE_BASIC, var/sound_to_play = null, var/frequency = RADIO_FREQ_SHIP, var/list/valid_mobs) +/proc/announce(announcement_sender = "Unknown", announcement_title = "Untitled",annoumcent_text = "NULL",announcement_type = ANNOUNCEMENT_STATION, language = LANGUAGE_BASIC, sound_to_play = null, frequency = RADIO_FREQ_SHIP, list/valid_mobs) var/language/LA = SSlanguage.all_languages[language] diff --git a/code/_core/world/error.dm b/code/_core/world/error.dm index 6efc284a3c..aab2604dc8 100644 --- a/code/_core/world/error.dm +++ b/code/_core/world/error.dm @@ -4,7 +4,7 @@ var/global/list/tracked_errors = list() var/global/list/tracker_errors_spam = list() -/world/Error(var/exception/e) +/world/Error(exception/e) if(SSreport) SSreport.runtime_count += 1 diff --git a/code/_core/world/life.dm b/code/_core/world/life.dm index 5ca36fed62..bfc7250343 100644 --- a/code/_core/world/life.dm +++ b/code/_core/world/life.dm @@ -1,4 +1,4 @@ -/world/proc/subsystem_life_loop(var/subsystem/SS) +/world/proc/subsystem_life_loop(subsystem/SS) set background = TRUE spawn while(SS.tick_rate > 0 && world_state < STATE_SHUTDOWN) if(SS.tick_rate > 0 && SS.overtime_count < SS.overtime_max) @@ -28,7 +28,7 @@ while(world_state <= STATE_INITIALIZING) sleep(10) -/world/proc/subsystem_initialize(var/subsystem/SS) +/world/proc/subsystem_initialize(subsystem/SS) //No background processing. Everything needs to run in order. var/local_benchmark = true_time() log_subsystem(SS.name,"Initializing...") diff --git a/code/_core/world/subsystems/__subsystems.dm b/code/_core/world/subsystems/__subsystems.dm index 32f4251d15..a471389318 100644 --- a/code/_core/world/subsystems/__subsystems.dm +++ b/code/_core/world/subsystems/__subsystems.dm @@ -48,14 +48,14 @@ all_subsystems += src return TRUE -/subsystem/proc/unclog(var/mob/caller) +/subsystem/proc/unclog(mob/caller) if(caller.ckey) broadcast_to_clients("SHITTERS CLOGGED: Subsystem [name] has been restarted by [caller.ckey].") else broadcast_to_clients("SHITTERS CLOGGED: Subsystem [name] has been restarted automatically by the server's failsafe.") return TRUE -/subsystem/New(var/desired_loc) +/subsystem/New(desired_loc) if(tick_rate > 0) tick_rate = FLOOR(tick_rate,1) if(!tick_rate) diff --git a/code/_core/world/subsystems/advanced_thinking.dm b/code/_core/world/subsystems/advanced_thinking.dm index b202a3c3ed..19def5718e 100644 --- a/code/_core/world/subsystems/advanced_thinking.dm +++ b/code/_core/world/subsystems/advanced_thinking.dm @@ -7,7 +7,7 @@ SUBSYSTEM_DEF(advanced_thinking) tick_usage_max = 75 -/subsystem/advanced_thinking/unclog(var/mob/caller) +/subsystem/advanced_thinking/unclog(mob/caller) for(var/k in src.all_thinkers) all_thinkers -= k return ..() @@ -24,14 +24,14 @@ SUBSYSTEM_DEF(advanced_thinking) return TRUE -/proc/start_advanced_thinking(var/atom/A) +/proc/start_advanced_thinking(atom/A) SSadvanced_thinking.all_thinkers[A] = TRUE return TRUE -/proc/stop_advanced_thinking(var/atom/A) +/proc/stop_advanced_thinking(atom/A) if(SSadvanced_thinking.all_thinkers[A]) SSadvanced_thinking.all_thinkers -= A return TRUE -/proc/is_advanced_thinking(var/atom/A) +/proc/is_advanced_thinking(atom/A) return SSadvanced_thinking.all_thinkers[A] diff --git a/code/_core/world/subsystems/ai.dm b/code/_core/world/subsystems/ai.dm index 60eb965310..949cd47b6f 100644 --- a/code/_core/world/subsystems/ai.dm +++ b/code/_core/world/subsystems/ai.dm @@ -20,7 +20,7 @@ SUBSYSTEM_DEF(ai) var/list/ai_attacking_players = list() //Assoc list. key is AI, value is list of players -/subsystem/ai/unclog(var/mob/caller) +/subsystem/ai/unclog(mob/caller) for(var/z in active_ai_by_z) for(var/k in active_ai_by_z[z]) diff --git a/code/_core/world/subsystems/ai_boss.dm b/code/_core/world/subsystems/ai_boss.dm index 4511c529c4..3783c0eacb 100644 --- a/code/_core/world/subsystems/ai_boss.dm +++ b/code/_core/world/subsystems/ai_boss.dm @@ -9,7 +9,7 @@ SUBSYSTEM_DEF(bossai) var/list/active_ai_by_z = list() var/list/inactive_ai_by_z = list() -/subsystem/bossai/unclog(var/mob/caller) +/subsystem/bossai/unclog(mob/caller) for(var/z in active_ai_by_z) for(var/k in active_ai_by_z[z]) diff --git a/code/_core/world/subsystems/air.dm b/code/_core/world/subsystems/air.dm index 7cd639ba88..a51db027cc 100644 --- a/code/_core/world/subsystems/air.dm +++ b/code/_core/world/subsystems/air.dm @@ -34,7 +34,7 @@ SUBSYSTEM_DEF(air) return ..() -/subsystem/air/proc/update_turf_air(var/turf/simulated/source_turf) +/subsystem/air/proc/update_turf_air(turf/simulated/source_turf) if(!ENABLE_ATMOS) return FALSE diff --git a/code/_core/world/subsystems/areas.dm b/code/_core/world/subsystems/areas.dm index c07fffce7d..68568ab138 100644 --- a/code/_core/world/subsystems/areas.dm +++ b/code/_core/world/subsystems/areas.dm @@ -19,7 +19,7 @@ SUBSYSTEM_DEF(area) var/list/areas_by_identifier = list() -/subsystem/area/unclog(var/mob/caller) +/subsystem/area/unclog(mob/caller) src.tick_rate = 0 log_subsystem(src.name,"Shutting down.") . = ..() @@ -154,7 +154,7 @@ SUBSYSTEM_DEF(area) return TRUE -/subsystem/area/proc/set_weather(var/weather_type,var/enabled=FALSE,var/list/area/affected_areas) +/subsystem/area/proc/set_weather(weather_type,enabled=FALSE,list/area/affected_areas) for(var/k in affected_areas) var/area/A = k if(!A) diff --git a/code/_core/world/subsystems/badwords.dm b/code/_core/world/subsystems/badwords.dm index 70abdf6e2f..8f36cbd11b 100644 --- a/code/_core/world/subsystems/badwords.dm +++ b/code/_core/world/subsystems/badwords.dm @@ -31,7 +31,7 @@ SUBSYSTEM_DEF(badwords) return TRUE -/subsystem/badwords/proc/has_badword(var/text_to_check) +/subsystem/badwords/proc/has_badword(text_to_check) if(!space_regex || !text_to_check || !length(bad_word_regex)) diff --git a/code/_core/world/subsystems/balance.dm b/code/_core/world/subsystems/balance.dm index 9a78e2a411..01e9f42c9a 100644 --- a/code/_core/world/subsystems/balance.dm +++ b/code/_core/world/subsystems/balance.dm @@ -112,7 +112,7 @@ SUBSYSTEM_DEF(balance) DIFFICULTY_NIGHTMARE = 6 ) -/subsystem/balance/proc/process_loadout_contents(var/obj/O) +/subsystem/balance/proc/process_loadout_contents(obj/O) //This allows gloves and medicine to be stored. It's shitcode, but it works. //Don't need to create any more items from here because it's all already created. for(var/k in O.contents) @@ -130,7 +130,7 @@ SUBSYSTEM_DEF(balance) return TRUE -/subsystem/balance/proc/process_loadout(var/turf/T) +/subsystem/balance/proc/process_loadout(turf/T) for(var/k in subtypesof(/obj/structure/interactive/vending/)) var/obj/structure/interactive/vending/V = k @@ -157,7 +157,7 @@ SUBSYSTEM_DEF(balance) //We don't run initialize or anything here because we just need the initial types. qdel(V) -/subsystem/balance/proc/process_items(var/turf/T,var/list/everything_else) +/subsystem/balance/proc/process_items(turf/T,list/everything_else) for(var/k in everything_else) var/obj/item/I = k @@ -175,7 +175,7 @@ SUBSYSTEM_DEF(balance) CHECK_TICK_HARD -/subsystem/balance/proc/process_bullets(var/turf/T,var/list/bullet_subtypes) +/subsystem/balance/proc/process_bullets(turf/T,list/bullet_subtypes) . = list() for(var/k in bullet_subtypes) var/obj/item/bullet_cartridge/B = k @@ -193,7 +193,7 @@ SUBSYSTEM_DEF(balance) . += B CHECK_TICK_HARD -/subsystem/balance/proc/process_magazines(var/turf/T,var/list/magazine_subtypes) +/subsystem/balance/proc/process_magazines(turf/T,list/magazine_subtypes) . = list() for(var/k in magazine_subtypes) var/obj/item/magazine/M = k @@ -214,7 +214,7 @@ SUBSYSTEM_DEF(balance) . += M CHECK_TICK_HARD -/subsystem/balance/proc/process_weapons(var/turf/T,var/list/weapon_subtypes) +/subsystem/balance/proc/process_weapons(turf/T,list/weapon_subtypes) . = list() for(var/k in weapon_subtypes) var/obj/item/weapon/W = k diff --git a/code/_core/world/subsystems/ball.dm b/code/_core/world/subsystems/ball.dm index 19e298cdcd..30ddf40df1 100644 --- a/code/_core/world/subsystems/ball.dm +++ b/code/_core/world/subsystems/ball.dm @@ -10,7 +10,7 @@ SUBSYSTEM_DEF(ball) //Finally. A subsystem dedicated to BALLS. var/list/all_balls = list() -/subsystem/ball/unclog(var/mob/caller) +/subsystem/ball/unclog(mob/caller) for(var/k in all_balls) var/obj/item/ball/B = k if(!B || B.qdeleting) diff --git a/code/_core/world/subsystems/ban.dm b/code/_core/world/subsystems/ban.dm index 6c19cb85bd..8a4bc20433 100644 --- a/code/_core/world/subsystems/ban.dm +++ b/code/_core/world/subsystems/ban.dm @@ -86,7 +86,7 @@ SUBSYSTEM_DEF(ban) return TRUE -/subsystem/ban/proc/is_banned(var/key,var/address,var/computer_id,var/type) +/subsystem/ban/proc/is_banned(key,address,computer_id,type) var/ckey_sanitized = ckey(key) @@ -117,7 +117,7 @@ SUBSYSTEM_DEF(ban) return SSban.is_banned(key,address,computer_id,type) -/subsystem/ban/proc/add_ckey_ban(var/desired_ckey,var/admin_ckey = "SERVER",var/reason = "No reason specified.",var/expires = world.realtime + 86400) +/subsystem/ban/proc/add_ckey_ban(desired_ckey,admin_ckey = "SERVER",reason = "No reason specified.",expires = world.realtime + 86400) bans_keys[desired_ckey] = list("admin" = admin_ckey, "reason" = reason, "expires" = expires) rustg_file_write(json_encode(bans_keys),BANLIST_KEYS_DIR) @@ -145,7 +145,7 @@ SUBSYSTEM_DEF(ban) return TRUE -/subsystem/ban/proc/remove_ckey_ban(var/ckey,admin_ckey) +/subsystem/ban/proc/remove_ckey_ban(ckey,admin_ckey) if(bans_keys[ckey]) bans_keys -= ckey log_admin("[ckey] was removed from the ckey banlist by [admin_ckey].") diff --git a/code/_core/world/subsystems/boss.dm b/code/_core/world/subsystems/boss.dm index 50329d64cf..cdc28c8b64 100644 --- a/code/_core/world/subsystems/boss.dm +++ b/code/_core/world/subsystems/boss.dm @@ -8,7 +8,7 @@ SUBSYSTEM_DEF(bosses) var/list/tracked_rogue_crewmembers = list() -/subsystem/bosses/unclog(var/mob/caller) +/subsystem/bosses/unclog(mob/caller) . = ..() @@ -20,7 +20,7 @@ SUBSYSTEM_DEF(bosses) L.gib() -/subsystem/bosses/proc/check_boss(var/mob/living/L) +/subsystem/bosses/proc/check_boss(mob/living/L) if(L.dead || L.qdeleting) for(var/v in L.players_fighting_boss) @@ -69,7 +69,7 @@ SUBSYSTEM_DEF(bosses) B.target_bosses |= src B.update_stats() -/mob/living/proc/add_player_to_boss(var/mob/living/advanced/player/P) +/mob/living/proc/add_player_to_boss(mob/living/advanced/player/P) if(P in src.players_fighting_boss) return FALSE players_fighting_boss += P @@ -77,7 +77,7 @@ SUBSYSTEM_DEF(bosses) B.target_bosses |= src B.update_stats() -/mob/living/proc/remove_player_from_boss(var/mob/living/advanced/player/P) +/mob/living/proc/remove_player_from_boss(mob/living/advanced/player/P) if(!(P in src.players_fighting_boss)) return FALSE players_fighting_boss -= P diff --git a/code/_core/world/subsystems/botany.dm b/code/_core/world/subsystems/botany.dm index 527849fdaa..239837a02b 100644 --- a/code/_core/world/subsystems/botany.dm +++ b/code/_core/world/subsystems/botany.dm @@ -11,7 +11,7 @@ SUBSYSTEM_DEF(botany) var/list/queued_plant_update_chunks = list() -/subsystem/botany/unclog(var/mob/caller) +/subsystem/botany/unclog(mob/caller) for(var/k in all_plants) var/obj/structure/interactive/plant/P = k diff --git a/code/_core/world/subsystems/botany_alchemy.dm b/code/_core/world/subsystems/botany_alchemy.dm index 7c29252163..d1d6a311ef 100644 --- a/code/_core/world/subsystems/botany_alchemy.dm +++ b/code/_core/world/subsystems/botany_alchemy.dm @@ -39,7 +39,7 @@ SUBSYSTEM_DEF(botany_alchemy) log_subsystem(name,"Generated [total_alchemy_plants] total alchemy plants in world.") return TRUE -/subsystem/botany_alchemy/unclog(var/mob/caller) +/subsystem/botany_alchemy/unclog(mob/caller) for(var/k in all_alchemy_plants) var/obj/structure/interactive/alchemy_plant/P = k qdel(P) diff --git a/code/_core/world/subsystems/callback.dm b/code/_core/world/subsystems/callback.dm index 455d843988..520a912c87 100644 --- a/code/_core/world/subsystems/callback.dm +++ b/code/_core/world/subsystems/callback.dm @@ -8,12 +8,12 @@ SUBSYSTEM_DEF(callback) tick_usage_max = 100 -/subsystem/callback/unclog(var/mob/caller) +/subsystem/callback/unclog(mob/caller) for(var/callback_id in src.all_callbacks) all_callbacks -= callback_id . = ..() -/subsystem/callback/proc/try_call(var/datum/stored_object,var/stored_proc,var/stored_args) +/subsystem/callback/proc/try_call(datum/stored_object,stored_proc,stored_args) if(stored_object) if(is_datum(stored_object) && stored_object.qdeleting) return FALSE @@ -53,7 +53,7 @@ SUBSYSTEM_DEF(callback) return TRUE -/subsystem/callback/proc/add_callback(var/desired_id,var/desired_time,var/desired_object,var/desired_proc,...) +/subsystem/callback/proc/add_callback(desired_id,desired_time,desired_object,desired_proc,...) all_callbacks[desired_id] = list( "object" = desired_object, "proc" = desired_proc, @@ -62,7 +62,7 @@ SUBSYSTEM_DEF(callback) ) return TRUE -/subsystem/callback/proc/remove_callback(var/desired_id) +/subsystem/callback/proc/remove_callback(desired_id) if(all_callbacks[desired_id]) all_callbacks -= desired_id return TRUE diff --git a/code/_core/world/subsystems/choice.dm b/code/_core/world/subsystems/choice.dm index b6b4e12094..61d3fca81b 100644 --- a/code/_core/world/subsystems/choice.dm +++ b/code/_core/world/subsystems/choice.dm @@ -25,7 +25,7 @@ SUBSYSTEM_DEF(choices) return TRUE -/proc/start_choice(var/mob/M,var/choice/C) +/proc/start_choice(mob/M,choice/C) if(!M.client) return FALSE diff --git a/code/_core/world/subsystems/chunk_cleaning.dm b/code/_core/world/subsystems/chunk_cleaning.dm index 34ed5ba223..60fc6796f8 100644 --- a/code/_core/world/subsystems/chunk_cleaning.dm +++ b/code/_core/world/subsystems/chunk_cleaning.dm @@ -45,7 +45,7 @@ SUBSYSTEM_DEF(chunkclean) return TRUE -/subsystem/chunkclean/proc/process_entire_z(var/z) +/subsystem/chunkclean/proc/process_entire_z(z) if(!z) return 0 @@ -75,7 +75,7 @@ SUBSYSTEM_DEF(chunkclean) if(M.enable_chunk_clean) . += M.on_chunk_clean() -/proc/get_chunk_data(var/adjacent=FALSE) +/proc/get_chunk_data(adjacent=FALSE) . = list() @@ -100,7 +100,7 @@ SUBSYSTEM_DEF(chunkclean) .["[x+1],[y+1],[T.z]"] = TRUE .["[x+1],[y],[T.z]"] = TRUE -/proc/get_chunk(var/chunk_x,var/chunk_y,var/chunk_z) +/proc/get_chunk(chunk_x,chunk_y,chunk_z) var/min_x = max(1,1 + CHUNK_SIZE * (chunk_x-1)) var/min_y = max(1,1 + CHUNK_SIZE * (chunk_y-1)) diff --git a/code/_core/world/subsystems/chunk_cleaning_new.dm b/code/_core/world/subsystems/chunk_cleaning_new.dm index 821561a2b6..b962432bad 100644 --- a/code/_core/world/subsystems/chunk_cleaning_new.dm +++ b/code/_core/world/subsystems/chunk_cleaning_new.dm @@ -17,7 +17,7 @@ SUBSYSTEM_DEF(chunk) var/list/failed_chunk_count = list() var/list/unclean_chunks = list() -/subsystem/chunk/unclog(var/mob/caller) +/subsystem/chunk/unclog(mob/caller) //Honestly there is literally 0 reason as to why this would fail 3 times in as row. //I can't wait to be proven wrong. . = ..() @@ -87,7 +87,7 @@ SUBSYSTEM_DEF(chunk) return TRUE -/subsystem/chunk/proc/process_entire_z(var/z) +/subsystem/chunk/proc/process_entire_z(z) . = 0 diff --git a/code/_core/world/subsystems/cleaning.dm b/code/_core/world/subsystems/cleaning.dm index 7141fae6b9..15e937a5be 100644 --- a/code/_core/world/subsystems/cleaning.dm +++ b/code/_core/world/subsystems/cleaning.dm @@ -13,7 +13,7 @@ SUBSYSTEM_DEF(delete) var/list/cleaning_log = list() -/subsystem/delete/unclog(var/mob/caller) +/subsystem/delete/unclog(mob/caller) for(var/k in src.objects_to_delete) var/datum/D = k @@ -87,7 +87,7 @@ SUBSYSTEM_DEF(delete) return TRUE -/subsystem/delete/proc/should_delete(var/datum/D) +/subsystem/delete/proc/should_delete(datum/D) if(!is_atom(D)) log_error("Warning: Tried safe deleting a non-atom! ([D.get_debug_name()]).") diff --git a/code/_core/world/subsystems/client.dm b/code/_core/world/subsystems/client.dm index 7d7963ee45..82cdeeb06d 100644 --- a/code/_core/world/subsystems/client.dm +++ b/code/_core/world/subsystems/client.dm @@ -30,7 +30,7 @@ SUBSYSTEM_DEF(client) var/list/all_clients = list() //Assoc list -/subsystem/client/unclog(var/mob/caller) +/subsystem/client/unclog(mob/caller) for(var/ckey in SSclient.all_clients) //This should never be tick checked. var/client/C = SSclient.all_clients[ckey] if(!C) diff --git a/code/_core/world/subsystems/damagetype.dm b/code/_core/world/subsystems/damagetype.dm index f3c9939ac2..d60a068c17 100644 --- a/code/_core/world/subsystems/damagetype.dm +++ b/code/_core/world/subsystems/damagetype.dm @@ -42,7 +42,7 @@ SUBSYSTEM_DEF(damagetype) return ..() /* -/subsystem/damagetype/proc/add_damage(var/atom/attacker,var/atom/victim,var/atom/weapon,var/atom/hit_object,var/atom/blamed,var/damage_multiplier=1,var/damagetype/DT) +/subsystem/damagetype/proc/add_damage(atom/attacker,atom/victim,atom/weapon,atom/hit_object,atom/blamed,damage_multiplier=1,damagetype/DT) var/reference_id = "\ref[weapon]_\ref[hit_object]" diff --git a/code/_core/world/subsystems/dialogue.dm b/code/_core/world/subsystems/dialogue.dm index f1591a656c..07be7e281a 100644 --- a/code/_core/world/subsystems/dialogue.dm +++ b/code/_core/world/subsystems/dialogue.dm @@ -29,7 +29,7 @@ SUBSYSTEM_DEF(dialogue) -/subsystem/dialogue/proc/setup_combat_dialogue(var/combat_dialogue/CD) +/subsystem/dialogue/proc/setup_combat_dialogue(combat_dialogue/CD) var/list/files = flist("[CD.folderpath]/") @@ -59,7 +59,7 @@ SUBSYSTEM_DEF(dialogue) return TRUE -/subsystem/dialogue/proc/get_combat_dialogue(var/combat_dialogue/cd_id,var/desired_category,var/swear_chance=25) +/subsystem/dialogue/proc/get_combat_dialogue(combat_dialogue/cd_id,desired_category,swear_chance=25) if(!desired_category) return FALSE diff --git a/code/_core/world/subsystems/discord.dm b/code/_core/world/subsystems/discord.dm index 62614ca8e9..8b16372095 100644 --- a/code/_core/world/subsystems/discord.dm +++ b/code/_core/world/subsystems/discord.dm @@ -20,7 +20,7 @@ SUBSYSTEM_DEF(discord) return TRUE -/subsystem/discord/proc/send_message(var/message_to_send) +/subsystem/discord/proc/send_message(message_to_send) if(world.port == 0) //Don't send to local servers. return FALSE diff --git a/code/_core/world/subsystems/dmm_suite.dm b/code/_core/world/subsystems/dmm_suite.dm index e0af4dc4b1..abac592140 100644 --- a/code/_core/world/subsystems/dmm_suite.dm +++ b/code/_core/world/subsystems/dmm_suite.dm @@ -300,7 +300,7 @@ SUBSYSTEM_DEF(dmm_suite) return ..() -/subsystem/dmm_suite/proc/is_pvp_coord(var/x,var/y,var/z,var/distance=0) +/subsystem/dmm_suite/proc/is_pvp_coord(x,y,z,distance=0) if(!pvp_y) return FALSE @@ -326,7 +326,7 @@ SUBSYSTEM_DEF(dmm_suite) //Here lies dead code. //Annoying to work with and I don't have time to spend 6 months on this. /* -/subsystem/dmm_suite/proc/generate_world(var/z=0) +/subsystem/dmm_suite/proc/generate_world(z=0) log_subsystem(name,"Generating world [z]...") diff --git a/code/_core/world/subsystems/enchanting.dm b/code/_core/world/subsystems/enchanting.dm index 1ead956f58..33f74243a5 100644 --- a/code/_core/world/subsystems/enchanting.dm +++ b/code/_core/world/subsystems/enchanting.dm @@ -30,7 +30,7 @@ SUBSYSTEM_DEF(enchanting) return ..() -/proc/get_random_enchantment(var/ench_type=ENCH_ANY,var/list/whitelist,var/list/blacklist) +/proc/get_random_enchantment(ench_type=ENCH_ANY,list/whitelist,list/blacklist) var/list/possible_enchantments = list() diff --git a/code/_core/world/subsystems/events.dm b/code/_core/world/subsystems/events.dm index a06450c9b9..69ff357fe4 100644 --- a/code/_core/world/subsystems/events.dm +++ b/code/_core/world/subsystems/events.dm @@ -16,7 +16,7 @@ SUBSYSTEM_DEF(events) var/enable = FALSE -/subsystem/events/unclog(var/mob/caller) +/subsystem/events/unclog(mob/caller) for(var/k in all_events_active) var/event/E = k @@ -42,7 +42,7 @@ SUBSYSTEM_DEF(events) return ..() -/subsystem/events/proc/process_event(var/event/E) +/subsystem/events/proc/process_event(event/E) if(E.end_time != -1 && E.end_time <= world.time) E.on_end() E.active = FALSE @@ -77,7 +77,7 @@ SUBSYSTEM_DEF(events) return TRUE -/subsystem/events/proc/trigger_random_event(var/minor) +/subsystem/events/proc/trigger_random_event(minor) if(!SSgamemode?.active_gamemode?.allow_launch) return FALSE @@ -103,7 +103,7 @@ SUBSYSTEM_DEF(events) return TRUE -/subsystem/events/proc/trigger_event(var/event/E) +/subsystem/events/proc/trigger_event(event/E) if(E.active) return FALSE diff --git a/code/_core/world/subsystems/explosion.dm b/code/_core/world/subsystems/explosion.dm index 7332f6c81b..dbe249c7cc 100644 --- a/code/_core/world/subsystems/explosion.dm +++ b/code/_core/world/subsystems/explosion.dm @@ -15,7 +15,7 @@ SUBSYSTEM_DEF(explosion) var/particles/fire_particles -/subsystem/explosion/unclog(var/mob/caller) +/subsystem/explosion/unclog(mob/caller) damage_to_process.Cut() @@ -98,7 +98,7 @@ SUBSYSTEM_DEF(explosion) return TRUE -/proc/explode(var/turf/desired_turf,var/desired_range,var/atom/desired_owner,var/atom/desired_source,var/desired_loyalty_tag,var/velocity_dir=0x0,var/multiplier=1) +/proc/explode(turf/desired_turf,desired_range,atom/desired_owner,atom/desired_source,desired_loyalty_tag,velocity_dir=0x0,multiplier=1) if(desired_range <= 0) return FALSE @@ -132,7 +132,7 @@ SUBSYSTEM_DEF(explosion) -/proc/emp(var/turf/desired_turf,var/desired_range,var/atom/desired_owner,var/atom/desired_source,var/desired_loyalty_tag,var/multiplier=1) +/proc/emp(turf/desired_turf,desired_range,atom/desired_owner,atom/desired_source,desired_loyalty_tag,multiplier=1) desired_range = min(desired_range,VIEW_RANGE) @@ -149,7 +149,7 @@ SUBSYSTEM_DEF(explosion) -/proc/firebomb(var/turf/desired_turf,var/desired_range,var/atom/desired_owner,var/atom/desired_source,var/desired_loyalty_tag,var/momentum=NORTH|EAST|SOUTH|WEST,var/multiplier=1) +/proc/firebomb(turf/desired_turf,desired_range,atom/desired_owner,atom/desired_source,desired_loyalty_tag,momentum=NORTH|EAST|SOUTH|WEST,multiplier=1) if(desired_range <= 0) return FALSE diff --git a/code/_core/world/subsystems/fuckup.dm b/code/_core/world/subsystems/fuckup.dm index 9d20bc213b..a8b7149165 100644 --- a/code/_core/world/subsystems/fuckup.dm +++ b/code/_core/world/subsystems/fuckup.dm @@ -16,7 +16,7 @@ SUBSYSTEM_DEF(fuckup) . = ..() -/subsystem/fuckup/proc/apply_fuckup(var/fuckup/FU) +/subsystem/fuckup/proc/apply_fuckup(fuckup/FU) allow_loading = FALSE diff --git a/code/_core/world/subsystems/gamemode.dm b/code/_core/world/subsystems/gamemode.dm index 76c694768a..97d023e403 100644 --- a/code/_core/world/subsystems/gamemode.dm +++ b/code/_core/world/subsystems/gamemode.dm @@ -13,7 +13,7 @@ SUBSYSTEM_DEF(gamemode) var/list/tracked_bosses = list() -/subsystem/gamemode/unclog(var/mob/caller) +/subsystem/gamemode/unclog(mob/caller) if(active_gamemode) var/gamemode/G = active_gamemode.type @@ -21,7 +21,7 @@ SUBSYSTEM_DEF(gamemode) . = ..() -/subsystem/gamemode/proc/set_active_gamemode(var/gamemode/desired_gamemode,var/source) +/subsystem/gamemode/proc/set_active_gamemode(gamemode/desired_gamemode,source) QDEL_NULL(active_gamemode) active_gamemode = new desired_gamemode log_debug("Setting gamemode to: [active_gamemode.name]... Source: [source].") diff --git a/code/_core/world/subsystems/ghost.dm b/code/_core/world/subsystems/ghost.dm index 5482980e22..4e3797795b 100644 --- a/code/_core/world/subsystems/ghost.dm +++ b/code/_core/world/subsystems/ghost.dm @@ -9,7 +9,7 @@ SUBSYSTEM_DEF(ghost) var/list/obj/item/emf/all_emf_trackers = list() var/list/obj/emf/all_emfs = list() -/subsystem/ghost/unclog(var/mob/caller) +/subsystem/ghost/unclog(mob/caller) for(var/k in all_emfs) var/obj/emf/E = k diff --git a/code/_core/world/subsystems/health_update.dm b/code/_core/world/subsystems/health_update.dm index 7e5051bdd1..9900e103a1 100644 --- a/code/_core/world/subsystems/health_update.dm +++ b/code/_core/world/subsystems/health_update.dm @@ -9,7 +9,7 @@ SUBSYSTEM_DEF(healthupdate) var/list/queued_mobs = list() -/subsystem/healthupdate/unclog(var/mob/caller) +/subsystem/healthupdate/unclog(mob/caller) queued_mobs.Cut() . = ..() diff --git a/code/_core/world/subsystems/hooks.dm b/code/_core/world/subsystems/hooks.dm index 2febb148ad..37a2f47b04 100644 --- a/code/_core/world/subsystems/hooks.dm +++ b/code/_core/world/subsystems/hooks.dm @@ -7,7 +7,7 @@ SUBSYSTEM_DEF(hook) //GMOD, anyone? Doesn't need a priority var as people should just add/overwrite the proc it calls. //Adds a hook to an event. -/subsystem/hook/proc/add_hook(var/event_name,var/identifier,var/datum/owner,var/datum/proc_target,var/proc_to_use) +/subsystem/hook/proc/add_hook(event_name,identifier,datum/owner,datum/proc_target,proc_to_use) ASSERT(event_name) ASSERT(identifier) @@ -25,7 +25,7 @@ SUBSYSTEM_DEF(hook) return TRUE -/subsystem/hook/proc/remove_hook(var/event_name,var/identifier,var/datum/datum_to_use) +/subsystem/hook/proc/remove_hook(event_name,identifier,datum/datum_to_use) ASSERT(datum_to_use) @@ -42,7 +42,7 @@ SUBSYSTEM_DEF(hook) return TRUE -/subsystem/hook/proc/call_hook(var/event_name,var/datum/datum_to_use,var/args) +/subsystem/hook/proc/call_hook(event_name,datum/datum_to_use,args) ASSERT(event_name) diff --git a/code/_core/world/subsystems/horde.dm b/code/_core/world/subsystems/horde.dm index e1c63fb187..b7a4517bb2 100644 --- a/code/_core/world/subsystems/horde.dm +++ b/code/_core/world/subsystems/horde.dm @@ -33,7 +33,7 @@ SUBSYSTEM_DEF(horde) -/subsystem/horde/unclog(var/mob/caller) +/subsystem/horde/unclog(mob/caller) enable = FALSE . = ..() @@ -126,7 +126,7 @@ SUBSYSTEM_DEF(horde) return TRUE -/subsystem/horde/proc/get_squad_to_send(var/atom/target) +/subsystem/horde/proc/get_squad_to_send(atom/target) //Get the hoard to send. var/area/A = get_area(target) @@ -152,7 +152,7 @@ SUBSYSTEM_DEF(horde) else return chosen_key -/subsystem/horde/proc/send_squad(var/atom/target,var/mob/living/attacker_type,var/bypass_restrictions=FALSE,var/horde_count_override=0,var/debug=FALSE) +/subsystem/horde/proc/send_squad(atom/target,mob/living/attacker_type,bypass_restrictions=FALSE,horde_count_override=0,debug=FALSE) var/enemies_to_send = horde_count_override if(!enemies_to_send && is_player(target)) diff --git a/code/_core/world/subsystems/horde_OLD.dm b/code/_core/world/subsystems/horde_OLD.dm index 27be69217f..585290289f 100644 --- a/code/_core/world/subsystems/horde_OLD.dm +++ b/code/_core/world/subsystems/horde_OLD.dm @@ -38,7 +38,7 @@ SUBSYSTEM_DEF(horde) tick_usage_max = 50 cpu_usage_max = 50 -/subsystem/horde/proc/on_killed_syndicate(var/mob/living/L) +/subsystem/horde/proc/on_killed_syndicate(mob/living/L) if(!(L in tracked_enemies)) return FALSE @@ -177,7 +177,7 @@ SUBSYSTEM_DEF(horde) round_time_next = HORDE_DELAY_WAIT return ..() -/subsystem/horde/proc/spawn_objectives(var/artifact_count = 1, var/kill_count = 3, var/rescue_count = 1) +/subsystem/horde/proc/spawn_objectives(artifact_count = 1, kill_count = 3, rescue_count = 1) var/desired_spawn_objectives = min(artifact_count,length(possible_objective_spawns)) var/desired_kill_objectives = min(kill_count,length(SSbosses.living_bosses)) diff --git a/code/_core/world/subsystems/image_notifications.dm b/code/_core/world/subsystems/image_notifications.dm index 3d3f881635..c5da63a93a 100644 --- a/code/_core/world/subsystems/image_notifications.dm +++ b/code/_core/world/subsystems/image_notifications.dm @@ -18,14 +18,14 @@ SUBSYSTEM_DEF(image_notifications) return TRUE -/proc/add_notification_colored_easy(var/client/C,var/color,var/duration,var/fade_in=TRUE,var/fade_out=TRUE) +/proc/add_notification_colored_easy(client/C,color,duration,fade_in=TRUE,fade_out=TRUE) var/obj/hud/screen/S = add_notification_easy(C,'icons/hud/screen.dmi',"blank",duration,fade_in,fade_out) S.color = color S.screen_loc = "LEFT,BOTTOM" return S -/proc/add_notification_easy(var/client/C,var/icon,var/icon_state,var/duration,var/fade_in=TRUE,var/fade_out=TRUE,var/desired_text) +/proc/add_notification_easy(client/C,icon,icon_state,duration,fade_in=TRUE,fade_out=TRUE,desired_text) var/obj/hud/screen/S = add_notification(C,duration,fade_in,fade_out) S.layer = LAYER_AREA S.plane = PLANE_HUD @@ -41,7 +41,7 @@ SUBSYSTEM_DEF(image_notifications) qdel(I) return S -/proc/add_notification(var/client/C,var/duration,var/fade_in=TRUE,var/fade_out=TRUE) +/proc/add_notification(client/C,duration,fade_in=TRUE,fade_out=TRUE) if(!C || !C.mob) return @@ -69,7 +69,7 @@ SUBSYSTEM_DEF(image_notifications) return S -/proc/remove_notification(var/client/C,var/obj/hud/screen/S) +/proc/remove_notification(client/C,obj/hud/screen/S) if(C && C.screen) C.screen -= S diff --git a/code/_core/world/subsystems/lighting.dm b/code/_core/world/subsystems/lighting.dm index ae56c2cda7..619874567c 100644 --- a/code/_core/world/subsystems/lighting.dm +++ b/code/_core/world/subsystems/lighting.dm @@ -64,7 +64,7 @@ SUBSYSTEM_DEF(lighting) -/subsystem/lighting/unclog(var/mob/caller) +/subsystem/lighting/unclog(mob/caller) for(var/k in lighting_corners) var/datum/D = k diff --git a/code/_core/world/subsystems/lighting_OLD.dm b/code/_core/world/subsystems/lighting_OLD.dm index 9f38f95990..71bcec9e77 100644 --- a/code/_core/world/subsystems/lighting_OLD.dm +++ b/code/_core/world/subsystems/lighting_OLD.dm @@ -34,7 +34,7 @@ SUBSYSTEM_DEF(lighting) for(var/zlevel = 1 to world.maxz) create_lighting_overlays_zlevel(zlevel) -/proc/turf_has_lighting(var/turf/T) +/proc/turf_has_lighting(turf/T) if(!T.dynamic_lighting) return FALSE @@ -44,7 +44,7 @@ SUBSYSTEM_DEF(lighting) return TRUE -/proc/create_lighting_overlays_zlevel(var/zlevel) +/proc/create_lighting_overlays_zlevel(zlevel) ASSERT(zlevel) diff --git a/code/_core/world/subsystems/living.dm b/code/_core/world/subsystems/living.dm index e00c059acc..7c9fe11a77 100644 --- a/code/_core/world/subsystems/living.dm +++ b/code/_core/world/subsystems/living.dm @@ -28,7 +28,7 @@ SUBSYSTEM_DEF(living) var/list/all_mobs_with_clients = list() var/list/all_mobs_with_clients_by_z = list() -/subsystem/living/unclog(var/mob/caller) +/subsystem/living/unclog(mob/caller) for(var/k in processing_mobs) var/mob/living/L = k diff --git a/code/_core/world/subsystems/logging.dm b/code/_core/world/subsystems/logging.dm index a281a592fd..5bc9d00fd0 100644 --- a/code/_core/world/subsystems/logging.dm +++ b/code/_core/world/subsystems/logging.dm @@ -21,7 +21,7 @@ SUBSYSTEM_DEF(logging) var/version = "NOT FOUND" //Logging shouldn't be unclogged. -/subsystem/logging/unclog(var/mob/caller) +/subsystem/logging/unclog(mob/caller) . = ..() /subsystem/logging/Initialize() @@ -42,17 +42,17 @@ SUBSYSTEM_DEF(logging) return ..() -/subsystem/logging/proc/get_logging_dir(var/type) +/subsystem/logging/proc/get_logging_dir(type) return "data/server/logging/[round_id]-[start_date]/[type].txt" -/subsystem/logging/proc/raw_log(var/file_name,var/text_data,var/timestamps=FALSE) +/subsystem/logging/proc/raw_log(file_name,text_data,timestamps=FALSE) if(!file_name || !text_data) return FALSE rustg_log_write(get_logging_dir(file_name),text_data, timestamps ? "true" : null) return TRUE -/subsystem/logging/proc/log_from_list(var/identifier,var/list/desired_list) +/subsystem/logging/proc/log_from_list(identifier,list/desired_list) if(!length(desired_list)) return FALSE var/log_string = english_list(desired_list,"LIST ERROR","\n","\n") diff --git a/code/_core/world/subsystems/maps.dm b/code/_core/world/subsystems/maps.dm index b2d2eec387..33c70a6be0 100644 --- a/code/_core/world/subsystems/maps.dm +++ b/code/_core/world/subsystems/maps.dm @@ -16,5 +16,5 @@ SUBSYSTEM_DEF(maps) for(var/i=1,i<=length(map_files),i++) map_2_zlevel[map_files[i]] = i -/proc/get_z_level(var/z_level) +/proc/get_z_level(z_level) return map_2_zlevel[z_level] \ No newline at end of file diff --git a/code/_core/world/subsystems/menus.dm b/code/_core/world/subsystems/menus.dm index 0dbd425d4a..ced4b396bf 100644 --- a/code/_core/world/subsystems/menus.dm +++ b/code/_core/world/subsystems/menus.dm @@ -20,7 +20,7 @@ SUBSYSTEM_DEF(menu) preload_assets(M) -/subsystem/menu/proc/preload_assets(var/mob/M) +/subsystem/menu/proc/preload_assets(mob/M) for(var/k in all_menus) var/menu/E = all_menus[k] @@ -28,12 +28,12 @@ SUBSYSTEM_DEF(menu) return TRUE -/proc/open_menu(var/mob/M,var/menu_id) +/proc/open_menu(mob/M,menu_id) spawn var/menu/E = SSmenu.all_menus[menu_id] E.open(M) -/proc/close_menu(var/mob/M,var/menu_id) +/proc/close_menu(mob/M,menu_id) spawn var/menu/E = SSmenu.all_menus[menu_id] E.close(M) @@ -41,7 +41,7 @@ SUBSYSTEM_DEF(menu) proc/get_menu(var/menu_id) return SSmenu.all_menus[menu_id] -/proc/send_load(var/mob/M,menu_id) //A common command I use every time I visit your mom. +/proc/send_load(mob/M,menu_id) //A common command I use every time I visit your mom. var/menu/E = SSmenu.all_menus[menu_id] if(!E) log_error("Warning: Could not load menu [menu_id ? menu_id : "NULL"] for [M.get_debug_name()]!") diff --git a/code/_core/world/subsystems/objs.dm b/code/_core/world/subsystems/objs.dm index ce18e7daa1..0be74507f5 100644 --- a/code/_core/world/subsystems/objs.dm +++ b/code/_core/world/subsystems/objs.dm @@ -27,7 +27,7 @@ SUBSYSTEM_DEF(obj) var/list/obj/hud/button/message/all_hud_messages = list() -/subsystem/obj/unclog(var/mob/caller) +/subsystem/obj/unclog(mob/caller) for(var/k in initialize_superlate) var/obj/O = k diff --git a/code/_core/world/subsystems/payday.dm b/code/_core/world/subsystems/payday.dm index 9884b7c303..64a09766ca 100644 --- a/code/_core/world/subsystems/payday.dm +++ b/code/_core/world/subsystems/payday.dm @@ -12,7 +12,7 @@ SUBSYSTEM_DEF(payday) tick_usage_max = 50 -/subsystem/payday/unclog(var/mob/caller) +/subsystem/payday/unclog(mob/caller) tick_rate = -1 . = ..() diff --git a/code/_core/world/subsystems/poly.dm b/code/_core/world/subsystems/poly.dm index 6cc8f4a48e..091903f730 100644 --- a/code/_core/world/subsystems/poly.dm +++ b/code/_core/world/subsystems/poly.dm @@ -32,7 +32,7 @@ SUBSYSTEM_DEF(poly) return TRUE -/subsystem/poly/proc/add_new_text(var/text_to_add) +/subsystem/poly/proc/add_new_text(text_to_add) if(!text_to_add) return FALSE if(length(text_to_add) > 144) diff --git a/code/_core/world/subsystems/power.dm b/code/_core/world/subsystems/power.dm index cf6d5fc661..2553770af0 100644 --- a/code/_core/world/subsystems/power.dm +++ b/code/_core/world/subsystems/power.dm @@ -13,7 +13,7 @@ SUBSYSTEM_DEF(power) var/power_id = 1 -/subsystem/power/unclog(var/mob/caller) +/subsystem/power/unclog(mob/caller) tick_rate = -1 . = ..() diff --git a/code/_core/world/subsystems/progress_bars.dm b/code/_core/world/subsystems/progress_bars.dm index 63a2e8c0fc..59a2b0124d 100644 --- a/code/_core/world/subsystems/progress_bars.dm +++ b/code/_core/world/subsystems/progress_bars.dm @@ -11,7 +11,7 @@ SUBSYSTEM_DEF(progressbars) tick_usage_max = 95 -/subsystem/progressbars/unclog(var/mob/caller) +/subsystem/progressbars/unclog(mob/caller) for(var/k in all_progress_bars) if(!k) @@ -30,7 +30,7 @@ SUBSYSTEM_DEF(progressbars) . = ..() -/subsystem/progressbars/proc/process_progress_bar(var/k) +/subsystem/progressbars/proc/process_progress_bar(k) var/atom/A = k var/list/progress_list = all_progress_bars[k] var/obj/hud/progress_bar/P = progress_list["progress_bar"] @@ -87,7 +87,7 @@ SUBSYSTEM_DEF(progressbars) return TRUE -/subsystem/progressbars/proc/add_progress_bar(var/atom/owner,var/atom/object,var/desired_time,var/desired_proc,...) +/subsystem/progressbars/proc/add_progress_bar(atom/owner,atom/object,desired_time,desired_proc,...) if(all_progress_bars[owner]) if(ismob(owner)) @@ -105,7 +105,7 @@ SUBSYSTEM_DEF(progressbars) return TRUE -/subsystem/progressbars/proc/add_progress_bar_conditions(var/atom/owner,var/atom/object,var/desired_proc,...) +/subsystem/progressbars/proc/add_progress_bar_conditions(atom/owner,atom/object,desired_proc,...) if(!all_progress_bars[owner]) return FALSE diff --git a/code/_core/world/subsystems/projectiles.dm b/code/_core/world/subsystems/projectiles.dm index e7f8d301a4..d4aebe3e58 100644 --- a/code/_core/world/subsystems/projectiles.dm +++ b/code/_core/world/subsystems/projectiles.dm @@ -12,7 +12,7 @@ SUBSYSTEM_DEF(projectiles) var/list/obj/projectile/all_projectiles = list() -/subsystem/projectiles/unclog(var/mob/caller) +/subsystem/projectiles/unclog(mob/caller) for(var/k in all_projectiles) var/obj/projectile/P = k diff --git a/code/_core/world/subsystems/radio.dm b/code/_core/world/subsystems/radio.dm index 1d24ece6f9..f5afa5af8c 100644 --- a/code/_core/world/subsystems/radio.dm +++ b/code/_core/world/subsystems/radio.dm @@ -16,7 +16,7 @@ SUBSYSTEM_DEF(radio) var/list/obj/item/device/signaller/all_signalers = list() //Radios should never be unclogged. -/subsystem/radio/unclog(var/mob/caller) +/subsystem/radio/unclog(mob/caller) tick_rate = -1 . = ..() diff --git a/code/_core/world/subsystems/reagent.dm b/code/_core/world/subsystems/reagent.dm index 4129b7d126..8b38ac92ca 100644 --- a/code/_core/world/subsystems/reagent.dm +++ b/code/_core/world/subsystems/reagent.dm @@ -15,7 +15,7 @@ SUBSYSTEM_DEF(reagent) var/list/valid_random_reagents = list() -/subsystem/reagent/unclog(var/mob/caller) +/subsystem/reagent/unclog(mob/caller) tick_rate = -1 . = ..() diff --git a/code/_core/world/subsystems/recipe.dm b/code/_core/world/subsystems/recipe.dm index 3f91bd98f6..ba4e9c0df8 100644 --- a/code/_core/world/subsystems/recipe.dm +++ b/code/_core/world/subsystems/recipe.dm @@ -19,7 +19,7 @@ SUBSYSTEM_DEF(recipe) return ..() -/proc/generate_crafting_table(var/mob/living/advanced/caller,var/obj/item/crafting_bench/C) +/proc/generate_crafting_table(mob/living/advanced/caller,obj/item/crafting_bench/C) var/list/item_table = list() @@ -34,7 +34,7 @@ SUBSYSTEM_DEF(recipe) return item_table -/proc/get_plate_recipe(var/list/list_contents) +/proc/get_plate_recipe(list/list_contents) if(!length(list_contents)) return null diff --git a/code/_core/world/subsystems/report.dm b/code/_core/world/subsystems/report.dm index f698ae1519..afab549cfd 100644 --- a/code/_core/world/subsystems/report.dm +++ b/code/_core/world/subsystems/report.dm @@ -19,7 +19,7 @@ SUBSYSTEM_DEF(report) var/next_report = 0 var/profiling = 0 -/subsystem/report/unclog(var/mob/caller) +/subsystem/report/unclog(mob/caller) tick_rate = -1 . = ..() diff --git a/code/_core/world/subsystems/research.dm b/code/_core/world/subsystems/research.dm index 44aa5d18d0..ba44bddd1b 100644 --- a/code/_core/world/subsystems/research.dm +++ b/code/_core/world/subsystems/research.dm @@ -27,7 +27,7 @@ SUBSYSTEM_DEF(research) return ..() -/subsystem/research/proc/add_quadrants_score(var/mob/living/advanced/player/P ,var/score) +/subsystem/research/proc/add_quadrants_score(mob/living/advanced/player/P ,score) quadrant_high_scores.Add(list(list(P.real_name,score))) sort_tim(quadrant_high_scores,/proc/cmp_highscore) quadrant_high_scores = quadrant_high_scores.Copy(1,min(length(quadrant_high_scores),5)) @@ -43,5 +43,5 @@ SUBSYSTEM_DEF(research) return FALSE -/proc/cmp_highscore(var/list/a,var/list/b) +/proc/cmp_highscore(list/a,list/b) return b[2] - a[2] \ No newline at end of file diff --git a/code/_core/world/subsystems/reward.dm b/code/_core/world/subsystems/reward.dm index d09846a9f2..95f0cee2fc 100644 --- a/code/_core/world/subsystems/reward.dm +++ b/code/_core/world/subsystems/reward.dm @@ -42,7 +42,7 @@ SUBSYSTEM_DEF(reward) return ..() -/subsystem/reward/proc/check_code(var/client/C,var/desired_code) +/subsystem/reward/proc/check_code(client/C,desired_code) if(!reward_code_to_reward[desired_code]) C.to_chat(span("warning","Invalid reward code! Reward codes can be obtained and entered here upon completing special surveys or events.")) diff --git a/code/_core/world/subsystems/shuttle.dm b/code/_core/world/subsystems/shuttle.dm index a65d6a8f62..48c0f5a044 100644 --- a/code/_core/world/subsystems/shuttle.dm +++ b/code/_core/world/subsystems/shuttle.dm @@ -24,7 +24,7 @@ SUBSYSTEM_DEF(shuttle) //Also controls drop pods. return ..() -/subsystem/shuttle/unclog(var/mob/caller) +/subsystem/shuttle/unclog(mob/caller) for(var/k in all_shuttle_controlers) var/obj/shuttle_controller/SC = k diff --git a/code/_core/world/subsystems/smoothing.dm b/code/_core/world/subsystems/smoothing.dm index 30ce237db1..f501399dd5 100644 --- a/code/_core/world/subsystems/smoothing.dm +++ b/code/_core/world/subsystems/smoothing.dm @@ -11,7 +11,7 @@ SUBSYSTEM_DEF(smoothing) var/list/seeds = list() //id = value -/subsystem/smoothing/unclog(var/mob/caller) +/subsystem/smoothing/unclog(mob/caller) queued_smoothing_objs.Cut() queued_smoothing_turfs.Cut() . = ..() @@ -51,7 +51,7 @@ SUBSYSTEM_DEF(smoothing) return TRUE -/subsystem/smoothing/proc/queue_update_edges(var/turf/T,var/include_self=TRUE) +/subsystem/smoothing/proc/queue_update_edges(turf/T,include_self=TRUE) var/list/valid_directions = DIRECTIONS_ALL if(include_self) diff --git a/code/_core/world/subsystems/soapstone.dm b/code/_core/world/subsystems/soapstone.dm index 4b5f69113b..834e556c7c 100644 --- a/code/_core/world/subsystems/soapstone.dm +++ b/code/_core/world/subsystems/soapstone.dm @@ -10,7 +10,7 @@ SUBSYSTEM_DEF(soapstone) save_soapstone.quick_load() return ..() -/subsystem/soapstone/proc/create_new_soapstone(var/turf/desired_loc,desired_dir,desired_color,desired_owner,desired_ckey,desired_text,desired_date,desired_time) +/subsystem/soapstone/proc/create_new_soapstone(turf/desired_loc,desired_dir,desired_color,desired_owner,desired_ckey,desired_text,desired_date,desired_time) var/list/data_to_write = list() data_to_write["name"] = desired_owner diff --git a/code/_core/world/subsystems/sound.dm b/code/_core/world/subsystems/sound.dm index 57f6c83d0d..7c61bf9a08 100644 --- a/code/_core/world/subsystems/sound.dm +++ b/code/_core/world/subsystems/sound.dm @@ -14,7 +14,7 @@ SUBSYSTEM_DEF(sound) var/list/sound_cache = list() -/subsystem/sound/unclog(var/mob/caller) +/subsystem/sound/unclog(mob/caller) for(var/k in active_sounds) var/sound/S = k active_sounds -= k @@ -30,7 +30,7 @@ SUBSYSTEM_DEF(sound) log_subsystem(name,"Found [length(round_end_sounds)] round end sounds.") return TRUE -/subsystem/sound/proc/process_sound(var/sound/S) +/subsystem/sound/proc/process_sound(sound/S) if(active_sounds[S] == -1) return FALSE active_sounds[S] -= 1 @@ -56,7 +56,7 @@ SUBSYSTEM_DEF(sound) return TRUE -/proc/stop_sound(var/sound_path,var/list/mob/hearers) +/proc/stop_sound(sound_path,list/mob/hearers) for(var/F in SSsound.active_sounds) CHECK_TICK(SSsound.tick_usage_max,FPS_SERVER) var/sound/S = F @@ -174,12 +174,12 @@ proc/play_music_track(var/music_track_id,var/client/hearer,var/volume=35,var/loo var/area/A = get_area(src) return A.sound_environment -/proc/get_mobs_in_range(var/range,var/atom/epicenter=usr) +/proc/get_mobs_in_range(range,atom/epicenter=usr) . = list() for(var/mob/M in range(range,epicenter)) . += M -/proc/get_clients_in_range(var/range,var/atom/epicenter=usr) +/proc/get_clients_in_range(range,atom/epicenter=usr) . = list() for(var/k in SSliving.all_mobs_with_clients) @@ -188,7 +188,7 @@ proc/play_music_track(var/music_track_id,var/client/hearer,var/volume=35,var/loo continue . += M -/proc/setup_sound(var/sound_path) +/proc/setup_sound(sound_path) if(!SSsound || !SSsound.initialized) return FALSE @@ -206,7 +206,7 @@ proc/play_music_track(var/music_track_id,var/client/hearer,var/volume=35,var/loo return created_sound -/proc/play_sound_target(var/sound_path,var/mob/M,var/range_min=SOUND_RANGE*0.25, var/range_max = SOUND_RANGE, var/volume=50, var/sound_setting = SOUND_SETTING_FX, var/pitch=1, var/loop=0, var/duration=0, var/pan=0, var/channel=SOUND_CHANNEL_FX, var/priority=0, var/echo = 0, var/invisibility_check = 0,var/tracked) +/proc/play_sound_target(sound_path,mob/M,range_min=SOUND_RANGE*0.25, range_max = SOUND_RANGE, volume=50, sound_setting = SOUND_SETTING_FX, pitch=1, loop=0, duration=0, pan=0, channel=SOUND_CHANNEL_FX, priority=0, echo = 0, invisibility_check = 0,tracked) if(!M) CRASH("Error: Tried playing sound '[sound_path]' without a mob target!") @@ -271,7 +271,7 @@ proc/play_music_track(var/music_track_id,var/client/hearer,var/volume=35,var/loo return C -/proc/play_sound_global(var/sound_path,var/list/hearers=SSliving.all_mobs_with_clients, var/volume=50, var/sound_setting = SOUND_SETTING_FX, var/pitch=1, var/loop=0, var/duration=0, var/pan=0, var/channel=SOUND_CHANNEL_FX, var/priority=0, var/echo = 0, var/invisibility_check = 0,var/tracked) +/proc/play_sound_global(sound_path,list/hearers=SSliving.all_mobs_with_clients, volume=50, sound_setting = SOUND_SETTING_FX, pitch=1, loop=0, duration=0, pan=0, channel=SOUND_CHANNEL_FX, priority=0, echo = 0, invisibility_check = 0,tracked) var/sound/created_sound = setup_sound(sound_path) if(!created_sound || volume <= 0) @@ -333,7 +333,7 @@ proc/play_music_track(var/music_track_id,var/client/hearer,var/volume=35,var/loo -/proc/play_sound(var/sound_path,var/turf/source_turf,var/list/hearers,var/range_min=1, var/range_max = SOUND_RANGE, var/volume=50, var/sound_setting = SOUND_SETTING_FX, var/pitch=1, var/loop=0, var/duration=0, var/pan=0, var/channel=SOUND_CHANNEL_FX, var/priority=0, var/echo = 0, var/invisibility_check = 0,var/tracked) +/proc/play_sound(sound_path,turf/source_turf,list/hearers,range_min=1, range_max = SOUND_RANGE, volume=50, sound_setting = SOUND_SETTING_FX, pitch=1, loop=0, duration=0, pan=0, channel=SOUND_CHANNEL_FX, priority=0, echo = 0, invisibility_check = 0,tracked) if(volume <= 0 || range_max <= 0) return FALSE diff --git a/code/_core/world/subsystems/spawning.dm b/code/_core/world/subsystems/spawning.dm index e2c309910b..07db7a73a2 100644 --- a/code/_core/world/subsystems/spawning.dm +++ b/code/_core/world/subsystems/spawning.dm @@ -30,7 +30,7 @@ SUBSYSTEM_DEF(spawning) return TRUE -/subsystem/spawning/proc/attempt_spawn(var/obj/marker/mob_spawn/M) +/subsystem/spawning/proc/attempt_spawn(obj/marker/mob_spawn/M) if(!M.mob_type) log_error("Warning: [M] at ([M.x],[M.y],[M.z]) has invalid spawning data.") @@ -51,7 +51,7 @@ SUBSYSTEM_DEF(spawning) return FALSE -/subsystem/spawning/proc/do_spawn(var/obj/marker/mob_spawn/M) +/subsystem/spawning/proc/do_spawn(obj/marker/mob_spawn/M) var/turf/spawning_turf = get_turf(M) diff --git a/code/_core/world/subsystems/squad.dm b/code/_core/world/subsystems/squad.dm index 5ce45c0e20..2c1865b194 100644 --- a/code/_core/world/subsystems/squad.dm +++ b/code/_core/world/subsystems/squad.dm @@ -8,7 +8,7 @@ SUBSYSTEM_DEF(squad) var/list/squad/all_squads = list() -/subsystem/squad/unclog(var/mob/caller) +/subsystem/squad/unclog(mob/caller) for(var/k in all_squads) var/squad/S = k diff --git a/code/_core/world/subsystems/tax.dm b/code/_core/world/subsystems/tax.dm index 1a36cbe0d9..8f84fa8ef5 100644 --- a/code/_core/world/subsystems/tax.dm +++ b/code/_core/world/subsystems/tax.dm @@ -25,14 +25,14 @@ SUBSYSTEM_DEF(tax) 52 ) -/subsystem/tax/proc/can_pax_taxes(var/mob/living/advanced/player/P) +/subsystem/tax/proc/can_pax_taxes(mob/living/advanced/player/P) return world.realtime >= (P.last_tax_payment + 604800*10) //1 week -/subsystem/tax/proc/check_delinquent(var/mob/living/advanced/player/P) +/subsystem/tax/proc/check_delinquent(mob/living/advanced/player/P) . = world.realtime - (P.last_tax_payment + 604800*10*2) //2 weeks . = max(0,.) -/subsystem/tax/proc/pay_taxes(var/mob/living/advanced/player/P,var/silent=FALSE) +/subsystem/tax/proc/pay_taxes(mob/living/advanced/player/P,silent=FALSE) var/taxes_to_pay = get_tax_amount(P) @@ -56,7 +56,7 @@ SUBSYSTEM_DEF(tax) return pay_amount -/subsystem/tax/proc/get_bracket_tax(var/profit) +/subsystem/tax/proc/get_bracket_tax(profit) . = 0 @@ -68,7 +68,7 @@ SUBSYSTEM_DEF(tax) . = CEILING(.,1) -/subsystem/tax/proc/get_tax_amount(var/mob/living/advanced/player/P) +/subsystem/tax/proc/get_tax_amount(mob/living/advanced/player/P) . += CEILING(P.revenue * revenue_tax * 0.01,1) //Taxing revenue . += CEILING(P.expenses * sales_tax * 0.01,1) //Taxing expenses. . += CEILING(P.partial_tax,1) //Taxing taxes you didn't pay last time. @@ -76,7 +76,7 @@ SUBSYSTEM_DEF(tax) . += get_bracket_tax(profit) -/subsystem/tax/proc/get_explaination(var/mob/living/advanced/player/P) +/subsystem/tax/proc/get_explaination(mob/living/advanced/player/P) var/bracket_tax_amount = get_bracket_tax(P.revenue - P.expenses) var/sales_tax_amount = CEILING(P.expenses * sales_tax * 0.01,1) diff --git a/code/_core/world/subsystems/text.dm b/code/_core/world/subsystems/text.dm index c3ec6559c8..a693bfaf89 100644 --- a/code/_core/world/subsystems/text.dm +++ b/code/_core/world/subsystems/text.dm @@ -44,14 +44,14 @@ SUBSYSTEM_DEF(text) return ..() -/subsystem/text/proc/check_duplicate_name(var/name) //For mobs. +/subsystem/text/proc/check_duplicate_name(name) //For mobs. if(name_count[name]) name_count[name]++ return "[name] ([name_count[name]])" name_count[name] = rand(1,999) //One funny thing is that you can tell at least how many of this type exists by starting it at 1, so it's random. return "[name] ([name_count[name]])" -/subsystem/text/proc/check_duplicate_player_name(var/name,var/ckey) //For players. +/subsystem/text/proc/check_duplicate_player_name(name,ckey) //For players. var/length_of_duplicate_names = length(player_names[name]) if(!length_of_duplicate_names) player_names[name] = list() diff --git a/code/_core/world/subsystems/thinking.dm b/code/_core/world/subsystems/thinking.dm index 09b5f231e1..418df36ff7 100644 --- a/code/_core/world/subsystems/thinking.dm +++ b/code/_core/world/subsystems/thinking.dm @@ -7,7 +7,7 @@ SUBSYSTEM_DEF(thinking) tick_usage_max = 99 -/subsystem/thinking/unclog(var/mob/caller) +/subsystem/thinking/unclog(mob/caller) for(var/k in src.all_thinkers) all_thinkers -= k diff --git a/code/_core/world/subsystems/turfs.dm b/code/_core/world/subsystems/turfs.dm index dc40cb4ff8..31ea25ccb1 100644 --- a/code/_core/world/subsystems/turfs.dm +++ b/code/_core/world/subsystems/turfs.dm @@ -27,7 +27,7 @@ SUBSYSTEM_DEF(turf) var/list/image/turf_damage_icons = new/list(5,4) -/subsystem/turf/unclog(var/mob/caller) +/subsystem/turf/unclog(mob/caller) wet_turfs.Cut() . = ..() diff --git a/code/_core/world/subsystems/virtual_reality.dm b/code/_core/world/subsystems/virtual_reality.dm index 98d93616bd..d8f96f9e0d 100644 --- a/code/_core/world/subsystems/virtual_reality.dm +++ b/code/_core/world/subsystems/virtual_reality.dm @@ -31,7 +31,7 @@ SUBSYSTEM_DEF(virtual_reality) return TRUE -/subsystem/virtual_reality/proc/set_virtual_reality(var/virtual_reality/desired_virtual_reality) +/subsystem/virtual_reality/proc/set_virtual_reality(virtual_reality/desired_virtual_reality) if(current_virtual_reality) qdel(current_virtual_reality) current_virtual_reality = new desired_virtual_reality diff --git a/code/_core/world/subsystems/vote.dm b/code/_core/world/subsystems/vote.dm index c7695b468d..99121a51cb 100644 --- a/code/_core/world/subsystems/vote.dm +++ b/code/_core/world/subsystems/vote.dm @@ -8,7 +8,7 @@ SUBSYSTEM_DEF(vote) var/list/active_votes = list() -/subsystem/vote/unclog(var/mob/caller) +/subsystem/vote/unclog(mob/caller) for(var/k in active_votes) var/vote/V = k @@ -19,7 +19,7 @@ SUBSYSTEM_DEF(vote) . = ..() -/subsystem/vote/proc/proces_vote(var/vote/V) +/subsystem/vote/proc/proces_vote(vote/V) if(V.time_to_end > world.time) return FALSE active_votes -= V @@ -39,7 +39,7 @@ SUBSYSTEM_DEF(vote) return TRUE -/subsystem/vote/proc/create_vote(var/vote/desired_vote_type) +/subsystem/vote/proc/create_vote(vote/desired_vote_type) var/vote/V = new desired_vote_type active_votes += V V.time_to_end = world.time + (V.time_limit) SECONDS diff --git a/code/_core/world/subsystems/wikibot.dm b/code/_core/world/subsystems/wikibot.dm index f71b20094d..e6f967b4f4 100644 --- a/code/_core/world/subsystems/wikibot.dm +++ b/code/_core/world/subsystems/wikibot.dm @@ -22,12 +22,12 @@ SUBSYSTEM_DEF(wikibot) return ..() -/subsystem/wikibot/proc/add_new_wikibot_key(var/list/keywords,var/answer) +/subsystem/wikibot/proc/add_new_wikibot_key(list/keywords,answer) wikibot_list += list(list("keywords" = keywords, "answer" = answer)) rustg_file_write(json_encode(wikibot_list),WIKIBOT) return TRUE -/subsystem/wikibot/proc/process_string(var/asker,var/string_to_process) +/subsystem/wikibot/proc/process_string(asker,string_to_process) var/best_score = 0 var/best_answer = null diff --git a/code/addons/lighting/lighting_area.dm b/code/addons/lighting/lighting_area.dm index 39093149d1..d7c7bca747 100644 --- a/code/addons/lighting/lighting_area.dm +++ b/code/addons/lighting/lighting_area.dm @@ -7,7 +7,7 @@ if (dynamic_lighting) luminosity = FALSE -/area/proc/set_dynamic_lighting(var/new_dynamic_lighting = TRUE) +/area/proc/set_dynamic_lighting(new_dynamic_lighting = TRUE) if (new_dynamic_lighting == dynamic_lighting) return FALSE diff --git a/code/addons/lighting/lighting_atom.dm b/code/addons/lighting/lighting_atom.dm index ce3218b56a..5d60f536d8 100644 --- a/code/addons/lighting/lighting_atom.dm +++ b/code/addons/lighting/lighting_atom.dm @@ -77,7 +77,7 @@ // Should always be used to change the opacity of an atom. // It notifies (potentially) affected light sources so they can update (if needed). -/atom/proc/set_opacity(var/new_opacity,var/force = FALSE) +/atom/proc/set_opacity(new_opacity,force = FALSE) if(!force && new_opacity == opacity) return FALSE @@ -86,7 +86,7 @@ return TRUE -/atom/movable/set_opacity(var/new_opacity,var/force=FALSE) +/atom/movable/set_opacity(new_opacity,force=FALSE) . = ..() @@ -110,7 +110,7 @@ -/atom/set_dir(var/desired_dir,var/force = FALSE) +/atom/set_dir(desired_dir,force = FALSE) . = ..() diff --git a/code/addons/lighting/lighting_source.dm b/code/addons/lighting/lighting_source.dm index 8356262714..0d96828baf 100644 --- a/code/addons/lighting/lighting_source.dm +++ b/code/addons/lighting/lighting_source.dm @@ -260,7 +260,7 @@ effect_str = null -/light_source/proc/recalc_corner(var/lighting_corner/C, now = FALSE) +/light_source/proc/recalc_corner(lighting_corner/C, now = FALSE) LAZYINITLIST(effect_str) if (effect_str[C]) // Already have one. REMOVE_CORNER(C,now) @@ -277,7 +277,7 @@ UNSETEMPTY(effect_str) -/light_source/proc/update_corners(var/now = FALSE) +/light_source/proc/update_corners(now = FALSE) var/update = FALSE var/atom/source_atom = src.source_atom //From /tg/. Prevents it from being cleared mid update.
Damage typeDamage valueSkill modifier