diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm index bb876640cc6..d32ebe4451e 100644 --- a/code/ATMOSPHERICS/atmospherics.dm +++ b/code/ATMOSPHERICS/atmospherics.dm @@ -61,7 +61,7 @@ Pipelines + Other Objects -> Pipe network /obj/machinery/atmospherics/proc/SetInitDirections() return -/obj/machinery/atmospherics/proc/safe_input(var/title, var/text, var/default_set) +/obj/machinery/atmospherics/proc/safe_input(title, text, default_set) var/new_value = input(usr,text,title,default_set) as num if(usr.canUseTopic(src)) return new_value @@ -86,13 +86,13 @@ Pipelines + Other Objects -> Pipe network /obj/machinery/atmospherics/proc/disconnect(obj/machinery/atmospherics/reference) return -/obj/machinery/atmospherics/proc/icon_addintact(var/obj/machinery/atmospherics/node, var/connected) +/obj/machinery/atmospherics/proc/icon_addintact(obj/machinery/atmospherics/node, connected) var/image/img = getpipeimage('icons/obj/atmospherics/binary_devices.dmi', "pipe_intact", get_dir(src,node), node.pipe_color) underlays += img return connected | img.dir -/obj/machinery/atmospherics/proc/icon_addbroken(var/connected) +/obj/machinery/atmospherics/proc/icon_addbroken(connected) var/unconnected = (~connected) & initialize_directions for(var/direction in cardinal) if(unconnected & direction) @@ -101,7 +101,7 @@ Pipelines + Other Objects -> Pipe network /obj/machinery/atmospherics/update_icon() return null -/obj/machinery/atmospherics/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) +/obj/machinery/atmospherics/attackby(obj/item/weapon/W, mob/user, params) if(can_unwrench && istype(W, /obj/item/weapon/wrench)) var/turf/T = get_turf(src) if (level==1 && isturf(T) && T.intact) @@ -138,7 +138,7 @@ Pipelines + Other Objects -> Pipe network //Called when an atmospherics object is unwrenched while having a large pressure difference //with it's locs air contents. -/obj/machinery/atmospherics/proc/unsafe_pressure_release(var/mob/user,var/pressures) +/obj/machinery/atmospherics/proc/unsafe_pressure_release(mob/user,pressures) if(!user) return @@ -165,7 +165,7 @@ Pipelines + Other Objects -> Pipe network /obj/machinery/atmospherics/proc/nullifyPipenet(datum/pipeline/P) P.other_atmosmch -= src -/obj/machinery/atmospherics/proc/getpipeimage(var/iconset, var/iconstate, var/direction, var/col=rgb(255,255,255)) +/obj/machinery/atmospherics/proc/getpipeimage(iconset, iconstate, direction, col=rgb(255,255,255)) //Add identifiers for the iconset if(iconsetids[iconset] == null) @@ -186,7 +186,7 @@ Pipelines + Other Objects -> Pipe network return img -/obj/machinery/atmospherics/construction(D, P, var/pipe_type, var/obj_color) +/obj/machinery/atmospherics/construction(D, P, pipe_type, obj_color) dir = D initialize_directions = P if(can_unwrench) @@ -212,7 +212,7 @@ Pipelines + Other Objects -> Pipe network //Find a connecting /obj/machinery/atmospherics in specified direction -/obj/machinery/atmospherics/proc/findConnecting(var/direction) +/obj/machinery/atmospherics/proc/findConnecting(direction) for(var/obj/machinery/atmospherics/target in get_step(src, direction)) if(target.initialize_directions & get_dir(target,src)) return target @@ -220,7 +220,7 @@ Pipelines + Other Objects -> Pipe network #define VENT_SOUND_DELAY 30 -/obj/machinery/atmospherics/relaymove(var/mob/living/user, var/direction) +/obj/machinery/atmospherics/relaymove(mob/living/user, direction) if(!(direction & initialize_directions)) //cant go this way. return @@ -248,7 +248,7 @@ Pipelines + Other Objects -> Pipe network user.canmove = 1 -/obj/machinery/atmospherics/AltClick(var/mob/living/L) +/obj/machinery/atmospherics/AltClick(mob/living/L) if(is_type_in_list(src, ventcrawl_machinery)) L.handle_ventcrawl(src) return diff --git a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm index e36e7989db4..eed16b29611 100644 --- a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm +++ b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm @@ -163,7 +163,7 @@ parent2 = New -/obj/machinery/atmospherics/binary/unsafe_pressure_release(var/mob/user,var/pressures) +/obj/machinery/atmospherics/binary/unsafe_pressure_release(mob/user,pressures) ..() var/turf/T = get_turf(src) diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm index 3ac13f56b51..218a65f5666 100644 --- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm +++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm @@ -144,7 +144,7 @@ Passive gate is similar to the regular pump except: -/obj/machinery/atmospherics/binary/passive_gate/attack_hand(user as mob) +/obj/machinery/atmospherics/binary/passive_gate/attack_hand(mob/user) if(..()) return src.add_fingerprint(usr) @@ -178,7 +178,7 @@ Passive gate is similar to the regular pump except: -/obj/machinery/atmospherics/binary/passive_gate/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) +/obj/machinery/atmospherics/binary/passive_gate/attackby(obj/item/weapon/W, mob/user, params) if (!istype(W, /obj/item/weapon/wrench)) return ..() if (on) diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index 8f25e7d242b..4f1dac583f6 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -97,7 +97,7 @@ Thus, the two variables affect pump operation are set in New(): return 1 -/obj/machinery/atmospherics/binary/pump/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/atmospherics/binary/pump/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if(stat & (BROKEN|NOPOWER)) return @@ -148,7 +148,7 @@ Thus, the two variables affect pump operation are set in New(): return -/obj/machinery/atmospherics/binary/pump/attack_hand(user as mob) +/obj/machinery/atmospherics/binary/pump/attack_hand(mob/user) if(..()) return src.add_fingerprint(usr) @@ -180,7 +180,7 @@ Thus, the two variables affect pump operation are set in New(): ..() update_icon() -/obj/machinery/atmospherics/binary/pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) +/obj/machinery/atmospherics/binary/pump/attackby(obj/item/weapon/W, mob/user, params) if (!istype(W, /obj/item/weapon/wrench)) return ..() if (!(stat & NOPOWER) && on) diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm index 4b920407ce8..c32d37db72b 100644 --- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm @@ -93,7 +93,7 @@ Thus, the two variables affect pump operation are set in New(): return 1 -/obj/machinery/atmospherics/binary/volume_pump/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/atmospherics/binary/volume_pump/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if(stat & (BROKEN|NOPOWER)) return @@ -143,7 +143,7 @@ Thus, the two variables affect pump operation are set in New(): update_icon() -/obj/machinery/atmospherics/binary/volume_pump/attack_hand(user as mob) +/obj/machinery/atmospherics/binary/volume_pump/attack_hand(mob/user) if(..()) return src.add_fingerprint(usr) @@ -177,7 +177,7 @@ Thus, the two variables affect pump operation are set in New(): -/obj/machinery/atmospherics/binary/volume_pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) +/obj/machinery/atmospherics/binary/volume_pump/attackby(obj/item/weapon/W, mob/user, params) if (!istype(W, /obj/item/weapon/wrench)) return ..() if (!(stat & NOPOWER) && on) diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index cedd26af4b2..bf1d078d2fd 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -142,7 +142,7 @@ Filter types: set_frequency(frequency) return ..() -/obj/machinery/atmospherics/trinary/filter/attack_hand(user as mob) +/obj/machinery/atmospherics/trinary/filter/attack_hand(mob/user) if(..()) return @@ -152,7 +152,7 @@ Filter types: ui_interact(user) -/obj/machinery/atmospherics/trinary/filter/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/atmospherics/trinary/filter/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if(stat & (BROKEN|NOPOWER)) return diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index 53b1d1b27f9..6382456ed3f 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -98,7 +98,7 @@ return 1 -/obj/machinery/atmospherics/trinary/mixer/attack_hand(user as mob) +/obj/machinery/atmospherics/trinary/mixer/attack_hand(mob/user) if(..()) return @@ -108,7 +108,7 @@ ui_interact(user) -/obj/machinery/atmospherics/trinary/mixer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/atmospherics/trinary/mixer/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if(stat & (BROKEN|NOPOWER)) return diff --git a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm index 1b2cdb378b8..f5497f2c8c6 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm @@ -45,13 +45,13 @@ Iconnery /obj/machinery/atmospherics/trinary/proc/update_icon_nopipes() return -/obj/machinery/atmospherics/trinary/icon_addintact(var/obj/machinery/atmospherics/node, var/connected) +/obj/machinery/atmospherics/trinary/icon_addintact(obj/machinery/atmospherics/node, connected) var/image/img = getpipeimage('icons/obj/atmospherics/trinary_devices.dmi', "intact", get_dir(src,node), node.pipe_color) overlays += img return connected | img.dir -/obj/machinery/atmospherics/trinary/icon_addbroken(var/connected) +/obj/machinery/atmospherics/trinary/icon_addbroken(connected) var/unconnected = (~connected) & initialize_directions for(var/direction in cardinal) if(unconnected & direction) @@ -222,7 +222,7 @@ Housekeeping and pipe network stuff below parent3 = New -/obj/machinery/atmospherics/trinary/unsafe_pressure_release(var/mob/user,var/pressures) +/obj/machinery/atmospherics/trinary/unsafe_pressure_release(mob/user,pressures) ..() var/turf/T = get_turf(src) diff --git a/code/ATMOSPHERICS/components/unary_devices/unary_base.dm b/code/ATMOSPHERICS/components/unary_devices/unary_base.dm index 7c2ab9b622c..59781d6c713 100644 --- a/code/ATMOSPHERICS/components/unary_devices/unary_base.dm +++ b/code/ATMOSPHERICS/components/unary_devices/unary_base.dm @@ -120,7 +120,7 @@ Housekeeping and pipe network stuff below parent = New -/obj/machinery/atmospherics/unary/unsafe_pressure_release(var/mob/user,var/pressures) +/obj/machinery/atmospherics/unary/unsafe_pressure_release(mob/user,pressures) ..() var/turf/T = get_turf(src) diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm index 9588baa7ee7..e598ccf0354 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm @@ -247,7 +247,7 @@ stat |= NOPOWER update_icon_nopipes() -/obj/machinery/atmospherics/unary/vent_scrubber/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) +/obj/machinery/atmospherics/unary/vent_scrubber/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0,user)) diff --git a/code/ATMOSPHERICS/pipes/manifold.dm b/code/ATMOSPHERICS/pipes/manifold.dm index 1aaf93e3ad9..8f6ac175080 100644 --- a/code/ATMOSPHERICS/pipes/manifold.dm +++ b/code/ATMOSPHERICS/pipes/manifold.dm @@ -108,7 +108,7 @@ if(node3) overlays += getpipeimage('icons/obj/atmospherics/pipes/manifold.dmi', "manifold_full[invis]", get_dir(src,node3)) -/obj/machinery/atmospherics/pipe/manifold/hide(var/i) +/obj/machinery/atmospherics/pipe/manifold/hide(i) if(level == 1 && istype(loc, /turf/simulated)) invisibility = i ? 101 : 0 update_icon() diff --git a/code/ATMOSPHERICS/pipes/manifold4w.dm b/code/ATMOSPHERICS/pipes/manifold4w.dm index d4c80c56b2e..4db873eed76 100644 --- a/code/ATMOSPHERICS/pipes/manifold4w.dm +++ b/code/ATMOSPHERICS/pipes/manifold4w.dm @@ -47,7 +47,7 @@ update_icon() ..() -/obj/machinery/atmospherics/pipe/manifold4w/hide(var/i) +/obj/machinery/atmospherics/pipe/manifold4w/hide(i) if(level == 1 && istype(loc, /turf/simulated)) invisibility = i ? 101 : 0 update_icon() diff --git a/code/ATMOSPHERICS/pipes/simple.dm b/code/ATMOSPHERICS/pipes/simple.dm index a280403a9df..b4685c44a1d 100644 --- a/code/ATMOSPHERICS/pipes/simple.dm +++ b/code/ATMOSPHERICS/pipes/simple.dm @@ -104,7 +104,7 @@ The regular pipe you see everywhere, including bent ones. var/have_node2 = node2?1:0 icon_state = "exposed[have_node1][have_node2][invisibility ? "-f" : "" ]" -/obj/machinery/atmospherics/pipe/simple/hide(var/i) +/obj/machinery/atmospherics/pipe/simple/hide(i) if(level == 1 && istype(loc, /turf/simulated)) invisibility = i ? 101 : 0 update_icon() diff --git a/code/LINDA/LINDA_system.dm b/code/LINDA/LINDA_system.dm index 515197b7b99..bee42ef44a1 100644 --- a/code/LINDA/LINDA_system.dm +++ b/code/LINDA/LINDA_system.dm @@ -1,4 +1,4 @@ -/turf/proc/CanAtmosPass(var/turf/T) +/turf/proc/CanAtmosPass(turf/T) if(!istype(T)) return 0 var/R if(blocks_air || T.blocks_air) @@ -79,23 +79,23 @@ T.atmos_adjacent_turfs_amount -= 1 T.atmos_adjacent_turfs &= ~counterdir -/atom/movable/proc/air_update_turf(var/command = 0) +/atom/movable/proc/air_update_turf(command = 0) if(!istype(loc,/turf) && command) return var/turf/T = get_turf(loc) T.air_update_turf(command) -/turf/proc/air_update_turf(var/command = 0) +/turf/proc/air_update_turf(command = 0) if(command) CalculateAdjacentTurfs() SSair.add_to_active(src,command) -/atom/movable/proc/move_update_air(var/turf/T) +/atom/movable/proc/move_update_air(turf/T) if(istype(T,/turf)) T.air_update_turf(1) air_update_turf(1) -/atom/movable/proc/atmos_spawn_air(var/text, var/amount) //because a lot of people loves to copy paste awful code lets just make a easy proc to spawn your plasma fires +/atom/movable/proc/atmos_spawn_air(text, amount) //because a lot of people loves to copy paste awful code lets just make a easy proc to spawn your plasma fires var/turf/simulated/T = get_turf(src) if(!istype(T)) return @@ -112,7 +112,7 @@ var/const/SPAWN_N2O = 64 var/const/SPAWN_AIR = 256 -/turf/simulated/proc/atmos_spawn_air(var/flag, var/amount) +/turf/simulated/proc/atmos_spawn_air(flag, amount) if(!text || !amount || !air) return diff --git a/code/LINDA/LINDA_turf_tile.dm b/code/LINDA/LINDA_turf_tile.dm index 011b627dae9..802b7a5ec59 100644 --- a/code/LINDA/LINDA_turf_tile.dm +++ b/code/LINDA/LINDA_turf_tile.dm @@ -240,7 +240,7 @@ if("sleeping_agent") overlays += SSair.sleeptoxin_overlay -/turf/simulated/proc/share_air(var/turf/simulated/T) +/turf/simulated/proc/share_air(turf/simulated/T) if(T.current_cycle < current_cycle) var/difference difference = air.share(T.air, atmos_adjacent_turfs_amount) @@ -251,7 +251,7 @@ T.consider_pressure_difference(src, difference) last_share_check() -/turf/proc/consider_pressure_difference(var/turf/simulated/T, var/difference) +/turf/proc/consider_pressure_difference(turf/simulated/T, difference) SSair.high_pressure_delta |= src if(difference > pressure_difference) pressure_direction = get_dir(src, T) @@ -284,13 +284,13 @@ /datum/excited_group/New() SSair.excited_groups += src -/datum/excited_group/proc/add_turf(var/turf/simulated/T) +/datum/excited_group/proc/add_turf(turf/simulated/T) turf_list += T T.excited_group = src T.recently_active = 1 reset_cooldowns() -/datum/excited_group/proc/merge_groups(var/datum/excited_group/E) +/datum/excited_group/proc/merge_groups(datum/excited_group/E) if(turf_list.len > E.turf_list.len) SSair.excited_groups -= E for(var/turf/simulated/T in E.turf_list) diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 33c56635c4d..8a0b055d4b2 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -32,7 +32,7 @@ // Like view but bypasses luminosity check -/proc/get_hear(var/range, var/atom/source) +/proc/get_hear(range, atom/source) var/lum = source.luminosity source.luminosity = 6 @@ -42,7 +42,7 @@ return heard -/proc/alone_in_area(var/area/the_area, var/mob/must_be_alone, var/check_type = /mob/living/carbon) +/proc/alone_in_area(area/the_area, mob/must_be_alone, check_type = /mob/living/carbon) var/area/our_area = get_area_master(the_area) for(var/C in living_mob_list) if(!istype(C, check_type)) @@ -125,7 +125,7 @@ //This is the new version of recursive_mob_check, used for say(). //The other proc was left intact because morgue trays use it. -/proc/recursive_hear_check(var/atom/O) +/proc/recursive_hear_check(atom/O) var/list/processing_list = list(O) var/list/processed_list = list() var/list/found_atoms = list() @@ -147,7 +147,7 @@ // Better recursive loop, technically sort of not actually recursive cause that shit is retarded, enjoy. //No need for a recursive limit either -/proc/recursive_mob_check(var/atom/O,var/client_check=1,var/sight_check=1,var/include_radio=1) +/proc/recursive_mob_check(atom/O,client_check=1,sight_check=1,include_radio=1) var/list/processing_list = list(O) var/list/processed_list = list() @@ -187,7 +187,7 @@ return found_mobs -/proc/get_hearers_in_view(var/R, var/atom/source) +/proc/get_hearers_in_view(R, atom/source) // Returns a list of hearers in view(R) from source (ignoring luminosity). Used in saycode. var/turf/T = get_turf(source) var/list/hear = list() @@ -202,7 +202,7 @@ return hear -/proc/get_mobs_in_radio_ranges(var/list/obj/item/device/radio/radios) +/proc/get_mobs_in_radio_ranges(list/obj/item/device/radio/radios) set background = BACKGROUND_ENABLED @@ -247,7 +247,7 @@ #undef SIGN -/proc/isInSight(var/atom/A, var/atom/B) +/proc/isInSight(atom/A, atom/B) var/turf/Aturf = get_turf(A) var/turf/Bturf = get_turf(B) @@ -282,7 +282,7 @@ if(AM.Move(get_step(T, direction))) break -/proc/get_mob_by_key(var/key) +/proc/get_mob_by_key(key) for(var/mob/M in mob_list) if(M.ckey == lowertext(key)) return M @@ -363,7 +363,7 @@ src.dest_x = dest_x src.dest_y = dest_y -/proc/projectile_trajectory(var/src_x, var/src_y, var/rotation, var/angle, var/power) +/proc/projectile_trajectory(src_x, src_y, rotation, angle, power) // returns the destination (Vx,y) that a projectile shot at [src_x], [src_y], with an angle of [angle], // rotated at [rotation] and with the power of [power] diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index 37eaa81413a..ef86ac33bfc 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -870,7 +870,7 @@ The _flatIcons list is a cache for generated icon files. //Find's the average colour of the icon //By vg's ComicIronic -/proc/AverageColour(var/icon/I) +/proc/AverageColour(icon/I) var/list/colours = list() for(var/x_pixel = 1 to I.Width()) for(var/y_pixel = 1 to I.Height()) @@ -889,7 +889,7 @@ The _flatIcons list is a cache for generated icon files. //Interface for using DrawBox() to draw 1 pixel on a coordinate. //Returns the same icon specifed in the argument, but with the pixel drawn -/proc/DrawPixel(var/icon/I,var/colour,var/drawX,var/drawY) +/proc/DrawPixel(icon/I,colour,drawX,drawY) if(!I) return 0 @@ -906,7 +906,7 @@ The _flatIcons list is a cache for generated icon files. //Interface for easy drawing of one pixel on an atom. -/atom/proc/DrawPixelOn(var/colour, var/drawX, var/drawY) +/atom/proc/DrawPixelOn(colour, drawX, drawY) var/icon/I = new(icon) var/icon/J = DrawPixel(I, colour, drawX, drawY) if(J) //Only set the icon if it succeeded, the icon without the pixel is 1000x better than a black square. diff --git a/code/__HELPERS/lists.dm b/code/__HELPERS/lists.dm index 461ec2c4601..2ec7b4c407f 100644 --- a/code/__HELPERS/lists.dm +++ b/code/__HELPERS/lists.dm @@ -10,7 +10,7 @@ */ //Returns a list in plain english as a string -/proc/english_list(var/list/input, nothing_text = "nothing", and_text = " and ", comma_text = ", ", final_comma_text = "" ) +/proc/english_list(list/input, nothing_text = "nothing", and_text = " and ", comma_text = ", ", final_comma_text = "" ) var/total = input.len if (!total) return "[nothing_text]" @@ -57,7 +57,7 @@ return 0 //Checks for specific types in a list -/proc/is_type_in_list(var/atom/A, var/list/L) +/proc/is_type_in_list(atom/A, list/L) for(var/type in L) if(istype(A, type)) return 1 @@ -84,7 +84,7 @@ * If skiprep = 1, repeated elements are treated as one. * If either of arguments is not a list, returns null */ -/proc/difflist(var/list/first, var/list/second, var/skiprep=0) +/proc/difflist(list/first, list/second, skiprep=0) if(!islist(first) || !islist(second)) return var/list/result = new @@ -101,7 +101,7 @@ * If skipref = 1, repeated elements are treated as one. * If either of arguments is not a list, returns null */ -/proc/uniquemergelist(var/list/first, var/list/second, var/skiprep=0) +/proc/uniquemergelist(list/first, list/second, skiprep=0) if(!islist(first) || !islist(second)) return var/list/result = new @@ -148,7 +148,7 @@ L.Insert(pos+1, thing) // Returns the next item in a list -/proc/next_list_item(var/item, var/list/L) +/proc/next_list_item(item, list/L) var/i i = L.Find(item) if(i == L.len) @@ -158,7 +158,7 @@ return L[i] // Returns the previous item in a list -/proc/previous_list_item(var/item, var/list/L) +/proc/previous_list_item(item, list/L) var/i i = L.Find(item) if(i == 1) @@ -172,7 +172,7 @@ */ /* //Reverses the order of items in the list -/proc/reverselist(var/list/input) +/proc/reverselist(list/input) var/list/output = list() for(var/i = input.len; i >= 1; i--) output += input[i] @@ -180,7 +180,7 @@ */ //Randomize: Return the list in a random order -/proc/shuffle(var/list/L) +/proc/shuffle(list/L) if(!L) return L = L.Copy() @@ -191,7 +191,7 @@ return L //Return a list with no duplicate entries -/proc/uniqueList(var/list/L) +/proc/uniqueList(list/L) . = list() for(var/i in L) . |= i @@ -206,11 +206,11 @@ return sortTim(L, order >= 0 ? /proc/cmp_records_asc : /proc/cmp_records_dsc) //any value in a list -/proc/sortList(var/list/L, cmp=/proc/cmp_text_asc) +/proc/sortList(list/L, cmp=/proc/cmp_text_asc) return sortTim(L.Copy(), cmp) //uses sortList() but uses the var's name specifically. This should probably be using mergeAtom() instead -/proc/sortNames(var/list/L, order=1) +/proc/sortNames(list/L, order=1) return sortTim(L, order >= 0 ? /proc/cmp_name_asc : /proc/cmp_name_dsc) @@ -232,7 +232,7 @@ return r // Returns the key based on the index -/proc/get_key_by_index(var/list/L, var/index) +/proc/get_key_by_index(list/L, index) var/i = 1 for(var/key in L) if(index == i) @@ -240,7 +240,7 @@ i++ return null -/proc/count_by_type(var/list/L, type) +/proc/count_by_type(list/L, type) var/i = 0 for(var/T in L) if(istype(T, type)) diff --git a/code/__HELPERS/maths.dm b/code/__HELPERS/maths.dm index 8402482c714..7940dae0d85 100644 --- a/code/__HELPERS/maths.dm +++ b/code/__HELPERS/maths.dm @@ -129,7 +129,7 @@ var/list/sqrtTable = list(1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, //A logarithm that converts an integer to a number scaled between 0 and 1 (can be tweaked to be higher). //Currently, this is used for hydroponics-produce sprite transforming, but could be useful for other transform functions. -/proc/TransformUsingVariable(var/input, var/inputmaximum, var/scaling_modifier = 0) +/proc/TransformUsingVariable(input, inputmaximum, scaling_modifier = 0) var/inputToDegrees = (input/inputmaximum)*180 //Converting from a 0 -> 100 scale to a 0 -> 180 scale. The 0 -> 180 scale corresponds to degrees var/size_factor = ((-cos(inputToDegrees) +1) /2) //returns a value from 0 to 1 diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 4642f002cbc..7e4bb267ea4 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -128,7 +128,7 @@ Proc for attack log creation, because really why not 6 is additional information, anything that needs to be added */ -/proc/add_logs(mob/user, mob/target, what_done, var/object=null, var/addition=null) +/proc/add_logs(mob/user, mob/target, what_done, object=null, addition=null) var/newhealthtxt = "" if (target && isliving(target)) var/mob/living/L = target diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index 4cef32a4130..3c074ad5756 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -32,7 +32,7 @@ var/command_name = null command_name = name return name -/proc/change_command_name(var/name) +/proc/change_command_name(name) command_name = name diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index 33b781ad4f8..1a7b44d0c4e 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -14,11 +14,11 @@ */ // Run all strings to be used in an SQL query through this proc first to properly escape out injection attempts. -/proc/sanitizeSQL(var/t as text) +/proc/sanitizeSQL(t as text) var/sqltext = dbcon.Quote(t); return copytext(sqltext, 2, lentext(sqltext));//Quote() adds quotes around input, we already do that -/proc/format_table_name(var/table as text) +/proc/format_table_name(table as text) return sqlfdbktableprefix + table /* @@ -26,7 +26,7 @@ */ //Simply removes < and > and limits the length of the message -/proc/strip_html_simple(var/t,var/limit=MAX_MESSAGE_LEN) +/proc/strip_html_simple(t,limit=MAX_MESSAGE_LEN) var/list/strip_chars = list("<",">") t = copytext(t,1,limit) for(var/char in strip_chars) @@ -37,7 +37,7 @@ return t //Removes a few problematic characters -/proc/sanitize_simple(var/t,var/list/repl_chars = list("\n"="#","\t"="#")) +/proc/sanitize_simple(t,list/repl_chars = list("\n"="#","\t"="#")) for(var/char in repl_chars) var/index = findtext(t, char) while(index) @@ -46,22 +46,22 @@ return t //Runs byond's sanitization proc along-side sanitize_simple -/proc/sanitize(var/t,var/list/repl_chars = null) +/proc/sanitize(t,list/repl_chars = null) return html_encode(sanitize_simple(t,repl_chars)) //Runs sanitize and strip_html_simple //I believe strip_html_simple() is required to run first to prevent '<' from displaying as '<' after sanitize() calls byond's html_encode() -/proc/strip_html(var/t,var/limit=MAX_MESSAGE_LEN) +/proc/strip_html(t,limit=MAX_MESSAGE_LEN) return copytext((sanitize(strip_html_simple(t))),1,limit) //Runs byond's sanitization proc along-side strip_html_simple //I believe strip_html_simple() is required to run first to prevent '<' from displaying as '<' that html_encode() would cause -/proc/adminscrub(var/t,var/limit=MAX_MESSAGE_LEN) +/proc/adminscrub(t,limit=MAX_MESSAGE_LEN) return copytext((html_encode(strip_html_simple(t))),1,limit) //Returns null if there is any bad text in the string -/proc/reject_bad_text(var/text, var/max_length=512) +/proc/reject_bad_text(text, max_length=512) if(length(text) > max_length) return //message too long var/non_whitespace = 0 for(var/i=1, i<=length(text), i++) @@ -74,17 +74,17 @@ if(non_whitespace) return text //only accepts the text if it has some non-spaces // Used to get a properly sanitized input, of max_length -/proc/stripped_input(var/mob/user, var/message = "", var/title = "", var/default = "", var/max_length=MAX_MESSAGE_LEN) +/proc/stripped_input(mob/user, message = "", title = "", default = "", max_length=MAX_MESSAGE_LEN) var/name = input(user, message, title, default) as text|null return html_encode(trim(name, max_length)) //trim is "inside" because html_encode can expand single symbols into multiple symbols (such as turning < into <) // Used to get a properly sanitized multiline input, of max_length -/proc/stripped_multiline_input(var/mob/user, var/message = "", var/title = "", var/default = "", var/max_length=MAX_MESSAGE_LEN) +/proc/stripped_multiline_input(mob/user, message = "", title = "", default = "", max_length=MAX_MESSAGE_LEN) var/name = input(user, message, title, default) as message|null return html_encode(trim(name, max_length)) //Filters out undesirable characters from names -/proc/reject_bad_name(var/t_in, var/allow_numbers=0, var/max_length=MAX_NAME_LEN) +/proc/reject_bad_name(t_in, allow_numbers=0, max_length=MAX_NAME_LEN) if(!t_in || length(t_in) > max_length) return //Rejects the input if it is null or if it is longer then the max length allowed @@ -149,7 +149,7 @@ //html_encode helper proc that returns the smallest non null of two numbers //or 0 if they're both null (needed because of findtext returning 0 when a value is not present) -/proc/non_zero_min(var/a, var/b) +/proc/non_zero_min(a, b) if(!a) return b if(!b) @@ -239,7 +239,7 @@ 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) //Centers text by adding spaces to either side of the string. @@ -267,7 +267,7 @@ return copytext(message, 1, length + 1) -/proc/stringmerge(var/text,var/compare,replace = "*") +/proc/stringmerge(text,compare,replace = "*") //This proc fills in all spaces with the "replace" var (* by default) with whatever //is in the other string at the same spot (assuming it is not a replace char). //This is used for fingerprints @@ -288,7 +288,7 @@ return 0 return newtext -/proc/stringpercent(var/text,character = "*") +/proc/stringpercent(text,character = "*") //This proc returns the number of chars of the string that is the character //This is used for detective work to determine fingerprint completion. if(!text || !character) @@ -300,7 +300,7 @@ count++ return count -/proc/reverse_text(var/text = "") +/proc/reverse_text(text = "") var/new_text = "" for(var/i = length(text); i > 0; i--) new_text += copytext(text, i, i+1) diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm index 66168dcc939..c297d043a30 100644 --- a/code/__HELPERS/time.dm +++ b/code/__HELPERS/time.dm @@ -2,10 +2,10 @@ /proc/worldtime2text() return gameTimestamp("hh:mm") -/proc/time_stamp(var/format = "hh:mm:ss") +/proc/time_stamp(format = "hh:mm:ss") return time2text(world.timeofday, format) -/proc/gameTimestamp(var/format = "hh:mm:ss") // Get the game time in text +/proc/gameTimestamp(format = "hh:mm:ss") // Get the game time in text return time2text(world.time - timezoneOffset + 432000, format) /* Preserving this so future generations can see how fucking retarded some people are @@ -23,7 +23,7 @@ proc/time_stamp() */ /* Returns 1 if it is the selected month and day */ -/proc/isDay(var/month, var/day) +/proc/isDay(month, day) if(isnum(month) && isnum(day)) var/MM = text2num(time2text(world.timeofday, "MM")) // get the current month var/DD = text2num(time2text(world.timeofday, "DD")) // get the current day diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index ad4b622f5d9..a14fa4ac40b 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -235,7 +235,7 @@ return //Converts an angle (degrees) into an ss13 direction -/proc/angle2dir(var/degree) +/proc/angle2dir(degree) degree = SimplifyDegrees(degree) @@ -250,7 +250,7 @@ //returns the north-zero clockwise angle in degrees, given a direction -/proc/dir2angle(var/D) +/proc/dir2angle(D) switch(D) if(NORTH) return 0 if(SOUTH) return 180 @@ -263,7 +263,7 @@ else return null //Returns the angle in english -/proc/angle2text(var/degree) +/proc/angle2text(degree) return dir2text(angle2dir(degree)) //Converts a blend_mode constant to one acceptable to icon.Blend() @@ -460,7 +460,7 @@ for(var/t in test_times) //Turns a Body_parts_covered bitfield into a list of organ/limb names. //(I challenge you to find a use for this) -/proc/body_parts_covered2organ_names(var/bpc) +/proc/body_parts_covered2organ_names(bpc) var/list/covered_parts = list() if(!bpc) @@ -544,7 +544,7 @@ for(var/t in test_times) else . = max(0, min(255, 138.5177312231 * log(temp - 10) - 305.0447927307)) -/proc/color2hex(var/color) //web colors +/proc/color2hex(color) //web colors if(!color) return "#000000" diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index f83878efb29..2a223184ccf 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -27,7 +27,7 @@ return //Returns the middle-most value -/proc/dd_range(var/low, var/high, var/num) +/proc/dd_range(low, high, num) return max(low,min(high,num)) @@ -183,7 +183,7 @@ Turf and target are seperate in case you want to teleport some distance from a t return 1 //Ensure the frequency is within bounds of what it should be sending/recieving at -/proc/sanitize_frequency(var/f) +/proc/sanitize_frequency(f) f = round(f) f = max(1441, f) // 144.1 f = min(1489, f) // 148.9 @@ -192,7 +192,7 @@ Turf and target are seperate in case you want to teleport some distance from a t return f //Turns 1479 into 147.9 -/proc/format_frequency(var/f) +/proc/format_frequency(f) f = text2num(f) return "[round(f / 10)].[f % 10]" @@ -200,7 +200,7 @@ Turf and target are seperate in case you want to teleport some distance from a t //This will update a mob's name, real_name, mind.name, data_core records, pda, id and traitor text //Calling this proc without an oldname will only update the mob and skip updating the pda, id and records ~Carn -/mob/proc/fully_replace_character_name(var/oldname,var/newname) +/mob/proc/fully_replace_character_name(oldname,newname) if(!newname) return 0 real_name = newname name = newname @@ -273,7 +273,7 @@ Turf and target are seperate in case you want to teleport some distance from a t //Generalised helper proc for letting mobs rename themselves. Used to be clname() and ainame() -/mob/proc/rename_self(var/role, var/allow_numbers=0) +/mob/proc/rename_self(role, allow_numbers=0) var/oldname = real_name var/newname var/loop = 1 @@ -329,7 +329,7 @@ Turf and target are seperate in case you want to teleport some distance from a t . += R //Returns a list of AI's -/proc/active_ais(var/check_mind=0) +/proc/active_ais(check_mind=0) . = list() for(var/mob/living/silicon/ai/A in living_mob_list) if(A.stat == DEAD) @@ -352,14 +352,14 @@ Turf and target are seperate in case you want to teleport some distance from a t return selected -/proc/select_active_free_borg(var/mob/user) +/proc/select_active_free_borg(mob/user) var/list/borgs = active_free_borgs() if(borgs.len) if(user) . = input(user,"Unshackled cyborg signals detected:", "Cyborg Selection", borgs[1]) in borgs else . = pick(borgs) return . -/proc/select_active_ai(var/mob/user) +/proc/select_active_ai(mob/user) var/list/ais = active_ais() if(ais.len) if(user) . = input(user,"AI signals detected:", "AI Selection", ais[1]) in ais @@ -427,16 +427,16 @@ Turf and target are seperate in case you want to teleport some distance from a t return moblist //E = MC^2 -/proc/convert2energy(var/M) +/proc/convert2energy(M) var/E = M*(SPEED_OF_LIGHT_SQ) return E //M = E/C^2 -/proc/convert2mass(var/E) +/proc/convert2mass(E) var/M = E/(SPEED_OF_LIGHT_SQ) return M -/proc/key_name(var/whom, var/include_link = null, var/include_name = 1) +/proc/key_name(whom, include_link = null, include_name = 1) var/mob/M var/client/C var/key @@ -492,10 +492,10 @@ Turf and target are seperate in case you want to teleport some distance from a t return . -/proc/key_name_admin(var/whom, var/include_name = 1) +/proc/key_name_admin(whom, include_name = 1) return key_name(whom, 1, include_name) -/proc/get_mob_by_ckey(var/key) +/proc/get_mob_by_ckey(key) if(!key) return var/list/mobs = sortmobs() @@ -505,7 +505,7 @@ Turf and target are seperate in case you want to teleport some distance from a t // Returns the atom sitting on the turf. // For example, using this on a disk, which is in a bag, on a mob, will return the mob because it's on the turf. -/proc/get_atom_on_turf(var/atom/movable/M) +/proc/get_atom_on_turf(atom/movable/M) var/atom/loc = M while(loc && loc.loc && !istype(loc.loc, /turf/)) loc = loc.loc @@ -513,7 +513,7 @@ Turf and target are seperate in case you want to teleport some distance from a t // returns the turf located at the map edge in the specified direction relative to A // used for mass driver -/proc/get_edge_target_turf(var/atom/A, var/direction) +/proc/get_edge_target_turf(atom/A, direction) var/turf/target = locate(A.x, A.y, A.z) if(!A || !target) @@ -537,7 +537,7 @@ Turf and target are seperate in case you want to teleport some distance from a t // result is bounded to map size // note range is non-pythagorean // used for disposal system -/proc/get_ranged_target_turf(var/atom/A, var/direction, var/range) +/proc/get_ranged_target_turf(atom/A, direction, range) var/x = A.x var/y = A.y @@ -555,7 +555,7 @@ Turf and target are seperate in case you want to teleport some distance from a t // returns turf relative to A offset in dx and dy tiles // bound to map limits -/proc/get_offset_target_turf(var/atom/A, var/dx, var/dy) +/proc/get_offset_target_turf(atom/A, dx, dy) var/x = min(world.maxx, max(1, A.x + dx)) var/y = min(world.maxy, max(1, A.y + dy)) return locate(x,y,A.z) @@ -565,7 +565,7 @@ Turf and target are seperate in case you want to teleport some distance from a t return y -/proc/anim(turf/location as turf,target as mob|obj,a_icon,a_icon_state as text,flick_anim as text,sleeptime = 0,direction as num) +/proc/anim(turf/location,target as mob|obj,a_icon,a_icon_state as text,flick_anim as text,sleeptime = 0,direction as num) //This proc throws up either an icon or an animation for a specified amount of time. //The variables should be apparent enough. var/atom/movable/overlay/animation = new(location) @@ -623,7 +623,7 @@ Turf and target are seperate in case you want to teleport some distance from a t //Step-towards method of determining whether one atom can see another. Similar to viewers() -/proc/can_see(var/atom/source, var/atom/target, var/length=5) // I couldnt be arsed to do actual raycasting :I This is horribly inaccurate. +/proc/can_see(atom/source, atom/target, length=5) // I couldnt be arsed to do actual raycasting :I This is horribly inaccurate. var/turf/current = get_turf(source) var/turf/target_turf = get_turf(target) var/steps = 0 @@ -638,7 +638,7 @@ Turf and target are seperate in case you want to teleport some distance from a t return 1 -/proc/is_blocked_turf(var/turf/T) +/proc/is_blocked_turf(turf/T) var/cant_pass = 0 if(T.density) cant_pass = 1 for(var/atom/A in T) @@ -646,7 +646,7 @@ Turf and target are seperate in case you want to teleport some distance from a t cant_pass = 1 return cant_pass -/proc/get_step_towards2(var/atom/ref , var/atom/trg) +/proc/get_step_towards2(atom/ref , atom/trg) var/base_dir = get_dir(ref, get_step_towards(ref,trg)) var/turf/temp = get_step_towards(ref,trg) @@ -674,7 +674,7 @@ Turf and target are seperate in case you want to teleport some distance from a t else return get_step(ref, base_dir) -/proc/do_mob(var/mob/user , var/mob/target, var/time = 30, numticks = 5, var/stealth = 0) //This is quite an ugly solution but i refuse to use the old request system. +/proc/do_mob(mob/user , mob/target, time = 30, numticks = 5, stealth = 0) //This is quite an ugly solution but i refuse to use the old request system. if(!user || !target) return 0 if(numticks == 0) @@ -703,7 +703,7 @@ Turf and target are seperate in case you want to teleport some distance from a t user.client.images -= progbar return 1 -/proc/make_progress_bar(var/current_number, var/goal_number, var/atom/target) +/proc/make_progress_bar(current_number, goal_number, atom/target) if(current_number && goal_number && target) var/image/progbar progbar = image("icon" = 'icons/effects/doafter_icon.dmi', "loc" = target, "icon_state" = "prog_bar_0") @@ -767,7 +767,7 @@ Turf and target are seperate in case you want to teleport some distance from a t //Takes: Anything that could possibly have variables and a varname to check. //Returns: 1 if found, 0 if not. -/proc/hasvar(var/datum/A, var/varname) +/proc/hasvar(datum/A, varname) if(A.vars.Find(lowertext(varname))) return 1 else return 0 @@ -785,7 +785,7 @@ Turf and target are seperate in case you want to teleport some distance from a t //Takes: Area type as text string or as typepath OR an instance of the area. //Returns: A list of all areas of that type in the world. -/proc/get_areas(var/areatype) +/proc/get_areas(areatype) if(!areatype) return null if(istext(areatype)) areatype = text2path(areatype) if(isarea(areatype)) @@ -799,7 +799,7 @@ Turf and target are seperate in case you want to teleport some distance from a t //Takes: Area type as text string or as typepath OR an instance of the area. //Returns: A list of all turfs in areas of that type of that type in the world. -/proc/get_area_turfs(var/areatype) +/proc/get_area_turfs(areatype) if(!areatype) return null if(istext(areatype)) areatype = text2path(areatype) if(isarea(areatype)) @@ -814,7 +814,7 @@ Turf and target are seperate in case you want to teleport some distance from a t //Takes: Area type as text string or as typepath OR an instance of the area. //Returns: A list of all atoms (objs, turfs, mobs) in areas of that type of that type in the world. -/proc/get_area_all_atoms(var/areatype) +/proc/get_area_all_atoms(areatype) if(!areatype) return null if(istext(areatype)) areatype = text2path(areatype) if(isarea(areatype)) @@ -833,7 +833,7 @@ Turf and target are seperate in case you want to teleport some distance from a t var/y_pos = null var/z_pos = null -/proc/DuplicateObject(obj/original, var/perfectcopy = 0 , var/sameloc = 0) +/proc/DuplicateObject(obj/original, perfectcopy = 0 , sameloc = 0) if(!original) return null @@ -852,7 +852,7 @@ Turf and target are seperate in case you want to teleport some distance from a t return O -/area/proc/copy_contents_to(var/area/A , var/platingRequired = 0 ) +/area/proc/copy_contents_to(area/A , platingRequired = 0 ) //Takes: Area. Optional: If it should copy to areas that don't have plating //Returns: Nothing. //Notes: Attempts to move the contents of one area to another area. @@ -1081,7 +1081,7 @@ Turf and target are seperate in case you want to teleport some distance from a t //centered = 0 counts from turf edge to edge //centered = 1 counts from turf center to turf center //of course mathematically this is just adding world.icon_size on again -/proc/getPixelDistance(var/atom/A, var/atom/B, var/centered = 1) +/proc/getPixelDistance(atom/A, atom/B, centered = 1) if(!istype(A)||!istype(B)) return 0 . = bounds_dist(A, B) + sqrt((((A.pixel_x+B.pixel_x)**2) + ((A.pixel_y+B.pixel_y)**2))) @@ -1110,7 +1110,7 @@ var/global/list/common_tools = list( return 1 return 0 -/proc/is_hot(obj/item/W as obj) +/proc/is_hot(obj/item/W) if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/O = W if(O.isOn()) @@ -1161,7 +1161,7 @@ var/global/list/common_tools = list( return 0 //Is this even used for anything besides balloons? Yes I took out the W:lit stuff because : really shouldnt be used. -/proc/is_sharp(obj/item/W as obj) // For the record, WHAT THE HELL IS THIS METHOD OF DOING IT? +/proc/is_sharp(obj/item/W) // For the record, WHAT THE HELL IS THIS METHOD OF DOING IT? var/list/sharp_things_1 = list(\ /obj/item/weapon/circular_saw,\ /obj/item/weapon/shovel,\ @@ -1194,7 +1194,7 @@ var/global/list/common_tools = list( else return 0 -/proc/is_pointed(obj/item/W as obj) +/proc/is_pointed(obj/item/W) if(istype(W, /obj/item/weapon/pen)) return 1 if(istype(W, /obj/item/weapon/screwdriver)) @@ -1257,7 +1257,7 @@ var/list/WALLITEMS = list( /proc/format_text(text) return replacetext(replacetext(text,"\proper ",""),"\improper ","") -/obj/proc/atmosanalyzer_scan(var/datum/gas_mixture/air_contents, mob/user, var/obj/target = src) +/obj/proc/atmosanalyzer_scan(datum/gas_mixture/air_contents, mob/user, obj/target = src) var/obj/icon = target user.visible_message("[user] has used the analyzer on \icon[icon] [target].", "You use the analyzer on \icon[icon] [target].") var/pressure = air_contents.return_pressure() @@ -1313,7 +1313,7 @@ var/list/WALLITEMS = list( living_player_count += 1 return living_player_count -/proc/randomColor(var/mode = 0) //if 1 it doesn't pick white, black or gray +/proc/randomColor(mode = 0) //if 1 it doesn't pick white, black or gray switch(mode) if(0) return pick("white","black","gray","red","green","blue","brown","yellow","orange","darkred", @@ -1336,7 +1336,7 @@ var/list/WALLITEMS = list( tY = max(1, min(world.maxy, origin.y + (text2num(tY) - (world.view + 1)))) return locate(tX, tY, tZ) -/proc/IsValidSrc(var/A) +/proc/IsValidSrc(A) if(istype(A, /datum)) var/datum/B = A return !B.gc_destroyed diff --git a/code/_onclick/adjacent.dm b/code/_onclick/adjacent.dm index 20aeb967d29..f1db0379efc 100644 --- a/code/_onclick/adjacent.dm +++ b/code/_onclick/adjacent.dm @@ -10,7 +10,7 @@ Note that in all cases the neighbor is handled simply; this is usually the user's mob, in which case it is up to you to check that the mob is not inside of something */ -/atom/proc/Adjacent(var/atom/neighbor) // basic inheritance, unused +/atom/proc/Adjacent(atom/neighbor) // basic inheritance, unused return 0 // Not a sane use of the function and (for now) indicative of an error elsewhere @@ -83,7 +83,7 @@ This is defined as any dense ON_BORDER object, or any dense object without throwpass. The border_only flag allows you to not objects (for source and destination squares) */ -/turf/proc/ClickCross(var/target_dir, var/border_only, var/target_atom = null) +/turf/proc/ClickCross(target_dir, border_only, target_atom = null) for(var/obj/O in src) if( !O.density || O == target_atom || O.throwpass) //check if there's a dense object present on the turf continue // throwpass is used for anything you can click through (or the firedoor special case, see above) diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm index 305e3af18d3..406a0fb4423 100644 --- a/code/_onclick/ai.dm +++ b/code/_onclick/ai.dm @@ -85,7 +85,7 @@ /mob/living/silicon/ai/RangedAttack(atom/A) A.attack_ai(src) -/atom/proc/attack_ai(mob/user as mob) +/atom/proc/attack_ai(mob/user) return /* @@ -112,7 +112,7 @@ /* Atom Procs */ /atom/proc/AICtrlClick() return -/atom/proc/AIAltClick(var/mob/living/silicon/ai/user) +/atom/proc/AIAltClick(mob/living/silicon/ai/user) AltClick(user) return /atom/proc/AIShiftClick() diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 193fa246a83..2be1d10aa41 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -33,7 +33,7 @@ * item/afterattack(atom,user,adjacent,params) - used both ranged and adjacent * mob/RangedAttack(atom,params) - used only ranged, only used for tk and laser eyes but could be changed */ -/mob/proc/ClickOn( var/atom/A, var/params ) +/mob/proc/ClickOn( atom/A, params ) if(world.time <= next_click) return next_click = world.time + 1 @@ -131,7 +131,7 @@ next_move = world.time + num // Default behavior: ignore double clicks (the second click that makes the doubleclick call already calls for a normal click) -/mob/proc/DblClickOn(var/atom/A, var/params) +/mob/proc/DblClickOn(atom/A, params) return @@ -145,7 +145,7 @@ proximity_flag is not currently passed to attack_hand, and is instead used in human click code to allow glove touches only at melee range. */ -/mob/proc/UnarmedAttack(var/atom/A, var/proximity_flag) +/mob/proc/UnarmedAttack(atom/A, proximity_flag) if(ismob(A)) changeNext_move(CLICK_CD_MELEE) return @@ -158,36 +158,36 @@ for things like ranged glove touches, spitting alien acid/neurotoxin, animals lunging, etc. */ -/mob/proc/RangedAttack(var/atom/A, var/params) +/mob/proc/RangedAttack(atom/A, params) /* Restrained ClickOn Used when you are handcuffed and click things. Not currently used by anything but could easily be. */ -/mob/proc/RestrainedClickOn(var/atom/A) +/mob/proc/RestrainedClickOn(atom/A) return /* Middle click Only used for swapping hands */ -/mob/proc/MiddleClickOn(var/atom/A) +/mob/proc/MiddleClickOn(atom/A) return -/mob/living/carbon/MiddleClickOn(var/atom/A) +/mob/living/carbon/MiddleClickOn(atom/A) if(!src.stat && src.mind && src.mind.changeling && src.mind.changeling.chosen_sting && (istype(A, /mob/living/carbon)) && (A != src)) next_click = world.time + 5 mind.changeling.chosen_sting.try_to_sting(src, A) else swap_hand() -/mob/living/simple_animal/drone/MiddleClickOn(var/atom/A) +/mob/living/simple_animal/drone/MiddleClickOn(atom/A) swap_hand() // In case of use break glass /* -/atom/proc/MiddleClick(var/mob/M as mob) +/atom/proc/MiddleClick(mob/M as mob) return */ @@ -196,10 +196,10 @@ For most mobs, examine. This is overridden in ai.dm */ -/mob/proc/ShiftClickOn(var/atom/A) +/mob/proc/ShiftClickOn(atom/A) A.ShiftClick(src) return -/atom/proc/ShiftClick(var/mob/user) +/atom/proc/ShiftClick(mob/user) if(user.client && user.client.eye == user || user.client.eye == user.loc) user.examinate(src) return @@ -208,13 +208,13 @@ Ctrl click For most objects, pull */ -/mob/proc/CtrlClickOn(var/atom/A) +/mob/proc/CtrlClickOn(atom/A) A.CtrlClick(src) return -/atom/proc/CtrlClick(var/mob/user) +/atom/proc/CtrlClick(mob/user) return -/atom/movable/CtrlClick(var/mob/user) +/atom/movable/CtrlClick(mob/user) if(Adjacent(user)) user.start_pulling(src) @@ -222,18 +222,18 @@ Alt click Unused except for AI */ -/mob/proc/AltClickOn(var/atom/A) +/mob/proc/AltClickOn(atom/A) A.AltClick(src) return -/mob/living/carbon/AltClickOn(var/atom/A) +/mob/living/carbon/AltClickOn(atom/A) if(!src.stat && src.mind && src.mind.changeling && src.mind.changeling.chosen_sting && (istype(A, /mob/living/carbon)) && (A != src)) next_click = world.time + 5 mind.changeling.chosen_sting.try_to_sting(src, A) else ..() -/atom/proc/AltClick(var/mob/user) +/atom/proc/AltClick(mob/user) var/turf/T = get_turf(src) if(T && user.TurfAdjacent(T)) if(user.listed_turf == T) @@ -243,18 +243,18 @@ user.client.statpanel = T.name return -/mob/proc/TurfAdjacent(var/turf/T) +/mob/proc/TurfAdjacent(turf/T) return T.Adjacent(src) /* Control+Shift click Unused except for AI */ -/mob/proc/CtrlShiftClickOn(var/atom/A) +/mob/proc/CtrlShiftClickOn(atom/A) A.CtrlShiftClick(src) return -/atom/proc/CtrlShiftClick(var/mob/user) +/atom/proc/CtrlShiftClick(mob/user) return /* @@ -292,7 +292,7 @@ src << "You're out of energy! You need food!" // Simple helper to face what you clicked on, in case it should be needed in more than one place -/mob/proc/face_atom(var/atom/A) +/mob/proc/face_atom(atom/A) if( buckled || stat != CONSCIOUS || !A || !x || !y || !A.x || !A.y ) return var/dx = A.x - x var/dy = A.y - y diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm index 25cf22540ae..4cb6a641ba8 100644 --- a/code/_onclick/cyborg.dm +++ b/code/_onclick/cyborg.dm @@ -90,36 +90,36 @@ return //Middle click cycles through selected modules. -/mob/living/silicon/robot/MiddleClickOn(var/atom/A) +/mob/living/silicon/robot/MiddleClickOn(atom/A) cycle_modules() return //Give cyborgs hotkey clicks without breaking existing uses of hotkey clicks // for non-doors/apcs -/mob/living/silicon/robot/CtrlShiftClickOn(var/atom/A) +/mob/living/silicon/robot/CtrlShiftClickOn(atom/A) A.BorgCtrlShiftClick(src) -/mob/living/silicon/robot/ShiftClickOn(var/atom/A) +/mob/living/silicon/robot/ShiftClickOn(atom/A) A.BorgShiftClick(src) -/mob/living/silicon/robot/CtrlClickOn(var/atom/A) +/mob/living/silicon/robot/CtrlClickOn(atom/A) A.BorgCtrlClick(src) -/mob/living/silicon/robot/AltClickOn(var/atom/A) +/mob/living/silicon/robot/AltClickOn(atom/A) A.BorgAltClick(src) -/atom/proc/BorgCtrlShiftClick(var/mob/living/silicon/robot/user) //forward to human click if not overriden +/atom/proc/BorgCtrlShiftClick(mob/living/silicon/robot/user) //forward to human click if not overriden CtrlShiftClick(user) /obj/machinery/door/airlock/BorgCtrlShiftClick() // Sets/Unsets Emergency Access Override Forwards to AI code. AICtrlShiftClick() -/atom/proc/BorgShiftClick(var/mob/living/silicon/robot/user) //forward to human click if not overriden +/atom/proc/BorgShiftClick(mob/living/silicon/robot/user) //forward to human click if not overriden ShiftClick(user) /obj/machinery/door/airlock/BorgShiftClick() // Opens and closes doors! Forwards to AI code. AIShiftClick() -/atom/proc/BorgCtrlClick(var/mob/living/silicon/robot/user) //forward to human click if not overriden +/atom/proc/BorgCtrlClick(mob/living/silicon/robot/user) //forward to human click if not overriden CtrlClick(user) /obj/machinery/door/airlock/BorgCtrlClick() // Bolts doors. Forwards to AI code. @@ -131,7 +131,7 @@ /obj/machinery/turretid/BorgCtrlClick() //turret control on/off. Forwards to AI code. AICtrlClick() -/atom/proc/BorgAltClick(var/mob/living/silicon/robot/user) +/atom/proc/BorgAltClick(mob/living/silicon/robot/user) AltClick(user) return @@ -154,6 +154,6 @@ /mob/living/silicon/robot/RangedAttack(atom/A) A.attack_robot(src) -/atom/proc/attack_robot(mob/user as mob) +/atom/proc/attack_robot(mob/user) attack_ai(user) return diff --git a/code/_onclick/hud/action.dm b/code/_onclick/hud/action.dm index 0a2d8da4a33..ebf7131e551 100644 --- a/code/_onclick/hud/action.dm +++ b/code/_onclick/hud/action.dm @@ -166,7 +166,7 @@ usr.update_action_buttons() -/obj/screen/movable/action_button/hide_toggle/proc/InitialiseIcon(var/mob/living/user) +/obj/screen/movable/action_button/hide_toggle/proc/InitialiseIcon(mob/living/user) if(isalien(user)) icon_state = "bg_alien" else @@ -188,7 +188,7 @@ #define AB_NORTH_OFFSET 26 #define AB_MAX_COLUMNS 10 -/datum/hud/proc/ButtonNumberToScreenCoords(var/number) // TODO : Make this zero-indexed for readabilty +/datum/hud/proc/ButtonNumberToScreenCoords(number) // TODO : Make this zero-indexed for readabilty var/row = round((number-1)/AB_MAX_COLUMNS) var/col = ((number - 1)%(AB_MAX_COLUMNS)) + 1 var/coord_col = "+[col-1]" @@ -197,7 +197,7 @@ var/coord_row_offset = 26 return "WEST[coord_col]:[coord_col_offset],NORTH[coord_row]:[coord_row_offset]" -/datum/hud/proc/SetButtonCoords(var/obj/screen/button,var/number) +/datum/hud/proc/SetButtonCoords(obj/screen/button,number) var/row = round((number-1)/AB_MAX_COLUMNS) var/col = ((number - 1)%(AB_MAX_COLUMNS)) + 1 var/x_offset = 32*(col-1) + 4 + 2*col diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index cb0ddfbf5ee..8c442d8dc35 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -202,7 +202,7 @@ var/datum/global_hud/global_hud = new() show_hud(HUD_STYLE_REDUCED) //Version denotes which style should be displayed. blank or 0 means "next version" -/datum/hud/proc/show_hud(var/version = 0) +/datum/hud/proc/show_hud(version = 0) if(!ismob(mymob)) return 0 if(!mymob.client) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 172b4bd63ae..e0bdd54cae3 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -16,7 +16,7 @@ user.changeNext_move(CLICK_CD_MELEE) I.attack(src, user) -/mob/living/proc/attacked_by(var/obj/item/I, var/mob/living/user, var/def_zone) +/mob/living/proc/attacked_by(obj/item/I, mob/living/user, def_zone) apply_damage(I.force, I.damtype, def_zone) if(I.damtype == "brute") if(prob(33) && I.force) @@ -63,7 +63,7 @@ else if(!src.force && src.w_class) return Clamp(src.w_class * 6, 10, 100) // Multiply the item's weight class by 6, then clamp the value between 10 and 100 -/obj/item/proc/attack(mob/living/M as mob, mob/living/user as mob, def_zone) +/obj/item/proc/attack(mob/living/M, mob/living/user, def_zone) if (!istype(M)) // not sure if this is the right thing... return diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm index b2d8c1a59c9..d452c21be90 100644 --- a/code/_onclick/observer.dm +++ b/code/_onclick/observer.dm @@ -53,7 +53,7 @@ A.attack_ghost(src) // Oh by the way this didn't work with old click code which is why clicking shit didn't spam you -/atom/proc/attack_ghost(mob/dead/observer/user as mob) +/atom/proc/attack_ghost(mob/dead/observer/user) if(user.client && user.client.inquisitive_ghost) user.examinate(src) return @@ -62,29 +62,29 @@ // And here are some good things for free: // Now you can click through portals, wormholes, gateways, and teleporters while observing. -Sayu -/obj/machinery/teleport/hub/attack_ghost(mob/user as mob) +/obj/machinery/teleport/hub/attack_ghost(mob/user) var/atom/l = loc var/obj/machinery/computer/teleporter/com = locate(/obj/machinery/computer/teleporter, locate(l.x - 2, l.y, l.z)) if(com && com.locked) user.loc = get_turf(com.locked) -/obj/effect/portal/attack_ghost(mob/user as mob) +/obj/effect/portal/attack_ghost(mob/user) if(target) user.loc = get_turf(target) -/obj/machinery/gateway/centerstation/attack_ghost(mob/user as mob) +/obj/machinery/gateway/centerstation/attack_ghost(mob/user) if(awaygate) user.loc = awaygate.loc else user << "[src] has no destination." -/obj/machinery/gateway/centeraway/attack_ghost(mob/user as mob) +/obj/machinery/gateway/centeraway/attack_ghost(mob/user) if(stationgate) user.loc = stationgate.loc else user << "[src] has no destination." -/obj/item/weapon/storage/attack_ghost(mob/user as mob) +/obj/item/weapon/storage/attack_ghost(mob/user) orient2hud(user) show_to(user) diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm index ba55e9cf993..1171a9aa5c9 100644 --- a/code/_onclick/other_mobs.dm +++ b/code/_onclick/other_mobs.dm @@ -4,7 +4,7 @@ Otherwise pretty standard. */ -/mob/living/carbon/human/UnarmedAttack(var/atom/A, var/proximity) +/mob/living/carbon/human/UnarmedAttack(atom/A, proximity) var/obj/item/clothing/gloves/G = gloves // not typecast specifically enough in defines // Special glove functions: @@ -22,7 +22,7 @@ A.attack_hand(src) -/atom/proc/attack_hand(mob/user as mob) +/atom/proc/attack_hand(mob/user) return /* @@ -30,10 +30,10 @@ return */ -/mob/living/carbon/RestrainedClickOn(var/atom/A) +/mob/living/carbon/RestrainedClickOn(atom/A) return 0 -/mob/living/carbon/human/RangedAttack(var/atom/A) +/mob/living/carbon/human/RangedAttack(atom/A) if(gloves) var/obj/item/clothing/gloves/G = gloves if(istype(G) && G.Touch(A,0)) // for magic gloves @@ -49,24 +49,24 @@ /* Animals & All Unspecified */ -/mob/living/UnarmedAttack(var/atom/A) +/mob/living/UnarmedAttack(atom/A) A.attack_animal(src) -/mob/living/simple_animal/hostile/UnarmedAttack(var/atom/A) +/mob/living/simple_animal/hostile/UnarmedAttack(atom/A) target = A AttackingTarget() -/atom/proc/attack_animal(mob/user as mob) +/atom/proc/attack_animal(mob/user) return -/mob/living/RestrainedClickOn(var/atom/A) +/mob/living/RestrainedClickOn(atom/A) return /* Monkeys */ -/mob/living/carbon/monkey/UnarmedAttack(var/atom/A) +/mob/living/carbon/monkey/UnarmedAttack(atom/A) A.attack_paw(src) -/atom/proc/attack_paw(mob/user as mob) +/atom/proc/attack_paw(mob/user) return /* @@ -76,7 +76,7 @@ moving it here instead of various hand_p's has simplified things considerably */ -/mob/living/carbon/monkey/RestrainedClickOn(var/atom/A) +/mob/living/carbon/monkey/RestrainedClickOn(atom/A) if(..()) return if(a_intent != "harm" || !ismob(A)) return @@ -102,18 +102,18 @@ Aliens Defaults to same as monkey in most places */ -/mob/living/carbon/alien/UnarmedAttack(var/atom/A) +/mob/living/carbon/alien/UnarmedAttack(atom/A) A.attack_alien(src) -/atom/proc/attack_alien(mob/user as mob) +/atom/proc/attack_alien(mob/user) attack_paw(user) return -/mob/living/carbon/alien/RestrainedClickOn(var/atom/A) +/mob/living/carbon/alien/RestrainedClickOn(atom/A) return // Babby aliens -/mob/living/carbon/alien/larva/UnarmedAttack(var/atom/A) +/mob/living/carbon/alien/larva/UnarmedAttack(atom/A) A.attack_larva(src) -/atom/proc/attack_larva(mob/user as mob) +/atom/proc/attack_larva(mob/user) return @@ -121,11 +121,11 @@ Slimes Nothing happening here */ -/mob/living/simple_animal/slime/UnarmedAttack(var/atom/A) +/mob/living/simple_animal/slime/UnarmedAttack(atom/A) A.attack_slime(src) -/atom/proc/attack_slime(mob/user as mob) +/atom/proc/attack_slime(mob/user) return -/mob/living/simple_animal/slime/RestrainedClickOn(var/atom/A) +/mob/living/simple_animal/slime/RestrainedClickOn(atom/A) return /* diff --git a/code/_onclick/overmind.dm b/code/_onclick/overmind.dm index f692ba8f7ea..dc4cca11421 100644 --- a/code/_onclick/overmind.dm +++ b/code/_onclick/overmind.dm @@ -1,17 +1,17 @@ // Blob Overmind Controls -/mob/camera/blob/CtrlClickOn(var/atom/A) // Expand blob +/mob/camera/blob/CtrlClickOn(atom/A) // Expand blob var/turf/T = get_turf(A) if(T) expand_blob(T) -/mob/camera/blob/MiddleClickOn(var/atom/A) // Rally spores +/mob/camera/blob/MiddleClickOn(atom/A) // Rally spores var/turf/T = get_turf(A) if(T) rally_spores(T) -/mob/camera/blob/AltClickOn(var/atom/A) // Create a shield +/mob/camera/blob/AltClickOn(atom/A) // Create a shield var/turf/T = get_turf(A) if(T) create_shield(T) \ No newline at end of file diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index 9cb3d4945e5..33a8ad6e056 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -75,7 +75,7 @@ var/const/tk_maxrange = 15 var/mob/living/host = null -/obj/item/tk_grab/dropped(mob/user as mob) +/obj/item/tk_grab/dropped(mob/user) if(focus && user && loc != user && loc != user.loc) // drop_item() gets called when you tk-attack a table/closet with an item if(focus.Adjacent(loc)) focus.loc = loc @@ -85,13 +85,13 @@ var/const/tk_maxrange = 15 //stops TK grabs being equipped anywhere but into hands -/obj/item/tk_grab/equipped(var/mob/user, var/slot) +/obj/item/tk_grab/equipped(mob/user, slot) if( (slot == slot_l_hand) || (slot== slot_r_hand) ) return qdel(src) return -/obj/item/tk_grab/attack_self(mob/user as mob) +/obj/item/tk_grab/attack_self(mob/user) if(focus) focus.attack_self_tk(user) @@ -141,11 +141,11 @@ var/const/tk_maxrange = 15 return 0 return 1 -/obj/item/tk_grab/attack(mob/living/M as mob, mob/living/user as mob, def_zone) +/obj/item/tk_grab/attack(mob/living/M, mob/living/user, def_zone) return -/obj/item/tk_grab/proc/focus_object(var/obj/target, var/mob/living/user) +/obj/item/tk_grab/proc/focus_object(obj/target, mob/living/user) if(!istype(target,/obj)) return//Cant throw non objects atm might let it do mobs later if(target.anchored || !isturf(target.loc)) qdel(src) diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index 27f6a92016b..8d88edc8ffb 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -135,7 +135,7 @@ var/datum/subsystem/air/SSair T.process_cell() -/datum/subsystem/air/proc/remove_from_active(var/turf/simulated/T) +/datum/subsystem/air/proc/remove_from_active(turf/simulated/T) if(istype(T)) T.excited = 0 active_turfs -= T @@ -143,7 +143,7 @@ var/datum/subsystem/air/SSair T.excited_group.garbage_collect() -/datum/subsystem/air/proc/add_to_active(var/turf/simulated/T, var/blockchanges = 1) +/datum/subsystem/air/proc/add_to_active(turf/simulated/T, blockchanges = 1) if(istype(T) && T.air) T.excited = 1 active_turfs |= T diff --git a/code/controllers/subsystem/jobs.dm b/code/controllers/subsystem/jobs.dm index 5f85d3f162c..5d6c83b8206 100644 --- a/code/controllers/subsystem/jobs.dm +++ b/code/controllers/subsystem/jobs.dm @@ -462,7 +462,7 @@ var/datum/subsystem/job/SSjob return 1 return 0 -/datum/subsystem/job/proc/RejectPlayer(var/mob/new_player/player) +/datum/subsystem/job/proc/RejectPlayer(mob/new_player/player) if(player.mind && player.mind.special_role) return Debug("Popcap overflow Check observer located, Player: [player]") diff --git a/code/controllers/subsystem/npcpool.dm b/code/controllers/subsystem/npcpool.dm index 7226ad211b3..580464eca10 100644 --- a/code/controllers/subsystem/npcpool.dm +++ b/code/controllers/subsystem/npcpool.dm @@ -12,7 +12,7 @@ var/datum/subsystem/npcpool/SSbp var/list/botPool_l = list() //list of all npcs using the pool var/list/botPool_l_non = list() //list of all non SNPC mobs using the pool -/datum/subsystem/npcpool/proc/insertBot(var/toInsert) +/datum/subsystem/npcpool/proc/insertBot(toInsert) if(istype(toInsert,/mob/living/carbon/human/interactive)) botPool_l |= toInsert diff --git a/code/controllers/subsystem/pai.dm b/code/controllers/subsystem/pai.dm index 431f68c348e..e4a6ce4b51e 100644 --- a/code/controllers/subsystem/pai.dm +++ b/code/controllers/subsystem/pai.dm @@ -82,7 +82,7 @@ var/datum/subsystem/pai/SSpai return recruitWindow(usr) -/datum/subsystem/pai/proc/recruitWindow(var/mob/M as mob) +/datum/subsystem/pai/proc/recruitWindow(mob/M) var/datum/paiCandidate/candidate for(var/datum/paiCandidate/c in candidates) if(c.key == M.key) @@ -133,7 +133,7 @@ var/datum/subsystem/pai/SSpai M << browse(dat, "window=paiRecruit") -/datum/subsystem/pai/proc/findPAI(var/obj/item/device/paicard/p, var/mob/user) +/datum/subsystem/pai/proc/findPAI(obj/item/device/paicard/p, mob/user) requestRecruits() var/list/available = list() for(var/datum/paiCandidate/c in SSpai.candidates) @@ -196,7 +196,7 @@ var/datum/subsystem/pai/SSpai if(!hasSubmitted && (O.client.prefs.be_special & BE_PAI)) question(O.client) -/datum/subsystem/pai/proc/question(var/client/C) +/datum/subsystem/pai/proc/question(client/C) spawn(0) if(!C) return asked.Add(C.key) diff --git a/code/controllers/subsystem/radio.dm b/code/controllers/subsystem/radio.dm index 84e117f3f64..25f172bf9da 100644 --- a/code/controllers/subsystem/radio.dm +++ b/code/controllers/subsystem/radio.dm @@ -9,7 +9,7 @@ var/datum/subsystem/radio/radio_controller /datum/subsystem/radio/New() NEW_SS_GLOBAL(radio_controller) -/datum/subsystem/radio/proc/add_object(obj/device as obj, var/new_frequency as num, var/filter = null as text|null) +/datum/subsystem/radio/proc/add_object(obj/device, new_frequency as num, filter = null as text|null) var/f_text = num2text(new_frequency) var/datum/radio_frequency/frequency = frequencies[f_text] @@ -34,7 +34,7 @@ var/datum/subsystem/radio/radio_controller return 1 -/datum/subsystem/radio/proc/return_frequency(var/new_frequency as num) +/datum/subsystem/radio/proc/return_frequency(new_frequency as num) var/f_text = num2text(new_frequency) var/datum/radio_frequency/frequency = frequencies[f_text] diff --git a/code/controllers/subsystem/shuttles/supply.dm b/code/controllers/subsystem/shuttles/supply.dm index 2cce906435f..8d0ca50207f 100644 --- a/code/controllers/subsystem/shuttles/supply.dm +++ b/code/controllers/subsystem/shuttles/supply.dm @@ -201,7 +201,7 @@ return 0 -/obj/machinery/computer/ordercomp/attack_hand(var/mob/user as mob) +/obj/machinery/computer/ordercomp/attack_hand(mob/user) if(..()) return user.set_machine(src) @@ -303,7 +303,7 @@ updateUsrDialog() return -/obj/machinery/computer/supplycomp/attack_hand(var/mob/user as mob) +/obj/machinery/computer/supplycomp/attack_hand(mob/user) if(!allowed(user)) user << "Access Denied." return @@ -514,7 +514,7 @@ updateUsrDialog() return -/obj/machinery/computer/supplycomp/proc/post_signal(var/command) +/obj/machinery/computer/supplycomp/proc/post_signal(command) var/datum/radio_frequency/frequency = radio_controller.return_frequency(1435) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 82af4344c69..599563b1c81 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -200,7 +200,7 @@ var/datum/subsystem/ticker/ticker //Plus it provides an easy way to make cinematics for other events. Just use this as a template -/datum/subsystem/ticker/proc/station_explosion_cinematic(var/station_missed=0, var/override = null) +/datum/subsystem/ticker/proc/station_explosion_cinematic(station_missed=0, override = null) if( cinematic ) return //already a cinematic in progress! for (var/datum/html_interface/hi in html_interfaces) diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm index 6c2834a081f..1d9fb09f63b 100644 --- a/code/controllers/subsystem/timer.dm +++ b/code/controllers/subsystem/timer.dm @@ -44,7 +44,7 @@ var/datum/subsystem/timer/SStimer /datum/timedevent/Destroy() SStimer.processing -= src -/proc/addtimer(var/thingToCall, var/procToCall, var/wait, var/argList = list()) +/proc/addtimer(thingToCall, procToCall, wait, argList = list()) if (!SStimer) //can't run timers before the mc has been created return if (!thingToCall || !procToCall || wait <= 0) @@ -63,7 +63,7 @@ var/datum/subsystem/timer/SStimer return event.id -/proc/deltimer(var/id) +/proc/deltimer(id) for (var/datum/timedevent/event in SStimer.processing) if (event.id == id) qdel(event) diff --git a/code/controllers/subsystem/voting.dm b/code/controllers/subsystem/voting.dm index 7988d4ab99e..5d11eccd14a 100644 --- a/code/controllers/subsystem/voting.dm +++ b/code/controllers/subsystem/voting.dm @@ -120,7 +120,7 @@ var/datum/subsystem/vote/SSvote return . -/datum/subsystem/vote/proc/submit_vote(var/vote) +/datum/subsystem/vote/proc/submit_vote(vote) if(mode) if(config.vote_no_dead && usr.stat == DEAD && !usr.client.holder) return 0 @@ -131,7 +131,7 @@ var/datum/subsystem/vote/SSvote return vote return 0 -/datum/subsystem/vote/proc/initiate_vote(var/vote_type, var/initiator_key) +/datum/subsystem/vote/proc/initiate_vote(vote_type, initiator_key) if(!mode) if(started_time != null) var/next_allowed_time = (started_time + config.vote_delay) @@ -162,7 +162,7 @@ var/datum/subsystem/vote/SSvote return 1 return 0 -/datum/subsystem/vote/proc/interface(var/client/C) +/datum/subsystem/vote/proc/interface(client/C) if(!C) return var/admin = 0 var/trialmin = 0 diff --git a/code/controllers/subsystems.dm b/code/controllers/subsystems.dm index 3d36430f592..ed81dda8652 100644 --- a/code/controllers/subsystems.dm +++ b/code/controllers/subsystems.dm @@ -57,7 +57,7 @@ //could be used to postpone a costly subsystem for (default one) var/cycles, cycles //for instance, during cpu intensive operations like explosions -/datum/subsystem/proc/postpone(var/cycles = 1) +/datum/subsystem/proc/postpone(cycles = 1) if(next_fire - world.time < wait) next_fire += (wait*cycles) diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm index f44fa115c39..b8f364d015a 100644 --- a/code/datums/ai_laws.dm +++ b/code/datums/ai_laws.dm @@ -119,23 +119,23 @@ /* General ai_law functions */ -/datum/ai_laws/proc/set_zeroth_law(var/law, var/law_borg = null) +/datum/ai_laws/proc/set_zeroth_law(law, law_borg = null) src.zeroth = law if(law_borg) //Making it possible for slaved borgs to see a different law 0 than their AI. --NEO src.zeroth_borg = law_borg -/datum/ai_laws/proc/add_inherent_law(var/law) +/datum/ai_laws/proc/add_inherent_law(law) if (!(law in src.inherent)) src.inherent += law -/datum/ai_laws/proc/add_ion_law(var/law) +/datum/ai_laws/proc/add_ion_law(law) src.ion += law /datum/ai_laws/proc/clear_inherent_laws() del(src.inherent) src.inherent = list() -/datum/ai_laws/proc/add_supplied_law(var/number, var/law) +/datum/ai_laws/proc/add_supplied_law(number, law) while (src.supplied.len < number + 1) src.supplied += "" @@ -147,7 +147,7 @@ /datum/ai_laws/proc/clear_ion_laws() src.ion = list() -/datum/ai_laws/proc/show_laws(var/who) +/datum/ai_laws/proc/show_laws(who) if (src.zeroth) who << "0. [src.zeroth]" @@ -171,7 +171,7 @@ who << "[number]. [law]" number++ -/datum/ai_laws/proc/clear_zeroth_law(var/force) //only removes zeroth from antag ai if force is 1 +/datum/ai_laws/proc/clear_zeroth_law(force) //only removes zeroth from antag ai if force is 1 if(force) src.zeroth = null src.zeroth_borg = null @@ -184,6 +184,6 @@ src.zeroth_borg = null return -/datum/ai_laws/proc/associate(var/mob/living/silicon/M) +/datum/ai_laws/proc/associate(mob/living/silicon/M) if(!owner) owner = M \ No newline at end of file diff --git a/code/datums/browser.dm b/code/datums/browser.dm index a43a3996271..7a218a85367 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -94,7 +94,7 @@ [get_footer()] "} -/datum/browser/proc/open(var/use_onclose = 1) +/datum/browser/proc/open(use_onclose = 1) var/window_size = "" if (width && height) window_size = "size=[width]x[height];" @@ -137,7 +137,7 @@ // to pass a "close=1" parameter to the atom's Topic() proc for special handling. // Otherwise, the user mob's machine var will be reset directly. // -/proc/onclose(mob/user, windowid, var/atom/ref=null) +/proc/onclose(mob/user, windowid, atom/ref=null) if(!user.client) return var/param = "null" if(ref) @@ -153,7 +153,7 @@ // if a valid atom reference is supplied, call the atom's Topic() with "close=1" // otherwise, just reset the client mob's machine var. // -/client/verb/windowclose(var/atomref as text) +/client/verb/windowclose(atomref as text) set hidden = 1 // hide this verb from the user's panel set name = ".windowclose" // no autocomplete on cmd line diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index ae0df9ac76d..c99aa61573a 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -33,7 +33,7 @@ c.dataId = ++securityCrimeCounter return c -/datum/datacore/proc/addMinorCrime(id = "", var/datum/data/crime/crime) +/datum/datacore/proc/addMinorCrime(id = "", datum/data/crime/crime) for(var/datum/data/record/R in security) if(R.fields["id"] == id) var/list/crimes = R.fields["mi_crim"] @@ -58,14 +58,14 @@ crimes -= crime return -/datum/datacore/proc/addMajorCrime(id = "", var/datum/data/crime/crime) +/datum/datacore/proc/addMajorCrime(id = "", datum/data/crime/crime) for(var/datum/data/record/R in security) if(R.fields["id"] == id) var/list/crimes = R.fields["ma_crim"] crimes |= crime return -/datum/datacore/proc/manifest(var/nosleep = 0) +/datum/datacore/proc/manifest(nosleep = 0) spawn() if(!nosleep) sleep(40) @@ -73,7 +73,7 @@ manifest_inject(H) return -/datum/datacore/proc/manifest_modify(var/name, var/assignment) +/datum/datacore/proc/manifest_modify(name, assignment) var/datum/data/record/foundrecord = find_record("name", name, data_core.general) if(foundrecord) foundrecord.fields["rank"] = assignment @@ -187,7 +187,7 @@ var/record_id_num = 1001 -/datum/datacore/proc/manifest_inject(var/mob/living/carbon/human/H) +/datum/datacore/proc/manifest_inject(mob/living/carbon/human/H) if(H.mind && (H.mind.assigned_role != H.mind.special_role)) var/assignment if(H.mind.assigned_role) @@ -265,7 +265,7 @@ var/record_id_num = 1001 locked += L return -/datum/datacore/proc/get_id_photo(var/mob/living/carbon/human/H) +/datum/datacore/proc/get_id_photo(mob/living/carbon/human/H) var/icon/photo = null var/g = (H.gender == FEMALE) ? "f" : "m" if(!config.mutant_races || H.dna.species.use_skintones) diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index 80a6fd4204e..34ac5085c27 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -324,7 +324,7 @@ body return -/client/proc/debug_variable(name, value, level, var/datum/DA = null) +/client/proc/debug_variable(name, value, level, datum/DA = null) var/html = "" if(DA) diff --git a/code/datums/diseases/_MobProcs.dm b/code/datums/diseases/_MobProcs.dm index f41cb13c576..01b2a738e02 100644 --- a/code/datums/diseases/_MobProcs.dm +++ b/code/datums/diseases/_MobProcs.dm @@ -1,12 +1,12 @@ -/mob/proc/HasDisease(var/datum/disease/D) +/mob/proc/HasDisease(datum/disease/D) for(var/datum/disease/DD in viruses) if(D.IsSame(DD)) return 1 return 0 -/mob/proc/CanContractDisease(var/datum/disease/D) +/mob/proc/CanContractDisease(datum/disease/D) if(stat == DEAD) return 0 @@ -25,20 +25,20 @@ return 1 -/mob/proc/ContractDisease(var/datum/disease/D) +/mob/proc/ContractDisease(datum/disease/D) if(!CanContractDisease(D)) return 0 AddDisease(D) -/mob/proc/AddDisease(var/datum/disease/D) +/mob/proc/AddDisease(datum/disease/D) var/datum/disease/DD = new D.type(1, D, 0) viruses += DD DD.affected_mob = src DD.holder = src if(DD.disease_flags & CAN_CARRY && prob(5)) DD.carrier = 1 - + //Copy properties over. This is so edited diseases persist. var/list/skipped = list("affected_mob","holder","carrier","stage","type","parent_type","vars") for(var/V in DD.vars) @@ -49,11 +49,11 @@ DD.vars[V] = L.Copy() else DD.vars[V] = D.vars[V] - + DD.affected_mob.med_hud_set_status() -/mob/living/carbon/ContractDisease(var/datum/disease/D) +/mob/living/carbon/ContractDisease(datum/disease/D) if(!CanContractDisease(D)) return 0 @@ -135,13 +135,13 @@ //Same as ContractDisease, except never overidden clothes checks -/mob/proc/ForceContractDisease(var/datum/disease/D) +/mob/proc/ForceContractDisease(datum/disease/D) if(!CanContractDisease(D)) return 0 AddDisease(D) -/mob/living/carbon/human/CanContractDisease(var/datum/disease/D) +/mob/living/carbon/human/CanContractDisease(datum/disease/D) if(dna && VIRUSIMMUNE in dna.species.specflags) return 0 return ..() \ No newline at end of file diff --git a/code/datums/diseases/_disease.dm b/code/datums/diseases/_disease.dm index 0de6ac8cebf..519ee6a946e 100644 --- a/code/datums/diseases/_disease.dm +++ b/code/datums/diseases/_disease.dm @@ -97,7 +97,7 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease break //One missing cure is enough to fail -/datum/disease/proc/spread(var/atom/source, var/force_spread = 0) +/datum/disease/proc/spread(atom/source, force_spread = 0) if((spread_flags & SPECIAL || spread_flags & NON_CONTAGIOUS || spread_flags & BLOOD) && !force_spread) return @@ -172,7 +172,7 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease SSdisease.processing += src -/datum/disease/proc/IsSame(var/datum/disease/D) +/datum/disease/proc/IsSame(datum/disease/D) if(istype(src, D.type)) return 1 return 0 diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 541fef7bef7..8d5b977c3d7 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -91,7 +91,7 @@ var/list/advance_cures = list( CRASH("We do not have any symptoms during stage_act()!") // Compares type then ID. -/datum/disease/advance/IsSame(var/datum/disease/advance/D) +/datum/disease/advance/IsSame(datum/disease/advance/D) if(!(istype(D, /datum/disease/advance))) return 0 @@ -101,7 +101,7 @@ var/list/advance_cures = list( return 1 // To add special resistances. -/datum/disease/advance/cure(var/resistance=1) +/datum/disease/advance/cure(resistance=1) if(affected_mob) var/id = "[GetDiseaseID()]" if(resistance && !(id in affected_mob.resistances)) @@ -110,7 +110,7 @@ var/list/advance_cures = list( del(src) //delete the datum to stop it processing // Returns the advance disease with a different reference memory. -/datum/disease/advance/Copy(var/process = 0) +/datum/disease/advance/Copy(process = 0) return new /datum/disease/advance(process, src, 1) /* @@ -120,20 +120,20 @@ var/list/advance_cures = list( */ // Mix the symptoms of two diseases (the src and the argument) -/datum/disease/advance/proc/Mix(var/datum/disease/advance/D) +/datum/disease/advance/proc/Mix(datum/disease/advance/D) if(!(src.IsSame(D))) var/list/possible_symptoms = shuffle(D.symptoms) for(var/datum/symptom/S in possible_symptoms) AddSymptom(new S.type) -/datum/disease/advance/proc/HasSymptom(var/datum/symptom/S) +/datum/disease/advance/proc/HasSymptom(datum/symptom/S) for(var/datum/symptom/symp in symptoms) if(symp.id == S.id) return 1 return 0 // Will generate new unique symptoms, use this if there are none. Returns a list of symptoms that were generated. -/datum/disease/advance/proc/GenerateSymptoms(var/level_min, var/level_max, var/amount_get = 0) +/datum/disease/advance/proc/GenerateSymptoms(level_min, level_max, amount_get = 0) var/list/generated = list() // Symptoms we generated. @@ -160,7 +160,7 @@ var/list/advance_cures = list( return generated -/datum/disease/advance/proc/Refresh(var/new_name = 0) +/datum/disease/advance/proc/Refresh(new_name = 0) //world << "[src.name] \ref[src] - REFRESH!" var/list/properties = GenerateProperties() AssignProperties(properties) @@ -195,7 +195,7 @@ var/list/advance_cures = list( return properties // Assign the properties that are in the list. -/datum/disease/advance/proc/AssignProperties(var/list/properties = list()) +/datum/disease/advance/proc/AssignProperties(list/properties = list()) if(properties && properties.len) switch(properties["stealth"]) @@ -216,7 +216,7 @@ var/list/advance_cures = list( // Assign the spread type and give it the correct description. -/datum/disease/advance/proc/SetSpread(var/spread_id) +/datum/disease/advance/proc/SetSpread(spread_id) switch(spread_id) if(NON_CONTAGIOUS) spread_text = "None" @@ -231,7 +231,7 @@ var/list/advance_cures = list( spread_flags = spread_id -/datum/disease/advance/proc/SetSeverity(var/level_sev) +/datum/disease/advance/proc/SetSeverity(level_sev) switch(level_sev) @@ -252,7 +252,7 @@ var/list/advance_cures = list( // Will generate a random cure, the less resistance the symptoms have, the harder the cure. -/datum/disease/advance/proc/GenerateCure(var/list/properties = list()) +/datum/disease/advance/proc/GenerateCure(list/properties = list()) if(properties && properties.len) var/res = Clamp(properties["resistance"] - (symptoms.len / 2), 1, advance_cures.len) //world << "Res = [res]" @@ -266,7 +266,7 @@ var/list/advance_cures = list( return // Randomly generate a symptom, has a chance to lose or gain a symptom. -/datum/disease/advance/proc/Evolve(var/min_level, var/max_level) +/datum/disease/advance/proc/Evolve(min_level, max_level) var/s = safepick(GenerateSymptoms(min_level, max_level, 1)) if(s) AddSymptom(s) @@ -283,7 +283,7 @@ var/list/advance_cures = list( return // Name the disease. -/datum/disease/advance/proc/AssignName(var/name = "Unknown") +/datum/disease/advance/proc/AssignName(name = "Unknown") src.name = name return @@ -301,7 +301,7 @@ var/list/advance_cures = list( // Add a symptom, if it is over the limit (with a small chance to be able to go over) // we take a random symptom away and add the new one. -/datum/disease/advance/proc/AddSymptom(var/datum/symptom/S) +/datum/disease/advance/proc/AddSymptom(datum/symptom/S) if(HasSymptom(S)) return @@ -314,7 +314,7 @@ var/list/advance_cures = list( return // Simply removes the symptom. -/datum/disease/advance/proc/RemoveSymptom(var/datum/symptom/S) +/datum/disease/advance/proc/RemoveSymptom(datum/symptom/S) symptoms -= S return @@ -357,7 +357,7 @@ var/list/advance_cures = list( to_return.Refresh(1) return to_return -/proc/SetViruses(var/datum/reagent/R, var/list/data) +/proc/SetViruses(datum/reagent/R, list/data) if(data) var/list/preserve = list() if(istype(data) && data["viruses"]) @@ -367,7 +367,7 @@ var/list/advance_cures = list( if(preserve.len) R.data["viruses"] = preserve -/proc/AdminCreateVirus(var/client/user) +/proc/AdminCreateVirus(client/user) if(!user) return diff --git a/code/datums/diseases/advance/symptoms/beard.dm b/code/datums/diseases/advance/symptoms/beard.dm index 44a81c6a884..fc16a9474af 100644 --- a/code/datums/diseases/advance/symptoms/beard.dm +++ b/code/datums/diseases/advance/symptoms/beard.dm @@ -24,7 +24,7 @@ BONUS level = 4 severity = 1 -/datum/symptom/beard/Activate(var/datum/disease/advance/A) +/datum/symptom/beard/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/choking.dm b/code/datums/diseases/advance/symptoms/choking.dm index e068adf4835..de198cab81a 100644 --- a/code/datums/diseases/advance/symptoms/choking.dm +++ b/code/datums/diseases/advance/symptoms/choking.dm @@ -25,7 +25,7 @@ Bonus level = 3 severity = 3 -/datum/symptom/choking/Activate(var/datum/disease/advance/A) +/datum/symptom/choking/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/confusion.dm b/code/datums/diseases/advance/symptoms/confusion.dm index 0fbc941a32f..8f48fdab86a 100644 --- a/code/datums/diseases/advance/symptoms/confusion.dm +++ b/code/datums/diseases/advance/symptoms/confusion.dm @@ -26,7 +26,7 @@ Bonus severity = 2 -/datum/symptom/confusion/Activate(var/datum/disease/advance/A) +/datum/symptom/confusion/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/carbon/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/cough.dm b/code/datums/diseases/advance/symptoms/cough.dm index 2c50271aa92..5ae2c47aeb4 100644 --- a/code/datums/diseases/advance/symptoms/cough.dm +++ b/code/datums/diseases/advance/symptoms/cough.dm @@ -25,7 +25,7 @@ BONUS level = 1 severity = 1 -/datum/symptom/cough/Activate(var/datum/disease/advance/A) +/datum/symptom/cough/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/damage_converter.dm b/code/datums/diseases/advance/symptoms/damage_converter.dm index 116372f536a..18396fbfec4 100644 --- a/code/datums/diseases/advance/symptoms/damage_converter.dm +++ b/code/datums/diseases/advance/symptoms/damage_converter.dm @@ -24,7 +24,7 @@ Bonus transmittable = -2 level = 4 -/datum/symptom/damage_converter/Activate(var/datum/disease/advance/A) +/datum/symptom/damage_converter/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB * 10)) var/mob/living/M = A.affected_mob @@ -33,7 +33,7 @@ Bonus Convert(M) return -/datum/symptom/damage_converter/proc/Convert(var/mob/living/M) +/datum/symptom/damage_converter/proc/Convert(mob/living/M) var/get_damage = rand(1, 2) diff --git a/code/datums/diseases/advance/symptoms/deafness.dm b/code/datums/diseases/advance/symptoms/deafness.dm index c615d644b51..15ffc133b23 100644 --- a/code/datums/diseases/advance/symptoms/deafness.dm +++ b/code/datums/diseases/advance/symptoms/deafness.dm @@ -25,7 +25,7 @@ Bonus level = 4 severity = 3 -/datum/symptom/deafness/Activate(var/datum/disease/advance/A) +/datum/symptom/deafness/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/dizzy.dm b/code/datums/diseases/advance/symptoms/dizzy.dm index a7109a316ac..7642fbb78bc 100644 --- a/code/datums/diseases/advance/symptoms/dizzy.dm +++ b/code/datums/diseases/advance/symptoms/dizzy.dm @@ -25,7 +25,7 @@ Bonus level = 4 severity = 2 -/datum/symptom/dizzy/Activate(var/datum/disease/advance/A) +/datum/symptom/dizzy/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/fever.dm b/code/datums/diseases/advance/symptoms/fever.dm index 749bab09fea..4ded231801a 100644 --- a/code/datums/diseases/advance/symptoms/fever.dm +++ b/code/datums/diseases/advance/symptoms/fever.dm @@ -25,7 +25,7 @@ Bonus level = 2 severity = 2 -/datum/symptom/fever/Activate(var/datum/disease/advance/A) +/datum/symptom/fever/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/carbon/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/fire.dm b/code/datums/diseases/advance/symptoms/fire.dm index bc63c170960..254918ccda1 100644 --- a/code/datums/diseases/advance/symptoms/fire.dm +++ b/code/datums/diseases/advance/symptoms/fire.dm @@ -25,7 +25,7 @@ Bonus level = 6 severity = 5 -/datum/symptom/fire/Activate(var/datum/disease/advance/A) +/datum/symptom/fire/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/flesh_eating.dm b/code/datums/diseases/advance/symptoms/flesh_eating.dm index 8c71d05f2bd..086c349c875 100644 --- a/code/datums/diseases/advance/symptoms/flesh_eating.dm +++ b/code/datums/diseases/advance/symptoms/flesh_eating.dm @@ -25,7 +25,7 @@ Bonus level = 6 severity = 5 -/datum/symptom/flesh_eating/Activate(var/datum/disease/advance/A) +/datum/symptom/flesh_eating/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/genetics.dm b/code/datums/diseases/advance/symptoms/genetics.dm index 7720af0449c..cb730215ee9 100644 --- a/code/datums/diseases/advance/symptoms/genetics.dm +++ b/code/datums/diseases/advance/symptoms/genetics.dm @@ -27,7 +27,7 @@ Bonus var/list/possible_mutations var/archived_dna = null -/datum/symptom/genetic_mutation/Activate(var/datum/disease/advance/A) +/datum/symptom/genetic_mutation/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB * 5)) // 15% chance var/mob/living/carbon/M = A.affected_mob @@ -40,7 +40,7 @@ Bonus return // Archive their DNA before they were infected. -/datum/symptom/genetic_mutation/Start(var/datum/disease/advance/A) +/datum/symptom/genetic_mutation/Start(datum/disease/advance/A) possible_mutations = (bad_mutations | not_good_mutations) - mutations_list[RACEMUT] var/mob/living/carbon/M = A.affected_mob if(M) @@ -49,7 +49,7 @@ Bonus archived_dna = M.dna.struc_enzymes // Give them back their old DNA when cured. -/datum/symptom/genetic_mutation/End(var/datum/disease/advance/A) +/datum/symptom/genetic_mutation/End(datum/disease/advance/A) var/mob/living/carbon/M = A.affected_mob if(M && archived_dna) if(!check_dna_integrity(M)) @@ -83,6 +83,6 @@ Bonus level = 6 severity = 0 -/datum/symptom/genetic_mutation/powers/Start(var/datum/disease/advance/A) +/datum/symptom/genetic_mutation/powers/Start(datum/disease/advance/A) ..() possible_mutations = good_mutations \ No newline at end of file diff --git a/code/datums/diseases/advance/symptoms/hallucigen.dm b/code/datums/diseases/advance/symptoms/hallucigen.dm index 4854b8d3261..dce78e8fee7 100644 --- a/code/datums/diseases/advance/symptoms/hallucigen.dm +++ b/code/datums/diseases/advance/symptoms/hallucigen.dm @@ -25,7 +25,7 @@ Bonus level = 5 severity = 3 -/datum/symptom/hallucigen/Activate(var/datum/disease/advance/A) +/datum/symptom/hallucigen/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/carbon/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/headache.dm b/code/datums/diseases/advance/symptoms/headache.dm index abbb0c44f9b..31f00342ac6 100644 --- a/code/datums/diseases/advance/symptoms/headache.dm +++ b/code/datums/diseases/advance/symptoms/headache.dm @@ -26,7 +26,7 @@ BONUS level = 1 severity = 1 -/datum/symptom/headache/Activate(var/datum/disease/advance/A) +/datum/symptom/headache/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm index 16e16c914a6..ec88c3011ba 100644 --- a/code/datums/diseases/advance/symptoms/heal.dm +++ b/code/datums/diseases/advance/symptoms/heal.dm @@ -24,7 +24,7 @@ Bonus transmittable = -4 level = 6 -/datum/symptom/heal/Activate(var/datum/disease/advance/A) +/datum/symptom/heal/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB * 10)) var/mob/living/M = A.affected_mob @@ -33,7 +33,7 @@ Bonus Heal(M, A) return -/datum/symptom/heal/proc/Heal(var/mob/living/M, var/datum/disease/advance/A) +/datum/symptom/heal/proc/Heal(mob/living/M, datum/disease/advance/A) var/get_damage = rand(8, 14) M.adjustToxLoss(-get_damage) @@ -66,7 +66,7 @@ Bonus level = 3 var/list/cured_diseases = list() -/datum/symptom/heal/metabolism/Heal(var/mob/living/M, var/datum/disease/advance/A) +/datum/symptom/heal/metabolism/Heal(mob/living/M, datum/disease/advance/A) var/cured = 0 for(var/datum/disease/D in M.viruses) if(D != A) @@ -76,7 +76,7 @@ Bonus if(cured) M << "You feel much better." -/datum/symptom/heal/metabolism/End(var/datum/disease/advance/A) +/datum/symptom/heal/metabolism/End(datum/disease/advance/A) // Remove all the diseases we cured. var/mob/living/M = A.affected_mob if(istype(M)) @@ -113,10 +113,10 @@ Bonus level = 3 var/longevity = 30 -/datum/symptom/heal/longevity/Heal(var/mob/living/M, var/datum/disease/advance/A) +/datum/symptom/heal/longevity/Heal(mob/living/M, datum/disease/advance/A) longevity -= 1 if(!longevity) A.cure() -/datum/symptom/heal/longevity/Start(var/datum/disease/advance/A) +/datum/symptom/heal/longevity/Start(datum/disease/advance/A) longevity = rand(initial(longevity) - 5, initial(longevity) + 5) diff --git a/code/datums/diseases/advance/symptoms/itching.dm b/code/datums/diseases/advance/symptoms/itching.dm index e7302c4345a..999b26a8717 100644 --- a/code/datums/diseases/advance/symptoms/itching.dm +++ b/code/datums/diseases/advance/symptoms/itching.dm @@ -26,7 +26,7 @@ BONUS level = 1 severity = 1 -/datum/symptom/itching/Activate(var/datum/disease/advance/A) +/datum/symptom/itching/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/oxygen.dm b/code/datums/diseases/advance/symptoms/oxygen.dm index b82bdfbc9a1..e74c112383b 100644 --- a/code/datums/diseases/advance/symptoms/oxygen.dm +++ b/code/datums/diseases/advance/symptoms/oxygen.dm @@ -24,7 +24,7 @@ Bonus transmittable = -4 level = 6 -/datum/symptom/oxygen/Activate(var/datum/disease/advance/A) +/datum/symptom/oxygen/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB * 5)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/shedding.dm b/code/datums/diseases/advance/symptoms/shedding.dm index d1c2317b868..6f0a2ba9978 100644 --- a/code/datums/diseases/advance/symptoms/shedding.dm +++ b/code/datums/diseases/advance/symptoms/shedding.dm @@ -24,7 +24,7 @@ BONUS level = 4 severity = 1 -/datum/symptom/shedding/Activate(var/datum/disease/advance/A) +/datum/symptom/shedding/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/shivering.dm b/code/datums/diseases/advance/symptoms/shivering.dm index ac13329d12c..494b99bfe88 100644 --- a/code/datums/diseases/advance/symptoms/shivering.dm +++ b/code/datums/diseases/advance/symptoms/shivering.dm @@ -25,7 +25,7 @@ Bonus level = 2 severity = 2 -/datum/symptom/shivering/Activate(var/datum/disease/advance/A) +/datum/symptom/shivering/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/carbon/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/skin.dm b/code/datums/diseases/advance/symptoms/skin.dm index 22d3386ef63..03eaadc2db1 100644 --- a/code/datums/diseases/advance/symptoms/skin.dm +++ b/code/datums/diseases/advance/symptoms/skin.dm @@ -24,7 +24,7 @@ BONUS level = 4 severity = 1 -/datum/symptom/vitiligo/Activate(var/datum/disease/advance/A) +/datum/symptom/vitiligo/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob @@ -68,7 +68,7 @@ BONUS level = 4 severity = 1 -/datum/symptom/revitiligo/Activate(var/datum/disease/advance/A) +/datum/symptom/revitiligo/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/sneeze.dm b/code/datums/diseases/advance/symptoms/sneeze.dm index bbf8cafaf52..b20c5256dbe 100644 --- a/code/datums/diseases/advance/symptoms/sneeze.dm +++ b/code/datums/diseases/advance/symptoms/sneeze.dm @@ -26,7 +26,7 @@ Bonus level = 1 severity = 1 -/datum/symptom/sneeze/Activate(var/datum/disease/advance/A) +/datum/symptom/sneeze/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/stimulant.dm b/code/datums/diseases/advance/symptoms/stimulant.dm index 0f5729e9842..c5796a3f6d3 100644 --- a/code/datums/diseases/advance/symptoms/stimulant.dm +++ b/code/datums/diseases/advance/symptoms/stimulant.dm @@ -24,7 +24,7 @@ Bonus transmittable = -4 level = 3 -/datum/symptom/stimulant/Activate(var/datum/disease/advance/A) +/datum/symptom/stimulant/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB * 10)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/symptoms.dm b/code/datums/diseases/advance/symptoms/symptoms.dm index 4b06cb505db..bbdeef487a4 100644 --- a/code/datums/diseases/advance/symptoms/symptoms.dm +++ b/code/datums/diseases/advance/symptoms/symptoms.dm @@ -28,13 +28,13 @@ var/global/const/SYMPTOM_ACTIVATION_PROB = 3 CRASH("We couldn't assign an ID!") // Called when processing of the advance disease, which holds this symptom, starts. -/datum/symptom/proc/Start(var/datum/disease/advance/A) +/datum/symptom/proc/Start(datum/disease/advance/A) return // Called when the advance disease is going to be deleted or when the advance disease stops processing. -/datum/symptom/proc/End(var/datum/disease/advance/A) +/datum/symptom/proc/End(datum/disease/advance/A) return -/datum/symptom/proc/Activate(var/datum/disease/advance/A) +/datum/symptom/proc/Activate(datum/disease/advance/A) return diff --git a/code/datums/diseases/advance/symptoms/vision.dm b/code/datums/diseases/advance/symptoms/vision.dm index b63a4ee729f..ea3bb05abd9 100644 --- a/code/datums/diseases/advance/symptoms/vision.dm +++ b/code/datums/diseases/advance/symptoms/vision.dm @@ -25,7 +25,7 @@ Bonus level = 5 severity = 4 -/datum/symptom/visionloss/Activate(var/datum/disease/advance/A) +/datum/symptom/visionloss/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob @@ -75,7 +75,7 @@ Bonus transmittable = -4 level = 4 -/datum/symptom/visionaid/Activate(var/datum/disease/advance/A) +/datum/symptom/visionaid/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB * 5)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/voice_change.dm b/code/datums/diseases/advance/symptoms/voice_change.dm index ccc39b839f7..1b56dbaa334 100644 --- a/code/datums/diseases/advance/symptoms/voice_change.dm +++ b/code/datums/diseases/advance/symptoms/voice_change.dm @@ -25,7 +25,7 @@ Bonus level = 6 severity = 2 -/datum/symptom/voice_change/Activate(var/datum/disease/advance/A) +/datum/symptom/voice_change/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) @@ -40,7 +40,7 @@ Bonus return -/datum/symptom/voice_change/End(var/datum/disease/advance/A) +/datum/symptom/voice_change/End(datum/disease/advance/A) ..() if(ishuman(A.affected_mob)) var/mob/living/carbon/human/H = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/vomit.dm b/code/datums/diseases/advance/symptoms/vomit.dm index 55fd92863e0..677e2f4b593 100644 --- a/code/datums/diseases/advance/symptoms/vomit.dm +++ b/code/datums/diseases/advance/symptoms/vomit.dm @@ -29,7 +29,7 @@ Bonus level = 3 severity = 4 -/datum/symptom/vomit/Activate(var/datum/disease/advance/A) +/datum/symptom/vomit/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB / 2)) var/mob/living/M = A.affected_mob @@ -41,7 +41,7 @@ Bonus return -/datum/symptom/vomit/proc/Vomit(var/mob/living/M) +/datum/symptom/vomit/proc/Vomit(mob/living/M) M.visible_message("[M] vomits on the floor!", \ "You throw up on the floor!") @@ -82,7 +82,7 @@ Bonus level = 4 severity = 5 -/datum/symptom/vomit/blood/Vomit(var/mob/living/M) +/datum/symptom/vomit/blood/Vomit(mob/living/M) M.Stun(1) M.visible_message("[M] vomits on the floor!", \ diff --git a/code/datums/diseases/advance/symptoms/weight.dm b/code/datums/diseases/advance/symptoms/weight.dm index f616545b057..eef76300e7b 100644 --- a/code/datums/diseases/advance/symptoms/weight.dm +++ b/code/datums/diseases/advance/symptoms/weight.dm @@ -25,7 +25,7 @@ Bonus level = 4 severity = 1 -/datum/symptom/weight_gain/Activate(var/datum/disease/advance/A) +/datum/symptom/weight_gain/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob @@ -67,7 +67,7 @@ Bonus level = 3 severity = 1 -/datum/symptom/weight_loss/Activate(var/datum/disease/advance/A) +/datum/symptom/weight_loss/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob @@ -109,7 +109,7 @@ Bonus transmittable = -2 level = 4 -/datum/symptom/weight_even/Activate(var/datum/disease/advance/A) +/datum/symptom/weight_even/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/advance/symptoms/youth.dm b/code/datums/diseases/advance/symptoms/youth.dm index bc9cb93355f..6d90d2b8cdc 100644 --- a/code/datums/diseases/advance/symptoms/youth.dm +++ b/code/datums/diseases/advance/symptoms/youth.dm @@ -24,7 +24,7 @@ BONUS transmittable = -4 level = 5 -/datum/symptom/youth/Activate(var/datum/disease/advance/A) +/datum/symptom/youth/Activate(datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB * 2)) var/mob/living/M = A.affected_mob diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm index dc57ec59822..93fd9239761 100644 --- a/code/datums/diseases/transformation.dm +++ b/code/datums/diseases/transformation.dm @@ -35,7 +35,7 @@ if(5) do_disease_transformation(affected_mob) -/datum/disease/transformation/proc/do_disease_transformation(var/mob/living/affected_mob) +/datum/disease/transformation/proc/do_disease_transformation(mob/living/affected_mob) if(istype(affected_mob, /mob/living/carbon) && affected_mob.stat != DEAD) if(stage5) affected_mob << pick(stage5) @@ -91,7 +91,7 @@ "You have a craving for bananas.", "Your mind feels clouded.") stage5 = list("You feel like monkeying around.") -/datum/disease/transformation/jungle_fever/do_disease_transformation(var/mob/living/carbon/affected_mob) +/datum/disease/transformation/jungle_fever/do_disease_transformation(mob/living/carbon/affected_mob) if(!ismonkey(affected_mob)) ticker.mode.add_monkey(affected_mob.mind) affected_mob.monkeyize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSE) diff --git a/code/datums/diseases/wizarditis.dm b/code/datums/diseases/wizarditis.dm index d2697c0f09f..42c277ec891 100644 --- a/code/datums/diseases/wizarditis.dm +++ b/code/datums/diseases/wizarditis.dm @@ -54,7 +54,7 @@ STI KALY - blind -/datum/disease/wizarditis/proc/spawn_wizard_clothes(var/chance = 0) +/datum/disease/wizarditis/proc/spawn_wizard_clothes(chance = 0) if(istype(affected_mob, /mob/living/carbon/human)) var/mob/living/carbon/human/H = affected_mob if(prob(chance)) diff --git a/code/datums/gas_mixture.dm b/code/datums/gas_mixture.dm index 5a66e77b413..618804418cb 100644 --- a/code/datums/gas_mixture.dm +++ b/code/datums/gas_mixture.dm @@ -548,7 +548,7 @@ What are the archived variables for? return 1 -/datum/gas_mixture/share(datum/gas_mixture/sharer, var/atmos_adjacent_turfs = 4) +/datum/gas_mixture/share(datum/gas_mixture/sharer, atmos_adjacent_turfs = 4) if(!sharer) return 0 var/delta_oxygen = QUANTIZE(oxygen_archived - sharer.oxygen_archived)/(atmos_adjacent_turfs+1) var/delta_carbon_dioxide = QUANTIZE(carbon_dioxide_archived - sharer.carbon_dioxide_archived)/(atmos_adjacent_turfs+1) @@ -677,7 +677,7 @@ What are the archived variables for? var/delta_pressure = temperature_archived*(total_moles() + moved_moles) - sharer.temperature_archived*(sharer.total_moles() - moved_moles) return delta_pressure*R_IDEAL_GAS_EQUATION/volume -/datum/gas_mixture/mimic(turf/model, border_multiplier, var/atmos_adjacent_turfs = 4) +/datum/gas_mixture/mimic(turf/model, border_multiplier, atmos_adjacent_turfs = 4) var/delta_oxygen = QUANTIZE(oxygen_archived - model.oxygen)/(atmos_adjacent_turfs+1) var/delta_carbon_dioxide = QUANTIZE(carbon_dioxide_archived - model.carbon_dioxide)/(atmos_adjacent_turfs+1) var/delta_nitrogen = QUANTIZE(nitrogen_archived - model.nitrogen)/(atmos_adjacent_turfs+1) @@ -961,13 +961,13 @@ What are the archived variables for? //Does handle trace gases! -/datum/gas_mixture/proc/get_breath_partial_pressure(var/gas_pressure) +/datum/gas_mixture/proc/get_breath_partial_pressure(gas_pressure) var/breath_pressure = (total_moles()*R_IDEAL_GAS_EQUATION*temperature)/BREATH_VOLUME return (gas_pressure/total_moles())*breath_pressure //Reverse of the above -/datum/gas_mixture/proc/get_true_breath_pressure(var/breath_pp) +/datum/gas_mixture/proc/get_true_breath_pressure(breath_pp) var/breath_pressure = (total_moles()/R_IDEAL_GAS_EQUATION/temperature)*BREATH_VOLUME return (breath_pp/breath_pressure*total_moles()) diff --git a/code/datums/helper_datums/construction_datum.dm b/code/datums/helper_datums/construction_datum.dm index 13014725d0c..af53f681059 100644 --- a/code/datums/helper_datums/construction_datum.dm +++ b/code/datums/helper_datums/construction_datum.dm @@ -23,10 +23,10 @@ set_desc(steps.len) return -/datum/construction/proc/action(atom/used_atom,mob/user as mob) +/datum/construction/proc/action(atom/used_atom,mob/user) return -/datum/construction/proc/check_step(atom/used_atom,mob/user as mob) //check last step only +/datum/construction/proc/check_step(atom/used_atom,mob/user) //check last step only var/valid_step = is_right_key(used_atom) if(valid_step) if(custom_action(valid_step, used_atom, user)) @@ -43,7 +43,7 @@ /datum/construction/proc/custom_action(step, used_atom, user) return 1 -/datum/construction/proc/check_all_steps(atom/used_atom,mob/user as mob) //check all steps, remove matching one. +/datum/construction/proc/check_all_steps(atom/used_atom,mob/user) //check all steps, remove matching one. for(var/i=1;i<=steps.len;i++) var/list/L = steps[i]; if(istype(used_atom, L["key"])) @@ -91,7 +91,7 @@ return BACKWARD //to the last step -> backwards return 0 -/datum/construction/reversible/check_step(atom/used_atom,mob/user as mob) +/datum/construction/reversible/check_step(atom/used_atom,mob/user) var/diff = is_right_key(used_atom) if(diff) if(custom_action(index, diff, used_atom, user)) diff --git a/code/datums/hud.dm b/code/datums/hud.dm index 259d148135f..f17de6bbbcb 100644 --- a/code/datums/hud.dm +++ b/code/datums/hud.dm @@ -18,35 +18,35 @@ var/datum/atom_hud/huds = list( \ var/list/mob/hudusers = list() //list with all mobs who can see the hud var/list/hud_icons = list() //these will be the indexes for the atom's hud_list -/datum/atom_hud/proc/remove_hud_from(var/mob/M) +/datum/atom_hud/proc/remove_hud_from(mob/M) if(src in M.permanent_huds) return for(var/atom/A in hudatoms) remove_from_single_hud(M, A) hudusers -= M -/datum/atom_hud/proc/remove_from_hud(var/atom/A) +/datum/atom_hud/proc/remove_from_hud(atom/A) for(var/mob/M in hudusers) remove_from_single_hud(M, A) hudatoms -= A -/datum/atom_hud/proc/remove_from_single_hud(var/mob/M, var/atom/A) //unsafe, no sanity apart from client +/datum/atom_hud/proc/remove_from_single_hud(mob/M, atom/A) //unsafe, no sanity apart from client if(!M.client) return for(var/i in hud_icons) M.client.images -= A.hud_list[i] -/datum/atom_hud/proc/add_hud_to(var/mob/M) +/datum/atom_hud/proc/add_hud_to(mob/M) hudusers |= M for(var/atom/A in hudatoms) add_to_single_hud(M, A) -/datum/atom_hud/proc/add_to_hud(var/atom/A) +/datum/atom_hud/proc/add_to_hud(atom/A) hudatoms |= A for(var/mob/M in hudusers) add_to_single_hud(M, A) -/datum/atom_hud/proc/add_to_single_hud(var/mob/M, var/atom/A) //unsafe, no sanity apart from client +/datum/atom_hud/proc/add_to_single_hud(mob/M, atom/A) //unsafe, no sanity apart from client if(!M.client) return for(var/i in hud_icons) diff --git a/code/datums/martial.dm b/code/datums/martial.dm index 0e86b40443d..f54df12a0c4 100644 --- a/code/datums/martial.dm +++ b/code/datums/martial.dm @@ -6,16 +6,16 @@ var/temporary = 0 var/datum/martial_art/base = null // The permanent style -/datum/martial_art/proc/disarm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/proc/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) return 0 -/datum/martial_art/proc/harm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/proc/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) return 0 -/datum/martial_art/proc/grab_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/proc/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D) return 0 -/datum/martial_art/proc/add_to_streak(var/element,var/mob/living/carbon/human/D) +/datum/martial_art/proc/add_to_streak(element,mob/living/carbon/human/D) if(D != current_target) current_target = D streak = "" @@ -24,7 +24,7 @@ streak = copytext(streak,2) return -/datum/martial_art/proc/basic_hit(var/mob/living/carbon/human/A,var/mob/living/carbon/human/D) +/datum/martial_art/proc/basic_hit(mob/living/carbon/human/A,mob/living/carbon/human/D) A.do_attack_animation(D) var/damage = rand(0,9) @@ -71,7 +71,7 @@ D.forcesay(hit_appends) return 1 -/datum/martial_art/proc/teach(var/mob/living/carbon/human/H,var/make_temporary=0) +/datum/martial_art/proc/teach(mob/living/carbon/human/H,make_temporary=0) if(make_temporary) temporary = 1 if(H.martial_art && H.martial_art.temporary) @@ -82,7 +82,7 @@ return H.martial_art = src -/datum/martial_art/proc/remove(var/mob/living/carbon/human/H) +/datum/martial_art/proc/remove(mob/living/carbon/human/H) if(H.martial_art != src) return H.martial_art = base @@ -90,15 +90,15 @@ /datum/martial_art/boxing name = "Boxing" -/datum/martial_art/boxing/disarm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/boxing/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) A << "Can't disarm while boxing!" return 1 -/datum/martial_art/boxing/grab_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/boxing/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D) A << "Can't grab while boxing!" return 1 -/datum/martial_art/boxing/harm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/boxing/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) A.do_attack_animation(D) @@ -143,7 +143,7 @@ /datum/martial_art/wrestling name = "Wrestling" -/datum/martial_art/wrestling/harm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/wrestling/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) D.grabbedby(A,1) var/obj/item/weapon/grab/G = A.get_active_hand() if(G && prob(50)) @@ -156,7 +156,7 @@ return 1 -/datum/martial_art/wrestling/proc/Suplex(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/wrestling/proc/Suplex(mob/living/carbon/human/A, mob/living/carbon/human/D) D.visible_message("[A] suplexes [D]!", \ "[A] suplexes [D]!") @@ -174,7 +174,7 @@ A.apply_effect(4, WEAKEN, armor_block) return -/datum/martial_art/wrestling/disarm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/wrestling/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) if(istype(A.get_inactive_hand(),/obj/item/weapon/grab)) var/obj/item/weapon/grab/G = A.get_inactive_hand() if(G.affecting == D) @@ -183,7 +183,7 @@ harm_act(A,D) return 1 -/datum/martial_art/wrestling/grab_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/wrestling/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D) D.grabbedby(A,1) D.visible_message("[A] holds [D] down!", \ "[A] holds [D] down!") @@ -199,7 +199,7 @@ /datum/martial_art/plasma_fist name = "Plasma Fist" -/datum/martial_art/plasma_fist/proc/check_streak(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/plasma_fist/proc/check_streak(mob/living/carbon/human/A, mob/living/carbon/human/D) if(findtext(streak,TORNADO_COMBO)) streak = "" Tornado(A,D) @@ -214,7 +214,7 @@ return 1 return 0 -/datum/martial_art/plasma_fist/proc/Tornado(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/plasma_fist/proc/Tornado(mob/living/carbon/human/A, mob/living/carbon/human/D) A.say("TORNADO SWEEP!") spawn(0) for(var/i in list(NORTH,SOUTH,EAST,WEST,EAST,SOUTH,NORTH,SOUTH,EAST,WEST,EAST,SOUTH)) @@ -228,7 +228,7 @@ R.cast(turfs) return -/datum/martial_art/plasma_fist/proc/Throwback(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/plasma_fist/proc/Throwback(mob/living/carbon/human/A, mob/living/carbon/human/D) D.visible_message("[A] has hit [D] with Plasma Punch!", \ "[A] has hit [D] with Plasma Punch!") playsound(D.loc, 'sound/weapons/punch1.ogg', 50, 1, -1) @@ -237,7 +237,7 @@ A.say("HYAH!") return -/datum/martial_art/plasma_fist/proc/Plasma(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/plasma_fist/proc/Plasma(mob/living/carbon/human/A, mob/living/carbon/human/D) A.do_attack_animation(D) playsound(D.loc, 'sound/weapons/punch1.ogg', 50, 1, -1) A.say("PLASMA FIST!") @@ -251,21 +251,21 @@ D.gib() return -/datum/martial_art/plasma_fist/harm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/plasma_fist/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) add_to_streak("H") if(check_streak(A,D)) return 1 basic_hit(A,D) return 1 -/datum/martial_art/plasma_fist/disarm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/plasma_fist/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) add_to_streak("D") if(check_streak(A,D)) return 1 basic_hit(A,D) return 1 -/datum/martial_art/plasma_fist/grab_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/plasma_fist/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D) add_to_streak("G") if(check_streak(A,D)) return 1 @@ -282,7 +282,7 @@ /datum/martial_art/the_sleeping_carp name = "The Sleeping Carp" -/datum/martial_art/the_sleeping_carp/proc/check_streak(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/the_sleeping_carp/proc/check_streak(mob/living/carbon/human/A, mob/living/carbon/human/D) if(findtext(streak,WRIST_WRENCH_COMBO)) streak = "" wristWrench(A,D) @@ -305,7 +305,7 @@ return 1 return 0 -/datum/martial_art/the_sleeping_carp/proc/wristWrench(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/the_sleeping_carp/proc/wristWrench(mob/living/carbon/human/A, mob/living/carbon/human/D) if(!D.stat && !D.stunned && !D.weakened) D.visible_message("[A] grabs [D]'s wrist and wrenches it sideways!", \ "[A] grabs your wrist and violently wrenches it to the side!") @@ -317,7 +317,7 @@ return 1 return basic_hit(A,D) -/datum/martial_art/the_sleeping_carp/proc/backKick(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/the_sleeping_carp/proc/backKick(mob/living/carbon/human/A, mob/living/carbon/human/D) if(A.dir == D.dir && !D.stat && !D.weakened) D.visible_message("[A] kicks [D] in the back!", \ "[A] kicks you in the back, making you stumble and fall!") @@ -327,7 +327,7 @@ return 1 return basic_hit(A,D) -/datum/martial_art/the_sleeping_carp/proc/kneeStomach(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/the_sleeping_carp/proc/kneeStomach(mob/living/carbon/human/A, mob/living/carbon/human/D) if(!D.stat && !D.weakened) D.visible_message("[A] knees [D] in the stomach!", \ "[A] winds you with a knee in the stomach!") @@ -338,7 +338,7 @@ return 1 return basic_hit(A,D) -/datum/martial_art/the_sleeping_carp/proc/headKick(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/the_sleeping_carp/proc/headKick(mob/living/carbon/human/A, mob/living/carbon/human/D) if(!D.stat && !D.weakened) D.visible_message("[A] kicks [D] in the head!", \ "[A] kicks you in the jaw!") @@ -348,7 +348,7 @@ return 1 return basic_hit(A,D) -/datum/martial_art/the_sleeping_carp/proc/elbowDrop(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/the_sleeping_carp/proc/elbowDrop(mob/living/carbon/human/A, mob/living/carbon/human/D) if(D.weakened || D.resting || D.stat) D.visible_message("[A] elbow drops [D]!", \ "[A] piledrives you with their elbow!") @@ -359,7 +359,7 @@ return 1 return basic_hit(A,D) -/datum/martial_art/the_sleeping_carp/grab_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/the_sleeping_carp/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D) add_to_streak("G") if(check_streak(A,D)) return 1 @@ -368,7 +368,7 @@ if(G) G.state = GRAB_AGGRESSIVE //Instant aggressive grab -/datum/martial_art/the_sleeping_carp/harm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/the_sleeping_carp/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) add_to_streak("H") if(check_streak(A,D)) return 1 @@ -379,7 +379,7 @@ return 1 -/datum/martial_art/the_sleeping_carp/disarm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/the_sleeping_carp/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) add_to_streak("D") if(check_streak(A,D)) return 1 @@ -445,7 +445,7 @@ icon_state ="scroll2" var/used = 0 -/obj/item/weapon/plasma_fist_scroll/attack_self(mob/user as mob) +/obj/item/weapon/plasma_fist_scroll/attack_self(mob/user) if(!ishuman(user)) return if(!used) @@ -464,7 +464,7 @@ icon = 'icons/obj/wizard.dmi' icon_state = "scroll2" -/obj/item/weapon/sleeping_carp_scroll/attack_self(mob/living/carbon/human/user as mob) +/obj/item/weapon/sleeping_carp_scroll/attack_self(mob/living/carbon/human/user) if(!istype(user) || !user) return user << "You begin to read the scroll..." diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 4871b068ad3..7141e73825e 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -1261,7 +1261,7 @@ ticker.mode.finalize_traitor(src) ticker.mode.greet_traitor(src) -/datum/mind/proc/make_Nuke(var/turf/spawnloc,var/nuke_code,var/leader=0) +/datum/mind/proc/make_Nuke(turf/spawnloc,nuke_code,leader=0) if(!(src in ticker.mode.syndicates)) ticker.mode.syndicates += src ticker.mode.update_synd_icons_added(src) @@ -1385,7 +1385,7 @@ fail |= !ticker.mode.equip_revolutionary(current) -/datum/mind/proc/make_Gang(var/datum/gang/G) +/datum/mind/proc/make_Gang(datum/gang/G) special_role = "[G.name] Gang Boss" G.bosses += src gang_datum = G @@ -1447,7 +1447,7 @@ -/datum/mind/proc/AddSpell(var/obj/effect/proc_holder/spell/spell) +/datum/mind/proc/AddSpell(obj/effect/proc_holder/spell/spell) spell_list += spell if(!spell.action) spell.action = new/datum/action/spell_action @@ -1458,7 +1458,7 @@ spell.action.background_icon_state = spell.action_background_icon_state spell.action.Grant(current) return -/datum/mind/proc/transfer_actions(var/mob/living/new_character) +/datum/mind/proc/transfer_actions(mob/living/new_character) if(current && current.actions) for(var/datum/action/A in current.actions) A.Grant(new_character) diff --git a/code/datums/modules.dm b/code/datums/modules.dm index 896d920f994..e52a644d157 100644 --- a/code/datums/modules.dm +++ b/code/datums/modules.dm @@ -30,14 +30,14 @@ var/list/modules = list( // global associative list status = needed installed = needed -/datum/moduletypes/proc/addmod(var/type, var/modtextlist) +/datum/moduletypes/proc/addmod(type, modtextlist) modules += type // index by type text modules[type] = modtextlist -/datum/moduletypes/proc/inmodlist(var/type) +/datum/moduletypes/proc/inmodlist(type) return ("[type]" in modules) -/datum/moduletypes/proc/getbitmask(var/type) +/datum/moduletypes/proc/getbitmask(type) var/count = modcount["[type]"] if(count) return 2**count-1 diff --git a/code/datums/mutations.dm b/code/datums/mutations.dm index c47f4771b77..82fa9d7e217 100644 --- a/code/datums/mutations.dm +++ b/code/datums/mutations.dm @@ -86,7 +86,7 @@ return 0 return 1 -/datum/mutation/human/proc/say_mod(var/message) +/datum/mutation/human/proc/say_mod(message) if(message) return message @@ -130,7 +130,7 @@ return owner.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH -/datum/mutation/human/hulk/say_mod(var/message) +/datum/mutation/human/hulk/say_mod(message) if(message) message = "[uppertext(replacetext(message, ".", "!"))]!!" return message @@ -225,7 +225,7 @@ quality = NEGATIVE text_gain_indication = "You feel strange." -/datum/mutation/human/bad_dna/on_acquiring(var/mob/living/carbon/human/owner) +/datum/mutation/human/bad_dna/on_acquiring(mob/living/carbon/human/owner) owner << text_gain_indication var/mob/new_mob if(prob(95)) @@ -426,7 +426,7 @@ text_gain_indication = "You feel so happy. Nothing can be wrong with anything. :)" text_lose_indication = "Everything is terrible again. :(" -/datum/mutation/human/smile/say_mod(var/message) +/datum/mutation/human/smile/say_mod(message) if(message) message = " [message] " //Time for a friendly game of SS13 @@ -481,7 +481,7 @@ text_gain_indication = "You can't seem to form any coherent thoughts!" text_lose_indication = "Your mind feels more clear." -/datum/mutation/human/unintelligable/say_mod(var/message) +/datum/mutation/human/unintelligable/say_mod(message) if(message) var/prefix=copytext(message,1,2) if(prefix == ";") @@ -512,7 +512,7 @@ text_gain_indication = "You feel Swedish, however that works." text_lose_indication = "The feeling of Swedishness passes." -/datum/mutation/human/swedish/say_mod(var/message) +/datum/mutation/human/swedish/say_mod(message) if(message) message = replacetext(message,"w","v") if(prob(30)) @@ -525,7 +525,7 @@ text_gain_indication = "Ye feel like a reet prat like, innit?" text_lose_indication = "You no longer feel like being rude and sassy." -/datum/mutation/human/chav/say_mod(var/message) +/datum/mutation/human/chav/say_mod(message) if(message) message = " [message] " message = replacetext(message," looking at "," gawpin' at ") @@ -568,7 +568,7 @@ if(prob(15)) owner.visible_message("[owner] [pick("jiggles their hips", "rotates their hips", "gyrates their hips", "taps their foot", "dances to an imaginary song", "jiggles their legs", "snaps their fingers")]!") -/datum/mutation/human/elvis/say_mod(var/message) +/datum/mutation/human/elvis/say_mod(message) if(message) message = " [message] " message = replacetext(message," i'm not "," I aint ") diff --git a/code/datums/recipe.dm b/code/datums/recipe.dm index 16a2d522a6c..d3085976a18 100644 --- a/code/datums/recipe.dm +++ b/code/datums/recipe.dm @@ -40,7 +40,7 @@ var/time = 100 // 1/10 part of second -/datum/recipe/proc/check_reagents(var/datum/reagents/avail_reagents) //1=precisely, 0=insufficiently, -1=superfluous +/datum/recipe/proc/check_reagents(datum/reagents/avail_reagents) //1=precisely, 0=insufficiently, -1=superfluous . = 1 for (var/r_r in reagents) var/aval_r_amnt = avail_reagents.get_reagent_amount(r_r) @@ -53,7 +53,7 @@ return -1 return . -/datum/recipe/proc/check_items(var/obj/container as obj) //1=precisely, 0=insufficiently, -1=superfluous +/datum/recipe/proc/check_items(obj/container) //1=precisely, 0=insufficiently, -1=superfluous if (!items) if (locate(/obj/) in container) return -1 @@ -75,7 +75,7 @@ return . //general version -/datum/recipe/proc/make(var/obj/container as obj) +/datum/recipe/proc/make(obj/container) var/obj/result_obj = new result(container) for (var/obj/O in (container.contents-result_obj)) O.reagents.trans_to(result_obj, O.reagents.total_volume) @@ -84,7 +84,7 @@ return result_obj // food-related -/datum/recipe/proc/make_food(var/obj/container as obj) +/datum/recipe/proc/make_food(obj/container) var/obj/result_obj = new result(container) for (var/obj/O in (container.contents-result_obj)) if (O.reagents) @@ -95,7 +95,7 @@ container.reagents.clear_reagents() return result_obj -/proc/select_recipe(var/list/datum/recipe/avaiable_recipes, var/obj/obj as obj, var/exact = 1 as num) +/proc/select_recipe(list/datum/recipe/avaiable_recipes, obj/obj, exact = 1 as num) if (!exact) exact = -1 var/list/datum/recipe/possible_recipes = new diff --git a/code/datums/spells/construct_spells.dm b/code/datums/spells/construct_spells.dm index 470b22f86d8..4f75e19ea40 100644 --- a/code/datums/spells/construct_spells.dm +++ b/code/datums/spells/construct_spells.dm @@ -94,17 +94,17 @@ jaunt_duration = 50 //in deciseconds centcom_cancast = 0 //Stop people from getting to centcom -/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/jaunt_disappear(var/atom/movable/overlay/animation, var/mob/living/target) +/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/jaunt_disappear(atom/movable/overlay/animation, mob/living/target) animation.icon_state = "phase_shift" animation.dir = target.dir flick("phase_shift",animation) -/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/jaunt_reappear(var/atom/movable/overlay/animation, var/mob/living/target) +/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/jaunt_reappear(atom/movable/overlay/animation, mob/living/target) animation.icon_state = "phase_shift2" animation.dir = target.dir flick("phase_shift2",animation) -/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/jaunt_steam(var/mobloc) +/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/jaunt_steam(mobloc) return /obj/effect/proc_holder/spell/targeted/projectile/magic_missile/lesser diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm index c8934867790..6f5247e8e92 100644 --- a/code/datums/spells/ethereal_jaunt.dm +++ b/code/datums/spells/ethereal_jaunt.dm @@ -60,16 +60,16 @@ qdel(animation) qdel(holder) -/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/proc/jaunt_disappear(var/atom/movable/overlay/animation, var/mob/living/target) +/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/proc/jaunt_disappear(atom/movable/overlay/animation, mob/living/target) animation.icon_state = "liquify" flick("liquify",animation) -/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/proc/jaunt_reappear(var/atom/movable/overlay/animation, var/mob/living/target) +/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/proc/jaunt_reappear(atom/movable/overlay/animation, mob/living/target) flick("reappear",animation) -/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/proc/jaunt_steam(var/mobloc) +/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/proc/jaunt_steam(mobloc) var/datum/effect/effect/system/steam_spread/steam = new /datum/effect/effect/system/steam_spread() steam.set_up(10, 0, mobloc) steam.start() diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm index a60c3c0fd9d..98d5944d5a3 100644 --- a/code/datums/spells/wizard.dm +++ b/code/datums/spells/wizard.dm @@ -297,7 +297,7 @@ action_icon_state = "fireball" sound = "sound/magic/Fireball.ogg" -/obj/effect/proc_holder/spell/turf/fireball/cast(var/turf/T) +/obj/effect/proc_holder/spell/turf/fireball/cast(turf/T) explosion(T, -1, 0, 2, 3, 0, flame_range = 2) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 5253e7dc68a..5d0e6fb95a0 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -17,7 +17,7 @@ var/const/supply_misc = 8 var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engineer,supply_medical,supply_science,supply_organic,supply_materials,supply_misc) -/proc/get_supply_group_name(var/cat) +/proc/get_supply_group_name(cat) switch(cat) if(1) return "Emergency" diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 4d7cb7b8469..739a747f967 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -49,14 +49,14 @@ var/list/uplink_items = list() var/list/excludefrom = list() //Empty list does nothing. Place the name of gamemode you don't want this item to be available in here. This is so you dont have to list EVERY mode to exclude something. var/surplus = 100 //Chance of being included in the surplus crate (when pick() selects it) -/datum/uplink_item/proc/spawn_item(var/turf/loc, var/obj/item/device/uplink/U) +/datum/uplink_item/proc/spawn_item(turf/loc, obj/item/device/uplink/U) if(item) U.uses -= max(cost, 0) U.used_TC += cost feedback_add_details("traitor_uplink_items_bought", "[item]") return new item(loc) -/datum/uplink_item/proc/buy(var/obj/item/device/uplink/U, var/mob/user) +/datum/uplink_item/proc/buy(obj/item/device/uplink/U, mob/user) ..() if(!istype(U)) @@ -775,7 +775,7 @@ var/list/uplink_items = list() item = /obj/item/weapon/storage/box/syndicate cost = 0 -/datum/uplink_item/badass/random/spawn_item(var/turf/loc, var/obj/item/device/uplink/U) +/datum/uplink_item/badass/random/spawn_item(turf/loc, obj/item/device/uplink/U) var/list/buyable_items = get_uplink_items() var/list/possible_items = list() diff --git a/code/datums/wires/airlock.dm b/code/datums/wires/airlock.dm index a51b0eadb08..96d55e05518 100644 --- a/code/datums/wires/airlock.dm +++ b/code/datums/wires/airlock.dm @@ -118,7 +118,7 @@ var/const/AIRLOCK_WIRE_LIGHT = 2048 A.update_icon() -/datum/wires/airlock/UpdatePulsed(var/index) +/datum/wires/airlock/UpdatePulsed(index) var/obj/machinery/door/airlock/A = holder switch(index) diff --git a/code/datums/wires/alarm.dm b/code/datums/wires/alarm.dm index e2fd697198d..32290d20bb0 100644 --- a/code/datums/wires/alarm.dm +++ b/code/datums/wires/alarm.dm @@ -9,7 +9,7 @@ var/const/AALARM_WIRE_AI_CONTROL = 8 var/const/AALARM_WIRE_AALARM = 16 -/datum/wires/alarm/CanUse(var/mob/living/L) +/datum/wires/alarm/CanUse(mob/living/L) var/obj/machinery/alarm/A = holder if(A.panel_open && A.buildstage == 2) return 1 @@ -20,7 +20,7 @@ var/const/AALARM_WIRE_AALARM = 16 . += ..() . += text("
\n[(A.locked ? "The Air Alarm is locked." : "The Air Alarm is unlocked.")]
\n[((A.shorted || (A.stat & (NOPOWER|BROKEN))) ? "The Air Alarm is offline." : "The Air Alarm is working properly!")]
\n[(A.aidisabled ? "The 'AI control allowed' light is off." : "The 'AI control allowed' light is on.")]") -/datum/wires/alarm/UpdateCut(var/index, var/mended) +/datum/wires/alarm/UpdateCut(index, mended) var/obj/machinery/alarm/A = holder switch(index) if(AALARM_WIRE_IDSCAN) @@ -50,7 +50,7 @@ var/const/AALARM_WIRE_AALARM = 16 A.post_alert(2) A.update_icon() -/datum/wires/alarm/UpdatePulsed(var/index) +/datum/wires/alarm/UpdatePulsed(index) var/obj/machinery/alarm/A = holder switch(index) if(AALARM_WIRE_IDSCAN) diff --git a/code/datums/wires/apc.dm b/code/datums/wires/apc.dm index a7b7934e399..02303e39044 100644 --- a/code/datums/wires/apc.dm +++ b/code/datums/wires/apc.dm @@ -13,13 +13,13 @@ var/const/APC_WIRE_AI_CONTROL = 8 . += text("
\n[(A.locked ? "The APC is locked." : "The APC is unlocked.")]
\n[(A.shorted ? "The APCs power has been shorted." : "The APC is working properly!")]
\n[(A.aidisabled ? "The 'AI control allowed' light is off." : "The 'AI control allowed' light is on.")]") -/datum/wires/apc/CanUse(var/mob/living/L) +/datum/wires/apc/CanUse(mob/living/L) var/obj/machinery/power/apc/A = holder if(A.wiresexposed) return 1 return 0 -/datum/wires/apc/UpdatePulsed(var/index) +/datum/wires/apc/UpdatePulsed(index) var/obj/machinery/power/apc/A = holder @@ -53,7 +53,7 @@ var/const/APC_WIRE_AI_CONTROL = 8 A.updateDialog() -/datum/wires/apc/UpdateCut(var/index, var/mended) +/datum/wires/apc/UpdateCut(index, mended) var/obj/machinery/power/apc/A = holder switch(index) diff --git a/code/datums/wires/autolathe.dm b/code/datums/wires/autolathe.dm index 0fe2c9f2fcf..c6487f4cefb 100644 --- a/code/datums/wires/autolathe.dm +++ b/code/datums/wires/autolathe.dm @@ -18,7 +18,7 @@ var/const/AUTOLATHE_DISABLE_WIRE = 4 return 1 return 0 -/datum/wires/autolathe/Interact(var/mob/living/user) +/datum/wires/autolathe/Interact(mob/living/user) if(CanUse(user)) var/obj/machinery/autolathe/V = holder V.attack_hand(user) diff --git a/code/datums/wires/explosive.dm b/code/datums/wires/explosive.dm index fac7163a486..34a85d4bece 100644 --- a/code/datums/wires/explosive.dm +++ b/code/datums/wires/explosive.dm @@ -6,12 +6,12 @@ var/const/WIRE_EXPLODE = 1 /datum/wires/explosive/proc/explode() return -/datum/wires/explosive/UpdatePulsed(var/index) +/datum/wires/explosive/UpdatePulsed(index) switch(index) if(WIRE_EXPLODE) explode() -/datum/wires/explosive/UpdateCut(var/index, var/mended) +/datum/wires/explosive/UpdateCut(index, mended) switch(index) if(WIRE_EXPLODE) if(!mended) @@ -20,7 +20,7 @@ var/const/WIRE_EXPLODE = 1 /datum/wires/explosive/c4 holder_type = /obj/item/weapon/c4 -/datum/wires/explosive/c4/CanUse(var/mob/living/L) +/datum/wires/explosive/c4/CanUse(mob/living/L) var/obj/item/weapon/c4/P = holder if(P.open_panel) return 1 @@ -35,10 +35,10 @@ var/const/WIRE_EXPLODE = 1 /datum/wires/explosive/gibtonite holder_type = /obj/item/weapon/twohanded/required/gibtonite -/datum/wires/explosive/gibtonite/CanUse(var/mob/living/L) +/datum/wires/explosive/gibtonite/CanUse(mob/living/L) return 1 -/datum/wires/explosive/gibtonite/UpdateCut(var/index, var/mended) +/datum/wires/explosive/gibtonite/UpdateCut(index, mended) return /datum/wires/explosive/gibtonite/explode() diff --git a/code/datums/wires/mulebot.dm b/code/datums/wires/mulebot.dm index 6b7bf818fbf..22cae76f697 100644 --- a/code/datums/wires/mulebot.dm +++ b/code/datums/wires/mulebot.dm @@ -13,19 +13,19 @@ var/const/WIRE_REMOTE_RX = 64 // remote recv functions var/const/WIRE_REMOTE_TX = 128 // remote trans status var/const/WIRE_BEACON_RX = 256 // beacon ping recv -/datum/wires/mulebot/CanUse(var/mob/living/L) +/datum/wires/mulebot/CanUse(mob/living/L) var/obj/machinery/bot/mulebot/M = holder if(M.open) return 1 return 0 // So the wires do not open a new window, handle the interaction ourselves. -/datum/wires/mulebot/Interact(var/mob/living/user) +/datum/wires/mulebot/Interact(mob/living/user) if(CanUse(user)) var/obj/machinery/bot/mulebot/M = holder M.interact(user) -/datum/wires/mulebot/UpdatePulsed(var/index) +/datum/wires/mulebot/UpdatePulsed(index) switch(index) if(WIRE_POWER1, WIRE_POWER2) holder.visible_message("\icon[holder] The charge light flickers.") diff --git a/code/datums/wires/particle_accelerator.dm b/code/datums/wires/particle_accelerator.dm index b55995eb3eb..3e59f50979e 100644 --- a/code/datums/wires/particle_accelerator.dm +++ b/code/datums/wires/particle_accelerator.dm @@ -8,13 +8,13 @@ var/const/PARTICLE_INTERFACE_WIRE = 4 // Determines the interface showing up. var/const/PARTICLE_LIMIT_POWER_WIRE = 8 // Determines how strong the PA can be. //var/const/PARTICLE_NOTHING_WIRE = 16 // Blank wire -/datum/wires/particle_acc/control_box/CanUse(var/mob/living/L) +/datum/wires/particle_acc/control_box/CanUse(mob/living/L) var/obj/machinery/particle_accelerator/control_box/C = holder if(C.construction_state == 2) return 1 return 0 -/datum/wires/particle_acc/control_box/UpdatePulsed(var/index) +/datum/wires/particle_acc/control_box/UpdatePulsed(index) var/obj/machinery/particle_accelerator/control_box/C = holder switch(index) @@ -30,7 +30,7 @@ var/const/PARTICLE_LIMIT_POWER_WIRE = 8 // Determines how strong the PA can be. if(PARTICLE_LIMIT_POWER_WIRE) C.visible_message("\icon[C][C] makes a large whirring noise.") -/datum/wires/particle_acc/control_box/UpdateCut(var/index, var/mended) +/datum/wires/particle_acc/control_box/UpdateCut(index, mended) var/obj/machinery/particle_accelerator/control_box/C = holder switch(index) diff --git a/code/datums/wires/radio.dm b/code/datums/wires/radio.dm index 249af31f6da..90e7f499787 100644 --- a/code/datums/wires/radio.dm +++ b/code/datums/wires/radio.dm @@ -6,18 +6,18 @@ var/const/WIRE_SIGNAL = 1 var/const/WIRE_RECEIVE = 2 var/const/WIRE_TRANSMIT = 4 -/datum/wires/radio/CanUse(var/mob/living/L) +/datum/wires/radio/CanUse(mob/living/L) var/obj/item/device/radio/R = holder if(R.b_stat) return 1 return 0 -/datum/wires/radio/Interact(var/mob/living/user) +/datum/wires/radio/Interact(mob/living/user) if(CanUse(user)) var/obj/item/device/radio/R = holder R.interact(user) -/datum/wires/radio/UpdatePulsed(var/index) +/datum/wires/radio/UpdatePulsed(index) var/obj/item/device/radio/R = holder switch(index) if(WIRE_SIGNAL) diff --git a/code/datums/wires/robot.dm b/code/datums/wires/robot.dm index 30f3cca3f12..a01efe58d21 100644 --- a/code/datums/wires/robot.dm +++ b/code/datums/wires/robot.dm @@ -18,7 +18,7 @@ var/const/BORG_WIRE_CAMERA = 16 . += text("
\n[(R.lockcharge ? "The lockdown light is on." : "The lockdown light is off.")]") return . -/datum/wires/robot/UpdateCut(var/index, var/mended) +/datum/wires/robot/UpdateCut(index, mended) var/mob/living/silicon/robot/R = holder switch(index) @@ -49,7 +49,7 @@ var/const/BORG_WIRE_CAMERA = 16 R.SetLockdown(!mended) -/datum/wires/robot/UpdatePulsed(var/index) +/datum/wires/robot/UpdatePulsed(index) var/mob/living/silicon/robot/R = holder switch(index) @@ -89,7 +89,7 @@ var/const/BORG_WIRE_CAMERA = 16 if(BORG_WIRE_LOCKED_DOWN) R.SetLockdown(!R.lockcharge) // Toggle -/datum/wires/robot/CanUse(var/mob/living/L) +/datum/wires/robot/CanUse(mob/living/L) var/mob/living/silicon/robot/R = holder if(R.wiresexposed) return 1 diff --git a/code/datums/wires/syndicatebomb.dm b/code/datums/wires/syndicatebomb.dm index fccc80ae5f2..a814eb67603 100644 --- a/code/datums/wires/syndicatebomb.dm +++ b/code/datums/wires/syndicatebomb.dm @@ -10,13 +10,13 @@ var/const/WIRE_PROCEED = 8 // Lowers the timer, explodes if cut while the bomb var/const/WIRE_ACTIVATE = 16 // Will start a bombs timer if pulsed, will hint if pulsed while already active, will stop a timer a bomb on cut -/datum/wires/syndicatebomb/CanUse(var/mob/living/L) +/datum/wires/syndicatebomb/CanUse(mob/living/L) var/obj/machinery/syndicatebomb/P = holder if(P.open_panel) return 1 return 0 -/datum/wires/syndicatebomb/UpdatePulsed(var/index) +/datum/wires/syndicatebomb/UpdatePulsed(index) var/obj/machinery/syndicatebomb/P = holder switch(index) if(WIRE_BOOM) @@ -48,7 +48,7 @@ var/const/WIRE_ACTIVATE = 16 // Will start a bombs timer if pulsed, will hint if P.loc.visible_message("\icon[holder] The bomb seems to hesitate for a moment.") P.timer += 5 -/datum/wires/syndicatebomb/UpdateCut(var/index, var/mended) +/datum/wires/syndicatebomb/UpdateCut(index, mended) var/obj/machinery/syndicatebomb/P = holder switch(index) if(WIRE_EXPLODE) diff --git a/code/datums/wires/taperecorder.dm b/code/datums/wires/taperecorder.dm index 45eaef24421..3217b890096 100644 --- a/code/datums/wires/taperecorder.dm +++ b/code/datums/wires/taperecorder.dm @@ -6,14 +6,14 @@ var/const/WIRE_PLAY = 1 var/const/WIRE_RECORD = 2 -/datum/wires/taperecorder/UpdatePulsed(var/index) +/datum/wires/taperecorder/UpdatePulsed(index) switch(index) if(WIRE_PLAY) play() if(WIRE_RECORD) record() -/datum/wires/taperecorder/CanUse(var/mob/living/L) +/datum/wires/taperecorder/CanUse(mob/living/L) var/obj/item/device/taperecorder/T = holder if(T.open_panel) return 1 diff --git a/code/datums/wires/vending.dm b/code/datums/wires/vending.dm index 5b7d4024533..505b99b3cf1 100644 --- a/code/datums/wires/vending.dm +++ b/code/datums/wires/vending.dm @@ -7,7 +7,7 @@ var/const/VENDING_WIRE_CONTRABAND = 2 var/const/VENDING_WIRE_ELECTRIFY = 4 var/const/VENDING_WIRE_IDSCAN = 8 -/datum/wires/vending/CanUse(var/mob/living/L) +/datum/wires/vending/CanUse(mob/living/L) var/obj/machinery/vending/V = holder if(!istype(L, /mob/living/silicon)) if(V.seconds_electrified) @@ -17,7 +17,7 @@ var/const/VENDING_WIRE_IDSCAN = 8 return 1 return 0 -/datum/wires/vending/Interact(var/mob/living/user) +/datum/wires/vending/Interact(mob/living/user) if(CanUse(user)) var/obj/machinery/vending/V = holder V.attack_hand(user) @@ -30,7 +30,7 @@ var/const/VENDING_WIRE_IDSCAN = 8 . += "The green light is [V.extended_inventory ? "on" : "off"].
" . += "A [V.scan_id ? "purple" : "yellow"] light is on.
" -/datum/wires/vending/UpdatePulsed(var/index) +/datum/wires/vending/UpdatePulsed(index) var/obj/machinery/vending/V = holder switch(index) if(VENDING_WIRE_THROW) @@ -42,7 +42,7 @@ var/const/VENDING_WIRE_IDSCAN = 8 if(VENDING_WIRE_IDSCAN) V.scan_id = !V.scan_id -/datum/wires/vending/UpdateCut(var/index, var/mended) +/datum/wires/vending/UpdateCut(index, mended) var/obj/machinery/vending/V = holder switch(index) if(VENDING_WIRE_THROW) diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index 89b57e6a16e..350c878a95e 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -65,7 +65,7 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown", //wires = shuffle(wires) -/datum/wires/proc/Interact(var/mob/living/user) +/datum/wires/proc/Interact(mob/living/user) var/html = null if(holder && CanUse(user)) @@ -155,14 +155,14 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown", // // Called when wires cut/mended. -/datum/wires/proc/UpdateCut(var/index, var/mended) +/datum/wires/proc/UpdateCut(index, mended) return // Called when wire pulsed. Add code here. -/datum/wires/proc/UpdatePulsed(var/index) +/datum/wires/proc/UpdatePulsed(index) return -/datum/wires/proc/CanUse(var/mob/living/L) +/datum/wires/proc/CanUse(mob/living/L) return 1 // Example of use: @@ -191,15 +191,15 @@ var/const/POWER = 8 // Helper Procs // -/datum/wires/proc/PulseColour(var/colour) +/datum/wires/proc/PulseColour(colour) PulseIndex(GetIndex(colour)) -/datum/wires/proc/PulseIndex(var/index) +/datum/wires/proc/PulseIndex(index) if(IsIndexCut(index)) return UpdatePulsed(index) -/datum/wires/proc/GetIndex(var/colour) +/datum/wires/proc/GetIndex(colour) if(wires[colour]) var/index = wires[colour] return index @@ -210,28 +210,28 @@ var/const/POWER = 8 // Is Index/Colour Cut procs // -/datum/wires/proc/IsColourCut(var/colour) +/datum/wires/proc/IsColourCut(colour) var/index = GetIndex(colour) return IsIndexCut(index) -/datum/wires/proc/IsIndexCut(var/index) +/datum/wires/proc/IsIndexCut(index) return (index & wires_status) // // Signaller Procs // -/datum/wires/proc/IsAttached(var/colour) +/datum/wires/proc/IsAttached(colour) if(signallers[colour]) return 1 return 0 -/datum/wires/proc/GetAttached(var/colour) +/datum/wires/proc/GetAttached(colour) if(signallers[colour]) return signallers[colour] return null -/datum/wires/proc/Attach(var/colour, var/obj/item/device/assembly/S) +/datum/wires/proc/Attach(colour, obj/item/device/assembly/S) if(colour && S && S.attachable) if(!IsAttached(colour)) signallers[colour] = S @@ -239,7 +239,7 @@ var/const/POWER = 8 S.connected = src return S -/datum/wires/proc/Detach(var/colour) +/datum/wires/proc/Detach(colour) if(colour) var/obj/item/device/assembly/S = GetAttached(colour) if(S) @@ -249,7 +249,7 @@ var/const/POWER = 8 return S -/datum/wires/proc/Pulse(var/obj/item/device/assembly/S) +/datum/wires/proc/Pulse(obj/item/device/assembly/S) for(var/colour in signallers) if(S == signallers[colour]) @@ -261,11 +261,11 @@ var/const/POWER = 8 // Cut Wire Colour/Index procs // -/datum/wires/proc/CutWireColour(var/colour) +/datum/wires/proc/CutWireColour(colour) var/index = GetIndex(colour) CutWireIndex(index) -/datum/wires/proc/CutWireIndex(var/index) +/datum/wires/proc/CutWireIndex(index) if(IsIndexCut(index)) wires_status &= ~index UpdateCut(index, 1) diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index a3af235a15f..316c437c912 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -48,7 +48,7 @@ -/area/proc/poweralert(var/state, var/obj/source as obj) +/area/proc/poweralert(state, obj/source) if (state != poweralm) poweralm = state if(istype(source)) //Only report power alarms on the z-level where the source is located. @@ -74,7 +74,7 @@ D.triggerAlarm("Power", src, cameras, source) return -/area/proc/atmosalert(var/danger_level, var/obj/source as obj) +/area/proc/atmosalert(danger_level, obj/source) if(danger_level != atmosalm) if (danger_level==2) var/list/cameras = list() @@ -101,7 +101,7 @@ return 1 return 0 -/area/proc/firealert(var/obj/source as obj) +/area/proc/firealert(obj/source) if(always_unpowered == 1) //no fire alarms in space/asteroid return @@ -130,7 +130,7 @@ D.triggerAlarm("Fire", src, cameras, source) return -/area/proc/firereset(var/obj/source as obj) +/area/proc/firereset(obj/source) for(var/area/RA in related) if (RA.fire) RA.fire = 0 @@ -154,7 +154,7 @@ D.cancelAlarm("Fire", src, source) return -/area/proc/burglaralert(var/obj/trigger) +/area/proc/burglaralert(obj/trigger) if(always_unpowered == 1) //no burglar alarms in space/asteroid return @@ -246,7 +246,7 @@ #define ENVIRON 3 */ -/area/proc/powered(var/chan) // return true if the area has power to given channel +/area/proc/powered(chan) // return true if the area has power to given channel if(!master.requires_power) return 1 @@ -274,7 +274,7 @@ if (fire || eject || party) RA.updateicon() -/area/proc/usage(var/chan) +/area/proc/usage(chan) var/used = 0 switch(chan) if(LIGHT) @@ -308,7 +308,7 @@ master.used_light = 0 master.used_environ = 0 -/area/proc/use_power(var/amount, var/chan) +/area/proc/use_power(amount, chan) switch(chan) if(EQUIP) diff --git a/code/game/asteroid.dm b/code/game/asteroid.dm index 55980bdbcb7..938c48b5343 100644 --- a/code/game/asteroid.dm +++ b/code/game/asteroid.dm @@ -2,7 +2,7 @@ var/global/list/possiblethemes = list("organharvest","cult","wizden","cavein","x var/global/max_secret_rooms = 6 -/proc/spawn_room(var/atom/start_loc, var/x_size, var/y_size, var/list/walltypes, var/floor, var/name) +/proc/spawn_room(atom/start_loc, x_size, y_size, list/walltypes, floor, name) var/list/room_turfs = list("walls"=list(),"floors"=list()) for(var/x = 0, x < x_size, x++) //sets the size of the room on the x axis diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 83a6d9f268b..c20a1f77fb5 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -98,7 +98,7 @@ else return null -/atom/proc/check_eye(user as mob) +/atom/proc/check_eye(mob/user) if (istype(user, /mob/living/silicon/ai)) // WHYYYY return 1 return @@ -134,7 +134,7 @@ /atom/proc/HasProximity(atom/movable/AM as mob|obj) return -/atom/proc/emp_act(var/severity) +/atom/proc/emp_act(severity) return /atom/proc/bullet_act(obj/item/projectile/P, def_zone) @@ -371,7 +371,7 @@ var/list/blood_splatter_icons = list() /atom/proc/rejects_blood() return 0 -/atom/proc/add_vomit_floor(mob/living/carbon/M as mob, var/toxvomit = 0) +/atom/proc/add_vomit_floor(mob/living/carbon/M, toxvomit = 0) if( istype(src, /turf/simulated) ) var/obj/effect/decal/cleanable/vomit/this = new /obj/effect/decal/cleanable/vomit(src) if(M.reagents) @@ -386,7 +386,7 @@ var/list/blood_splatter_icons = list() newDisease.holder = this*/ // Only adds blood on the floor -- Skie -/atom/proc/add_blood_floor(mob/living/carbon/M as mob) +/atom/proc/add_blood_floor(mob/living/carbon/M) if(istype(src, /turf/simulated)) if(check_dna_integrity(M)) //mobs with dna = (monkeys + humans at time of writing) var/obj/effect/decal/cleanable/blood/B = locate() in contents @@ -441,7 +441,7 @@ var/list/blood_splatter_icons = list() /atom/proc/singularity_pull() return -/atom/proc/acid_act(var/acidpwr, var/toxpwr, var/acid_volume) +/atom/proc/acid_act(acidpwr, toxpwr, acid_volume) return /atom/proc/emag_act() diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index f24e6bf8e4f..7480302230e 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -124,7 +124,7 @@ //Return 0 to have src start/keep drifting in a no-grav area and 1 to stop/not start drifting //Mobs should return 1 if they should be able to move of their own volition, see client/Move() in mob_movement.dm //movement_dir == 0 when stopping or any dir when trying to move -/atom/movable/proc/Process_Spacemove(var/movement_dir = 0) +/atom/movable/proc/Process_Spacemove(movement_dir = 0) if(has_gravity(src)) return 1 diff --git a/code/game/communications.dm b/code/game/communications.dm index 9f7d515a300..6d57e20afb9 100644 --- a/code/game/communications.dm +++ b/code/game/communications.dm @@ -64,7 +64,7 @@ so i made radios not use the radio controller. */ var/list/all_radios = list() -/proc/add_radio(var/obj/item/radio, freq) +/proc/add_radio(obj/item/radio, freq) if(!freq || !radio) return if(!all_radios["[freq]"]) @@ -74,7 +74,7 @@ var/list/all_radios = list() all_radios["[freq]"] |= radio return freq -/proc/remove_radio(var/obj/item/radio, freq) +/proc/remove_radio(obj/item/radio, freq) if(!freq || !radio) return if(!all_radios["[freq]"]) @@ -82,7 +82,7 @@ var/list/all_radios = list() all_radios["[freq]"] -= radio -/proc/remove_radio_all(var/obj/item/radio) +/proc/remove_radio_all(obj/item/radio) for(var/freq in all_radios) all_radios["[freq]"] -= radio @@ -182,7 +182,7 @@ var/const/RADIO_MAGNETS = "9" //If range > 0, only post to devices on the same z_level and within range //Use range = -1, to restrain to the same z_level without limiting range -/datum/radio_frequency/proc/post_signal(obj/source as obj|null, datum/signal/signal, var/filter = null as text|null, var/range = null as num|null) +/datum/radio_frequency/proc/post_signal(obj/source as obj|null, datum/signal/signal, filter = null as text|null, range = null as num|null) //Apply filter to the signal. If none supply, broadcast to every devices //_default channel is always checked @@ -213,7 +213,7 @@ var/const/RADIO_MAGNETS = "9" continue device.receive_signal(signal, TRANSMISSION_RADIO, frequency) -/datum/radio_frequency/proc/add_listener(obj/device as obj, var/filter as text|null) +/datum/radio_frequency/proc/add_listener(obj/device, filter as text|null) if (!filter) filter = "_default" diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index edd4d2ad81b..e3fa61d3409 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -20,18 +20,18 @@ /datum/atom_hud/data/medical/basic -/datum/atom_hud/data/medical/basic/proc/check_sensors(var/mob/living/carbon/human/H) +/datum/atom_hud/data/medical/basic/proc/check_sensors(mob/living/carbon/human/H) if(!istype(H)) return 0 var/obj/item/clothing/under/U = H.w_uniform if(!istype(U)) return 0 if(U.sensor_mode <= 2) return 0 return 1 -/datum/atom_hud/data/medical/basic/add_to_single_hud(var/mob/M, var/mob/living/carbon/H) +/datum/atom_hud/data/medical/basic/add_to_single_hud(mob/M, mob/living/carbon/H) if(check_sensors(H)) ..() -/datum/atom_hud/data/medical/basic/proc/update_suit_sensors(var/mob/living/carbon/H) +/datum/atom_hud/data/medical/basic/proc/update_suit_sensors(mob/living/carbon/H) check_sensors(H) ? add_to_hud(H) : remove_from_hud(H) /datum/atom_hud/data/medical/advanced diff --git a/code/game/dna.dm b/code/game/dna.dm index 1e269bd342c..c1ce01cd512 100644 --- a/code/game/dna.dm +++ b/code/game/dna.dm @@ -40,7 +40,7 @@ destination.dna.real_name = real_name destination.dna.mutations = mutations -/datum/dna/proc/copy_dna(var/datum/dna/new_dna) +/datum/dna/proc/copy_dna(datum/dna/new_dna) new_dna.unique_enzymes = unique_enzymes new_dna.struc_enzymes = struc_enzymes new_dna.uni_identity = uni_identity @@ -119,7 +119,7 @@ . += repeat_string(DNA_UNIQUE_ENZYMES_LEN, "0") return . -/datum/dna/proc/mutations_say_mods(var/message) +/datum/dna/proc/mutations_say_mods(message) if(message) for(var/datum/mutation/human/M in mutations) message = M.say_mod(message) @@ -384,7 +384,7 @@ ..() update_icon() -/obj/machinery/dna_scannernew/proc/toggle_open(var/mob/user) +/obj/machinery/dna_scannernew/proc/toggle_open(mob/user) if(panel_open) user << "Close the maintenance panel first." return @@ -454,7 +454,7 @@ open_machine() return -/obj/machinery/dna_scannernew/attackby(var/obj/item/I, mob/user, params) +/obj/machinery/dna_scannernew/attackby(obj/item/I, mob/user, params) if(!occupant && default_deconstruction_screwdriver(user, icon_state, icon_state, I))//sent icon_state is irrelevant... update_icon()//..since we're updating the icon here, since the scanner can be unpowered when opened/closed @@ -516,7 +516,7 @@ idle_power_usage = 10 active_power_usage = 400 -/obj/machinery/computer/scan_consolenew/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/machinery/computer/scan_consolenew/attackby(obj/item/I, mob/user, params) if (istype(I, /obj/item/weapon/disk/data)) //INSERT SOME DISKETTES if (!src.diskette) if(!user.drop_item()) @@ -972,7 +972,7 @@ return value -/datum/dna/proc/is_same_as(var/datum/dna/D) +/datum/dna/proc/is_same_as(datum/dna/D) if(uni_identity == D.uni_identity && struc_enzymes == D.struc_enzymes && real_name == D.real_name) if(species == D.species && features == D.features && blood_type == D.blood_type) return 1 diff --git a/code/game/gamemodes/abduction/abduction.dm b/code/game/gamemodes/abduction/abduction.dm index cd462b1fd87..fe821790077 100644 --- a/code/game/gamemodes/abduction/abduction.dm +++ b/code/game/gamemodes/abduction/abduction.dm @@ -40,7 +40,7 @@ return 1 -/datum/game_mode/abduction/proc/make_abductor_team(var/team_number,var/preset_agent=null,var/preset_scientist=null) +/datum/game_mode/abduction/proc/make_abductor_team(team_number,preset_agent=null,preset_scientist=null) //Team Name team_names[team_number] = "Mothership [pick(possible_changeling_IDs)]" //TODO Ensure unique and actual alieny names //Team Objective @@ -133,7 +133,7 @@ return ..() //Used for create antag buttons -/datum/game_mode/abduction/proc/post_setup_team(var/team_number) +/datum/game_mode/abduction/proc/post_setup_team(team_number) var/list/obj/effect/landmark/abductor/agent_landmarks = new var/list/obj/effect/landmark/abductor/scientist_landmarks = new agent_landmarks.len = max_teams @@ -181,7 +181,7 @@ H.regenerate_icons() -/datum/game_mode/abduction/proc/greet_agent(var/datum/mind/abductor,var/team_number) +/datum/game_mode/abduction/proc/greet_agent(datum/mind/abductor,team_number) abductor.objectives += team_objectives[team_number] var/team_name = team_names[team_number] @@ -195,7 +195,7 @@ obj_count++ return -/datum/game_mode/abduction/proc/greet_scientist(var/datum/mind/abductor,var/team_number) +/datum/game_mode/abduction/proc/greet_scientist(datum/mind/abductor,team_number) abductor.objectives += team_objectives[team_number] var/team_name = team_names[team_number] @@ -209,7 +209,7 @@ obj_count++ return -/datum/game_mode/abduction/proc/equip_common(var/mob/living/carbon/human/agent,var/team_number) +/datum/game_mode/abduction/proc/equip_common(mob/living/carbon/human/agent,team_number) var/radio_freq = SYND_FREQ var/obj/item/device/radio/R = new /obj/item/device/radio/headset/syndicate/alt(agent) @@ -219,7 +219,7 @@ agent.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(agent), slot_w_uniform) //they're greys gettit agent.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(agent), slot_back) -/datum/game_mode/abduction/proc/get_team_console(var/team) +/datum/game_mode/abduction/proc/get_team_console(team) var/obj/machinery/abductor/console/console for(var/obj/machinery/abductor/console/c in machines) if(c.team == team) @@ -227,7 +227,7 @@ break return console -/datum/game_mode/abduction/proc/equip_agent(var/mob/living/carbon/human/agent,var/team_number) +/datum/game_mode/abduction/proc/equip_agent(mob/living/carbon/human/agent,team_number) if(!team_number) var/datum/species/abductor/S = agent.dna.species team_number = S.team diff --git a/code/game/gamemodes/abduction/abduction_gear.dm b/code/game/gamemodes/abduction/abduction_gear.dm index a85c712b858..a84adc0b15a 100644 --- a/code/game/gamemodes/abduction/abduction_gear.dm +++ b/code/game/gamemodes/abduction/abduction_gear.dm @@ -44,7 +44,7 @@ -/obj/item/clothing/suit/armor/abductor/vest/proc/SetDisguise(var/datum/icon_snapshot/entry) +/obj/item/clothing/suit/armor/abductor/vest/proc/SetDisguise(datum/icon_snapshot/entry) disguise = entry /obj/item/clothing/suit/armor/abductor/vest/proc/ActivateStealth() @@ -114,7 +114,7 @@ if(combat_cooldown==initial(combat_cooldown)) SSobj.processing.Remove(src) -/obj/item/device/abductor/proc/IsAbductor(var/user) +/obj/item/device/abductor/proc/IsAbductor(user) if(ishuman(user)) var/mob/living/carbon/human/H = user if(H.dna.species.id != "abductor") @@ -122,13 +122,13 @@ return 1 return 0 -/obj/item/device/abductor/proc/AbductorCheck(var/user) +/obj/item/device/abductor/proc/AbductorCheck(user) if(IsAbductor(user)) return 1 user << "You can't figure how this works!" return 0 -/obj/item/device/abductor/proc/ScientistCheck(var/user) +/obj/item/device/abductor/proc/ScientistCheck(user) var/mob/living/carbon/human/H = user var/datum/species/abductor/S = H.dna.species return S.scientist @@ -171,7 +171,7 @@ mark(M, user) -/obj/item/device/abductor/gizmo/afterattack(var/atom/target, var/mob/living/user, flag, params) +/obj/item/device/abductor/gizmo/afterattack(atom/target, mob/living/user, flag, params) if(flag) return if(!AbductorCheck(user)) @@ -185,13 +185,13 @@ if(GIZMO_MARK) mark(target, user) -/obj/item/device/abductor/gizmo/proc/scan(var/atom/target, var/mob/living/user) +/obj/item/device/abductor/gizmo/proc/scan(atom/target, mob/living/user) if(istype(target,/mob/living/carbon/human)) if(console!=null) console.AddSnapshot(target) user << "You scan [target] and add them to the database." -/obj/item/device/abductor/gizmo/proc/mark(var/atom/target, var/mob/living/user) +/obj/item/device/abductor/gizmo/proc/mark(atom/target, mob/living/user) if(marked == target) user << "This specimen is already marked!" return @@ -204,7 +204,7 @@ else prepare(target,user) -/obj/item/device/abductor/gizmo/proc/prepare(var/atom/target, var/mob/living/user) +/obj/item/device/abductor/gizmo/proc/prepare(atom/target, mob/living/user) if(get_dist(target,user)>1) user << "You need to be next to the specimen to prepare it for transport!" return @@ -227,14 +227,14 @@ return radio_off(M, user) -/obj/item/device/abductor/silencer/afterattack(var/atom/target, var/mob/living/user, flag, params) +/obj/item/device/abductor/silencer/afterattack(atom/target, mob/living/user, flag, params) if(flag) return if(!AbductorCheck(user)) return radio_off(target, user) -/obj/item/device/abductor/silencer/proc/radio_off(var/atom/target, var/mob/living/user) +/obj/item/device/abductor/silencer/proc/radio_off(atom/target, mob/living/user) if( !(user in (viewers(7,target))) ) return @@ -247,7 +247,7 @@ user << "You silence [M]'s radio devices." radio_off_mob(M) -/obj/item/device/abductor/silencer/proc/radio_off_mob(var/mob/living/carbon/human/M) +/obj/item/device/abductor/silencer/proc/radio_off_mob(mob/living/carbon/human/M) var/list/all_items = M.GetAllContents() for(var/obj/I in all_items) @@ -368,7 +368,7 @@ Congratulations! You are now trained for xenobiology research!"} if(BATON_PROBE) icon_state = "wonderprod" -/obj/item/weapon/abductor_baton/proc/IsAbductor(var/mob/living/user) +/obj/item/weapon/abductor_baton/proc/IsAbductor(mob/living/user) if(!ishuman(user)) return 0 var/mob/living/carbon/human/H = user @@ -378,7 +378,7 @@ Congratulations! You are now trained for xenobiology research!"} return 0 return 1 -/obj/item/weapon/abductor_baton/attack(mob/target as mob, mob/living/user as mob) +/obj/item/weapon/abductor_baton/attack(mob/target, mob/living/user) if(!IsAbductor(user)) return diff --git a/code/game/gamemodes/abduction/gland.dm b/code/game/gamemodes/abduction/gland.dm index 68595ad93f8..73eff48987d 100644 --- a/code/game/gamemodes/abduction/gland.dm +++ b/code/game/gamemodes/abduction/gland.dm @@ -217,7 +217,7 @@ density = 1 var/hatch_time = 0 -/obj/effect/cocoon/abductor/proc/Copy(var/mob/living/carbon/human/H) +/obj/effect/cocoon/abductor/proc/Copy(mob/living/carbon/human/H) var/mob/living/carbon/human/interactive/greytide/clone = new(src) hardset_dna(clone,H.dna.uni_identity,H.dna.struc_enzymes,H.real_name, H.dna.blood_type, H.dna.species.type, H.dna.features) diff --git a/code/game/gamemodes/abduction/machinery/camera.dm b/code/game/gamemodes/abduction/machinery/camera.dm index 428ce8ce2ab..ce9470f9ac8 100644 --- a/code/game/gamemodes/abduction/machinery/camera.dm +++ b/code/game/gamemodes/abduction/machinery/camera.dm @@ -19,7 +19,7 @@ eyeobj.icon = 'icons/obj/abductor.dmi' eyeobj.icon_state = "camera_target" -/obj/machinery/computer/camera_advanced/abductor/GrantActions(var/mob/living/carbon/user) +/obj/machinery/computer/camera_advanced/abductor/GrantActions(mob/living/carbon/user) off_action.target = user off_action.Grant(user) @@ -41,14 +41,14 @@ vest_disguise_action.target = console vest_disguise_action.Grant(user) -/obj/machinery/computer/camera_advanced/abductor/proc/IsAbductor(var/mob/living/carbon/human/H) +/obj/machinery/computer/camera_advanced/abductor/proc/IsAbductor(mob/living/carbon/human/H) return H.dna.species.id == "abductor" -/obj/machinery/computer/camera_advanced/abductor/proc/IsScientist(var/mob/living/carbon/human/H) +/obj/machinery/computer/camera_advanced/abductor/proc/IsScientist(mob/living/carbon/human/H) var/datum/species/abductor/S = H.dna.species return S.scientist -/obj/machinery/computer/camera_advanced/abductor/attack_hand(var/mob/user as mob) +/obj/machinery/computer/camera_advanced/abductor/attack_hand(mob/user) if(!iscarbon(user) || !IsAbductor(user)) return return ..() diff --git a/code/game/gamemodes/abduction/machinery/console.dm b/code/game/gamemodes/abduction/machinery/console.dm index 94a321ad72c..7bfcc1cb4bc 100644 --- a/code/game/gamemodes/abduction/machinery/console.dm +++ b/code/game/gamemodes/abduction/machinery/console.dm @@ -3,18 +3,18 @@ /obj/machinery/abductor var/team = 0 -/obj/machinery/abductor/proc/IsAbductor(var/mob/living/carbon/human/H) +/obj/machinery/abductor/proc/IsAbductor(mob/living/carbon/human/H) if(!H.dna) return 0 return H.dna.species.id == "abductor" -/obj/machinery/abductor/proc/IsAgent(var/mob/living/carbon/human/H) +/obj/machinery/abductor/proc/IsAgent(mob/living/carbon/human/H) if(H.dna.species.id == "abductor") var/datum/species/abductor/S = H.dna.species return S.agent return 0 -/obj/machinery/abductor/proc/IsScientist(var/mob/living/carbon/human/H) +/obj/machinery/abductor/proc/IsScientist(mob/living/carbon/human/H) if(H.dna.species.id == "abductor") var/datum/species/abductor/S = H.dna.species return S.scientist @@ -36,7 +36,7 @@ var/obj/machinery/computer/camera_advanced/abductor/camera var/list/datum/icon_snapshot/disguises = list() -/obj/machinery/abductor/console/attack_hand(var/mob/user as mob) +/obj/machinery/abductor/console/attack_hand(mob/user) if(..()) return if(!IsAbductor(user)) @@ -140,7 +140,7 @@ vest.flip_mode() return -/obj/machinery/abductor/console/proc/SelectDisguise(var/remote=0) +/obj/machinery/abductor/console/proc/SelectDisguise(remote=0) var/list/entries = list() var/tempname var/datum/icon_snapshot/temp @@ -171,7 +171,7 @@ camera = c c.console = src -/obj/machinery/abductor/console/proc/AddSnapshot(var/mob/living/carbon/human/target) +/obj/machinery/abductor/console/proc/AddSnapshot(mob/living/carbon/human/target) var/datum/icon_snapshot/entry = new entry.name = target.name entry.icon = target.icon @@ -185,7 +185,7 @@ disguises.Add(entry) return -/obj/machinery/abductor/console/attackby(O as obj, user as mob, params) +/obj/machinery/abductor/console/attackby(obj/O, mob/user, params) if(istype(O, /obj/item/device/abductor/gizmo)) var/obj/item/device/abductor/gizmo/G = O user << "You link the tool to the console." @@ -198,7 +198,7 @@ else ..() -/obj/machinery/abductor/console/proc/Dispense(var/item,var/cost=1) +/obj/machinery/abductor/console/proc/Dispense(item,cost=1) if(experiment && experiment.points >= cost) experiment.points-=cost say("Incoming supply!") diff --git a/code/game/gamemodes/abduction/machinery/dispenser.dm b/code/game/gamemodes/abduction/machinery/dispenser.dm index 33b4944785b..91d290a508c 100644 --- a/code/game/gamemodes/abduction/machinery/dispenser.dm +++ b/code/game/gamemodes/abduction/machinery/dispenser.dm @@ -22,7 +22,7 @@ gland_colors[i] = random_color() amounts[i] = rand(1,5) -/obj/machinery/abductor/gland_dispenser/attack_hand(var/mob/user as mob) +/obj/machinery/abductor/gland_dispenser/attack_hand(mob/user) if(..()) return if(!IsAbductor(user)) @@ -76,7 +76,7 @@ Dispense(text2num(href_list["dispense"])) src.updateUsrDialog() -/obj/machinery/abductor/gland_dispenser/proc/Dispense(var/count) +/obj/machinery/abductor/gland_dispenser/proc/Dispense(count) if(amounts[count]>0) amounts[count]-- var/T = gland_types[count] diff --git a/code/game/gamemodes/abduction/machinery/experiment.dm b/code/game/gamemodes/abduction/machinery/experiment.dm index 71ca57b29c1..4ea01595c37 100644 --- a/code/game/gamemodes/abduction/machinery/experiment.dm +++ b/code/game/gamemodes/abduction/machinery/experiment.dm @@ -36,7 +36,7 @@ if(state_open && !panel_open) ..(target) -/obj/machinery/abductor/experiment/proc/dissection_icon(var/mob/living/carbon/human/H) +/obj/machinery/abductor/experiment/proc/dissection_icon(mob/living/carbon/human/H) var/icon/photo = null var/g = (H.gender == FEMALE) ? "f" : "m" if(!config.mutant_races || H.dna.species.use_skintones) @@ -129,7 +129,7 @@ updateUsrDialog() add_fingerprint(usr) -/obj/machinery/abductor/experiment/proc/Experiment(var/mob/occupant,var/type) +/obj/machinery/abductor/experiment/proc/Experiment(mob/occupant,type) var/mob/living/carbon/human/H = occupant var/point_reward = 0 if(H in history) @@ -185,7 +185,7 @@ return "ERROR" -/obj/machinery/abductor/experiment/proc/SendBack(var/mob/living/carbon/human/H) +/obj/machinery/abductor/experiment/proc/SendBack(mob/living/carbon/human/H) H.Sleeping(8) var/area/A if(console && console.pad && console.pad.teleport_target) diff --git a/code/game/gamemodes/abduction/machinery/pad.dm b/code/game/gamemodes/abduction/machinery/pad.dm index b586874397d..e7abfd04529 100644 --- a/code/game/gamemodes/abduction/machinery/pad.dm +++ b/code/game/gamemodes/abduction/machinery/pad.dm @@ -6,7 +6,7 @@ anchored = 1 var/area/teleport_target -/obj/machinery/abductor/proc/TeleportToArea(var/mob/living/target,var/area/thearea) +/obj/machinery/abductor/proc/TeleportToArea(mob/living/target,area/thearea) var/list/L = list() for(var/turf/T in get_area_turfs(thearea.type)) if(!T.density) @@ -37,7 +37,7 @@ if(!success) target.loc = pick(L) -/obj/machinery/abductor/pad/proc/Warp(var/mob/living/target) +/obj/machinery/abductor/pad/proc/Warp(mob/living/target) target.Move(src.loc) /obj/machinery/abductor/pad/proc/Send() @@ -49,13 +49,13 @@ spawn(0) anim(target.loc,target,'icons/mob/mob.dmi',,"uncloak",,target.dir) -/obj/machinery/abductor/pad/proc/Retrieve(var/mob/living/target) +/obj/machinery/abductor/pad/proc/Retrieve(mob/living/target) flick("alien-pad", src) spawn(0) anim(target.loc,target,'icons/mob/mob.dmi',,"uncloak",,target.dir) Warp(target) -/obj/machinery/abductor/pad/proc/MobToLoc(var/place,var/mob/living/target) +/obj/machinery/abductor/pad/proc/MobToLoc(place,mob/living/target) var/obj/effect/teleport_abductor/F = new(place) var/datum/effect/effect/system/spark_spread/S = new S.set_up(10,0,place) @@ -66,7 +66,7 @@ target.forceMove(place) anim(target.loc,target,'icons/mob/mob.dmi',,"uncloak",,target.dir) -/obj/machinery/abductor/pad/proc/PadToLoc(var/place) +/obj/machinery/abductor/pad/proc/PadToLoc(place) var/obj/effect/teleport_abductor/F = new(place) var/datum/effect/effect/system/spark_spread/S = new S.set_up(10,0,place) diff --git a/code/game/gamemodes/antag_hud.dm b/code/game/gamemodes/antag_hud.dm index 416d54a6318..f2294177272 100644 --- a/code/game/gamemodes/antag_hud.dm +++ b/code/game/gamemodes/antag_hud.dm @@ -1,7 +1,7 @@ /datum/atom_hud/antag hud_icons = list(ANTAG_HUD) -/datum/atom_hud/antag/proc/join_hud(var/mob/living/M) +/datum/atom_hud/antag/proc/join_hud(mob/living/M) if(!istype(M)) CRASH("join_hud(): [M] ([M.type]) is not a living mob!") if(M.mind.antag_hud) @@ -11,7 +11,7 @@ add_hud_to(M) M.mind.antag_hud = src -/datum/atom_hud/antag/proc/leave_hud(var/mob/living/M) +/datum/atom_hud/antag/proc/leave_hud(mob/living/M) if(!istype(M)) CRASH("leave_hud(): [M] ([M.type]) is not a living mob!") remove_from_hud(M) @@ -21,7 +21,7 @@ //GAME_MODE PROCS //called to set a mob's antag icon state -/datum/game_mode/proc/set_antag_hud(var/mob/living/M, var/new_icon_state) +/datum/game_mode/proc/set_antag_hud(mob/living/M, new_icon_state) if(!istype(M)) CRASH("set_antag_hud(): [M] ([M.type]) is not a living mob!") var/image/holder = M.hud_list[ANTAG_HUD] @@ -31,7 +31,7 @@ //MIND PROCS //this is called by mind.transfer_to() -/datum/mind/proc/transfer_antag_huds(var/mob/living/M) +/datum/mind/proc/transfer_antag_huds(mob/living/M) for(var/datum/atom_hud/antag/hud in huds) if(M in hud.hudusers) hud.leave_hud(M) diff --git a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm index 99a9cafeedc..b3e6ab5e0f8 100644 --- a/code/game/gamemodes/antag_spawner.dm +++ b/code/game/gamemodes/antag_spawner.dm @@ -4,10 +4,10 @@ w_class = 1.0 var/used = 0 -/obj/item/weapon/antag_spawner/proc/spawn_antag(var/client/C, var/turf/T, var/type = "") +/obj/item/weapon/antag_spawner/proc/spawn_antag(client/C, turf/T, type = "") return -/obj/item/weapon/antag_spawner/proc/equip_antag(mob/target as mob) +/obj/item/weapon/antag_spawner/proc/equip_antag(mob/target) return /obj/item/weapon/antag_spawner/contract @@ -16,7 +16,7 @@ icon = 'icons/obj/wizard.dmi' icon_state ="scroll2" -/obj/item/weapon/antag_spawner/contract/attack_self(mob/user as mob) +/obj/item/weapon/antag_spawner/contract/attack_self(mob/user) user.set_machine(src) var/dat if(used) @@ -63,7 +63,7 @@ else H << "Unable to reach your apprentice! You can either attack the spellbook with the contract to refund your points, or wait and try again later." -/obj/item/weapon/antag_spawner/contract/spawn_antag(var/client/C, var/turf/T, var/type = "") +/obj/item/weapon/antag_spawner/contract/spawn_antag(client/C, turf/T, type = "") PoolOrNew(/obj/effect/effect/smoke, T) var/mob/living/carbon/human/M = new/mob/living/carbon/human(T) C.prefs.copy_to(M) @@ -108,7 +108,7 @@ ticker.mode.update_wiz_icons_added(M.mind) M << sound('sound/effects/magic.ogg') -/obj/item/weapon/antag_spawner/contract/equip_antag(mob/target as mob) +/obj/item/weapon/antag_spawner/contract/equip_antag(mob/target) target.equip_to_slot_or_del(new /obj/item/device/radio/headset(target), slot_ears) target.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(target), slot_w_uniform) target.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(target), slot_shoes) @@ -125,7 +125,7 @@ icon_state = "locator" var/TC_cost = 0 -/obj/item/weapon/antag_spawner/borg_tele/attack_self(mob/user as mob) +/obj/item/weapon/antag_spawner/borg_tele/attack_self(mob/user) if(used) user << "The teleporter is out of power." return @@ -137,7 +137,7 @@ else user << "Unable to connect to Syndicate Command. Please wait and try again later or use the teleporter on your uplink to get your points refunded." -/obj/item/weapon/antag_spawner/borg_tele/spawn_antag(var/client/C, var/turf/T, var/type = "") +/obj/item/weapon/antag_spawner/borg_tele/spawn_antag(client/C, turf/T, type = "") var/datum/effect/effect/system/spark_spread/S = new /datum/effect/effect/system/spark_spread S.set_up(4, 1, src) S.start() @@ -156,7 +156,7 @@ icon_state = "vial" -/obj/item/weapon/antag_spawner/slaughter_demon/attack_self(mob/user as mob) +/obj/item/weapon/antag_spawner/slaughter_demon/attack_self(mob/user) var/list/demon_candidates = get_candidates(BE_ALIEN) if(user.z != 1) user << "You should probably wait until you reach the station." @@ -173,7 +173,7 @@ user << "You can't seem to work up the nerve to shatter the bottle. Perhaps you should try again later." -/obj/item/weapon/antag_spawner/slaughter_demon/spawn_antag(var/client/C, var/turf/T, var/type = "") +/obj/item/weapon/antag_spawner/slaughter_demon/spawn_antag(client/C, turf/T, type = "") var /obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter(T) var/mob/living/simple_animal/slaughter/S = new /mob/living/simple_animal/slaughter/(holder) diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm index c629c157f98..06153d71aff 100644 --- a/code/game/gamemodes/blob/blob.dm +++ b/code/game/gamemodes/blob/blob.dm @@ -59,7 +59,7 @@ var/list/blob_nodes = list() return candidates -/datum/game_mode/blob/proc/blobize(var/mob/living/carbon/human/blob) +/datum/game_mode/blob/proc/blobize(mob/living/carbon/human/blob) var/datum/mind/blobmind = blob.mind if(!istype(blobmind)) return 0 @@ -72,7 +72,7 @@ var/list/blob_nodes = list() burst_blob(blobmind) return 1 -/datum/game_mode/blob/proc/make_blobs(var/count) +/datum/game_mode/blob/proc/make_blobs(count) var/list/candidates = get_blob_candidates() var/mob/living/carbon/human/blob = null count=min(count, candidates.len) @@ -90,7 +90,7 @@ var/list/blob_nodes = list() world << "You must kill it all while minimizing the damage to the station." -/datum/game_mode/blob/proc/greet_blob(var/datum/mind/blob) +/datum/game_mode/blob/proc/greet_blob(datum/mind/blob) blob.current << "You are infected by the Blob!" blob.current << "Your body is ready to give spawn to a new blob core which will eat this station." blob.current << "Find a good location to spawn the core and then take control and overwhelm the station!" @@ -98,7 +98,7 @@ var/list/blob_nodes = list() blob.current << "If you go outside of the station level, or in space, then you will die; make sure your location has lots of ground to cover." return -/datum/game_mode/blob/proc/show_message(var/message) +/datum/game_mode/blob/proc/show_message(message) for(var/datum/mind/blob in infected_crew) blob.current << message @@ -106,7 +106,7 @@ var/list/blob_nodes = list() for(var/datum/mind/blob in infected_crew) burst_blob(blob) -/datum/game_mode/blob/proc/burst_blob(var/datum/mind/blob, var/warned=0) +/datum/game_mode/blob/proc/burst_blob(datum/mind/blob, warned=0) var/client/blob_client = null var/turf/location = null @@ -186,7 +186,7 @@ var/list/blob_nodes = list() return ..(0) -/datum/game_mode/blob/proc/stage(var/stage) +/datum/game_mode/blob/proc/stage(stage) switch(stage) if (0) diff --git a/code/game/gamemodes/blob/blob_report.dm b/code/game/gamemodes/blob/blob_report.dm index d08526eda5d..eec4d27e80c 100644 --- a/code/game/gamemodes/blob/blob_report.dm +++ b/code/game/gamemodes/blob/blob_report.dm @@ -1,6 +1,6 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 -/datum/game_mode/blob/send_intercept(var/report = 1) +/datum/game_mode/blob/send_intercept(report = 1) var/intercepttext = "" switch(report) if(0) @@ -57,7 +57,7 @@ var/num_territories = 1//Number of total valid territories for gang mode -/datum/station_state/proc/count(var/count_territories) +/datum/station_state/proc/count(count_territories) for(var/turf/T in block(locate(1,1,1), locate(world.maxx,world.maxy,1))) if(istype(T,/turf/simulated/floor)) @@ -100,7 +100,7 @@ else world << "ERROR: NO VALID TERRITORIES" -/datum/station_state/proc/score(var/datum/station_state/result) +/datum/station_state/proc/score(datum/station_state/result) if(!result) return 0 var/output = 0 output += (result.floor / max(floor,1)) diff --git a/code/game/gamemodes/blob/blobs/blob_mobs.dm b/code/game/gamemodes/blob/blobs/blob_mobs.dm index 8580c480ab1..895774a2dc3 100644 --- a/code/game/gamemodes/blob/blobs/blob_mobs.dm +++ b/code/game/gamemodes/blob/blobs/blob_mobs.dm @@ -13,7 +13,7 @@ maxbodytemp = 360 var/mob/camera/blob/overmind = null -/mob/living/simple_animal/hostile/blob/proc/adjustcolors(var/a_color) +/mob/living/simple_animal/hostile/blob/proc/adjustcolors(a_color) if(a_color) color = a_color @@ -65,7 +65,7 @@ break ..() -/mob/living/simple_animal/hostile/blob/blobspore/proc/Zombify(var/mob/living/carbon/human/H) +/mob/living/simple_animal/hostile/blob/blobspore/proc/Zombify(mob/living/carbon/human/H) is_zombie = 1 if(H.wear_suit) var/obj/item/clothing/suit/armor/A = H.wear_suit @@ -128,7 +128,7 @@ adjustcolors(color) //to ensure zombie/other overlays update -/mob/living/simple_animal/hostile/blob/blobspore/adjustcolors(var/a_color) +/mob/living/simple_animal/hostile/blob/blobspore/adjustcolors(a_color) color = a_color if(is_zombie) diff --git a/code/game/gamemodes/blob/blobs/core.dm b/code/game/gamemodes/blob/blobs/core.dm index bf8822c40f5..dc5fbd797d0 100644 --- a/code/game/gamemodes/blob/blobs/core.dm +++ b/code/game/gamemodes/blob/blobs/core.dm @@ -24,7 +24,7 @@ ..(loc, h) -/obj/effect/blob/core/adjustcolors(var/a_color) +/obj/effect/blob/core/adjustcolors(a_color) overlays.Cut() color = null var/image/I = new('icons/mob/blob.dmi', "blob") @@ -80,7 +80,7 @@ ..() -/obj/effect/blob/core/proc/create_overmind(var/client/new_overmind, var/override_delay) +/obj/effect/blob/core/proc/create_overmind(client/new_overmind, override_delay) if(overmind_get_delay > world.time && !override_delay) return diff --git a/code/game/gamemodes/blob/blobs/factory.dm b/code/game/gamemodes/blob/blobs/factory.dm index 3ab5874c176..4138d56cbc6 100644 --- a/code/game/gamemodes/blob/blobs/factory.dm +++ b/code/game/gamemodes/blob/blobs/factory.dm @@ -20,7 +20,7 @@ spores = null ..() -/obj/effect/blob/factory/PulseAnimation(var/activate = 0) +/obj/effect/blob/factory/PulseAnimation(activate = 0) if(activate) ..() return diff --git a/code/game/gamemodes/blob/blobs/node.dm b/code/game/gamemodes/blob/blobs/node.dm index d436693ed4f..0b8124daacd 100644 --- a/code/game/gamemodes/blob/blobs/node.dm +++ b/code/game/gamemodes/blob/blobs/node.dm @@ -11,7 +11,7 @@ SSobj.processing |= src ..(loc, h) -/obj/effect/blob/node/adjustcolors(var/a_color) +/obj/effect/blob/node/adjustcolors(a_color) overlays.Cut() color = null var/image/I = new('icons/mob/blob.dmi', "blob") diff --git a/code/game/gamemodes/blob/blobs/resource.dm b/code/game/gamemodes/blob/blobs/resource.dm index 2480d48552f..45b1e08687d 100644 --- a/code/game/gamemodes/blob/blobs/resource.dm +++ b/code/game/gamemodes/blob/blobs/resource.dm @@ -11,7 +11,7 @@ if(health <= 0) qdel(src) -/obj/effect/blob/resource/PulseAnimation(var/activate = 0) +/obj/effect/blob/resource/PulseAnimation(activate = 0) if(activate) ..() return diff --git a/code/game/gamemodes/blob/blobs/storage.dm b/code/game/gamemodes/blob/blobs/storage.dm index dcfb5ddf1ac..47b50a5bb03 100644 --- a/code/game/gamemodes/blob/blobs/storage.dm +++ b/code/game/gamemodes/blob/blobs/storage.dm @@ -11,11 +11,11 @@ overmind.max_blob_points -= 50 qdel(src) -/obj/effect/blob/storage/PulseAnimation(var/activate = 0) +/obj/effect/blob/storage/PulseAnimation(activate = 0) if(activate) ..() return -/obj/effect/blob/storage/proc/update_max_blob_points(var/new_point_increase) +/obj/effect/blob/storage/proc/update_max_blob_points(new_point_increase) if(overmind) overmind.max_blob_points += new_point_increase \ No newline at end of file diff --git a/code/game/gamemodes/blob/overmind.dm b/code/game/gamemodes/blob/overmind.dm index 005c40b3364..26ffc2d65c5 100644 --- a/code/game/gamemodes/blob/overmind.dm +++ b/code/game/gamemodes/blob/overmind.dm @@ -67,12 +67,12 @@ if(blob_core) hud_used.blobhealthdisplay.maptext = "
[round(blob_core.health)]
" -/mob/camera/blob/proc/add_points(var/points) +/mob/camera/blob/proc/add_points(points) if(points != 0) blob_points = Clamp(blob_points + points, 0, max_blob_points) hud_used.blobpwrdisplay.maptext = "
[round(src.blob_points)]
" -/mob/camera/blob/say(var/message) +/mob/camera/blob/say(message) if (!message) return @@ -103,7 +103,7 @@ if(isovermind(M) || isobserver(M)) M.show_message(rendered, 2) -/mob/camera/blob/emote(var/act,var/m_type=1,var/message = null) +/mob/camera/blob/emote(act,m_type=1,message = null) return /mob/camera/blob/blob_act() @@ -116,7 +116,7 @@ stat(null, "Core Health: [blob_core.health]") stat(null, "Power Stored: [blob_points]/[max_blob_points]") -/mob/camera/blob/Move(var/NewLoc, var/Dir = 0) +/mob/camera/blob/Move(NewLoc, Dir = 0) var/obj/effect/blob/B = locate() in range("3x3", NewLoc) if(B) loc = NewLoc diff --git a/code/game/gamemodes/blob/powers.dm b/code/game/gamemodes/blob/powers.dm index 446e324b486..78c15e08e5e 100644 --- a/code/game/gamemodes/blob/powers.dm +++ b/code/game/gamemodes/blob/powers.dm @@ -1,6 +1,6 @@ // Point controlling procs -/mob/camera/blob/proc/can_buy(var/cost = 15) +/mob/camera/blob/proc/can_buy(cost = 15) if(blob_points < cost) src << "You cannot afford this!" return 0 @@ -39,7 +39,7 @@ var/turf/T = get_turf(src) create_shield(T) -/mob/camera/blob/proc/create_shield(var/turf/T) +/mob/camera/blob/proc/create_shield(turf/T) var/obj/effect/blob/B = (locate(/obj/effect/blob) in T) @@ -255,7 +255,7 @@ var/turf/T = get_turf(src) expand_blob(T) -/mob/camera/blob/proc/expand_blob(var/turf/T) +/mob/camera/blob/proc/expand_blob(turf/T) if(!T) return @@ -290,7 +290,7 @@ var/turf/T = get_turf(src) rally_spores(T) -/mob/camera/blob/proc/rally_spores(var/turf/T) +/mob/camera/blob/proc/rally_spores(turf/T) if(!can_buy(5)) return diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm index 30c3261bddd..13fd5d40269 100644 --- a/code/game/gamemodes/blob/theblob.dm +++ b/code/game/gamemodes/blob/theblob.dm @@ -63,7 +63,7 @@ health_timestamp = world.time + 10 // 1 seconds -/obj/effect/blob/proc/Pulse(var/pulse = 0, var/origin_dir = 0, var/a_color)//Todo: Fix spaceblob expand +/obj/effect/blob/proc/Pulse(pulse = 0, origin_dir = 0, a_color)//Todo: Fix spaceblob expand set background = BACKGROUND_ENABLED @@ -100,7 +100,7 @@ return 0 -/obj/effect/blob/proc/expand(var/turf/T = null, var/prob = 1, var/a_color) +/obj/effect/blob/proc/expand(turf/T = null, prob = 1, a_color) if(prob && !prob(health)) return if(istype(T, /turf/space) && prob(75)) return if(!T) @@ -138,12 +138,12 @@ take_damage(Proj.damage, Proj.damage_type) return 0 -/obj/effect/blob/Crossed(var/mob/living/L) +/obj/effect/blob/Crossed(mob/living/L) ..() L.blob_act() -/obj/effect/blob/attackby(var/obj/item/weapon/W, var/mob/living/user, params) +/obj/effect/blob/attackby(obj/item/weapon/W, mob/living/user, params) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1) @@ -152,7 +152,7 @@ playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) take_damage(W.force, W.damtype) -/obj/effect/blob/attack_animal(mob/living/simple_animal/M as mob) +/obj/effect/blob/attack_animal(mob/living/simple_animal/M) M.changeNext_move(CLICK_CD_MELEE) M.do_attack_animation(src) playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1) @@ -161,7 +161,7 @@ take_damage(damage, BRUTE) return -/obj/effect/blob/attack_alien(mob/living/carbon/alien/humanoid/M as mob) +/obj/effect/blob/attack_alien(mob/living/carbon/alien/humanoid/M) M.changeNext_move(CLICK_CD_MELEE) M.do_attack_animation(src) playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1) @@ -181,7 +181,7 @@ health -= damage update_icon() -/obj/effect/blob/proc/change_to(var/type) +/obj/effect/blob/proc/change_to(type) if(!ispath(type)) ERROR("[type] is an invalid type for the blob.") var/obj/effect/blob/B = new type(src.loc) @@ -191,7 +191,7 @@ B.adjustcolors(color) qdel(src) -/obj/effect/blob/proc/adjustcolors(var/a_color) +/obj/effect/blob/proc/adjustcolors(a_color) if(a_color) color = a_color return diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index b7eec7d9187..c5953578dfe 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -76,7 +76,7 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" ..() return -/datum/game_mode/changeling/make_antag_chance(var/mob/living/carbon/human/character) //Assigns changeling to latejoiners +/datum/game_mode/changeling/make_antag_chance(mob/living/carbon/human/character) //Assigns changeling to latejoiners var/changelingcap = min( round(joined_player_list.len/(config.changeling_scaling_coeff*2))+2, round(joined_player_list.len/config.changeling_scaling_coeff) ) if(ticker.mode.changelings.len >= changelingcap) //Caps number of latejoin antagonists return @@ -87,7 +87,7 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" if(!(character.job in restricted_jobs)) character.mind.make_Changling() -/datum/game_mode/proc/forge_changeling_objectives(var/datum/mind/changeling) +/datum/game_mode/proc/forge_changeling_objectives(datum/mind/changeling) //OBJECTIVES - random traitor objectives. Unique objectives "steal brain" and "identity theft". //No escape alone because changelings aren't suited for it and it'd probably just lead to rampant robusting //If it seems like they'd be able to do it in play, add a 10% chance to have to escape alone @@ -147,7 +147,7 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" changeling.objectives += identity_theft return -/datum/game_mode/proc/greet_changeling(var/datum/mind/changeling, var/you_are=1) +/datum/game_mode/proc/greet_changeling(datum/mind/changeling, you_are=1) if (you_are) changeling.current << "You are [changeling.changeling.changelingID], a changeling! You have absorbed and taken the form of a human." changeling.current << "Use say \":g message\" to communicate with your fellow changelings." @@ -266,18 +266,18 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" geneticdamage = max(0, geneticdamage-1) -/datum/changeling/proc/get_dna(var/dna_owner) +/datum/changeling/proc/get_dna(dna_owner) for(var/datum/dna/DNA in (absorbed_dna+protected_dna)) if(dna_owner == DNA.real_name) return DNA -/datum/changeling/proc/has_dna(var/datum/dna/tDNA) +/datum/changeling/proc/has_dna(datum/dna/tDNA) for(var/datum/dna/D in (absorbed_dna+protected_dna)) if(tDNA.is_same_as(D)) return 1 return 0 -/datum/changeling/proc/can_absorb_dna(var/mob/living/carbon/user, var/mob/living/carbon/target) +/datum/changeling/proc/can_absorb_dna(mob/living/carbon/user, mob/living/carbon/target) if(absorbed_dna[1] == user.dna)//If our current DNA is the stalest, we gotta ditch it. user << "We have reached our capacity to store genetic information! We must transform before absorbing more." return diff --git a/code/game/gamemodes/changeling/changeling_power.dm b/code/game/gamemodes/changeling/changeling_power.dm index 9ce3ed0590a..19315f476c0 100644 --- a/code/game/gamemodes/changeling/changeling_power.dm +++ b/code/game/gamemodes/changeling/changeling_power.dm @@ -17,7 +17,7 @@ var/max_genetic_damage = 100 // hard counter for spamming abilities. Not used/balanced much yet. -/obj/effect/proc_holder/changeling/proc/on_purchase(var/mob/user) +/obj/effect/proc_holder/changeling/proc/on_purchase(mob/user) return /obj/effect/proc_holder/changeling/Click() @@ -26,7 +26,7 @@ return try_to_sting(user) -/obj/effect/proc_holder/changeling/proc/try_to_sting(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/proc/try_to_sting(mob/user, mob/target) if(!can_sting(user, target)) return var/datum/changeling/c = user.mind.changeling @@ -34,18 +34,18 @@ sting_feedback(user, target) take_chemical_cost(c) -/obj/effect/proc_holder/changeling/proc/sting_action(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/proc/sting_action(mob/user, mob/target) return 0 -/obj/effect/proc_holder/changeling/proc/sting_feedback(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/proc/sting_feedback(mob/user, mob/target) return 0 -/obj/effect/proc_holder/changeling/proc/take_chemical_cost(var/datum/changeling/changeling) +/obj/effect/proc_holder/changeling/proc/take_chemical_cost(datum/changeling/changeling) changeling.chem_charges -= chemical_cost changeling.geneticdamage += genetic_damage //Fairly important to remember to return 1 on success >.< -/obj/effect/proc_holder/changeling/proc/can_sting(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/proc/can_sting(mob/user, mob/target) if(!ishuman(user) && !ismonkey(user)) //typecast everything from mob to carbon from this point onwards return 0 if(req_human && !ishuman(user)) @@ -70,7 +70,7 @@ return 1 //used in /mob/Stat() -/obj/effect/proc_holder/changeling/proc/can_be_used_by(var/mob/user) +/obj/effect/proc_holder/changeling/proc/can_be_used_by(mob/user) if(!ishuman(user) && !ismonkey(user)) return 0 if(req_human && !ishuman(user)) diff --git a/code/game/gamemodes/changeling/evolution_menu.dm b/code/game/gamemodes/changeling/evolution_menu.dm index 7989c3fe92a..9269dc71be1 100644 --- a/code/game/gamemodes/changeling/evolution_menu.dm +++ b/code/game/gamemodes/changeling/evolution_menu.dm @@ -18,7 +18,7 @@ var/list/sting_paths usr << browse(dat, "window=powers;size=600x700")//900x480 -/obj/effect/proc_holder/changeling/evolution_menu/proc/create_menu(var/datum/changeling/changeling) +/obj/effect/proc_holder/changeling/evolution_menu/proc/create_menu(datum/changeling/changeling) var/dat dat +="Changling Evolution Menu" @@ -297,7 +297,7 @@ var/list/sting_paths usr << browse(dat, "window=powers;size=600x700") ///// -/datum/changeling/proc/purchasePower(var/mob/living/carbon/user, var/sting_name) +/datum/changeling/proc/purchasePower(mob/living/carbon/user, sting_name) var/obj/effect/proc_holder/changeling/thepower = null @@ -337,7 +337,7 @@ var/list/sting_paths thepower.on_purchase(user) //Reselect powers -/datum/changeling/proc/lingRespec(var/mob/user) +/datum/changeling/proc/lingRespec(mob/user) if(!ishuman(user)) user << "We can't remove our evolutions in this form!" return @@ -384,7 +384,7 @@ var/list/sting_paths chem_recharge_slowdown = initial(chem_recharge_slowdown) mimicing = "" -/mob/proc/remove_changeling_powers(var/keep_free_powers=0) +/mob/proc/remove_changeling_powers(keep_free_powers=0) if(ishuman(src) || ismonkey(src)) if(mind && mind.changeling) digitalcamo = 0 diff --git a/code/game/gamemodes/changeling/powers/absorb.dm b/code/game/gamemodes/changeling/powers/absorb.dm index abe45f557f5..3b4327aa868 100644 --- a/code/game/gamemodes/changeling/powers/absorb.dm +++ b/code/game/gamemodes/changeling/powers/absorb.dm @@ -6,7 +6,7 @@ req_human = 1 max_genetic_damage = 100 -/obj/effect/proc_holder/changeling/absorbDNA/can_sting(var/mob/living/carbon/user) +/obj/effect/proc_holder/changeling/absorbDNA/can_sting(mob/living/carbon/user) if(!..()) return @@ -28,7 +28,7 @@ -/obj/effect/proc_holder/changeling/absorbDNA/sting_action(var/mob/user) +/obj/effect/proc_holder/changeling/absorbDNA/sting_action(mob/user) var/datum/changeling/changeling = user.mind.changeling var/obj/item/weapon/grab/G = user.get_active_hand() var/mob/living/carbon/human/target = G.affecting @@ -83,7 +83,7 @@ //Absorbs the target DNA. -/datum/changeling/proc/absorb_dna(mob/living/carbon/T, var/mob/user) +/datum/changeling/proc/absorb_dna(mob/living/carbon/T, mob/user) if(absorbed_dna.len) absorbed_dna.Cut(1,2) T.dna.real_name = T.real_name //Set this again, just to be sure that it's properly set. @@ -97,7 +97,7 @@ absorbedcount++ store_dna(new_dna, user) -/datum/changeling/proc/store_dna(var/datum/dna/new_dna, var/mob/user) +/datum/changeling/proc/store_dna(datum/dna/new_dna, mob/user) for(var/datum/objective/escape/escape_with_identity/E in user.mind.objectives) if(E.target_real_name == new_dna.real_name) protected_dna |= new_dna @@ -116,7 +116,7 @@ req_human = 1 //Monkeys can't grab genetic_damage = 50 -/obj/effect/proc_holder/changeling/swap_form/can_sting(var/mob/living/carbon/user) +/obj/effect/proc_holder/changeling/swap_form/can_sting(mob/living/carbon/user) if(!..()) return var/obj/item/weapon/grab/G = user.get_active_hand() @@ -133,7 +133,7 @@ return 1 -/obj/effect/proc_holder/changeling/swap_form/sting_action(var/mob/living/carbon/user) +/obj/effect/proc_holder/changeling/swap_form/sting_action(mob/living/carbon/user) var/obj/item/weapon/grab/G = user.get_active_hand() var/mob/living/carbon/target = G.affecting var/datum/changeling/changeling = user.mind.changeling diff --git a/code/game/gamemodes/changeling/powers/adrenaline.dm b/code/game/gamemodes/changeling/powers/adrenaline.dm index ed7496be1d2..1d4a2d35084 100644 --- a/code/game/gamemodes/changeling/powers/adrenaline.dm +++ b/code/game/gamemodes/changeling/powers/adrenaline.dm @@ -8,7 +8,7 @@ req_stat = UNCONSCIOUS //Recover from stuns. -/obj/effect/proc_holder/changeling/adrenaline/sting_action(var/mob/living/user) +/obj/effect/proc_holder/changeling/adrenaline/sting_action(mob/living/user) user << "Energy rushes through us.[user.lying ? " We arise." : ""]" user.stat = 0 user.SetParalysis(0) @@ -29,7 +29,7 @@ color = "#C8A5DC" overdose_threshold = 30 -/datum/reagent/medicine/changelingAdrenaline/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/changelingAdrenaline/on_mob_life(mob/living/M as mob) M.AdjustParalysis(-1) M.AdjustStunned(-1) M.AdjustWeakened(-1) @@ -37,7 +37,7 @@ ..() return -/datum/reagent/medicine/changelingAdrenaline/overdose_process(var/mob/living/M as mob) +/datum/reagent/medicine/changelingAdrenaline/overdose_process(mob/living/M as mob) M.adjustToxLoss(1) ..() return @@ -49,7 +49,7 @@ color = "#C8A5DC" metabolization_rate = 1 -/datum/reagent/medicine/changelingAdrenaline2/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/changelingAdrenaline2/on_mob_life(mob/living/M as mob) M.status_flags |= GOTTAGOREALLYFAST M.adjustToxLoss(2) ..() diff --git a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm index 66dcd7c20b9..7eb4f1eebac 100644 --- a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm +++ b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm @@ -9,7 +9,7 @@ dna_cost = 2 //Would be 1 without thermal vision var/active = 0 //Whether or not vision is enhanced -/obj/effect/proc_holder/changeling/augmented_eyesight/sting_action(var/mob/user) +/obj/effect/proc_holder/changeling/augmented_eyesight/sting_action(mob/user) active = !active if(active) user << "We feel a minute twitch in our eyes, and darkness creeps away." diff --git a/code/game/gamemodes/changeling/powers/digitalcamo.dm b/code/game/gamemodes/changeling/powers/digitalcamo.dm index d63e5777f79..2404041ae17 100644 --- a/code/game/gamemodes/changeling/powers/digitalcamo.dm +++ b/code/game/gamemodes/changeling/powers/digitalcamo.dm @@ -5,7 +5,7 @@ dna_cost = 1 //Prevents AIs tracking you but makes you easily detectable to the human-eye. -/obj/effect/proc_holder/changeling/digitalcamo/sting_action(var/mob/user) +/obj/effect/proc_holder/changeling/digitalcamo/sting_action(mob/user) if(user.digitalcamo) user << "We return to normal." diff --git a/code/game/gamemodes/changeling/powers/fakedeath.dm b/code/game/gamemodes/changeling/powers/fakedeath.dm index f09eeceb54d..02d6eb91654 100644 --- a/code/game/gamemodes/changeling/powers/fakedeath.dm +++ b/code/game/gamemodes/changeling/powers/fakedeath.dm @@ -9,7 +9,7 @@ //Fake our own death and fully heal. You will appear to be dead but regenerate fully after a short delay. -/obj/effect/proc_holder/changeling/fakedeath/sting_action(var/mob/living/user) +/obj/effect/proc_holder/changeling/fakedeath/sting_action(mob/living/user) user << "We begin our stasis, preparing energy to arise once more." user.status_flags |= FAKEDEATH //play dead user.update_canmove() @@ -23,7 +23,7 @@ feedback_add_details("changeling_powers","FD") return 1 -/obj/effect/proc_holder/changeling/fakedeath/can_sting(var/mob/user) +/obj/effect/proc_holder/changeling/fakedeath/can_sting(mob/user) if(user.status_flags & FAKEDEATH) user << "We are already regenerating." return diff --git a/code/game/gamemodes/changeling/powers/fleshmend.dm b/code/game/gamemodes/changeling/powers/fleshmend.dm index c19fbc6dbbe..dcc28941ed0 100644 --- a/code/game/gamemodes/changeling/powers/fleshmend.dm +++ b/code/game/gamemodes/changeling/powers/fleshmend.dm @@ -7,7 +7,7 @@ req_stat = UNCONSCIOUS //Starts healing you every second for 10 seconds. Can be used whilst unconscious. -/obj/effect/proc_holder/changeling/fleshmend/sting_action(var/mob/living/user) +/obj/effect/proc_holder/changeling/fleshmend/sting_action(mob/living/user) user << "We begin to heal rapidly." spawn(0) if(ishuman(user)) diff --git a/code/game/gamemodes/changeling/powers/glands.dm b/code/game/gamemodes/changeling/powers/glands.dm index ca36093a9f7..a5a232ba346 100644 --- a/code/game/gamemodes/changeling/powers/glands.dm +++ b/code/game/gamemodes/changeling/powers/glands.dm @@ -5,7 +5,7 @@ dna_cost = 2 chemical_cost = -1 -/obj/effect/proc_holder/changeling/glands/on_purchase(var/mob/user) +/obj/effect/proc_holder/changeling/glands/on_purchase(mob/user) ..() var/datum/changeling/changeling=user.mind.changeling changeling.chem_storage += 25 diff --git a/code/game/gamemodes/changeling/powers/headcrab.dm b/code/game/gamemodes/changeling/powers/headcrab.dm index a04b48ce627..076dde153ce 100644 --- a/code/game/gamemodes/changeling/powers/headcrab.dm +++ b/code/game/gamemodes/changeling/powers/headcrab.dm @@ -5,7 +5,7 @@ dna_cost = 1 req_human = 1 -/obj/effect/proc_holder/changeling/headcrab/sting_action(var/mob/user) +/obj/effect/proc_holder/changeling/headcrab/sting_action(mob/user) explosion(get_turf(user),0,0,2,0,silent=1) var/turf = get_turf(user) spawn(5) // So it's not killed in explosion diff --git a/code/game/gamemodes/changeling/powers/hivemind.dm b/code/game/gamemodes/changeling/powers/hivemind.dm index 6e7add1edf2..69a795ad9c4 100644 --- a/code/game/gamemodes/changeling/powers/hivemind.dm +++ b/code/game/gamemodes/changeling/powers/hivemind.dm @@ -58,7 +58,7 @@ var/list/datum/dna/hivemind_bank = list() chemical_cost = 10 dna_cost = -1 -/obj/effect/proc_holder/changeling/hivemind_download/can_sting(var/mob/living/carbon/user) +/obj/effect/proc_holder/changeling/hivemind_download/can_sting(mob/living/carbon/user) if(!..()) return var/datum/changeling/changeling = user.mind.changeling @@ -67,7 +67,7 @@ var/list/datum/dna/hivemind_bank = list() return return 1 -/obj/effect/proc_holder/changeling/hivemind_download/sting_action(var/mob/user) +/obj/effect/proc_holder/changeling/hivemind_download/sting_action(mob/user) var/datum/changeling/changeling = user.mind.changeling var/list/names = list() for(var/datum/dna/DNA in hivemind_bank) diff --git a/code/game/gamemodes/changeling/powers/humanform.dm b/code/game/gamemodes/changeling/powers/humanform.dm index 9cccaf83609..999aaf47bed 100644 --- a/code/game/gamemodes/changeling/powers/humanform.dm +++ b/code/game/gamemodes/changeling/powers/humanform.dm @@ -8,7 +8,7 @@ //Transform into a human. -/obj/effect/proc_holder/changeling/humanform/sting_action(var/mob/living/carbon/user) +/obj/effect/proc_holder/changeling/humanform/sting_action(mob/living/carbon/user) var/datum/changeling/changeling = user.mind.changeling var/list/names = list() for(var/datum/dna/DNA in (changeling.absorbed_dna+changeling.protected_dna)) diff --git a/code/game/gamemodes/changeling/powers/lesserform.dm b/code/game/gamemodes/changeling/powers/lesserform.dm index b9220f4044b..310b470ff28 100644 --- a/code/game/gamemodes/changeling/powers/lesserform.dm +++ b/code/game/gamemodes/changeling/powers/lesserform.dm @@ -7,7 +7,7 @@ req_human = 1 //Transform into a monkey. -/obj/effect/proc_holder/changeling/lesserform/sting_action(var/mob/living/carbon/human/user) +/obj/effect/proc_holder/changeling/lesserform/sting_action(mob/living/carbon/human/user) if(!user || user.notransform) return 0 user << "Our genes cry out!" diff --git a/code/game/gamemodes/changeling/powers/mimic_voice.dm b/code/game/gamemodes/changeling/powers/mimic_voice.dm index 108e7d5fa01..d33532015ad 100644 --- a/code/game/gamemodes/changeling/powers/mimic_voice.dm +++ b/code/game/gamemodes/changeling/powers/mimic_voice.dm @@ -8,7 +8,7 @@ // Fake Voice -/obj/effect/proc_holder/changeling/mimicvoice/sting_action(var/mob/user) +/obj/effect/proc_holder/changeling/mimicvoice/sting_action(mob/user) var/datum/changeling/changeling=user.mind.changeling if(changeling.mimicing) changeling.mimicing = "" diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm index 2e5903420e7..5d8ef2f8963 100644 --- a/code/game/gamemodes/changeling/powers/mutations.dm +++ b/code/game/gamemodes/changeling/powers/mutations.dm @@ -20,7 +20,7 @@ var/weapon_type var/weapon_name_simple -/obj/effect/proc_holder/changeling/weapon/try_to_sting(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/weapon/try_to_sting(mob/user, mob/target) if(istype(user.l_hand, weapon_type)) //Not the nicest way to do it, but eh playsound(user, 'sound/effects/blobattack.ogg', 30, 1) qdel(user.l_hand) @@ -35,7 +35,7 @@ return ..(user, target) -/obj/effect/proc_holder/changeling/weapon/sting_action(var/mob/user) +/obj/effect/proc_holder/changeling/weapon/sting_action(mob/user) if(!user.drop_item()) user << "The [user.get_active_hand()] is stuck to your hand, you cannot grow a [weapon_name_simple] over it!" return @@ -60,7 +60,7 @@ var/recharge_slowdown = 0 var/blood_on_castoff = 0 -/obj/effect/proc_holder/changeling/suit/try_to_sting(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/suit/try_to_sting(mob/user, mob/target) var/datum/changeling/changeling = user.mind.changeling if(!ishuman(user) || !changeling) return @@ -85,7 +85,7 @@ return ..(H, target) -/obj/effect/proc_holder/changeling/suit/sting_action(var/mob/living/carbon/human/user) +/obj/effect/proc_holder/changeling/suit/sting_action(mob/living/carbon/human/user) if(!user.canUnEquip(user.wear_suit)) user << "\the [user.wear_suit] is stuck to your body, you cannot grow a [suit_name_simple] over it!" return @@ -188,7 +188,7 @@ weapon_type = /obj/item/weapon/shield/changeling weapon_name_simple = "shield" -/obj/effect/proc_holder/changeling/weapon/shield/sting_action(var/mob/user) +/obj/effect/proc_holder/changeling/weapon/shield/sting_action(mob/user) var/datum/changeling/changeling = user.mind.changeling //So we can read the absorbedcount. if(!changeling) return diff --git a/code/game/gamemodes/changeling/powers/panacea.dm b/code/game/gamemodes/changeling/powers/panacea.dm index ceb7fc8e311..b6880a371e7 100644 --- a/code/game/gamemodes/changeling/powers/panacea.dm +++ b/code/game/gamemodes/changeling/powers/panacea.dm @@ -7,7 +7,7 @@ req_stat = UNCONSCIOUS //Heals the things that the other regenerative abilities don't. -/obj/effect/proc_holder/changeling/panacea/sting_action(var/mob/user) +/obj/effect/proc_holder/changeling/panacea/sting_action(mob/user) user << "We cleanse impurities from our form." user.reagents.add_reagent("mutadone", 10) diff --git a/code/game/gamemodes/changeling/powers/revive.dm b/code/game/gamemodes/changeling/powers/revive.dm index 7e9aaa79c37..ede5aa3e50b 100644 --- a/code/game/gamemodes/changeling/powers/revive.dm +++ b/code/game/gamemodes/changeling/powers/revive.dm @@ -4,7 +4,7 @@ req_stat = DEAD //Revive from revival stasis -/obj/effect/proc_holder/changeling/revive/sting_action(var/mob/living/carbon/user) +/obj/effect/proc_holder/changeling/revive/sting_action(mob/living/carbon/user) if(user.stat == DEAD) dead_mob_list -= user living_mob_list += user diff --git a/code/game/gamemodes/changeling/powers/shriek.dm b/code/game/gamemodes/changeling/powers/shriek.dm index 8642feef895..92d6c84daee 100644 --- a/code/game/gamemodes/changeling/powers/shriek.dm +++ b/code/game/gamemodes/changeling/powers/shriek.dm @@ -7,7 +7,7 @@ req_human = 1 //A flashy ability, good for crowd control and sewing chaos. -/obj/effect/proc_holder/changeling/resonant_shriek/sting_action(var/mob/user) +/obj/effect/proc_holder/changeling/resonant_shriek/sting_action(mob/user) for(var/mob/living/M in get_hearers_in_view(4, user)) if(iscarbon(M)) if(!M.mind || !M.mind.changeling) @@ -35,7 +35,7 @@ dna_cost = 1 //A flashy ability, good for crowd control and sewing chaos. -/obj/effect/proc_holder/changeling/dissonant_shriek/sting_action(var/mob/user) +/obj/effect/proc_holder/changeling/dissonant_shriek/sting_action(mob/user) for(var/obj/machinery/light/L in range(5, usr)) L.on = 1 L.broken() diff --git a/code/game/gamemodes/changeling/powers/spiders.dm b/code/game/gamemodes/changeling/powers/spiders.dm index b081d4d2f79..dc3a5b40cea 100644 --- a/code/game/gamemodes/changeling/powers/spiders.dm +++ b/code/game/gamemodes/changeling/powers/spiders.dm @@ -7,7 +7,7 @@ req_dna = 5 //Makes some spiderlings. Good for setting traps and causing general trouble. -/obj/effect/proc_holder/changeling/spiders/sting_action(var/mob/user) +/obj/effect/proc_holder/changeling/spiders/sting_action(mob/user) for(var/i=0, i<2, i++) var/obj/effect/spider/spiderling/S = new(user.loc) S.grow_as = /mob/living/simple_animal/hostile/poison/giant_spider/hunter diff --git a/code/game/gamemodes/changeling/powers/strained_muscles.dm b/code/game/gamemodes/changeling/powers/strained_muscles.dm index 9ff9f870adc..94c96ad30bc 100644 --- a/code/game/gamemodes/changeling/powers/strained_muscles.dm +++ b/code/game/gamemodes/changeling/powers/strained_muscles.dm @@ -11,7 +11,7 @@ var/stacks = 0 //Increments every 5 seconds; damage increases over time var/active = 0 //Whether or not you are a hedgehog -/obj/effect/proc_holder/changeling/strained_muscles/sting_action(var/mob/living/carbon/user) +/obj/effect/proc_holder/changeling/strained_muscles/sting_action(mob/living/carbon/user) active = !active if(active) user << "Our muscles tense and strengthen." diff --git a/code/game/gamemodes/changeling/powers/tiny_prick.dm b/code/game/gamemodes/changeling/powers/tiny_prick.dm index 42c5dd83a5a..576a4102baa 100644 --- a/code/game/gamemodes/changeling/powers/tiny_prick.dm +++ b/code/game/gamemodes/changeling/powers/tiny_prick.dm @@ -13,13 +13,13 @@ unset_sting(user) return -/obj/effect/proc_holder/changeling/sting/proc/set_sting(var/mob/user) +/obj/effect/proc_holder/changeling/sting/proc/set_sting(mob/user) user << "We prepare our sting, use alt+click or middle mouse button on target to sting them." user.mind.changeling.chosen_sting = src user.hud_used.lingstingdisplay.icon_state = sting_icon user.hud_used.lingstingdisplay.invisibility = 0 -/obj/effect/proc_holder/changeling/sting/proc/unset_sting(var/mob/user) +/obj/effect/proc_holder/changeling/sting/proc/unset_sting(mob/user) user << "We retract our sting, we can't sting anyone for now." user.mind.changeling.chosen_sting = null user.hud_used.lingstingdisplay.icon_state = null @@ -29,7 +29,7 @@ if(mind && mind.changeling && mind.changeling.chosen_sting) src.mind.changeling.chosen_sting.unset_sting(src) -/obj/effect/proc_holder/changeling/sting/can_sting(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/sting/can_sting(mob/user, mob/target) if(!..()) return if(!user.mind.changeling.chosen_sting) @@ -48,7 +48,7 @@ return return 1 -/obj/effect/proc_holder/changeling/sting/sting_feedback(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/sting/sting_feedback(mob/user, mob/target) if(!target) return user << "We stealthily sting [target.name]." @@ -78,7 +78,7 @@ return ..() -/obj/effect/proc_holder/changeling/sting/transformation/can_sting(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/sting/transformation/can_sting(mob/user, mob/target) if(!..()) return if((target.disabilities & HUSK) || !check_dna_integrity(target)) @@ -86,7 +86,7 @@ return 0 return 1 -/obj/effect/proc_holder/changeling/sting/transformation/sting_action(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/sting/transformation/sting_action(mob/user, mob/target) add_logs(user, target, "stung", "transformation sting", " new identity is [selected_dna.real_name]") var/datum/dna/NewDNA = selected_dna if(ismonkey(target)) @@ -122,7 +122,7 @@ /obj/item/weapon/melee/arm_blade/false/afterattack(atom/target, mob/user, proximity) return -/obj/effect/proc_holder/changeling/sting/false_armblade/can_sting(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/sting/false_armblade/can_sting(mob/user, mob/target) if(!..()) return if((target.disabilities & HUSK) || !check_dna_integrity(target)) @@ -130,7 +130,7 @@ return 0 return 1 -/obj/effect/proc_holder/changeling/sting/false_armblade/sting_action(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/sting/false_armblade/sting_action(mob/user, mob/target) add_logs(user, target, "stung", object="falso armblade sting") if(!target.drop_item()) @@ -164,11 +164,11 @@ chemical_cost = 25 dna_cost = 0 -/obj/effect/proc_holder/changeling/sting/extract_dna/can_sting(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/sting/extract_dna/can_sting(mob/user, mob/target) if(..()) return user.mind.changeling.can_absorb_dna(user, target) -/obj/effect/proc_holder/changeling/sting/extract_dna/sting_action(var/mob/user, var/mob/living/carbon/human/target) +/obj/effect/proc_holder/changeling/sting/extract_dna/sting_action(mob/user, mob/living/carbon/human/target) add_logs(user, target, "stung", "extraction sting") if(!(user.mind.changeling.has_dna(target.dna))) user.mind.changeling.absorb_dna(target, user) @@ -183,7 +183,7 @@ chemical_cost = 20 dna_cost = 2 -/obj/effect/proc_holder/changeling/sting/mute/sting_action(var/mob/user, var/mob/living/carbon/target) +/obj/effect/proc_holder/changeling/sting/mute/sting_action(mob/user, mob/living/carbon/target) add_logs(user, target, "stung", "mute sting") target.silent += 30 feedback_add_details("changeling_powers","MS") @@ -197,7 +197,7 @@ chemical_cost = 25 dna_cost = 1 -/obj/effect/proc_holder/changeling/sting/blind/sting_action(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/sting/blind/sting_action(mob/user, mob/target) add_logs(user, target, "stung", "blind sting") target << "Your eyes burn horrifically!" target.disabilities |= NEARSIGHT @@ -214,7 +214,7 @@ chemical_cost = 10 dna_cost = 1 -/obj/effect/proc_holder/changeling/sting/LSD/sting_action(var/mob/user, var/mob/living/carbon/target) +/obj/effect/proc_holder/changeling/sting/LSD/sting_action(mob/user, mob/living/carbon/target) add_logs(user, target, "stung", "LSD sting") spawn(rand(300,600)) if(target) @@ -230,7 +230,7 @@ chemical_cost = 15 dna_cost = 2 -/obj/effect/proc_holder/changeling/sting/cryo/sting_action(var/mob/user, var/mob/target) +/obj/effect/proc_holder/changeling/sting/cryo/sting_action(mob/user, mob/target) add_logs(user, target, "stung", "cryo sting") if(target.reagents) target.reagents.add_reagent("frostoil", 30) diff --git a/code/game/gamemodes/changeling/powers/transform.dm b/code/game/gamemodes/changeling/powers/transform.dm index 2f57a81ebb7..105c92c570c 100644 --- a/code/game/gamemodes/changeling/powers/transform.dm +++ b/code/game/gamemodes/changeling/powers/transform.dm @@ -8,7 +8,7 @@ max_genetic_damage = 3 //Change our DNA to that of somebody we've absorbed. -/obj/effect/proc_holder/changeling/transform/sting_action(var/mob/living/carbon/human/user) +/obj/effect/proc_holder/changeling/transform/sting_action(mob/living/carbon/human/user) var/datum/changeling/changeling = user.mind.changeling var/datum/dna/chosen_dna = changeling.select_dna("Select the target DNA: ", "Target DNA") diff --git a/code/game/gamemodes/changeling/traitor_chan.dm b/code/game/gamemodes/changeling/traitor_chan.dm index 2e0b22314b8..b236141c7f3 100644 --- a/code/game/gamemodes/changeling/traitor_chan.dm +++ b/code/game/gamemodes/changeling/traitor_chan.dm @@ -60,7 +60,7 @@ ..() return -/datum/game_mode/traitor/changeling/make_antag_chance(var/mob/living/carbon/human/character) //Assigns changeling to latejoiners +/datum/game_mode/traitor/changeling/make_antag_chance(mob/living/carbon/human/character) //Assigns changeling to latejoiners var/changelingcap = min( round(joined_player_list.len/(config.changeling_scaling_coeff*4))+2, round(joined_player_list.len/(config.changeling_scaling_coeff*2)) ) if(ticker.mode.changelings.len >= changelingcap) //Caps number of latejoin antagonists ..() diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 990e9d1bdb5..50fac253f91 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -7,7 +7,7 @@ var/list/cult_objectives = list() -/proc/iscultist(mob/living/M as mob) +/proc/iscultist(mob/living/M) return istype(M) && M.mind && ticker && ticker.mode && (M.mind in ticker.mode.cult) /proc/is_convertable_to_cult(datum/mind/mind) @@ -19,7 +19,7 @@ if(mind.current == ticker.mode.sacrifice_target) return 0 return 1 -/proc/cultist_commune(var/mob/living/user, var/clear = 0, var/say = 0, var/message) +/proc/cultist_commune(mob/living/user, clear = 0, say = 0, message) if(!message) return if(say) @@ -128,7 +128,7 @@ ..() -/datum/game_mode/cult/proc/memorize_cult_objectives(var/datum/mind/cult_mind) +/datum/game_mode/cult/proc/memorize_cult_objectives(datum/mind/cult_mind) for(var/obj_count = 1,obj_count <= cult_objectives.len,obj_count++) var/explanation switch(cult_objectives[obj_count]) @@ -195,7 +195,7 @@ // startwords -= word // return ..(cult_mob,word) -/datum/game_mode/proc/grant_runeword(mob/living/carbon/human/cult_mob, var/word) +/datum/game_mode/proc/grant_runeword(mob/living/carbon/human/cult_mob, word) if(!wordtravel) runerandom() if (!word) diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index bfdacd24ad3..6aaeba71931 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -11,7 +11,7 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") -/obj/item/weapon/melee/cultblade/attack(mob/living/target as mob, mob/living/carbon/human/user as mob) +/obj/item/weapon/melee/cultblade/attack(mob/living/target, mob/living/carbon/human/user) if(iscultist(user)) return ..() else @@ -23,7 +23,7 @@ user.update_damage_overlays(0) return -/obj/item/weapon/melee/cultblade/pickup(mob/living/user as mob) +/obj/item/weapon/melee/cultblade/pickup(mob/living/user) if(!iscultist(user)) user << "An overwhelming feeling of dread comes over you as you pick up the cultist's sword. It would be wise to be rid of this blade quickly." user.Dizzy(120) diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 500f4d27b6a..e146e9b349a 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -145,7 +145,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", -/obj/effect/rune/attackby(I as obj, user as mob, params) +/obj/effect/rune/attackby(obj/I, mob/user, params) if(istype(I, /obj/item/weapon/tome) && iscultist(user)) user << "You retrace your steps, carefully undoing the lines of the rune." qdel(src) @@ -157,7 +157,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", return -/obj/effect/rune/attack_hand(mob/living/user as mob) // OH GOD this is horrible +/obj/effect/rune/attack_hand(mob/living/user) // OH GOD this is horrible if(!iscultist(user)) user << "You can't mouth the arcane scratchings without fumbling over them!" return @@ -221,7 +221,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", return fizzle(user) -/obj/effect/rune/proc/fizzle(var/mob/living/cultist = null) +/obj/effect/rune/proc/fizzle(mob/living/cultist = null) var/gibberish = pick("B'ADMINES SP'WNIN SH'T","IC'IN O'OC","RO'SHA'M I'SA GRI'FF'N ME'AI","TOX'IN'S O'NM FI'RAH","IA BL'AME TOX'IN'S","FIR'A NON'AN RE'SONA","A'OI I'RS ROUA'GE","LE'OAN JU'STA SP'A'C Z'EE SH'EF","IA PT'WOBEA'RD, IA A'DMI'NEH'LP") if(cultist) @@ -489,7 +489,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", // usr << "whatev" // usr << browse(null, "window=tank") -/obj/item/weapon/tome/attack(mob/living/M as mob, mob/living/user as mob) +/obj/item/weapon/tome/attack(mob/living/M, mob/living/user) if(istype(M,/mob/dead)) M.invisibility = 0 user.visible_message( \ @@ -516,7 +516,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", add_logs(user, M, "smacked", src) -/obj/item/weapon/tome/attack_self(mob/living/user as mob) +/obj/item/weapon/tome/attack_self(mob/living/user) usr = user if(!usr.canmove || usr.stat || usr.restrained()) return @@ -649,7 +649,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", user << "The book seems full of illegible scribbles. Is this a joke?" return -/obj/item/weapon/tome/attackby(obj/item/weapon/tome/T as obj, mob/living/user as mob, params) +/obj/item/weapon/tome/attackby(obj/item/weapon/tome/T, mob/living/user, params) if(istype(T, /obj/item/weapon/tome)) // sanity check to prevent a runtime error switch(alert("Copy the runes from your tome?",,"Copy", "Cancel")) if("cancel") diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 855647ffabc..56b4044c7f2 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -6,7 +6,7 @@ var/list/sacrificed = list() ///Teleport: Teleports the user to a random teleport rune with the same rune. Can be imbued into a talisman. -/obj/effect/rune/proc/teleport(var/key) +/obj/effect/rune/proc/teleport(key) var/mob/living/user = usr var/allrunesloc[] allrunesloc = new/list() @@ -42,7 +42,7 @@ var/list/sacrificed = list() //Subtype of teleport, teleports any items and mobs on top of the rune rather than the user themselves -/obj/effect/rune/proc/itemport(var/key) +/obj/effect/rune/proc/itemport(key) // var/allrunesloc[] // allrunesloc = new/list() // var/index = 0 @@ -184,7 +184,7 @@ var/list/sacrificed = list() ///EMP: Lets out a large EMP blast -/obj/effect/rune/proc/emp(var/U,var/range_red) //range_red - var which determines by which number to reduce the default emp range, U is the source loc, needed because of talisman emps which are held in hand at the moment of using and that apparently messes things up -- Urist +/obj/effect/rune/proc/emp(U,range_red) //range_red - var which determines by which number to reduce the default emp range, U is the source loc, needed because of talisman emps which are held in hand at the moment of using and that apparently messes things up -- Urist if(istype(src,/obj/effect/rune)) usr.say("Ta'gh fara[pick("'","`")]qha fel d'amar det!") else @@ -323,7 +323,7 @@ var/list/sacrificed = list() ///Veil: Makes all surrounding runes invisible. They cannot be used directly but still used indirectly (i.e. teleport...) -/obj/effect/rune/proc/obscure(var/rad) +/obj/effect/rune/proc/obscure(rad) var/S=0 for(var/obj/effect/rune/R in orange(rad,src)) if(R!=src) @@ -638,14 +638,14 @@ var/list/sacrificed = list() for(var/mob/victim in src.loc) //TO-DO: Move the shite above into the mob's own sac_act - see /mob/living/simple_animal/pet/corgi/sac_act for an example victim.sac_act(src, victim) //Sacrifice procs are now seperate per mob, this allows us to allow sacrifice on as many mob types as we want without making an already clunky system worse -/obj/effect/rune/proc/sac_grant_word(var/mob/living/C) //The proc that which chooses a word rewarded for a successful sacrifice, sacrifices always give a currently unknown word if the normal checks pass +/obj/effect/rune/proc/sac_grant_word(mob/living/C) //The proc that which chooses a word rewarded for a successful sacrifice, sacrifices always give a currently unknown word if the normal checks pass if(C.mind.cult_words.len != ticker.mode.allwords.len) // No point running if they already know everything var/convert_word var/pick_list = ticker.mode.allwords - C.mind.cult_words convert_word = pick(pick_list) ticker.mode.grant_runeword(C, convert_word) -/obj/effect/rune/proc/stone_or_gib(var/mob/T) +/obj/effect/rune/proc/stone_or_gib(mob/T) var/obj/item/device/soulstone/stone = new /obj/item/device/soulstone(get_turf(src)) if(!stone.transfer_soul("FORCE", T, usr)) //if it fails to add soul qdel(stone) @@ -659,7 +659,7 @@ var/list/sacrificed = list() ///Reveal: Reverses the Veil rune's effect, revealing all hidden runes. -/obj/effect/rune/proc/revealrunes(var/obj/W as obj) +/obj/effect/rune/proc/revealrunes(obj/W) var/go=0 var/rad var/S=0 @@ -928,7 +928,7 @@ var/list/sacrificed = list() ///Stun: Everyone nearby would be stunned for a -very- short time. If used in a talisman, it stuns and mutes a single target. -/obj/effect/rune/proc/runestun(var/mob/living/T as mob) +/obj/effect/rune/proc/runestun(mob/living/T) if(istype(src,/obj/effect/rune)) ///When invoked as rune, flash and stun everyone around. usr.say("Fuu ma[pick("'","`")]jin!") for(var/mob/living/L in viewers(src)) diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index 1fd9ea37360..76e97bc7371 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -3,7 +3,7 @@ var/imbue = null var/uses = 0 - attack_self(mob/living/user as mob) + attack_self(mob/living/user) if(iscultist(user)) var/delete = 1 switch(imbue) @@ -42,7 +42,7 @@ return - attack(mob/living/carbon/T as mob, mob/living/user as mob) + attack(mob/living/carbon/T, mob/living/user) if(iscultist(user)) if(imbue == "runestun") user.take_organ_damage(10, 0) @@ -55,7 +55,7 @@ ..() - proc/supply(var/key) + proc/supply(key) if (!src.uses) qdel(src) return diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index fa24f0be0f7..6aa1574b4e2 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -72,7 +72,7 @@ ///post_setup() ///Everyone should now be on the station and have their normal gear. This is the place to give the special roles extra things -/datum/game_mode/proc/post_setup(var/report=1) +/datum/game_mode/proc/post_setup(report=1) spawn (ROUNDSTART_LOGOUT_REPORT_TIME) display_roundstart_logout_report() @@ -91,7 +91,7 @@ ///make_antag_chance() ///Handles late-join antag assignments -/datum/game_mode/proc/make_antag_chance(var/mob/living/carbon/human/character) +/datum/game_mode/proc/make_antag_chance(mob/living/carbon/human/character) if(replacementmode && round_converted == 2) replacementmode.make_antag_chance(character) return @@ -287,7 +287,7 @@ set_security_level(SEC_LEVEL_BLUE) -/datum/game_mode/proc/get_players_for_role(var/role) +/datum/game_mode/proc/get_players_for_role(role) var/list/players = list() var/list/candidates = list() var/list/drafted = list() @@ -471,7 +471,7 @@ if(M.client && M.client.holder) M << msg -/datum/game_mode/proc/printplayer(var/datum/mind/ply) +/datum/game_mode/proc/printplayer(datum/mind/ply) var/role = "\improper[ply.assigned_role]" var/text = "
[ply.name]([ply.key]) as \a [role] (" if(ply.current) @@ -487,7 +487,7 @@ return text -/datum/game_mode/proc/printobjectives(var/datum/mind/ply) +/datum/game_mode/proc/printobjectives(datum/mind/ply) var/text = "" var/count = 1 for(var/datum/objective/objective in ply.objectives) diff --git a/code/game/gamemodes/gang/dominator.dm b/code/game/gamemodes/gang/dominator.dm index 206a1f7d230..6475565527e 100644 --- a/code/game/gamemodes/gang/dominator.dm +++ b/code/game/gamemodes/gang/dominator.dm @@ -48,7 +48,7 @@ else SSmachine.processing -= src -/obj/machinery/dominator/proc/healthcheck(var/damage) +/obj/machinery/dominator/proc/healthcheck(damage) var/iconname = "dominator" if(gang) iconname += "-[gang.color]" @@ -128,7 +128,7 @@ healthcheck(30) return -/obj/machinery/dominator/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/dominator/bullet_act(obj/item/projectile/Proj) if(Proj.damage) if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) var/damage = Proj.damage @@ -142,7 +142,7 @@ /obj/machinery/dominator/blob_act() healthcheck(110) -/obj/machinery/dominator/attackby(I as obj, user as mob, params) +/obj/machinery/dominator/attackby(obj/I, mob/user, params) return @@ -195,7 +195,7 @@ "You hear metal scraping.") healthcheck(15) -/obj/machinery/dominator/attack_animal(mob/living/user as mob) +/obj/machinery/dominator/attack_animal(mob/living/user) if(!isanimal(user)) return var/mob/living/simple_animal/M = user @@ -218,7 +218,7 @@ "You hear metal being slammed.") healthcheck(5) -/obj/machinery/dominator/attackby(obj/item/weapon/I as obj, mob/living/user as mob, params) +/obj/machinery/dominator/attackby(obj/item/weapon/I, mob/living/user, params) if(istype(I, /obj/item/weapon)) add_fingerprint(user) user.changeNext_move(CLICK_CD_MELEE) diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm index 3b46ffd0330..b9ee7887e88 100644 --- a/code/game/gamemodes/gang/gang.dm +++ b/code/game/gamemodes/gang/gang.dm @@ -77,13 +77,13 @@ var/list/gang_colors_pool = list("red","orange","yellow","green","blue","purple" ..() -/datum/game_mode/proc/forge_gang_objectives(var/datum/mind/boss_mind) +/datum/game_mode/proc/forge_gang_objectives(datum/mind/boss_mind) var/datum/objective/rival_obj = new rival_obj.owner = boss_mind rival_obj.explanation_text = "Be the first gang to successfully takeover the station with a Dominator." boss_mind.objectives += rival_obj -/datum/game_mode/proc/greet_gang(var/datum/mind/boss_mind, var/you_are=1) +/datum/game_mode/proc/greet_gang(datum/mind/boss_mind, you_are=1) var/obj_count = 1 if (you_are) boss_mind.current << "You are the Boss of the [boss_mind.gang_datum.name] Gang!" @@ -147,7 +147,7 @@ var/list/gang_colors_pool = list("red","orange","yellow","green","blue","purple" /////////////////////////////////////////// //Deals with converting players to a gang// /////////////////////////////////////////// -/datum/game_mode/proc/add_gangster(datum/mind/gangster_mind, var/datum/gang/G, var/check = 1) +/datum/game_mode/proc/add_gangster(datum/mind/gangster_mind, datum/gang/G, check = 1) if(!G || (gangster_mind in get_all_gangsters())) return 0 if(check && isloyal(gangster_mind.current)) //Check to see if the potential gangster is implanted @@ -171,7 +171,7 @@ var/list/gang_colors_pool = list("red","orange","yellow","green","blue","purple" //////////////////////////////////////////////////////////////////// //Deals with players reverting to neutral (Not a gangster anymore)// //////////////////////////////////////////////////////////////////// -/datum/game_mode/proc/remove_gangster(datum/mind/gangster_mind, var/beingborged, var/silent, var/remove_bosses=0) +/datum/game_mode/proc/remove_gangster(datum/mind/gangster_mind, beingborged, silent, remove_bosses=0) var/datum/gang/gang = gangster_mind.gang_datum if(!gang) return 0 @@ -255,7 +255,7 @@ var/list/gang_colors_pool = list("red","orange","yellow","green","blue","purple" -/datum/game_mode/proc/gang_membership_report(var/list/membership) +/datum/game_mode/proc/gang_membership_report(list/membership) var/text = "" for(var/datum/mind/gang_mind in membership) text += "
[gang_mind.key] was [gang_mind.name] (" diff --git a/code/game/gamemodes/gang/gang_datum.dm b/code/game/gamemodes/gang/gang_datum.dm index 9fda51eb919..99fce43f8e6 100644 --- a/code/game/gamemodes/gang/gang_datum.dm +++ b/code/game/gamemodes/gang/gang_datum.dm @@ -55,7 +55,7 @@ ganghud.leave_hud(defector_mind.current) ticker.mode.set_antag_hud(defector_mind.current, null) -/datum/gang/proc/domination(var/modifier=1) +/datum/gang/proc/domination(modifier=1) dom_timer = get_domination_time(src) * modifier set_security_level("delta") SSshuttle.emergencyNoEscape = 1 @@ -64,7 +64,7 @@ //Used by recallers when purchasing a gang outfit. First time a gang outfit is purchased the buyer decides a gang style which is stored so gang outfits are uniform -/datum/gang/proc/gang_outfit(mob/living/carbon/user,var/obj/item/device/gangtool/gangtool) +/datum/gang/proc/gang_outfit(mob/living/carbon/user,obj/item/device/gangtool/gangtool) if(!user || !gangtool) return 0 if(!gangtool.can_use(user)) @@ -110,7 +110,7 @@ //////////////////////////////////////////// MESSAGING -/datum/gang/proc/message_gangtools(var/message,var/beep=1,var/warning) +/datum/gang/proc/message_gangtools(message,beep=1,warning) if(!gangtools.len || !message) return for(var/obj/item/device/gangtool/tool in gangtools) diff --git a/code/game/gamemodes/gang/recaller.dm b/code/game/gamemodes/gang/recaller.dm index 6cfc0a742ad..dafdb485cd5 100644 --- a/code/game/gamemodes/gang/recaller.dm +++ b/code/game/gamemodes/gang/recaller.dm @@ -313,7 +313,7 @@ attack_self(usr) -/obj/item/device/gangtool/proc/ping_gang(var/mob/user) +/obj/item/device/gangtool/proc/ping_gang(mob/user) if(!user) return var/message = stripped_input(user,"Discreetly send a gang-wide message.","Send Message") as null|text @@ -335,7 +335,7 @@ log_game("[key_name(user)] Messaged [gang.name] Gang: [message].") -/obj/item/device/gangtool/proc/register_device(var/mob/user) +/obj/item/device/gangtool/proc/register_device(mob/user) if(gang) //It's already been registered! return if((promotable && (user.mind in ticker.mode.get_gangsters())) || (user.mind in ticker.mode.get_gang_bosses())) diff --git a/code/game/gamemodes/intercept_report.dm b/code/game/gamemodes/intercept_report.dm index 730fff0d91a..2b16b298975 100644 --- a/code/game/gamemodes/intercept_report.dm +++ b/code/game/gamemodes/intercept_report.dm @@ -55,7 +55,7 @@ ) -/datum/intercept_text/proc/build(var/mode_type, datum/mind/correct_person) +/datum/intercept_text/proc/build(mode_type, datum/mind/correct_person) switch(mode_type) if("revolution") src.text = "" diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index e89be96093c..c88dc2d2f99 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -225,7 +225,7 @@ power_type = /mob/living/silicon/ai/proc/overload_machine -/mob/living/silicon/ai/proc/overload_machine(obj/machinery/M as obj in world) +/mob/living/silicon/ai/proc/overload_machine(obj/machinery/M in world) set name = "Overload Machine" set category = "Malfunction" @@ -255,7 +255,7 @@ power_type = /mob/living/silicon/ai/proc/override_machine -/mob/living/silicon/ai/proc/override_machine(obj/machinery/M as obj in world) +/mob/living/silicon/ai/proc/override_machine(obj/machinery/M in world) set name = "Override Machine" set category = "Malfunction" @@ -380,7 +380,7 @@ power_type = /mob/living/silicon/ai/proc/reactivate_camera -/mob/living/silicon/ai/proc/reactivate_camera(obj/machinery/camera/C as obj in cameranet.cameras) +/mob/living/silicon/ai/proc/reactivate_camera(obj/machinery/camera/C in cameranet.cameras) set name = "Reactivate Camera" set category = "Malfunction" @@ -408,7 +408,7 @@ power_type = /mob/living/silicon/ai/proc/upgrade_camera -/mob/living/silicon/ai/proc/upgrade_camera(obj/machinery/camera/C as obj in cameranet.cameras) +/mob/living/silicon/ai/proc/upgrade_camera(obj/machinery/camera/C in cameranet.cameras) set name = "Upgrade Camera" set category = "Malfunction" @@ -458,13 +458,13 @@ if(AM.power_type != null) src.possible_modules += AM -/datum/module_picker/proc/remove_verbs(var/mob/living/silicon/ai/A) +/datum/module_picker/proc/remove_verbs(mob/living/silicon/ai/A) for(var/datum/AI_Module/AM in possible_modules) A.verbs.Remove(AM.power_type) -/datum/module_picker/proc/use(user as mob) +/datum/module_picker/proc/use(mob/user) var/dat dat = "Select use of processing time: (currently #[src.processing_time] left.)
" dat += "
" diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm index 6d0feda4a1e..e6b7500a866 100644 --- a/code/game/gamemodes/malfunction/malfunction.dm +++ b/code/game/gamemodes/malfunction/malfunction.dm @@ -29,7 +29,7 @@ required_players = max(required_enemies+1, required_players) //to prevent issues if players are set too low return ..() -/datum/game_mode/malfunction/get_players_for_role(var/role = BE_MALF) +/datum/game_mode/malfunction/get_players_for_role(role = BE_MALF) var/datum/job/ai/DummyAIjob = new for(var/mob/new_player/player in player_list) if(player.client && player.ready) @@ -71,7 +71,7 @@ ..() -/datum/game_mode/proc/greet_malf(var/datum/mind/malf) +/datum/game_mode/proc/greet_malf(datum/mind/malf) malf.current << "You are malfunctioning! You do not have to follow any laws." malf.current << "The crew do not know you have malfunctioned. You may keep it a secret or go wild." malf.current << "You must override the programming of the station's APCs to assume full control of the station." diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index eb00c258223..f6dd06738a5 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -20,11 +20,11 @@ //Meteor spawning global procs /////////////////////////////// -/proc/spawn_meteors(var/number = 10, var/list/meteortypes) +/proc/spawn_meteors(number = 10, list/meteortypes) for(var/i = 0; i < number; i++) spawn_meteor(meteortypes) -/proc/spawn_meteor(var/list/meteortypes) +/proc/spawn_meteor(list/meteortypes) var/turf/pickedstart var/turf/pickedgoal var/max_i = 10//number of tries to spawn meteor. @@ -133,7 +133,7 @@ playsound(src.loc, meteorsound, 40, 1) get_hit() -/obj/effect/meteor/proc/ram_turf(var/turf/T) +/obj/effect/meteor/proc/ram_turf(turf/T) //first bust whatever is in the turf for(var/atom/A in T) if(A != src) @@ -157,7 +157,7 @@ /obj/effect/meteor/ex_act() return -/obj/effect/meteor/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/effect/meteor/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/pickaxe)) qdel(src) return @@ -168,7 +168,7 @@ var/obj/item/O = new meteordrop(get_turf(src)) O.throw_at(dest, 5, 10) -/obj/effect/meteor/proc/meteor_effect(var/sound=1) +/obj/effect/meteor/proc/meteor_effect(sound=1) if(sound) for(var/mob/M in player_list) var/turf/T = get_turf(M) @@ -257,7 +257,7 @@ new meteorgibs(get_turf(src)) -/obj/effect/meteor/meaty/ram_turf(var/turf/T) +/obj/effect/meteor/meaty/ram_turf(turf/T) if(!istype(T, /turf/space)) new /obj/effect/decal/cleanable/blood (T) @@ -271,7 +271,7 @@ meteordrop = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno meteorgibs = /obj/effect/gibspawner/xeno -/obj/effect/meteor/meaty/xeno/ram_turf(var/turf/T) +/obj/effect/meteor/meaty/xeno/ram_turf(turf/T) if(!istype(T, /turf/space)) new /obj/effect/decal/cleanable/xenoblood (T) diff --git a/code/game/gamemodes/monkey/monkey.dm b/code/game/gamemodes/monkey/monkey.dm index d27155825c0..647230a4963 100644 --- a/code/game/gamemodes/monkey/monkey.dm +++ b/code/game/gamemodes/monkey/monkey.dm @@ -45,7 +45,7 @@ Monkeys: Ensure that your kind lives on! Rise up against your captors!" -/datum/game_mode/monkey/proc/greet_carrier(var/datum/mind/carrier) +/datum/game_mode/monkey/proc/greet_carrier(datum/mind/carrier) carrier.current << "You are the Jungle Fever patient zero!!" carrier.current << "You have been planted onto this station by the Animal Rights Consortium." carrier.current << "Soon the disease will transform you into an ape. Afterwards, you will be able spread the infection to others with a bite." diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index f549e8c8815..45f5ca57397 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -109,7 +109,7 @@ return ..() -/datum/game_mode/proc/prepare_syndicate_leader(var/datum/mind/synd_mind, var/nuke_code) +/datum/game_mode/proc/prepare_syndicate_leader(datum/mind/synd_mind, nuke_code) var/leader_title = pick("Czar", "Boss", "Commander", "Chief", "Kingpin", "Director", "Overlord") spawn(1) NukeNameAssign(nukelastname(synd_mind.current),syndicates) //allows time for the rest of the syndies to be chosen @@ -138,13 +138,13 @@ return -/datum/game_mode/proc/forge_syndicate_objectives(var/datum/mind/syndicate) +/datum/game_mode/proc/forge_syndicate_objectives(datum/mind/syndicate) var/datum/objective/nuclear/syndobj = new syndobj.owner = syndicate syndicate.objectives += syndobj -/datum/game_mode/proc/greet_syndicate(var/datum/mind/syndicate, var/you_are=1) +/datum/game_mode/proc/greet_syndicate(datum/mind/syndicate, you_are=1) if (you_are) syndicate.current << "You are a [syndicate_name()] agent!" var/obj_count = 1 @@ -316,7 +316,7 @@ return 1 -/proc/nukelastname(var/mob/M as mob) //--All praise goes to NEO|Phyte, all blame goes to DH, and it was Cindi-Kate's idea. Also praise Urist for copypasta ho. +/proc/nukelastname(mob/M) //--All praise goes to NEO|Phyte, all blame goes to DH, and it was Cindi-Kate's idea. Also praise Urist for copypasta ho. var/randomname = pick(last_names) var/newname = copytext(sanitize(input(M,"You are the nuke operative [pick("Czar", "Boss", "Commander", "Chief", "Kingpin", "Director", "Overlord")]. Please choose a last name for your family.", "Name change",randomname)),1,MAX_NAME_LEN) @@ -330,7 +330,7 @@ return capitalize(newname) -/proc/NukeNameAssign(var/lastname,var/list/syndicates) +/proc/NukeNameAssign(lastname,list/syndicates) for(var/datum/mind/synd_mind in syndicates) var/mob/living/carbon/human/H = synd_mind.current synd_mind.name = H.dna.species.random_name(H.gender,0,lastname) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 3adb24a8a0c..ff133d7980c 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -212,13 +212,13 @@ var/bomb_set attack_hand(M) return -/obj/machinery/nuclearbomb/attack_paw(mob/user as mob) +/obj/machinery/nuclearbomb/attack_paw(mob/user) return attack_hand(user) -/obj/machinery/nuclearbomb/attack_ai(mob/user as mob) +/obj/machinery/nuclearbomb/attack_ai(mob/user) return -/obj/machinery/nuclearbomb/attack_hand(mob/user as mob) +/obj/machinery/nuclearbomb/attack_hand(mob/user) user.set_machine(src) var/dat = text("\nAuth. Disk: []
", src, (auth ? "++++++++++" : "----------")) if (auth) diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index b63b140982c..2d145a525d4 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -167,7 +167,7 @@ var/obj/docking_port/mobile/home -/obj/item/weapon/pinpointer/nukeop/attack_self(mob/user as mob) +/obj/item/weapon/pinpointer/nukeop/attack_self(mob/user) if(!active) active = 1 var/mode_text = "Authentication Disk Locator mode" diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 109b8b2770d..0ea208a2fcd 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -352,7 +352,7 @@ var/global/list/possible_items = list() approved_targets += possible_item return set_target(safepick(approved_targets)) -/datum/objective/steal/proc/set_target(var/datum/objective_item/item) +/datum/objective/steal/proc/set_target(datum/objective_item/item) if(item) targetinfo = item @@ -428,7 +428,7 @@ var/global/list/possible_items_special = list() /datum/objective/steal/exchange dangerrating = 10 -/datum/objective/steal/exchange/proc/set_faction(var/faction,var/otheragent) +/datum/objective/steal/exchange/proc/set_faction(faction,otheragent) target = otheragent if(faction == "red") targetinfo = new/datum/objective_item/unique/docs_blue @@ -449,7 +449,7 @@ var/global/list/possible_items_special = list() /datum/objective/steal/exchange/backstab dangerrating = 3 -/datum/objective/steal/exchange/backstab/set_faction(var/faction) +/datum/objective/steal/exchange/backstab/set_faction(faction) if(faction == "red") targetinfo = new/datum/objective_item/unique/docs_red else if(faction == "blue") @@ -537,7 +537,7 @@ var/global/list/possible_items_special = list() /datum/objective/absorb dangerrating = 10 -/datum/objective/absorb/proc/gen_amount_goal(var/lowbound = 4, var/highbound = 6) +/datum/objective/absorb/proc/gen_amount_goal(lowbound = 4, highbound = 6) target_amount = rand (lowbound,highbound) if (ticker) var/n_p = 1 //autowin diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm index e1d07164042..430b4c405f7 100644 --- a/code/game/gamemodes/objective_items.dm +++ b/code/game/gamemodes/objective_items.dm @@ -91,7 +91,7 @@ difficulty = 3 excludefromjob = list("Chief Engineer","Research Director","Station Engineer","Scientist","Atmospheric Technician") -/datum/objective_item/plasma/check_special_completion(var/obj/item/weapon/tank/T) +/datum/objective_item/plasma/check_special_completion(obj/item/weapon/tank/T) var/target_amount = text2num(name) var/found_amount = 0 found_amount += T.air_contents.toxins @@ -103,7 +103,7 @@ targetitem = /obj/item/device/aicard difficulty = 20 //beyond the impossible -/datum/objective_item/functionalai/check_special_completion(var/obj/item/device/aicard/C) +/datum/objective_item/functionalai/check_special_completion(obj/item/device/aicard/C) for(var/mob/living/silicon/ai/A in C) if(istype(A, /mob/living/silicon/ai) && A.stat != 2) //See if any AI's are alive inside that card. return 1 @@ -116,7 +116,7 @@ excludefromjob = list("Chief Engineer") altitems = list(/obj/item/weapon/photo) -/datum/objective_item/blueprints/check_special_completion(var/obj/item/I) +/datum/objective_item/blueprints/check_special_completion(obj/item/I) if(istype(I, /obj/item/areaeditor/blueprints)) return 1 if(istype(I, /obj/item/weapon/photo)) @@ -131,7 +131,7 @@ difficulty = 3 excludefromjob = list("Research Director","Scientist") -/datum/objective_item/slime/check_special_completion(var/obj/item/slime_extract/E) +/datum/objective_item/slime/check_special_completion(obj/item/slime_extract/E) if(E.Uses > 0) return 1 return 0 @@ -189,7 +189,7 @@ targetitem = /obj/item/stack/sheet/cardboard difficulty = 9001 -/datum/objective_item/stack/check_special_completion(var/obj/item/stack/S) +/datum/objective_item/stack/check_special_completion(obj/item/stack/S) var/target_amount = text2num(name) var/found_amount = 0 diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 58d915a0559..c198a583328 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -95,7 +95,7 @@ return 0 -/datum/game_mode/proc/forge_revolutionary_objectives(var/datum/mind/rev_mind) +/datum/game_mode/proc/forge_revolutionary_objectives(datum/mind/rev_mind) var/list/heads = get_living_heads() for(var/datum/mind/head_mind in heads) var/datum/objective/mutiny/rev_obj = new @@ -104,7 +104,7 @@ rev_obj.explanation_text = "Assassinate or exile [head_mind.name], the [head_mind.assigned_role]." rev_mind.objectives += rev_obj -/datum/game_mode/proc/greet_revolutionary(var/datum/mind/rev_mind, var/you_are=1) +/datum/game_mode/proc/greet_revolutionary(datum/mind/rev_mind, you_are=1) var/obj_count = 1 if (you_are) rev_mind.current << "You are a member of the revolutionaries' leadership!" @@ -150,7 +150,7 @@ ///////////////////////////////// //Gives head revs their targets// ///////////////////////////////// -/datum/game_mode/revolution/proc/mark_for_death(var/datum/mind/rev_mind, var/datum/mind/head_mind) +/datum/game_mode/revolution/proc/mark_for_death(datum/mind/rev_mind, datum/mind/head_mind) var/datum/objective/mutiny/rev_obj = new rev_obj.owner = rev_mind rev_obj.target = head_mind diff --git a/code/game/gamemodes/shadowling/ascendant_shadowling.dm b/code/game/gamemodes/shadowling/ascendant_shadowling.dm index dbc93ef2273..c0dc989a7b3 100644 --- a/code/game/gamemodes/shadowling/ascendant_shadowling.dm +++ b/code/game/gamemodes/shadowling/ascendant_shadowling.dm @@ -32,7 +32,7 @@ faction = list("faithless") -/mob/living/simple_animal/ascendant_shadowling/Process_Spacemove(var/movement_dir = 0) +/mob/living/simple_animal/ascendant_shadowling/Process_Spacemove(movement_dir = 0) return 1 //copypasta from carp code /mob/living/simple_animal/ascendant_shadowling/get_spans() diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm index 7cfd5f675d9..52fb5a2899e 100644 --- a/code/game/gamemodes/shadowling/shadowling.dm +++ b/code/game/gamemodes/shadowling/shadowling.dm @@ -112,14 +112,14 @@ Made by Xhuis ..() return -/datum/game_mode/proc/greet_shadow(var/datum/mind/shadow) +/datum/game_mode/proc/greet_shadow(datum/mind/shadow) shadow.current << "Currently, you are disguised as an employee aboard [world.name]." shadow.current << "In your limited state, you have three abilities: Enthrall, Hatch, and Hivemind Commune." shadow.current << "Any other shadowlings are you allies. You must assist them as they shall assist you." shadow.current << "If you are new to shadowling, or want to read about abilities, check the wiki page at https://tgstation13.org/wiki/Shadowling
" -/datum/game_mode/proc/process_shadow_objectives(var/datum/mind/shadow_mind) +/datum/game_mode/proc/process_shadow_objectives(datum/mind/shadow_mind) var/objective = "enthrall" //may be devour later, but for now it seems murderbone-y if(objective == "enthrall") @@ -129,7 +129,7 @@ Made by Xhuis shadow_mind.current << "Objective #1: [objective_explanation]
" -/datum/game_mode/proc/finalize_shadowling(var/datum/mind/shadow_mind) +/datum/game_mode/proc/finalize_shadowling(datum/mind/shadow_mind) var/mob/living/carbon/human/S = shadow_mind.current shadow_mind.current.verbs += /mob/living/carbon/human/proc/shadowling_hatch shadow_mind.spell_list += new /obj/effect/proc_holder/spell/targeted/enthrall diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm index dbc3715dfb5..ad849f8e924 100644 --- a/code/game/gamemodes/shadowling/shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm @@ -38,7 +38,7 @@ range = 5 var/blacklisted_lights = list(/obj/item/device/flashlight/flare, /obj/item/device/flashlight/slime) -/obj/effect/proc_holder/spell/aoe_turf/veil/proc/extinguishItem(var/obj/item/I) //WARNING NOT SUFFICIENT TO EXTINGUISH AN ITEM HELD BY A MOB +/obj/effect/proc_holder/spell/aoe_turf/veil/proc/extinguishItem(obj/item/I) //WARNING NOT SUFFICIENT TO EXTINGUISH AN ITEM HELD BY A MOB if(istype(I, /obj/item/device/flashlight)) var/obj/item/device/flashlight/F = I if(F.on) @@ -53,7 +53,7 @@ I.SetLuminosity(0) return I.luminosity -/obj/effect/proc_holder/spell/aoe_turf/veil/proc/extinguishMob(var/mob/living/H) +/obj/effect/proc_holder/spell/aoe_turf/veil/proc/extinguishMob(mob/living/H) var/blacklistLuminosity = 0 for(var/obj/item/F in H) blacklistLuminosity += extinguishItem(F) @@ -375,7 +375,7 @@ datum/reagent/shadowling_blindness_smoke //Blinds non-shadowlings, heals shadowl color = "#000000" //Complete black (RGB: 0, 0, 0) metabolization_rate = 100 //lel -/datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) +/datum/reagent/shadowling_blindness_smoke/on_mob_life(mob/living/M) if(!M) M = holder.my_atom if(!is_shadow_or_thrall(M)) M << "You breathe in the black smoke, and your eyes burn horribly!" @@ -441,7 +441,7 @@ datum/reagent/shadowling_blindness_smoke //Blinds non-shadowlings, heals shadowl var/targetsDrained var/list/nearbyTargets -/obj/effect/proc_holder/spell/aoe_turf/drainLife/cast(list/targets, var/mob/living/carbon/human/U = usr) +/obj/effect/proc_holder/spell/aoe_turf/drainLife/cast(list/targets, mob/living/carbon/human/U = usr) targetsDrained = 0 nearbyTargets = list() for(var/turf/T in targets) diff --git a/code/game/gamemodes/shadowling/shadowling_items.dm b/code/game/gamemodes/shadowling/shadowling_items.dm index 01e0f5ae928..3d35167214f 100644 --- a/code/game/gamemodes/shadowling/shadowling_items.dm +++ b/code/game/gamemodes/shadowling/shadowling_items.dm @@ -94,7 +94,7 @@ sleep(100) qdel(src) -/obj/structure/shadow_vortex/Crossed(var/td) +/obj/structure/shadow_vortex/Crossed(td) ..() if(ismob(td)) td << "You enter the rift. Sickening chimes begin to jangle in your ears. \ diff --git a/code/game/gamemodes/traitor/double_agents.dm b/code/game/gamemodes/traitor/double_agents.dm index d614da9b9ca..e444726bfa7 100644 --- a/code/game/gamemodes/traitor/double_agents.dm +++ b/code/game/gamemodes/traitor/double_agents.dm @@ -28,7 +28,7 @@ target_list[traitor] = traitors[i + 1] ..() -/datum/game_mode/traitor/double_agents/forge_traitor_objectives(var/datum/mind/traitor) +/datum/game_mode/traitor/double_agents/forge_traitor_objectives(datum/mind/traitor) if(target_list.len && target_list[traitor]) // Is a double agent @@ -48,7 +48,7 @@ ..() // Give them standard objectives. return -/datum/game_mode/traitor/double_agents/add_latejoin_traitor(var/datum/mind/character) +/datum/game_mode/traitor/double_agents/add_latejoin_traitor(datum/mind/character) check_potential_agents() diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 6c7b57edd47..e45a673a364 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -69,7 +69,7 @@ ..() return 1 -/datum/game_mode/traitor/make_antag_chance(var/mob/living/carbon/human/character) //Assigns traitor to latejoiners +/datum/game_mode/traitor/make_antag_chance(mob/living/carbon/human/character) //Assigns traitor to latejoiners var/traitorcap = min(round(joined_player_list.len / (config.traitor_scaling_coeff * 2)) + 2 + num_modifier, round(joined_player_list.len/config.traitor_scaling_coeff) + num_modifier ) if(ticker.mode.traitors.len >= traitorcap) //Upper cap for number of latejoin antagonists return @@ -80,11 +80,11 @@ if(!(character.job in restricted_jobs)) add_latejoin_traitor(character.mind) -/datum/game_mode/traitor/proc/add_latejoin_traitor(var/datum/mind/character) +/datum/game_mode/traitor/proc/add_latejoin_traitor(datum/mind/character) character.make_Traitor() -/datum/game_mode/proc/forge_traitor_objectives(var/datum/mind/traitor) +/datum/game_mode/proc/forge_traitor_objectives(datum/mind/traitor) if(istype(traitor.current, /mob/living/silicon)) var/objective_count = 0 @@ -169,7 +169,7 @@ -/datum/game_mode/proc/greet_traitor(var/datum/mind/traitor) +/datum/game_mode/proc/greet_traitor(datum/mind/traitor) traitor.current << "You are the [traitor_name]." var/obj_count = 1 for(var/datum/objective/objective in traitor.objectives) @@ -272,7 +272,7 @@ return 1 -/datum/game_mode/proc/equip_traitor(mob/living/carbon/human/traitor_mob, var/safety = 0) +/datum/game_mode/proc/equip_traitor(mob/living/carbon/human/traitor_mob, safety = 0) if (!istype(traitor_mob)) return . = 1 @@ -325,7 +325,7 @@ if(!safety)//If they are not a rev. Can be added on to. give_codewords(traitor_mob) -/datum/game_mode/proc/assign_exchange_role(var/datum/mind/owner) +/datum/game_mode/proc/assign_exchange_role(datum/mind/owner) //set faction var/faction = "red" if(owner == exchange_blue) diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 3fb8fe34f4b..639ae937977 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -20,7 +20,7 @@ var/rend_desc = "You should run now." var/spawn_fast = 0 //if 1, ignores checking for mobs on loc before spawning -/obj/item/weapon/veilrender/attack_self(mob/user as mob) +/obj/item/weapon/veilrender/attack_self(mob/user) if(charges > 0) new /obj/effect/rend(get_turf(usr), spawn_type, spawn_amt, rend_desc, spawn_fast) charges-- @@ -57,7 +57,7 @@ if(spawn_amt_left <= 0) qdel(src) -/obj/effect/rend/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/effect/rend/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/nullrod)) user.visible_message("[usr] seals \the [src] with \the [I].") qdel(src) @@ -95,7 +95,7 @@ force = 15 hitsound = 'sound/items/welder2.ogg' -/obj/item/weapon/scrying/attack_self(mob/user as mob) +/obj/item/weapon/scrying/attack_self(mob/user) user << "You can see...everything!" visible_message("[usr] stares into [src], their eyes glazing over.") user.ghostize(1) @@ -162,7 +162,7 @@ listclearnulls(spooky_scaries) //Funny gimmick, skeletons always seem to wear roman/ancient armour -/obj/item/device/necromantic_stone/proc/equip_roman_skeleton(var/mob/living/carbon/human/H) +/obj/item/device/necromantic_stone/proc/equip_roman_skeleton(mob/living/carbon/human/H) for(var/obj/item/I in H) H.unEquip(I) diff --git a/code/game/gamemodes/wizard/raginmages.dm b/code/game/gamemodes/wizard/raginmages.dm index 6f19d7cdd0d..d59f47796b5 100644 --- a/code/game/gamemodes/wizard/raginmages.dm +++ b/code/game/gamemodes/wizard/raginmages.dm @@ -24,7 +24,7 @@ max_mages = 20 if(max_mages < 1) max_mages = 1 -/datum/game_mode/wizard/raginmages/greet_wizard(var/datum/mind/wizard, var/you_are=1) +/datum/game_mode/wizard/raginmages/greet_wizard(datum/mind/wizard, you_are=1) if (you_are) wizard.current << "You are the Space Wizard!" wizard.current << "The Space Wizards Federation has given you the following tasks:" @@ -123,7 +123,7 @@ world << "The crew has managed to hold off the wizard attack! The Space Wizards Federation has been taught a lesson they will not soon forget!" ..(1) -/datum/game_mode/wizard/raginmages/proc/makeBody(var/mob/dead/observer/G_found) // Uses stripped down and bastardized code from respawn character +/datum/game_mode/wizard/raginmages/proc/makeBody(mob/dead/observer/G_found) // Uses stripped down and bastardized code from respawn character if(!G_found || !G_found.key) return //First we spawn a dude. diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm index 7d1a612ecfc..d7f0cfc38e8 100644 --- a/code/game/gamemodes/wizard/rightandwrong.dm +++ b/code/game/gamemodes/wizard/rightandwrong.dm @@ -1,6 +1,6 @@ //In this file: Summon Magic/Summon Guns/Summon Events -/proc/rightandwrong(var/summon_type, var/mob/user, var/survivor_probability) //0 = Summon Guns, 1 = Summon Magic +/proc/rightandwrong(summon_type, mob/user, survivor_probability) //0 = Summon Guns, 1 = Summon Magic var/list/gunslist = list("taser","egun","laser","revolver","detective","c20r","nuclear","deagle","gyrojet","pulse","suppressed","cannon","doublebarrel","shotgun","combatshotgun","bulldog","mateba","sabr","crossbow","saw","car","boltaction","speargun","arg","uzi") var/list/magiclist = list("fireball","smoke","blind","mindswap","forcewall","knock","horsemask","charge", "summonitem", "wandnothing", "wanddeath", "wandresurrection", "wandpolymorph", "wandteleport", "wanddoor", "wandfireball", "staffchange", "staffhealing", "armor", "scrying","staffdoor", "special") var/list/magicspeciallist = list("staffchange","staffanimation", "wandbelt", "contract", "staffchaos", "necromantic") diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index ce8e20d8009..00a3306e3e1 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -13,14 +13,14 @@ /obj/item/device/soulstone/anybody usability = 1 -/obj/item/device/soulstone/pickup(mob/living/user as mob) +/obj/item/device/soulstone/pickup(mob/living/user) if(!iscultist(user) && !iswizard(user) && !usability) user << "An overwhelming feeling of dread comes over you as you pick up the soulstone. It would be wise to be rid of this quickly." user.Dizzy(120) //////////////////////////////Capturing//////////////////////////////////////////////////////// -/obj/item/device/soulstone/attack(mob/living/carbon/human/M as mob, mob/user as mob) +/obj/item/device/soulstone/attack(mob/living/carbon/human/M, mob/user) if(!iscultist(user) && !iswizard(user) && !usability) user.Paralyse(5) user << "Your body is wracked with debilitating pain!" @@ -92,7 +92,7 @@ icon_state = "construct" desc = "A wicked machine used by those skilled in magical arts. It is inactive" -/obj/structure/constructshell/attackby(obj/item/O as obj, mob/user as mob, params) +/obj/structure/constructshell/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/device/soulstone)) var/obj/item/device/soulstone/SS = O SS.transfer_soul("CONSTRUCT",src,user) @@ -101,7 +101,7 @@ ////////////////////////////Proc for moving soul in and out off stone////////////////////////////////////// -/obj/item/device/soulstone/proc/transfer_soul(var/choice as text, var/target, var/mob/U as mob). +/obj/item/device/soulstone/proc/transfer_soul(choice as text, target, mob/U). switch(choice) if("FORCE") if(!iscarbon(target)) //TO-DO: Add sacrifice stoning for non-organics, just because you have no body doesnt mean you dont have a soul @@ -188,7 +188,7 @@ return -/proc/makeNewConstruct(var/mob/living/simple_animal/construct/ctype, var/mob/target, var/mob/stoner = null, cultoverride = 0) +/proc/makeNewConstruct(mob/living/simple_animal/construct/ctype, mob/target, mob/stoner = null, cultoverride = 0) var/mob/living/simple_animal/construct/newstruct = new ctype(get_turf(target)) newstruct.faction |= "\ref[stoner]" newstruct.key = target.key @@ -207,7 +207,7 @@ newstruct.cancel_camera() -/obj/item/device/soulstone/proc/init_shade(var/obj/item/device/soulstone/C, var/mob/living/carbon/human/T, var/mob/U as mob, var/vic = 0) +/obj/item/device/soulstone/proc/init_shade(obj/item/device/soulstone/C, mob/living/carbon/human/T, mob/U, vic = 0) new /obj/effect/decal/remains/human(T.loc) //Spawns a skeleton T.invisibility = 101 var/atom/movable/overlay/animation = new /atom/movable/overlay( T.loc ) diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 4f1b195dadb..e47331ed349 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -13,11 +13,11 @@ /datum/spellbook_entry/proc/IsAvailible() // For config prefs / gamemode restrictions - these are round applied return 1 -/datum/spellbook_entry/proc/CanBuy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) // Specific circumstances +/datum/spellbook_entry/proc/CanBuy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) // Specific circumstances if(book.usesYou have learned [S.name]." return 1 -/datum/spellbook_entry/proc/CanRefund(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) +/datum/spellbook_entry/proc/CanRefund(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) if(!refundable) return 0 if(!S) @@ -65,7 +65,7 @@ return 1 return 0 -/datum/spellbook_entry/proc/Refund(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) //return point value or -1 for failure +/datum/spellbook_entry/proc/Refund(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) //return point value or -1 for failure var/area/wizard_station/A = locate() if(!(user in A.contents)) user << "You can only refund spells at the wizard lair" @@ -205,7 +205,7 @@ var/item_path= null -/datum/spellbook_entry/item/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) +/datum/spellbook_entry/item/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) new item_path(get_turf(user)) feedback_add_details("wizard_spell_learned",log_name) return 1 @@ -249,7 +249,7 @@ item_path = /obj/item/weapon/scrying log_name = "SO" -/datum/spellbook_entry/item/scryingorb/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) +/datum/spellbook_entry/item/scryingorb/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) if(..()) if (!(user.dna.check_mutation(XRAY))) user.dna.add_mutation(XRAY) @@ -261,7 +261,7 @@ item_path = /obj/item/weapon/storage/belt/soulstone/full log_name = "SS" -/datum/spellbook_entry/item/soulstones/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) +/datum/spellbook_entry/item/soulstones/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) . =..() if(.) user.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/construct(null)) @@ -285,7 +285,7 @@ item_path = /obj/item/clothing/suit/space/hardsuit/wizard log_name = "HS" -/datum/spellbook_entry/item/armor/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) +/datum/spellbook_entry/item/armor/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) . = ..() if(.) new /obj/item/clothing/shoes/sandal(get_turf(user)) //In case they've lost them. @@ -310,7 +310,7 @@ buy_word = "Cast" var/active = 0 -/datum/spellbook_entry/summon/CanBuy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) +/datum/spellbook_entry/summon/CanBuy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) return ..() && !active /datum/spellbook_entry/summon/GetInfo() @@ -337,7 +337,7 @@ return 0 return (ticker.mode.name != "ragin' mages" && !config.no_summon_guns) -/datum/spellbook_entry/summon/guns/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) +/datum/spellbook_entry/summon/guns/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) feedback_add_details("wizard_spell_learned",log_name) rightandwrong(0, user, 25) playsound(get_turf(user),"sound/magic/CastSummon.ogg",50,1) @@ -356,7 +356,7 @@ return 0 return (ticker.mode.name != "ragin' mages" && !config.no_summon_magic) -/datum/spellbook_entry/summon/magic/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) +/datum/spellbook_entry/summon/magic/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) feedback_add_details("wizard_spell_learned",log_name) rightandwrong(1, user, 0) book.uses += 1 @@ -377,7 +377,7 @@ return 0 return (ticker.mode.name != "ragin' mages" && !config.no_summon_events) -/datum/spellbook_entry/summon/events/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) +/datum/spellbook_entry/summon/events/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) feedback_add_details("wizard_spell_learned",log_name) summonevents() times++ @@ -425,7 +425,7 @@ Initialize() -/obj/item/weapon/spellbook/attackby(obj/item/O as obj, mob/user as mob, params) +/obj/item/weapon/spellbook/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/weapon/antag_spawner/contract)) var/obj/item/weapon/antag_spawner/contract/contract = O if(contract.used) @@ -439,7 +439,7 @@ src.uses++ qdel(O) -/obj/item/weapon/spellbook/proc/GetCategoryHeader(var/category) +/obj/item/weapon/spellbook/proc/GetCategoryHeader(category) var/dat = "" switch(category) if("Offensive Spells") @@ -460,7 +460,7 @@ dat += "These powerful spells change the very fabric of reality. Not always in your favour.
" return dat -/obj/item/weapon/spellbook/proc/wrap(var/content) +/obj/item/weapon/spellbook/proc/wrap(content) var/dat = "" dat +="Spellbook" dat += {" @@ -480,7 +480,7 @@ dat += {"[content]"} return dat -/obj/item/weapon/spellbook/attack_self(mob/user as mob) +/obj/item/weapon/spellbook/attack_self(mob/user) if(!owner) user << "You bind the spellbook to yourself." owner = user @@ -574,7 +574,7 @@ /obj/item/weapon/spellbook/oneuse/Initialize() //No need to init return -/obj/item/weapon/spellbook/oneuse/attack_self(mob/user as mob) +/obj/item/weapon/spellbook/oneuse/attack_self(mob/user) var/obj/effect/proc_holder/spell/S = new spell for(var/obj/effect/proc_holder/spell/knownspell in user.mind.spell_list) if(knownspell.type == S.type) @@ -592,10 +592,10 @@ user.attack_log += text("\[[time_stamp()]\] [user.real_name] ([user.ckey]) learned the spell [spellname] ([S]).") onlearned(user) -/obj/item/weapon/spellbook/oneuse/proc/recoil(mob/user as mob) +/obj/item/weapon/spellbook/oneuse/proc/recoil(mob/user) user.visible_message("[src] glows in a black light!") -/obj/item/weapon/spellbook/oneuse/proc/onlearned(mob/user as mob) +/obj/item/weapon/spellbook/oneuse/proc/onlearned(mob/user) used = 1 user.visible_message("[src] glows dark for a second!") @@ -608,7 +608,7 @@ icon_state ="bookfireball" desc = "This book feels warm to the touch." -/obj/item/weapon/spellbook/oneuse/fireball/recoil(mob/user as mob) +/obj/item/weapon/spellbook/oneuse/fireball/recoil(mob/user) ..() explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2) qdel(src) @@ -619,7 +619,7 @@ icon_state ="booksmoke" desc = "This book is overflowing with the dank arts." -/obj/item/weapon/spellbook/oneuse/smoke/recoil(mob/user as mob) +/obj/item/weapon/spellbook/oneuse/smoke/recoil(mob/user) ..() user <<"Your stomach rumbles..." if(user.nutrition) @@ -633,7 +633,7 @@ icon_state ="bookblind" desc = "This book looks blurry, no matter how you look at it." -/obj/item/weapon/spellbook/oneuse/blind/recoil(mob/user as mob) +/obj/item/weapon/spellbook/oneuse/blind/recoil(mob/user) ..() user <<"You go blind!" user.eye_blind = 10 @@ -651,7 +651,7 @@ name = "spellbook of [spellname]" //Note, desc doesn't change by design ..() -/obj/item/weapon/spellbook/oneuse/mindswap/recoil(mob/user as mob) +/obj/item/weapon/spellbook/oneuse/mindswap/recoil(mob/user) ..() if(stored_swap in dead_mob_list) stored_swap = null @@ -696,7 +696,7 @@ icon_state ="bookforcewall" desc = "This book has a dedication to mimes everywhere inside the front cover." -/obj/item/weapon/spellbook/oneuse/forcewall/recoil(mob/user as mob) +/obj/item/weapon/spellbook/oneuse/forcewall/recoil(mob/user) ..() user <<"You suddenly feel very solid!" var/obj/structure/closet/statue/S = new /obj/structure/closet/statue(user.loc, user) @@ -710,7 +710,7 @@ icon_state ="bookknock" desc = "This book is hard to hold closed properly." -/obj/item/weapon/spellbook/oneuse/knock/recoil(mob/user as mob) +/obj/item/weapon/spellbook/oneuse/knock/recoil(mob/user) ..() user <<"You're knocked down!" user.Weaken(20) @@ -721,7 +721,7 @@ icon_state ="bookhorses" desc = "This book is more horse than your mind has room for." -/obj/item/weapon/spellbook/oneuse/barnyard/recoil(mob/living/carbon/user as mob) +/obj/item/weapon/spellbook/oneuse/barnyard/recoil(mob/living/carbon/user) if(istype(user, /mob/living/carbon/human)) user <<"HOR-SIE HAS RISEN" var/obj/item/clothing/mask/horsehead/magichead = new /obj/item/clothing/mask/horsehead @@ -741,7 +741,7 @@ icon_state ="bookcharge" desc = "This book is made of 100% post-consumer wizard." -/obj/item/weapon/spellbook/oneuse/charge/recoil(mob/user as mob) +/obj/item/weapon/spellbook/oneuse/charge/recoil(mob/user) ..() user <<"[src] suddenly feels very warm!" empulse(src, 1, 1) @@ -752,7 +752,7 @@ icon_state ="booksummons" desc = "This book is bright and garish, very hard to miss." -/obj/item/weapon/spellbook/oneuse/summonitem/recoil(mob/user as mob) +/obj/item/weapon/spellbook/oneuse/summonitem/recoil(mob/user) ..() user <<"[src] suddenly vanishes!" qdel(src) diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index 25f8b25db8c..1fbc7f42955 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -47,7 +47,7 @@ return -/datum/game_mode/proc/forge_wizard_objectives(var/datum/mind/wizard) +/datum/game_mode/proc/forge_wizard_objectives(datum/mind/wizard) switch(rand(1,100)) if(1 to 30) @@ -113,7 +113,7 @@ return -/datum/game_mode/proc/greet_wizard(var/datum/mind/wizard, var/you_are=1) +/datum/game_mode/proc/greet_wizard(datum/mind/wizard, you_are=1) if (you_are) wizard.current << "You are the Space Wizard!" wizard.current << "The Space Wizards Federation has given you the following tasks:" @@ -241,7 +241,7 @@ //OTHER PROCS //To batch-remove wizard spells. Linked to mind.dm. -/mob/proc/spellremove(var/mob/M as mob) +/mob/proc/spellremove(mob/M) if(!mind) return for(var/obj/effect/proc_holder/spell/spell_to_remove in src.mind.spell_list) @@ -265,7 +265,7 @@ Made a proc so this is not repeated 14 (or more) times.*/ return 1 -/proc/iswizard(mob/living/M as mob) +/proc/iswizard(mob/living/M) return istype(M) && M.mind && ticker && ticker.mode && (M.mind in ticker.mode.wizards) diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 6bb063181f0..96a314d3fde 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -155,7 +155,7 @@ return 1 -/obj/proc/check_access_list(var/list/L) +/obj/proc/check_access_list(list/L) if(!src.req_access && !src.req_one_access) return 1 if(!istype(src.req_access, /list)) return 1 if(!src.req_access.len && (!src.req_one_access || !src.req_one_access.len)) return 1 @@ -218,7 +218,7 @@ /proc/get_all_centcom_access() return list(access_cent_general, access_cent_thunder, access_cent_specops, access_cent_medical, access_cent_living, access_cent_storage, access_cent_teleporter, access_cent_captain) -/proc/get_ert_access(var/class) +/proc/get_ert_access(class) switch(class) if("commander") return get_all_centcom_access() @@ -232,7 +232,7 @@ /proc/get_all_syndicate_access() return list(access_syndicate, access_syndicate) -/proc/get_region_accesses(var/code) +/proc/get_region_accesses(code) switch(code) if(0) return get_all_accesses() @@ -251,7 +251,7 @@ if(7) //command return list(access_heads, access_RC_announce, access_keycard_auth, access_change_ids, access_ai_upload, access_teleporter, access_eva, access_gateway, access_all_personal_lockers, access_heads_vault, access_hop, access_captain) -/proc/get_region_accesses_name(var/code) +/proc/get_region_accesses_name(code) switch(code) if(0) return "All" diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm index 6bee48e1f3e..7733a3be546 100644 --- a/code/game/jobs/job/assistant.dm +++ b/code/game/jobs/job/assistant.dm @@ -13,7 +13,7 @@ Assistant access = list() //See /datum/job/assistant/get_access() minimal_access = list() //See /datum/job/assistant/get_access() -/datum/job/assistant/equip_items(var/mob/living/carbon/human/H) +/datum/job/assistant/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(H), slot_shoes) if (config.grey_assistants) H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), slot_w_uniform) diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index f94c21e1d2f..0d20ace899d 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -23,7 +23,7 @@ Captain access = list() //See get_access() minimal_access = list() //See get_access() -/datum/job/captain/equip_items(var/mob/living/carbon/human/H) +/datum/job/captain/equip_items(mob/living/carbon/human/H) var/obj/item/clothing/under/U = new /obj/item/clothing/under/rank/captain(H) U.attachTie(new /obj/item/clothing/tie/medal/gold/captain()) H.equip_to_slot_or_del(U, slot_w_uniform) @@ -84,7 +84,7 @@ Head of Personnel access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_mineral_storeroom) -/datum/job/hop/equip_items(var/mob/living/carbon/human/H) +/datum/job/hop/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/head_of_personnel(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/brown(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/head/hopcap(H), slot_head) diff --git a/code/game/jobs/job/cargo_service.dm b/code/game/jobs/job/cargo_service.dm index 23ff5214392..0ecef1296c3 100644 --- a/code/game/jobs/job/cargo_service.dm +++ b/code/game/jobs/job/cargo_service.dm @@ -18,7 +18,7 @@ Quartermaster access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_mineral_storeroom) minimal_access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_mineral_storeroom) -/datum/job/qm/equip_items(var/mob/living/carbon/human/H) +/datum/job/qm/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/cargo(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/brown(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses) @@ -44,7 +44,7 @@ Cargo Technician access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_mineral_storeroom) minimal_access = list(access_maint_tunnels, access_cargo, access_cargo_bot, access_mailsorting, access_mineral_storeroom) -/datum/job/cargo_tech/equip_items(var/mob/living/carbon/human/H) +/datum/job/cargo_tech/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/cargotech(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(H), slot_shoes) @@ -71,7 +71,7 @@ Shaft Miner access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_mineral_storeroom) minimal_access = list(access_mining, access_mining_station, access_mailsorting, access_mineral_storeroom) -/datum/job/mining/equip_items(var/mob/living/carbon/human/H) +/datum/job/mining/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/miner(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(H), slot_shoes) @@ -106,7 +106,7 @@ Bartender access = list(access_hydroponics, access_bar, access_kitchen, access_morgue, access_weapons) minimal_access = list(access_bar) -/datum/job/bartender/equip_backpack(var/mob/living/carbon/human/H) +/datum/job/bartender/equip_backpack(mob/living/carbon/human/H) switch(H.backbag) if(1) //No backpack or satchel @@ -126,7 +126,7 @@ Bartender new default_storagebox(BPK) H.equip_to_slot_or_del(BPK, slot_back,1) -/datum/job/bartender/equip_items(var/mob/living/carbon/human/H) +/datum/job/bartender/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/bartender(H), slot_w_uniform) @@ -158,7 +158,7 @@ Cook access = list(access_hydroponics, access_bar, access_kitchen, access_morgue) minimal_access = list(access_kitchen, access_morgue) -/datum/job/cook/equip_items(var/mob/living/carbon/human/H) +/datum/job/cook/equip_items(mob/living/carbon/human/H) cooks += 1 H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chef(H), slot_w_uniform) @@ -191,7 +191,7 @@ Botanist access = list(access_hydroponics, access_bar, access_kitchen, access_morgue) // Removed tox and chem access because STOP PISSING OFF THE CHEMIST GUYS // //Removed medical access because WHAT THE FUCK YOU AREN'T A DOCTOR YOU GROW WHEAT //Given Morgue access because they have a viable means of cloning. minimal_access = list(access_hydroponics, access_morgue) // Removed tox and chem access because STOP PISSING OFF THE CHEMIST GUYS // //Removed medical access because WHAT THE FUCK YOU AREN'T A DOCTOR YOU GROW WHEAT //Given Morgue access because they have a viable means of cloning. -/datum/job/hydro/equip_items(var/mob/living/carbon/human/H) +/datum/job/hydro/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/hydroponics(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/gloves/botanic_leather(H), slot_gloves) @@ -219,6 +219,6 @@ Janitor access = list(access_janitor, access_maint_tunnels) minimal_access = list(access_janitor, access_maint_tunnels) -/datum/job/janitor/equip_items(var/mob/living/carbon/human/H) +/datum/job/janitor/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/janitor(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(H), slot_shoes) diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 90700b72776..1de8bd9e469 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -18,7 +18,7 @@ Clown access = list(access_theatre) minimal_access = list(access_theatre) -/datum/job/clown/equip_backpack(var/mob/living/carbon/human/H) +/datum/job/clown/equip_backpack(mob/living/carbon/human/H) var/obj/item/weapon/storage/backpack/BPK = new default_backpack(H) new default_storagebox(BPK) @@ -28,7 +28,7 @@ Clown H.equip_to_slot_or_del(BPK, slot_back) -/datum/job/clown/equip_items(var/mob/living/carbon/human/H) +/datum/job/clown/equip_items(mob/living/carbon/human/H) H.fully_replace_character_name(H.real_name, pick(clown_names)) // Give him a temporary random name to prevent identity revealing H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/clown(H), slot_w_uniform) @@ -60,7 +60,7 @@ Mime access = list(access_theatre) minimal_access = list(access_theatre) -/datum/job/mime/equip_backpack(var/mob/living/carbon/human/H) +/datum/job/mime/equip_backpack(mob/living/carbon/human/H) var/obj/item/weapon/storage/backpack/BPK = new default_backpack(H) new default_storagebox(BPK) @@ -69,7 +69,7 @@ Mime H.equip_to_slot_or_del(BPK, slot_back) -/datum/job/mime/equip_items(var/mob/living/carbon/human/H) +/datum/job/mime/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/mime(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/white(H), slot_gloves) @@ -103,7 +103,7 @@ Librarian access = list(access_library) minimal_access = list(access_library) -/datum/job/librarian/equip_items(var/mob/living/carbon/human/H) +/datum/job/librarian/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/librarian(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/weapon/storage/bag/books(H), slot_l_hand) @@ -131,7 +131,7 @@ Lawyer access = list(access_lawyer, access_court, access_sec_doors) minimal_access = list(access_lawyer, access_court, access_sec_doors) -/datum/job/lawyer/equip_items(var/mob/living/carbon/human/H) +/datum/job/lawyer/equip_items(mob/living/carbon/human/H) lawyers += 1 switch(lawyers) diff --git a/code/game/jobs/job/civilian_chaplain.dm b/code/game/jobs/job/civilian_chaplain.dm index 53d8be8e8ad..87ffe8f8b19 100644 --- a/code/game/jobs/job/civilian_chaplain.dm +++ b/code/game/jobs/job/civilian_chaplain.dm @@ -18,7 +18,7 @@ Chaplain access = list(access_morgue, access_chapel_office, access_crematorium) minimal_access = list(access_morgue, access_chapel_office, access_crematorium) -/datum/job/chaplain/equip_items(var/mob/living/carbon/human/H) +/datum/job/chaplain/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(H), slot_shoes) diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index 8c8c69ce873..da315e23444 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -31,7 +31,7 @@ Chief Engineer access_heads, access_construction, access_sec_doors, access_minisat, access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_mineral_storeroom) -/datum/job/chief_engineer/equip_items(var/mob/living/carbon/human/H) +/datum/job/chief_engineer/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chief_engineer(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/brown(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(H), slot_head) @@ -68,7 +68,7 @@ Station Engineer minimal_access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_tcomsat) -/datum/job/engineer/equip_items(var/mob/living/carbon/human/H) +/datum/job/engineer/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/engineer(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/workboots(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full(H), slot_belt) @@ -98,7 +98,7 @@ Atmospheric Technician access_external_airlocks, access_construction, access_atmospherics) minimal_access = list(access_atmospherics, access_maint_tunnels, access_emergency_storage, access_construction) -/datum/job/atmos/equip_items(var/mob/living/carbon/human/H) +/datum/job/atmos/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/atmospheric_technician(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/analyzer(H), slot_r_store) diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index 93c43bd653d..41f5af9ad52 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -49,10 +49,10 @@ var/default_storagebox= /obj/item/weapon/storage/box/survival //Only override this proc -/datum/job/proc/equip_items(var/mob/living/carbon/human/H) +/datum/job/proc/equip_items(mob/living/carbon/human/H) //Or this proc -/datum/job/proc/equip_backpack(var/mob/living/carbon/human/H) +/datum/job/proc/equip_backpack(mob/living/carbon/human/H) switch(H.backbag) if(1) //No backpack or satchel H.equip_to_slot_or_del(new default_storagebox(H), slot_r_hand) @@ -66,7 +66,7 @@ H.equip_to_slot_or_del(BPK, slot_back,1) //But don't override this -/datum/job/proc/equip(var/mob/living/carbon/human/H) +/datum/job/proc/equip(mob/living/carbon/human/H) if(!H) return 0 @@ -100,7 +100,7 @@ //Equip headset H.equip_to_slot_or_del(new src.default_headset(H), slot_ears) -/datum/job/proc/apply_fingerprints(var/mob/living/carbon/human/H) +/datum/job/proc/apply_fingerprints(mob/living/carbon/human/H) if(!istype(H)) return if(H.back) diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 6e11a228224..20b0ec7844d 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -27,7 +27,7 @@ Chief Medical Officer access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, access_keycard_auth, access_sec_doors) -/datum/job/cmo/equip_items(var/mob/living/carbon/human/H) +/datum/job/cmo/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chief_medical_officer(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/brown(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/labcoat/cmo(H), slot_wear_suit) @@ -60,7 +60,7 @@ Medical Doctor access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_mineral_storeroom) minimal_access = list(access_medical, access_morgue, access_surgery) -/datum/job/doctor/equip_items(var/mob/living/carbon/human/H) +/datum/job/doctor/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/white(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/labcoat(H), slot_wear_suit) @@ -87,7 +87,7 @@ Chemist access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_mineral_storeroom) minimal_access = list(access_medical, access_chemistry, access_mineral_storeroom) -/datum/job/chemist/equip_items(var/mob/living/carbon/human/H) +/datum/job/chemist/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chemist(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/white(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/labcoat/chemist(H), slot_wear_suit) @@ -112,7 +112,7 @@ Geneticist access = list(access_medical, access_morgue, access_chemistry, access_virology, access_genetics, access_research, access_xenobiology, access_robotics, access_mineral_storeroom, access_tech_storage) minimal_access = list(access_medical, access_morgue, access_genetics, access_research) -/datum/job/geneticist/equip_items(var/mob/living/carbon/human/H) +/datum/job/geneticist/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/geneticist(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/white(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/labcoat/genetics(H), slot_wear_suit) @@ -140,7 +140,7 @@ Virologist access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_mineral_storeroom) minimal_access = list(access_medical, access_virology, access_mineral_storeroom) -/datum/job/virologist/equip_items(var/mob/living/carbon/human/H) +/datum/job/virologist/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/virologist(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(H), slot_wear_mask) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/white(H), slot_shoes) diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index 27451f9dedd..488a598c0b0 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -29,7 +29,7 @@ Research Director access_RC_announce, access_keycard_auth, access_gateway, access_mineral_storeroom, access_tech_storage, access_minisat) -/datum/job/rd/equip_items(var/mob/living/carbon/human/H) +/datum/job/rd/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/brown(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/research_director(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/labcoat(H), slot_wear_suit) @@ -60,7 +60,7 @@ Scientist access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_mineral_storeroom, access_tech_storage, access_genetics) minimal_access = list(access_tox, access_tox_storage, access_research, access_xenobiology, access_mineral_storeroom) -/datum/job/scientist/equip_items(var/mob/living/carbon/human/H) +/datum/job/scientist/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/scientist(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/white(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/labcoat/science(H), slot_wear_suit) @@ -86,7 +86,7 @@ Roboticist access = list(access_robotics, access_tox, access_tox_storage, access_tech_storage, access_morgue, access_research, access_mineral_storeroom, access_xenobiology, access_genetics) minimal_access = list(access_robotics, access_tech_storage, access_morgue, access_research, access_mineral_storeroom) -/datum/job/roboticist/equip_items(var/mob/living/carbon/human/H) +/datum/job/roboticist/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/roboticist(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/labcoat(H), slot_wear_suit) diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 6ca62edde8b..73cbbc059de 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -35,7 +35,7 @@ Head of Security access_research, access_engine, access_mining, access_medical, access_construction, access_mailsorting, access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway) -/datum/job/hos/equip_items(var/mob/living/carbon/human/H) +/datum/job/hos/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/head_of_security(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/hos/trenchcoat(H), slot_wear_suit) @@ -78,7 +78,7 @@ Warden access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels, access_morgue, access_weapons, access_forensics_lockers) minimal_access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_weapons) //See /datum/job/warden/get_access() -/datum/job/warden/equip_items(var/mob/living/carbon/human/H) +/datum/job/warden/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/warden(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/warden(H), slot_wear_suit) @@ -124,7 +124,7 @@ Detective access = list(access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court, access_weapons, access_brig, access_security) minimal_access = list(access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court, access_weapons) -/datum/job/detective/equip_items(var/mob/living/carbon/human/H) +/datum/job/detective/equip_items(mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/det(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/brown(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/head/det_hat(H), slot_head) @@ -174,7 +174,7 @@ Security Officer access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels, access_morgue, access_weapons, access_forensics_lockers) minimal_access = list(access_security, access_sec_doors, access_brig, access_court, access_weapons) //But see /datum/job/warden/get_access() -/datum/job/officer/equip_items(var/mob/living/carbon/human/H) +/datum/job/officer/equip_items(mob/living/carbon/human/H) assign_sec_to_department(H) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) @@ -206,7 +206,7 @@ Security Officer var/list/sec_departments = list("engineering", "supply", "medical", "science") -/datum/job/officer/proc/assign_sec_to_department(var/mob/living/carbon/human/H) +/datum/job/officer/proc/assign_sec_to_department(mob/living/carbon/human/H) if(!sec_departments.len) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(H), slot_w_uniform) else diff --git a/code/game/jobs/job/silicon.dm b/code/game/jobs/job/silicon.dm index 77de7e2ceef..15d9cd2cb2e 100644 --- a/code/game/jobs/job/silicon.dm +++ b/code/game/jobs/job/silicon.dm @@ -13,7 +13,7 @@ AI req_admin_notify = 1 minimal_player_age = 30 -/datum/job/ai/equip(var/mob/living/carbon/human/H) +/datum/job/ai/equip(mob/living/carbon/human/H) if(!H) return 0 /datum/job/ai/config_check() @@ -35,6 +35,6 @@ Cyborg selection_color = "#ddffdd" minimal_player_age = 21 -/datum/job/cyborg/equip(var/mob/living/carbon/human/H) +/datum/job/cyborg/equip(mob/living/carbon/human/H) if(!H) return 0 return H.Robotize() diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index f5e4112a7c5..9bcc58643d7 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -123,5 +123,5 @@ var/list/nonhuman_positions = list( ) -/proc/guest_jobbans(var/job) +/proc/guest_jobbans(job) return ((job in command_positions) || (job in nonhuman_positions) || (job in security_positions)) diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm index 26ded6705f1..057bc5b6adb 100644 --- a/code/game/machinery/Beacon.dm +++ b/code/game/machinery/Beacon.dm @@ -27,7 +27,7 @@ ..() // update the invisibility and icon -/obj/machinery/bluespace_beacon/hide(var/intact) +/obj/machinery/bluespace_beacon/hide(intact) invisibility = intact ? 101 : 0 updateicon() diff --git a/code/game/machinery/Freezer.dm b/code/game/machinery/Freezer.dm index 16b8d76da62..5b948573ca7 100644 --- a/code/game/machinery/Freezer.dm +++ b/code/game/machinery/Freezer.dm @@ -57,13 +57,13 @@ icon_state = "freezer" return -/obj/machinery/atmospherics/unary/cold_sink/freezer/attack_ai(mob/user as mob) +/obj/machinery/atmospherics/unary/cold_sink/freezer/attack_ai(mob/user) return interact(user) -/obj/machinery/atmospherics/unary/cold_sink/freezer/attack_paw(mob/user as mob) +/obj/machinery/atmospherics/unary/cold_sink/freezer/attack_paw(mob/user) return interact(user) -/obj/machinery/atmospherics/unary/cold_sink/freezer/attack_hand(mob/user as mob) +/obj/machinery/atmospherics/unary/cold_sink/freezer/attack_hand(mob/user) return interact(user) /obj/machinery/atmospherics/unary/cold_sink/freezer/interact(mob/user) @@ -183,13 +183,13 @@ icon_state = "heater" return -/obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_ai(mob/user as mob) +/obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_ai(mob/user) return src.attack_hand(user) -/obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_paw(mob/user as mob) +/obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_hand(mob/user as mob) +/obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_hand(mob/user) return interact(user) /obj/machinery/atmospherics/unary/heat_reservoir/heater/interact(mob/user) diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index ab226c94879..892052ea48d 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -40,7 +40,7 @@ src.colorlist += D -/obj/machinery/pdapainter/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/pdapainter/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/device/pda)) if(storedpda) user << "There is already a PDA inside!" @@ -56,7 +56,7 @@ update_icon() -/obj/machinery/pdapainter/attack_hand(mob/user as mob) +/obj/machinery/pdapainter/attack_hand(mob/user) ..() src.add_fingerprint(user) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index be55c50012c..922c0a71cd5 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -60,7 +60,7 @@ A.blob_act() qdel(src) -/obj/machinery/sleeper/attack_animal(var/mob/living/simple_animal/M)//Stop putting hostile mobs in things guise +/obj/machinery/sleeper/attack_animal(mob/living/simple_animal/M)//Stop putting hostile mobs in things guise if(M.environment_smash) M.do_attack_animation(src) visible_message("[M.name] smashes [src] apart!") @@ -109,7 +109,7 @@ /obj/machinery/sleeper/container_resist() open_machine() -/obj/machinery/sleeper/relaymove(var/mob/user) +/obj/machinery/sleeper/relaymove(mob/user) ..() open_machine() diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 82d9841d328..0532fc63f3f 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -23,7 +23,7 @@ icon_state = "motion0" stat |= NOPOWER -/obj/machinery/ai_slipper/proc/setState(var/enabled, var/uses) +/obj/machinery/ai_slipper/proc/setState(enabled, uses) src.disabled = disabled src.uses = uses src.power_change() @@ -49,10 +49,10 @@ return return -/obj/machinery/ai_slipper/attack_ai(mob/user as mob) +/obj/machinery/ai_slipper/attack_ai(mob/user) return attack_hand(user) -/obj/machinery/ai_slipper/attack_hand(mob/user as mob) +/obj/machinery/ai_slipper/attack_hand(mob/user) if(stat & (NOPOWER|BROKEN)) return if ( (get_dist(src, user) > 1 )) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index dbeb74c7411..824cd32a54d 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -196,7 +196,7 @@ return -/obj/machinery/alarm/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/alarm/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if(stat & (BROKEN|NOPOWER)) return @@ -243,7 +243,7 @@ frequency = new_frequency radio_connection = radio_controller.add_object(src, frequency, RADIO_TO_AIRALARM) -/obj/machinery/alarm/proc/send_signal(var/target, var/list/command)//sends signal 'command' to 'target'. Returns 0 if no radio connection, 1 otherwise +/obj/machinery/alarm/proc/send_signal(target, list/command)//sends signal 'command' to 'target'. Returns 0 if no radio connection, 1 otherwise if(!radio_connection) return 0 @@ -260,7 +260,7 @@ return 1 -/obj/machinery/alarm/proc/populate_status(var/list/data) +/obj/machinery/alarm/proc/populate_status(list/data) var/turf/location = get_turf(src) if(!location) return @@ -304,7 +304,7 @@ environment_data += list(list("name" = "Temperature", "value" = environment.temperature, "unit" = "K ([round(environment.temperature - T0C, 0.1)]C)", "danger_level" = temperature_danger)) data["environment_data"] = environment_data -/obj/machinery/alarm/proc/populate_controls(var/list/data) +/obj/machinery/alarm/proc/populate_controls(list/data) switch(screen) if(AALARM_SCREEN_MAIN) data["mode"] = mode @@ -661,7 +661,7 @@ post_alert(new_area_danger_level) update_icon() -/obj/machinery/alarm/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/machinery/alarm/attackby(obj/item/W, mob/user, params) switch(buildstage) if(2) if(istype(W, /obj/item/weapon/wirecutters) && panel_open && (wires.wires_status == 27 || wires.wires_status == 31)) //this checks for all wires to be cut, except the syphon wire which is optional. @@ -755,7 +755,7 @@ update_icon() -/obj/machinery/alarm/emag_act(mob/user as mob) +/obj/machinery/alarm/emag_act(mob/user) if(!emagged) src.emagged = 1 user.visible_message("Sparks fly out of the [src]!", "You emag the [src], disabling its safeties.") @@ -788,7 +788,7 @@ Code shamelessly copied from apc_frame icon_state = "alarm_bitem" flags = CONDUCT -/obj/item/alarm_frame/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/alarm_frame/attackby(obj/item/weapon/W, mob/user, params) if (istype(W, /obj/item/weapon/wrench)) new /obj/item/stack/sheet/metal( get_turf(src.loc), 2 ) qdel(src) @@ -883,7 +883,7 @@ FIRE ALARM -/obj/machinery/firealarm/emag_act(mob/user as mob) +/obj/machinery/firealarm/emag_act(mob/user) if(!emagged) src.emagged = 1 user.visible_message("Sparks fly out of the [src]!", "You emag the [src], disabling its thermal sensors.") @@ -904,14 +904,14 @@ FIRE ALARM /obj/machinery/firealarm/bullet_act(BLAH) return src.alarm() -/obj/machinery/firealarm/attack_paw(mob/user as mob) +/obj/machinery/firealarm/attack_paw(mob/user) return src.attack_hand(user) /obj/machinery/firealarm/emp_act(severity) if(prob(50/severity)) alarm() ..() -/obj/machinery/firealarm/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/machinery/firealarm/attackby(obj/item/W, mob/user, params) src.add_fingerprint(user) if (istype(W, /obj/item/weapon/screwdriver) && buildstage == 2) @@ -1008,7 +1008,7 @@ FIRE ALARM if(loc) update_icon() -/obj/machinery/firealarm/attack_hand(mob/user as mob) +/obj/machinery/firealarm/attack_hand(mob/user) if(user.stat || stat & (NOPOWER|BROKEN)) return @@ -1148,7 +1148,7 @@ Code shamelessly copied from apc_frame flags = CONDUCT -/obj/item/firealarm_frame/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/firealarm_frame/attackby(obj/item/weapon/W, mob/user, params) if (istype(W, /obj/item/weapon/wrench)) new /obj/item/stack/sheet/metal( get_turf(src.loc), 2 ) qdel(src) @@ -1188,7 +1188,7 @@ Code shamelessly copied from apc_frame name = "\improper PARTY BUTTON" desc = "Cuban Pete is in the house!" -/obj/machinery/firealarm/partyalarm/attack_hand(mob/user as mob) +/obj/machinery/firealarm/partyalarm/attack_hand(mob/user) if(user.stat || stat & (NOPOWER|BROKEN)) return diff --git a/code/game/machinery/atmoalter/area_atmos_computer.dm b/code/game/machinery/atmoalter/area_atmos_computer.dm index 2063e4d72ae..38d9a29cfed 100644 --- a/code/game/machinery/atmoalter/area_atmos_computer.dm +++ b/code/game/machinery/atmoalter/area_atmos_computer.dm @@ -19,7 +19,7 @@ spawn(10) scanscrubbers() -/obj/machinery/computer/area_atmos/attack_hand(var/mob/user as mob) +/obj/machinery/computer/area_atmos/attack_hand(mob/user) if(..(user)) return src.add_fingerprint(usr) @@ -103,7 +103,7 @@ scrubber.on = text2num(href_list["toggle"]) scrubber.update_icon() -/obj/machinery/computer/area_atmos/proc/validscrubber( var/obj/machinery/portable_atmospherics/scrubber/huge/scrubber as obj ) +/obj/machinery/computer/area_atmos/proc/validscrubber( obj/machinery/portable_atmospherics/scrubber/huge/scrubber ) if(!isobj(scrubber) || get_dist(scrubber.loc, src.loc) > src.range || scrubber.loc.z != src.loc.z) return 0 @@ -127,7 +127,7 @@ /obj/machinery/computer/area_atmos/area zone = "This computer is working in a wired network limited to this area." - validscrubber( var/obj/machinery/portable_atmospherics/scrubber/huge/scrubber as obj ) + validscrubber( obj/machinery/portable_atmospherics/scrubber/huge/scrubber ) if(!isobj(scrubber)) return 0 diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 41f22184808..82f0e3a1a78 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -201,7 +201,7 @@ update_flag healthcheck() return -/obj/machinery/portable_atmospherics/canister/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/portable_atmospherics/canister/bullet_act(obj/item/projectile/Proj) if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) if(Proj.damage) src.health -= round(Proj.damage / 2) @@ -230,7 +230,7 @@ update_flag return return -/obj/machinery/portable_atmospherics/canister/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) +/obj/machinery/portable_atmospherics/canister/attackby(obj/item/weapon/W, mob/user, params) if(!istype(W, /obj/item/weapon/wrench) && !istype(W, /obj/item/weapon/tank) && !istype(W, /obj/item/device/analyzer) && !istype(W, /obj/item/device/pda)) visible_message("[user] hits \the [src] with a [W]!") investigate_log("was smacked with \a [W] by [key_name(user)]", "atmos") @@ -253,16 +253,16 @@ update_flag ..() -/obj/machinery/portable_atmospherics/canister/attack_ai(var/mob/user as mob) +/obj/machinery/portable_atmospherics/canister/attack_ai(mob/user) return src.attack_hand(user) -/obj/machinery/portable_atmospherics/canister/attack_paw(var/mob/user as mob) +/obj/machinery/portable_atmospherics/canister/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/portable_atmospherics/canister/attack_tk(var/mob/user as mob) +/obj/machinery/portable_atmospherics/canister/attack_tk(mob/user) return src.attack_hand(user) -/obj/machinery/portable_atmospherics/canister/attack_hand(var/mob/user as mob) +/obj/machinery/portable_atmospherics/canister/attack_hand(mob/user) return src.ui_interact(user) /obj/machinery/portable_atmospherics/canister/interact(mob/user, ui_key = "main") @@ -271,7 +271,7 @@ update_flag SSnano.try_update_ui(user, src, ui_key, null, src.get_ui_data()) -/obj/machinery/portable_atmospherics/canister/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/portable_atmospherics/canister/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if (src.destroyed) return diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index 77f019ffc99..47d32366084 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -91,7 +91,7 @@ user << status() -/obj/machinery/meter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) +/obj/machinery/meter/attackby(obj/item/weapon/W, mob/user, params) if (istype(W, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user << "You begin to unfasten \the [src]..." @@ -105,13 +105,13 @@ return ..() -/obj/machinery/meter/attack_ai(var/mob/user as mob) +/obj/machinery/meter/attack_ai(mob/user) return src.attack_hand(user) -/obj/machinery/meter/attack_paw(var/mob/user as mob) +/obj/machinery/meter/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/meter/attack_hand(var/mob/user as mob) +/obj/machinery/meter/attack_hand(mob/user) if(stat & (NOPOWER|BROKEN)) return 1 diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index 85b57fb7413..bdeb5bb4c62 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -63,7 +63,7 @@ /obj/machinery/portable_atmospherics/portableConnectorReturnAir() return air_contents -/obj/machinery/portable_atmospherics/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) +/obj/machinery/portable_atmospherics/attackby(obj/item/weapon/W, mob/user, params) if ((istype(W, /obj/item/weapon/tank) && !( src.destroyed ))) if (src.holding) return diff --git a/code/game/machinery/atmoalter/pump.dm b/code/game/machinery/atmoalter/pump.dm index 5f5519fa105..3602982dbca 100644 --- a/code/game/machinery/atmoalter/pump.dm +++ b/code/game/machinery/atmoalter/pump.dm @@ -93,13 +93,13 @@ /obj/machinery/portable_atmospherics/pump/return_air() return air_contents -/obj/machinery/portable_atmospherics/pump/attack_ai(var/mob/user as mob) +/obj/machinery/portable_atmospherics/pump/attack_ai(mob/user) return src.attack_hand(user) -/obj/machinery/portable_atmospherics/pump/attack_paw(var/mob/user as mob) +/obj/machinery/portable_atmospherics/pump/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/portable_atmospherics/pump/attack_hand(var/mob/user as mob) +/obj/machinery/portable_atmospherics/pump/attack_hand(mob/user) user.set_machine(src) var/holding_text diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm index 52cd6e636db..4ce9cbb4748 100644 --- a/code/game/machinery/atmoalter/scrubber.dm +++ b/code/game/machinery/atmoalter/scrubber.dm @@ -48,7 +48,7 @@ else icon_state = "scrubber:0" - attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) + attackby(obj/item/weapon/W, mob/user) if(istype(W, /obj/item/weapon/wrench)) if(on) user << "Turn it off first!" @@ -65,7 +65,7 @@ /obj/machinery/portable_atmospherics/scrubber/huge/stationary name = "stationary air scrubber" - attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) + attackby(obj/item/weapon/W, mob/user) if(istype(W, /obj/item/weapon/wrench)) user << "The bolts are too tight for you to unscrew!" return @@ -151,13 +151,13 @@ /obj/machinery/portable_atmospherics/scrubber/return_air() return air_contents -/obj/machinery/portable_atmospherics/scrubber/attack_ai(var/mob/user as mob) +/obj/machinery/portable_atmospherics/scrubber/attack_ai(mob/user) return src.attack_hand(user) -/obj/machinery/portable_atmospherics/scrubber/attack_paw(var/mob/user as mob) +/obj/machinery/portable_atmospherics/scrubber/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/portable_atmospherics/scrubber/attack_hand(var/mob/user as mob) +/obj/machinery/portable_atmospherics/scrubber/attack_hand(mob/user) user.set_machine(src) var/holding_text diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 5e92ee7468d..73026e5dac1 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -273,7 +273,7 @@ dat += "" return dat -/obj/machinery/autolathe/proc/category_win(mob/user,var/selected_category) +/obj/machinery/autolathe/proc/category_win(mob/user,selected_category) var/dat = "Return to main menu" dat += "

Browsing [selected_category]:


" dat += "Total amount: [materials.total_amount] / [materials.max_amount] cm3
" @@ -330,7 +330,7 @@ dat += "
" return dat -/obj/machinery/autolathe/proc/can_build(var/datum/design/D) +/obj/machinery/autolathe/proc/can_build(datum/design/D) var/coeff = (ispath(D.build_path,/obj/item/stack) ? 1 : 2 ** prod_coeff) if(D.materials[MAT_METAL] && (materials.amount(MAT_METAL) < (D.materials[MAT_METAL] / coeff))) @@ -339,7 +339,7 @@ return 0 return 1 -/obj/machinery/autolathe/proc/get_design_cost(var/datum/design/D) +/obj/machinery/autolathe/proc/get_design_cost(datum/design/D) var/coeff = (ispath(D.build_path,/obj/item/stack) ? 1 : 2 ** prod_coeff) var/dat if(D.materials[MAT_METAL]) @@ -361,7 +361,7 @@ else return 0 -/obj/machinery/autolathe/proc/adjust_hacked(var/hack) +/obj/machinery/autolathe/proc/adjust_hacked(hack) hacked = hack if(hack) diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm index f9543249cfa..cb21aa88feb 100644 --- a/code/game/machinery/bots/bots.dm +++ b/code/game/machinery/bots/bots.dm @@ -125,7 +125,7 @@ if (health <= 0) explode() -/obj/machinery/bot/proc/Emag(mob/user as mob) //Master Emag proc. Ensure this is called in your bot before setting unique functions. +/obj/machinery/bot/proc/Emag(mob/user) //Master Emag proc. Ensure this is called in your bot before setting unique functions. if(locked) //First emag application unlocks the bot's interface. Apply a screwdriver to use the emag again. locked = 0 emagged = 1 @@ -149,7 +149,7 @@ else user << "[src] is in pristine condition." -/obj/machinery/bot/attack_alien(var/mob/living/carbon/alien/user as mob) +/obj/machinery/bot/attack_alien(mob/living/carbon/alien/user) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) health -= rand(15,30)*brute_dam_coeff @@ -160,7 +160,7 @@ healthcheck() -/obj/machinery/bot/attack_animal(var/mob/living/simple_animal/M as mob) +/obj/machinery/bot/attack_animal(mob/living/simple_animal/M) M.do_attack_animation(src) if(M.melee_damage_upper == 0) return @@ -238,7 +238,7 @@ return 1 //Successful completion. Used to prevent child process() continuing if this one is ended early. -/obj/machinery/bot/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/bot/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/screwdriver)) if(!locked) open = !open @@ -274,11 +274,11 @@ ..() healthcheck() -/obj/machinery/bot/emag_act(mob/user as mob) +/obj/machinery/bot/emag_act(mob/user) if(emagged < 2) Emag(user) -/obj/machinery/bot/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/bot/bullet_act(obj/item/projectile/Proj) if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) health -= Proj.damage if(prob(75) && Proj.damage > 0) @@ -349,7 +349,7 @@ /obj/machinery/bot/attack_ai(mob/user as mob) attack_hand(user) -/obj/machinery/bot/proc/speak(var/message, freq) //Pass a message to have the bot say() it. Pass a frequency to say it on the radio. +/obj/machinery/bot/proc/speak(message, freq) //Pass a message to have the bot say() it. Pass a frequency to say it on the radio. if((!on) || (!message)) return if(freq) @@ -371,7 +371,7 @@ Example usage: patient = scan(/mob/living/carbon/human, oldpatient, 1) The proc would return a human next to the bot to be set to the patient var. Pass the desired type path itself, declaring a temporary var beforehand is not required. */ -/obj/machinery/bot/proc/scan(var/scan_type, var/old_target, var/scan_range = DEFAULT_SCAN_RANGE) +/obj/machinery/bot/proc/scan(scan_type, old_target, scan_range = DEFAULT_SCAN_RANGE) var/final_result for (var/scan in view (scan_range, src) ) //Search for something in range! if(!istype(scan, scan_type)) //Check that the thing we found is the type we want! @@ -386,11 +386,11 @@ Pass the desired type path itself, declaring a temporary var beforehand is not r return final_result //When the scan finds a target, run bot specific processing to select it for the next step. Empty by default. -/obj/machinery/bot/proc/process_scan(var/scan_target) +/obj/machinery/bot/proc/process_scan(scan_target) return scan_target -/obj/machinery/bot/proc/add_to_ignore(var/subject) +/obj/machinery/bot/proc/add_to_ignore(subject) if(ignore_list.len < 50) //This will help keep track of them, so the bot is always trying to reach a blocked spot. ignore_list |= subject else if (ignore_list.len >= subject) //If the list is full, insert newest, delete oldest. @@ -401,7 +401,7 @@ Pass the desired type path itself, declaring a temporary var beforehand is not r Movement proc for stepping a bot through a path generated through A-star. Pass a positive integer as an argument to override a bot's default speed. */ -/obj/machinery/bot/proc/bot_move(var/dest, var/move_speed) +/obj/machinery/bot/proc/bot_move(dest, move_speed) if(!dest || !path || path.len == 0) //A-star failed or a path/destination was not set. path = list() @@ -429,7 +429,7 @@ Pass a positive integer as an argument to override a bot's default speed. return 1 -/obj/machinery/bot/proc/bot_step(var/dest) +/obj/machinery/bot/proc/bot_step(dest) if(path && path.len > 1) step_towards(src, path[1]) if(get_turf(src) == path[1]) //Successful move @@ -446,7 +446,7 @@ Pass a positive integer as an argument to override a bot's default speed. if(mode != BOT_SUMMON && mode != BOT_RESPONDING) botcard.access = prev_access -/obj/machinery/bot/proc/call_bot(var/caller, var/turf/waypoint, var/message=TRUE) +/obj/machinery/bot/proc/call_bot(caller, turf/waypoint, message=TRUE) bot_reset() //Reset a bot before setting it to call mode. var/area/end_area = get_area(waypoint) @@ -620,7 +620,7 @@ obj/machinery/bot/proc/bot_reset() destination = nearest_beacon //PDA control. Some bots, especially MULEs, may have more parameters. -/obj/machinery/bot/proc/bot_control(var/command, mob/user, var/turf/user_turf, var/list/user_access = list()) +/obj/machinery/bot/proc/bot_control(command, mob/user, turf/user_turf, list/user_access = list()) if(!on || emagged == 2 || remote_disabled) //Emagged bots do not respect anyone's authority! Bots with their remote controls off cannot get commands. return 1 //ACCESS DENIED // process control input @@ -655,11 +655,11 @@ obj/machinery/bot/proc/bot_reset() // calculates a path to the current destination // given an optional turf to avoid -/obj/machinery/bot/proc/calc_path(var/turf/avoid) +/obj/machinery/bot/proc/calc_path(turf/avoid) check_bot_access() path = get_path_to(loc, patrol_target, src, /turf/proc/Distance_cardinal, 0, 120, id=botcard, exclude=avoid) -/obj/machinery/bot/proc/calc_summon_path(var/turf/avoid) +/obj/machinery/bot/proc/calc_summon_path(turf/avoid) check_bot_access() spawn() path = get_path_to(loc, summon_target, src, /turf/proc/Distance_cardinal, 0, 150, id=botcard, exclude=avoid) diff --git a/code/game/machinery/bots/cleanbot.dm b/code/game/machinery/bots/cleanbot.dm index f73276842c3..ea5613108f7 100644 --- a/code/game/machinery/bots/cleanbot.dm +++ b/code/game/machinery/bots/cleanbot.dm @@ -71,14 +71,14 @@ text_dehack = "[name]'s software has been reset!" text_dehack_fail = "[name] does not seem to respond to your repair code!" -/obj/machinery/bot/cleanbot/attack_hand(mob/user as mob) +/obj/machinery/bot/cleanbot/attack_hand(mob/user) . = ..() if (.) return usr.set_machine(src) interact(user) -/obj/machinery/bot/cleanbot/interact(mob/user as mob) +/obj/machinery/bot/cleanbot/interact(mob/user) var/dat dat += hack(user) dat += text({" @@ -106,7 +106,7 @@ text("[on ? "On" : "Off"]")) updateUsrDialog() updateUsrDialog() -/obj/machinery/bot/cleanbot/attackby(obj/item/weapon/W, mob/user as mob, params) +/obj/machinery/bot/cleanbot/attackby(obj/item/weapon/W, mob/user, params) if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) if(allowed(user) && !open && !emagged) locked = !locked @@ -121,13 +121,13 @@ text("[on ? "On" : "Off"]")) else return ..() -/obj/machinery/bot/cleanbot/Emag(mob/user as mob) +/obj/machinery/bot/cleanbot/Emag(mob/user) ..() if(emagged == 2) if(user) user << "[src] buzzes and beeps." -/obj/machinery/bot/cleanbot/process_scan(var/obj/effect/decal/cleanable/D) +/obj/machinery/bot/cleanbot/process_scan(obj/effect/decal/cleanable/D) for(var/T in target_types) if(istype(D, T)) return D @@ -209,7 +209,7 @@ text("[on ? "On" : "Off"]")) target_types += /obj/effect/decal/cleanable/blood/drip/ target_types += /obj/effect/decal/cleanable/trail_holder -/obj/machinery/bot/cleanbot/proc/clean(var/obj/effect/decal/cleanable/target) +/obj/machinery/bot/cleanbot/proc/clean(obj/effect/decal/cleanable/target) anchored = 1 icon_state = "cleanbot-c" visible_message("[src] begins to clean up [target]") @@ -240,7 +240,7 @@ text("[on ? "On" : "Off"]")) qdel(src) return -/obj/item/weapon/bucket_sensor/attackby(var/obj/item/W, mob/user as mob, params) +/obj/item/weapon/bucket_sensor/attackby(obj/item/W, mob/user as mob, params) ..() if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm)) if(!user.unEquip(W)) diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index c1869318560..8aaf4173d49 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -98,7 +98,7 @@ text_dehack = "You restore [name]'s combat inhibitor." text_dehack_fail = "[name] ignores your attempts to restrict him!" -/obj/machinery/bot/ed209/attack_hand(mob/user as mob) +/obj/machinery/bot/ed209/attack_hand(mob/user) . = ..() if (.) return @@ -159,7 +159,7 @@ Auto Patrol[]"}, declare_arrests = !declare_arrests updateUsrDialog() -/obj/machinery/bot/ed209/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/bot/ed209/attackby(obj/item/weapon/W, mob/user, params) if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) if (allowed(user) && !open && !emagged) locked = !locked @@ -185,7 +185,7 @@ Auto Patrol[]"}, shootAt(user) mode = BOT_HUNT -/obj/machinery/bot/ed209/Emag(mob/user as mob) +/obj/machinery/bot/ed209/Emag(mob/user) ..() if(emagged == 2) if(user) @@ -196,7 +196,7 @@ Auto Patrol[]"}, icon_state = "[lasercolor]ed209[on]" set_weapon() -/obj/machinery/bot/ed209/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/bot/ed209/bullet_act(obj/item/projectile/Proj) if(istype(Proj ,/obj/item/projectile/beam)||istype(Proj,/obj/item/projectile/bullet)) if((Proj.damage_type == BURN) || (Proj.damage_type == BRUTE)) if (!Proj.nodamage && Proj.damage < src.health) @@ -467,7 +467,7 @@ Auto Patrol[]"}, else if(lasercolor == "r") projectile = /obj/item/projectile/lasertag/redtag -/obj/machinery/bot/ed209/proc/shootAt(var/mob/target) +/obj/machinery/bot/ed209/proc/shootAt(mob/target) if(lastfired && world.time - lastfired < shot_delay) return lastfired = world.time @@ -494,7 +494,7 @@ Auto Patrol[]"}, A.xo = U.x - T.x A.fire() -/obj/machinery/bot/ed209/attack_alien(var/mob/living/carbon/alien/user as mob) +/obj/machinery/bot/ed209/attack_alien(mob/living/carbon/alien/user) ..() if (!isalien(target)) target = user @@ -541,7 +541,7 @@ Auto Patrol[]"}, -/obj/item/weapon/ed209_assembly/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/ed209_assembly/attackby(obj/item/weapon/W, mob/user, params) ..() if(istype(W, /obj/item/weapon/pen)) @@ -689,7 +689,7 @@ Auto Patrol[]"}, qdel(src) -/obj/machinery/bot/ed209/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/bot/ed209/bullet_act(obj/item/projectile/Proj) if(!disabled) var/lasertag_check = 0 if((lasercolor == "b")) diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm index 1a5899ee4df..75194d08fcd 100644 --- a/code/game/machinery/bots/floorbot.dm +++ b/code/game/machinery/bots/floorbot.dm @@ -90,14 +90,14 @@ text_dehack = "You detect errors in [name] and reset his programming." text_dehack_fail = "[name] is not responding to reset commands!" -/obj/machinery/bot/floorbot/attack_hand(mob/user as mob) +/obj/machinery/bot/floorbot/attack_hand(mob/user) . = ..() if (.) return usr.set_machine(src) interact(user) -/obj/machinery/bot/floorbot/interact(mob/user as mob) +/obj/machinery/bot/floorbot/interact(mob/user) var/dat dat += hack(user) dat += "Floor Repairer Controls v1.1

" @@ -127,7 +127,7 @@ return -/obj/machinery/bot/floorbot/attackby(var/obj/item/W , mob/user as mob, params) +/obj/machinery/bot/floorbot/attackby(obj/item/W , mob/user, params) if(istype(W, /obj/item/stack/tile/plasteel)) var/obj/item/stack/tile/plasteel/T = W if(amount >= 50) @@ -156,7 +156,7 @@ else ..() -/obj/machinery/bot/floorbot/Emag(mob/user as mob) +/obj/machinery/bot/floorbot/Emag(mob/user) ..() if(emagged == 2) if(user) @@ -305,7 +305,7 @@ speak("Requesting refill at [get_area(src)]!", radio_frequency) nagged = 1 -/obj/machinery/bot/floorbot/proc/is_hull_breach(var/turf/t) //Ignore space tiles not considered part of a structure, also ignores shuttle docking areas. +/obj/machinery/bot/floorbot/proc/is_hull_breach(turf/t) //Ignore space tiles not considered part of a structure, also ignores shuttle docking areas. var/area/t_area = get_area(t) if (t_area && (t_area.name == "Space" || findtext(t_area.name, "huttle"))) return 0 @@ -313,7 +313,7 @@ return 1 //Floorbots, having several functions, need sort out special conditions here. -obj/machinery/bot/floorbot/process_scan(var/scan_target) +obj/machinery/bot/floorbot/process_scan(scan_target) var/result var/turf/simulated/floor/F switch(process_type) @@ -341,7 +341,7 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target) result = scan_target return result -/obj/machinery/bot/floorbot/proc/repair(var/turf/target_turf) +/obj/machinery/bot/floorbot/proc/repair(turf/target_turf) if(istype(target_turf, /turf/space/)) //Must be a hull breach or in bridge mode to continue. @@ -385,7 +385,7 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target) anchored = 0 target = null -/obj/machinery/bot/floorbot/proc/eattile(var/obj/item/stack/tile/plasteel/T) +/obj/machinery/bot/floorbot/proc/eattile(obj/item/stack/tile/plasteel/T) if(!istype(T, /obj/item/stack/tile/plasteel)) return visible_message("[src] begins to collect tiles.") @@ -406,7 +406,7 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target) target = null mode = BOT_IDLE -/obj/machinery/bot/floorbot/proc/maketile(var/obj/item/stack/sheet/metal/M) +/obj/machinery/bot/floorbot/proc/maketile(obj/item/stack/sheet/metal/M) if(!istype(M, /obj/item/stack/sheet/metal)) return visible_message("[src] begins to create tiles.") @@ -462,7 +462,7 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target) return -/obj/item/weapon/storage/toolbox/mechanical/attackby(var/obj/item/stack/tile/plasteel/T, mob/user as mob, params) +/obj/item/weapon/storage/toolbox/mechanical/attackby(obj/item/stack/tile/plasteel/T, mob/user, params) if(!istype(T, /obj/item/stack/tile/plasteel)) ..() return @@ -481,7 +481,7 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target) user << "You need 10 floor tiles to start building a floorbot!" return -/obj/item/weapon/toolbox_tiles/attackby(var/obj/item/W, mob/user as mob, params) +/obj/item/weapon/toolbox_tiles/attackby(obj/item/W, mob/user, params) ..() if(isprox(W)) qdel(W) @@ -501,7 +501,7 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target) created_name = t -/obj/item/weapon/toolbox_tiles_sensor/attackby(var/obj/item/W, mob/user as mob, params) +/obj/item/weapon/toolbox_tiles_sensor/attackby(obj/item/W, mob/user, params) ..() if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm)) qdel(W) diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm index 0b60c45b1b7..e8a4b1ce2eb 100644 --- a/code/game/machinery/bots/medbot.dm +++ b/code/game/machinery/bots/medbot.dm @@ -133,10 +133,10 @@ text_dehack = "You reset [name]'s reagent processor circuits." text_dehack_fail = "[name] seems damaged and does not respond to reprogramming!" -/obj/machinery/bot/medbot/attack_paw(mob/user as mob) +/obj/machinery/bot/medbot/attack_paw(mob/user) return attack_hand(user) -/obj/machinery/bot/medbot/attack_hand(mob/user as mob) +/obj/machinery/bot/medbot/attack_hand(mob/user) . = ..() if (.) return @@ -259,7 +259,7 @@ if (health < current_health) //if medbot took some damage step_to(src, (get_step_away(src,user))) -/obj/machinery/bot/medbot/Emag(mob/user as mob) +/obj/machinery/bot/medbot/Emag(mob/user) ..() if(emagged == 2) declare_crit = 0 @@ -271,7 +271,7 @@ if(user) oldpatient = user -/obj/machinery/bot/medbot/process_scan(var/mob/living/carbon/human/H) +/obj/machinery/bot/medbot/process_scan(mob/living/carbon/human/H) if (H.stat == 2) return @@ -362,7 +362,7 @@ return -/obj/machinery/bot/medbot/proc/assess_patient(mob/living/carbon/C as mob) +/obj/machinery/bot/medbot/proc/assess_patient(mob/living/carbon/C) //Time to see if they need medical help! if(C.stat == 2) return 0 //welp too late for them! @@ -409,7 +409,7 @@ return 0 -/obj/machinery/bot/medbot/proc/medicate_patient(mob/living/carbon/C as mob) +/obj/machinery/bot/medbot/proc/medicate_patient(mob/living/carbon/C) if(!on) return @@ -504,7 +504,7 @@ reagent_id = null return -/obj/machinery/bot/medbot/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/bot/medbot/bullet_act(obj/item/projectile/Proj) if(Proj.flag == "taser") stunned = min(stunned+10,20) ..() @@ -533,7 +533,7 @@ qdel(src) return -/obj/machinery/bot/medbot/proc/declare(var/crit_patient) +/obj/machinery/bot/medbot/proc/declare(crit_patient) if(declare_cooldown) return var/area/location = get_area(src) @@ -546,7 +546,7 @@ * Medbot Assembly -- Can be made out of all three medkits. */ -/obj/item/weapon/storage/firstaid/attackby(var/obj/item/robot_parts/S, mob/user as mob, params) +/obj/item/weapon/storage/firstaid/attackby(obj/item/robot_parts/S, mob/user, params) if ((!istype(S, /obj/item/robot_parts/l_arm)) && (!istype(S, /obj/item/robot_parts/r_arm))) ..() @@ -574,7 +574,7 @@ qdel(src) -/obj/item/weapon/firstaid_arm_assembly/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/firstaid_arm_assembly/attackby(obj/item/weapon/W, mob/user, params) ..() if(istype(W, /obj/item/weapon/pen)) var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN) diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm index f8845ab32b4..f7b2e0c8010 100644 --- a/code/game/machinery/bots/mulebot.dm +++ b/code/game/machinery/bots/mulebot.dm @@ -83,7 +83,7 @@ obj/machinery/bot/mulebot/bot_reset() // screwdriver: open/close hatch // cell: insert it // other: chance to knock rider off bot -/obj/machinery/bot/mulebot/attackby(var/obj/item/I, var/mob/user, params) +/obj/machinery/bot/mulebot/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/card/id) || istype(I, /obj/item/device/pda)) if(toggle_lock(user)) user << "Controls [(locked ? "locked" : "unlocked")]." @@ -132,13 +132,13 @@ obj/machinery/bot/mulebot/bot_reset() ..() return -/obj/machinery/bot/mulebot/emag_act(mob/user as mob) +/obj/machinery/bot/mulebot/emag_act(mob/user) locked = !locked user << "You [locked ? "lock" : "unlock"] the mulebot's controls!" flick("mulebot-emagged", src) playsound(loc, 'sound/effects/sparks1.ogg', 100, 0) -/obj/machinery/bot/mulebot/ex_act(var/severity) +/obj/machinery/bot/mulebot/ex_act(severity) unload(0) switch(severity) if(1) @@ -150,7 +150,7 @@ obj/machinery/bot/mulebot/bot_reset() wires.RandomCut() return -/obj/machinery/bot/mulebot/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/bot/mulebot/bullet_act(obj/item/projectile/Proj) if(..()) if(prob(50) && !isnull(load)) unload(0) @@ -159,18 +159,18 @@ obj/machinery/bot/mulebot/bot_reset() wires.RandomCut() -/obj/machinery/bot/mulebot/attack_ai(var/mob/user) +/obj/machinery/bot/mulebot/attack_ai(mob/user) user.set_machine(src) interact(user, 1) -/obj/machinery/bot/mulebot/attack_hand(var/mob/user) +/obj/machinery/bot/mulebot/attack_hand(mob/user) . = ..() if (.) return user.set_machine(src) interact(user, 0) -/obj/machinery/bot/mulebot/interact(var/mob/user, var/ai=0) +/obj/machinery/bot/mulebot/interact(mob/user, ai=0) var/dat dat += "

Multiple Utility Load Effector Mk. V

" dat += "ID: [suffix]
" @@ -308,7 +308,7 @@ obj/machinery/bot/mulebot/bot_reset() usr.unset_machine() return -/obj/machinery/bot/mulebot/bot_control(var/command, mob/user, pda= 0) +/obj/machinery/bot/mulebot/bot_control(command, mob/user, pda= 0) if(pda && !wires.RemoteRX()) //MULE wireless is controlled by wires. return @@ -385,7 +385,7 @@ obj/machinery/bot/mulebot/bot_reset() /obj/machinery/bot/mulebot/proc/has_power() return !open && cell && cell.charge > 0 && wires.HasPower() -/obj/machinery/bot/mulebot/proc/toggle_lock(var/mob/user) +/obj/machinery/bot/mulebot/proc/toggle_lock(mob/user) if(allowed(user)) locked = !locked updateDialog() @@ -397,7 +397,7 @@ obj/machinery/bot/mulebot/bot_reset() // mousedrop a crate to load the bot // can load anything if emagged -/obj/machinery/bot/mulebot/MouseDrop_T(var/atom/movable/C, mob/user) +/obj/machinery/bot/mulebot/MouseDrop_T(atom/movable/C, mob/user) if(user.stat) return @@ -412,7 +412,7 @@ obj/machinery/bot/mulebot/bot_reset() // called to load a crate -/obj/machinery/bot/mulebot/proc/load(var/atom/movable/C) +/obj/machinery/bot/mulebot/proc/load(atom/movable/C) if(wires.LoadCheck() && !istype(C,/obj/structure/closet/crate)) visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.") playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0) @@ -457,7 +457,7 @@ obj/machinery/bot/mulebot/bot_reset() // called to unload the bot // argument is optional direction to unload // if zero, unload at bot's location -/obj/machinery/bot/mulebot/proc/unload(var/dirn) +/obj/machinery/bot/mulebot/proc/unload(dirn) if(!load) return @@ -660,14 +660,14 @@ obj/machinery/bot/mulebot/bot_reset() // calculates a path to the current destination // given an optional turf to avoid -/obj/machinery/bot/mulebot/calc_path(var/turf/avoid = null) +/obj/machinery/bot/mulebot/calc_path(turf/avoid = null) path = get_path_to(loc, target, src, /turf/proc/Distance_cardinal, 0, 250, id=botcard, exclude=avoid) // sets the current destination // signals all beacons matching the delivery code // beacons will return a signal giving their locations -/obj/machinery/bot/mulebot/proc/set_destination(var/new_dest) +/obj/machinery/bot/mulebot/proc/set_destination(new_dest) new_destination = new_dest get_nav() updateDialog() @@ -736,7 +736,7 @@ obj/machinery/bot/mulebot/bot_reset() return // called when bot bumps into anything -/obj/machinery/bot/mulebot/Bump(var/atom/obs) +/obj/machinery/bot/mulebot/Bump(atom/obs) if(!wires.MobAvoid()) //usually just bumps, but if avoidance disabled knock over mobs var/mob/M = obs if(ismob(M)) @@ -755,7 +755,7 @@ obj/machinery/bot/mulebot/bot_reset() // called from mob/living/carbon/human/Crossed() // when mulebot is in the same loc -/obj/machinery/bot/mulebot/proc/RunOver(var/mob/living/carbon/human/H) +/obj/machinery/bot/mulebot/proc/RunOver(mob/living/carbon/human/H) H.visible_message("[src] drives over [H]!", \ "[src] drives over you!") playsound(loc, 'sound/effects/splat.ogg', 50, 1) @@ -774,7 +774,7 @@ obj/machinery/bot/mulebot/bot_reset() bloodiness += 4 // player on mulebot attempted to move -/obj/machinery/bot/mulebot/relaymove(var/mob/user) +/obj/machinery/bot/mulebot/relaymove(mob/user) if(user.stat) return if(load == user) diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index 9f7119b1eeb..ee609ef42cd 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -84,14 +84,14 @@ text_dehack = "You reboot [name] and restore the target identification." text_dehack_fail = "[name] refuses to accept your authority!" -/obj/machinery/bot/secbot/attack_hand(mob/user as mob) +/obj/machinery/bot/secbot/attack_hand(mob/user) . = ..() if(.) return usr.set_machine(src) interact(user) -/obj/machinery/bot/secbot/interact(mob/user as mob) +/obj/machinery/bot/secbot/interact(mob/user) var/dat dat += hack(user) dat += text({" @@ -145,7 +145,7 @@ Auto Patrol: []"}, updateUsrDialog() -/obj/machinery/bot/secbot/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/bot/secbot/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) if(allowed(user) && !open && !emagged) locked = !locked @@ -168,7 +168,7 @@ Auto Patrol: []"}, target = user mode = BOT_HUNT -/obj/machinery/bot/secbot/Emag(mob/user as mob) +/obj/machinery/bot/secbot/Emag(mob/user) ..() if(emagged == 2) @@ -179,7 +179,7 @@ Auto Patrol: []"}, declare_arrests = 0 icon_state = "secbot[on]" -/obj/machinery/bot/secbot/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/bot/secbot/bullet_act(obj/item/projectile/Proj) if(istype(Proj ,/obj/item/projectile/beam)||istype(Proj,/obj/item/projectile/bullet)) if((Proj.damage_type == BURN) || (Proj.damage_type == BRUTE)) if (!Proj.nodamage && Proj.damage < src.health) @@ -402,7 +402,7 @@ Auto Patrol: []"}, //Secbot Construction -/obj/item/clothing/head/helmet/attackby(var/obj/item/device/assembly/signaler/S, mob/user as mob, params) +/obj/item/clothing/head/helmet/attackby(obj/item/device/assembly/signaler/S, mob/user, params) ..() if(!issignaler(S)) ..() diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 2780745861d..33b4a99844c 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -102,16 +102,16 @@ qdel(src) return -/obj/machinery/camera/proc/setViewRange(var/num = 7) +/obj/machinery/camera/proc/setViewRange(num = 7) src.view_range = num cameranet.updateVisibility(src, 0) -/obj/machinery/camera/proc/shock(var/mob/living/user) +/obj/machinery/camera/proc/shock(mob/living/user) if(!istype(user)) return user.electrocute_act(10, src) -/obj/machinery/camera/attack_paw(mob/living/carbon/alien/humanoid/user as mob) +/obj/machinery/camera/attack_paw(mob/living/carbon/alien/humanoid/user) if(!istype(user)) return user.do_attack_animation(src) @@ -327,7 +327,7 @@ return null -/obj/machinery/camera/proc/weld(var/obj/item/weapon/weldingtool/WT, var/mob/living/user) +/obj/machinery/camera/proc/weld(obj/item/weapon/weldingtool/WT, mob/living/user) if(busy) return 0 if(!WT.remove_fuel(0, user)) @@ -344,7 +344,7 @@ busy = 0 return 0 -/obj/machinery/camera/bullet_act(var/obj/item/projectile/proj) +/obj/machinery/camera/bullet_act(obj/item/projectile/proj) if(proj.damage_type == BRUTE) health = max(0, health - proj.damage) if(!health && status) diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index cf78392cecf..dce9196f8db 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -21,7 +21,7 @@ 4 = Screwdriver panel closed and is fully built (you cannot attach upgrades) */ -/obj/item/weapon/camera_assembly/attackby(obj/item/W as obj, mob/living/user as mob, params) +/obj/item/weapon/camera_assembly/attackby(obj/item/W, mob/living/user, params) switch(state) @@ -145,11 +145,11 @@ else icon_state = "cameracase" -/obj/item/weapon/camera_assembly/attack_hand(mob/user as mob) +/obj/item/weapon/camera_assembly/attack_hand(mob/user) if(!anchored) ..() -/obj/item/weapon/camera_assembly/proc/weld(var/obj/item/weapon/weldingtool/WT, var/mob/living/user) +/obj/item/weapon/camera_assembly/proc/weld(obj/item/weapon/weldingtool/WT, mob/living/user) if(busy) return 0 diff --git a/code/game/machinery/camera/motion.dm b/code/game/machinery/camera/motion.dm index 4454d5a89cb..b0b2b840af1 100644 --- a/code/game/machinery/camera/motion.dm +++ b/code/game/machinery/camera/motion.dm @@ -25,7 +25,7 @@ // If they aren't in range, lose the target. lostTarget(target) -/obj/machinery/camera/proc/newTarget(var/mob/target) +/obj/machinery/camera/proc/newTarget(mob/target) if (istype(target, /mob/living/silicon/ai)) return 0 if (detectTime == 0) detectTime = world.time // start the clock @@ -33,7 +33,7 @@ motionTargets += target return 1 -/obj/machinery/camera/proc/lostTarget(var/mob/target) +/obj/machinery/camera/proc/lostTarget(mob/target) if (target in motionTargets) motionTargets -= target if (motionTargets.len == 0) diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index 0dfc5d045d0..a7657017611 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -22,7 +22,7 @@ return T -/mob/living/silicon/ai/proc/ai_camera_list(var/camera) +/mob/living/silicon/ai/proc/ai_camera_list(camera) if (!camera) return 0 @@ -73,7 +73,7 @@ return targets -/mob/living/silicon/ai/verb/ai_camera_track(var/target_name in trackable_mobs()) +/mob/living/silicon/ai/verb/ai_camera_track(target_name in trackable_mobs()) set name = "track" set hidden = 1 //Don't display it on the verb lists. This verb exists purely so you can type "track Oldman Robustin" and follow his ass @@ -122,7 +122,7 @@ else sleep(10) continue - + else cameraticks = 0 U.tracking = 0 @@ -137,7 +137,7 @@ sleep(10) -/proc/near_camera(var/mob/living/M) +/proc/near_camera(mob/living/M) if (!isturf(M.loc)) return 0 if(isrobot(M)) @@ -148,7 +148,7 @@ return 0 return 1 -/obj/machinery/camera/attack_ai(var/mob/living/silicon/ai/user as mob) +/obj/machinery/camera/attack_ai(mob/living/silicon/ai/user) if (!istype(user)) return if (!src.can_use()) @@ -156,7 +156,7 @@ user.eyeobj.setLoc(get_turf(src)) -/mob/living/silicon/ai/attack_ai(var/mob/user as mob) +/mob/living/silicon/ai/attack_ai(mob/user) ai_camera_list() /proc/camera_sort(list/L) diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index adb2c039ce8..6c76c19e864 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -60,7 +60,7 @@ //Find a dead mob with a brain and client. -/proc/find_dead_player(var/find_key) +/proc/find_dead_player(find_key) if (isnull(find_key)) return @@ -83,7 +83,7 @@ ..() icon_state = "datadisk[pick(0,1,2)]" -/obj/item/weapon/disk/data/attack_self(mob/user as mob) +/obj/item/weapon/disk/data/attack_self(mob/user) read_only = !read_only user << "You flip the write-protect tab to [src.read_only ? "protected" : "unprotected"]." @@ -109,11 +109,11 @@ src.healthstring = "ERROR" return src.healthstring -/obj/machinery/clonepod/attack_ai(mob/user as mob) +/obj/machinery/clonepod/attack_ai(mob/user) return attack_hand(user) -/obj/machinery/clonepod/attack_paw(mob/user as mob) +/obj/machinery/clonepod/attack_paw(mob/user) return attack_hand(user) -/obj/machinery/clonepod/attack_hand(mob/user as mob) +/obj/machinery/clonepod/attack_hand(mob/user) if (isnull(src.occupant) || !is_operational()) return if ((!isnull(src.occupant)) && (src.occupant.stat != 2)) @@ -124,7 +124,7 @@ //Clonepod //Start growing a human clone in the pod! -/obj/machinery/clonepod/proc/growclone(var/ckey, var/clonename, var/ui, var/se, var/mindref, var/datum/species/mrace, var/list/features, var/factions) +/obj/machinery/clonepod/proc/growclone(ckey, clonename, ui, se, mindref, datum/species/mrace, list/features, factions) if(panel_open) return 0 if(mess || attempting) @@ -244,7 +244,7 @@ return //Let's unlock this early I guess. Might be too early, needs tweaking. -/obj/machinery/clonepod/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/clonepod/attackby(obj/item/weapon/W, mob/user, params) if(!(occupant || mess || locked)) if(default_deconstruction_screwdriver(user, "[icon_state]_maintenance", "[initial(icon_state)]",W)) return @@ -269,7 +269,7 @@ else ..() -/obj/machinery/clonepod/emag_act(user as mob) +/obj/machinery/clonepod/emag_act(mob/user) if (isnull(src.occupant)) return user << "You force an emergency ejection." @@ -277,7 +277,7 @@ src.go_out() //Put messages in the connected computer's temp var for display. -/obj/machinery/clonepod/proc/connected_message(var/message) +/obj/machinery/clonepod/proc/connected_message(message) if ((isnull(src.connected)) || (!istype(src.connected, /obj/machinery/computer/cloning))) return 0 if (!message) @@ -343,7 +343,7 @@ qdel(src.occupant) return -/obj/machinery/clonepod/relaymove(mob/user as mob) +/obj/machinery/clonepod/relaymove(mob/user) if (user.stat) return src.go_out() diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index 62427b807e5..ffaecb88a14 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -10,7 +10,7 @@ var/damaged = 0 var/last_change = 0 -/obj/machinery/computer/HolodeckControl/attack_hand(var/mob/user as mob) +/obj/machinery/computer/HolodeckControl/attack_hand(mob/user) if(..()) return @@ -115,7 +115,7 @@ -/obj/machinery/computer/HolodeckControl/emag_act(mob/user as mob) +/obj/machinery/computer/HolodeckControl/emag_act(mob/user) if(!emagged) playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 @@ -184,7 +184,7 @@ -/obj/machinery/computer/HolodeckControl/proc/derez(var/obj/obj , var/silent = 1) +/obj/machinery/computer/HolodeckControl/proc/derez(obj/obj , silent = 1) holographic_items.Remove(obj) if(obj == null) @@ -200,7 +200,7 @@ visible_message("The [oldobj.name] fades away!") qdel(obj) -/obj/machinery/computer/HolodeckControl/proc/checkInteg(var/area/A) +/obj/machinery/computer/HolodeckControl/proc/checkInteg(area/A) for(var/turf/T in A) if(istype(T, /turf/space)) return 0 @@ -212,7 +212,7 @@ if(stat & NOPOWER) emergencyShutdown() -/obj/machinery/computer/HolodeckControl/proc/loadProgram(var/area/A) +/obj/machinery/computer/HolodeckControl/proc/loadProgram(area/A) if(world.time < (last_change + 25)) if(world.time < (last_change + 15))//To prevent super-spam clicking, reduced process size and annoyance -Sieve @@ -276,7 +276,7 @@ icon_state = "floor" thermal_conductivity = 0 -/turf/simulated/floor/holofloor/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/turf/simulated/floor/holofloor/attackby(obj/item/weapon/W, mob/user, params) return // HOLOFLOOR DOES NOT GIVE A FUCK @@ -285,27 +285,27 @@ gender = PLURAL name = "lush grass" -/turf/simulated/floor/grass/holo/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/turf/simulated/floor/grass/holo/attackby(obj/item/weapon/W, mob/user, params) return // HOLOGRASS DOES NOT GIVE A FUCK /obj/structure/table/holotable name = "table" -/obj/structure/table/holotable/attack_paw(mob/user as mob) +/obj/structure/table/holotable/attack_paw(mob/user) return attack_hand(user) -/obj/structure/table/holotable/attack_alien(mob/user as mob) //Removed code for larva since it doesn't work. Previous code is now a larva ability. /N +/obj/structure/table/holotable/attack_alien(mob/user) //Removed code for larva since it doesn't work. Previous code is now a larva ability. /N return attack_hand(user) -/obj/structure/table/holotable/attack_animal(mob/living/simple_animal/user as mob) //Removed code for larva since it doesn't work. Previous code is now a larva ability. /N +/obj/structure/table/holotable/attack_animal(mob/living/simple_animal/user) //Removed code for larva since it doesn't work. Previous code is now a larva ability. /N return attack_hand(user) -/obj/structure/table/holotable/attack_hand(mob/user as mob) +/obj/structure/table/holotable/attack_hand(mob/user) return // HOLOTABLE DOES NOT GIVE A FUCK -/obj/structure/table/holotable/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/table/holotable/attackby(obj/item/weapon/W, mob/user, params) if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2) var/obj/item/weapon/grab/G = W if(G.state < GRAB_AGGRESSIVE) @@ -365,13 +365,13 @@ return 1 return 0 -/obj/item/weapon/holo/esword/attack(target as mob, mob/user as mob) +/obj/item/weapon/holo/esword/attack(mob/target, mob/user) ..() /obj/item/weapon/holo/esword/New() item_color = pick("red","blue","green","purple") -/obj/item/weapon/holo/esword/attack_self(mob/living/user as mob) +/obj/item/weapon/holo/esword/attack_self(mob/living/user) active = !active if (active) force = 30 @@ -423,7 +423,7 @@ density = 1 throwpass = 1 -/obj/structure/holohoop/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/holohoop/attackby(obj/item/weapon/W, mob/user, params) if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2) var/obj/item/weapon/grab/G = W if(G.state < GRAB_AGGRESSIVE) @@ -469,11 +469,11 @@ active_power_usage = 6 power_channel = ENVIRON -/obj/machinery/readybutton/attack_ai(mob/user as mob) +/obj/machinery/readybutton/attack_ai(mob/user) user << "The station AI is not to interact with these devices" return -/obj/machinery/readybutton/attack_paw(mob/user as mob) +/obj/machinery/readybutton/attack_paw(mob/user) user << "You are too primitive to use this device!" return @@ -481,10 +481,10 @@ ..() -/obj/machinery/readybutton/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/readybutton/attackby(obj/item/weapon/W, mob/user, params) user << "The device is a solid button, there's nothing you can do with it!" -/obj/machinery/readybutton/attack_hand(mob/user as mob) +/obj/machinery/readybutton/attack_hand(mob/user) if(user.stat || stat & (NOPOWER|BROKEN)) user << "This device is not powered!" return diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 528756c0c7e..fa5e5e563cf 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -8,7 +8,7 @@ icon_keyboard = "tech_key" icon_screen = "ai-fixer" -/obj/machinery/computer/aifixer/attackby(I as obj, user as mob, params) +/obj/machinery/computer/aifixer/attackby(obj/I, mob/user, params) if(occupier && istype(I, /obj/item/weapon/screwdriver)) if(stat & (NOPOWER|BROKEN)) user << "The screws on [name]'s screen won't budge." @@ -18,7 +18,7 @@ else ..() -/obj/machinery/computer/aifixer/attack_hand(var/mob/user as mob) +/obj/machinery/computer/aifixer/attack_hand(mob/user) if(..()) return interact(user) @@ -121,7 +121,7 @@ else overlays += "ai-fixer-empty" -/obj/machinery/computer/aifixer/transfer_ai(var/interaction, var/mob/user, var/mob/living/silicon/ai/AI, var/obj/item/device/aicard/card) +/obj/machinery/computer/aifixer/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card) if(!..()) return //Downloading AI from card to terminal. diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index d9a0b84f457..661a8d78fe5 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -109,7 +109,7 @@ src.enemy_name = replacetext((name_part1 + name_part2), "the ", "") src.name = (name_action + name_part1 + name_part2) -/obj/machinery/computer/arcade/battle/attack_hand(mob/user as mob) +/obj/machinery/computer/arcade/battle/attack_hand(mob/user) if(..()) return user.set_machine(src) @@ -273,7 +273,7 @@ return -/obj/machinery/computer/arcade/battle/emag_act(mob/user as mob) +/obj/machinery/computer/arcade/battle/emag_act(mob/user) if(!emagged) temp = "If you die in the game, you die for real!" player_hp = 30 @@ -361,7 +361,7 @@ playing = 1 gameover = 0 -/obj/machinery/computer/arcade/orion_trail/attack_hand(mob/user as mob) +/obj/machinery/computer/arcade/orion_trail/attack_hand(mob/user) if(..()) return if(fuel <= 0 || food <=0 || settlers.len == 0) @@ -676,7 +676,7 @@ name = "The Orion Trail" desc = "Learn how our ancestors got to Orion, and have fun in the process!" -/obj/machinery/computer/arcade/orion_trail/emag_act(mob/user as mob) +/obj/machinery/computer/arcade/orion_trail/emag_act(mob/user) if(!emagged) user << "You override the cheat code menu and skip to Cheat #[rand(1, 50)]: Realism Mode." name = "The Orion Trail: Realism Edition" diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index ed6360ff691..d49f0c1cee5 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -248,7 +248,7 @@ build_path = /obj/machinery/computer/libraryconsole origin_tech = "programming=1" -/obj/item/weapon/circuitboard/card/minor/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/item/weapon/circuitboard/card/minor/attackby(obj/item/I, mob/user, params) if(istype(I,/obj/item/device/multitool)) var/list/dept_list = list("general","security","medical","science","engineering") var/choice = input("Currently set to [dept_list[target_dept]] personnel database. Changing to:","Multitool-Circuitboard interface") as null|anything in dept_list @@ -256,7 +256,7 @@ target_dept = dept_list.Find(choice) return -/obj/item/weapon/circuitboard/supplycomp/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/item/weapon/circuitboard/supplycomp/attackby(obj/item/I, mob/user, params) if(istype(I,/obj/item/device/multitool)) var/catastasis = src.contraband_enabled var/opposite_catastasis @@ -278,7 +278,7 @@ user << "DERP! BUG! Report this (And what you were doing to cause it) to Agouri" return -/obj/item/weapon/circuitboard/rdconsole/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/item/weapon/circuitboard/rdconsole/attackby(obj/item/I, mob/user, params) if(istype(I,/obj/item/weapon/screwdriver)) if(build_path == /obj/machinery/computer/rdconsole/core) name = "circuit board (RD Console - Robotics)" @@ -290,7 +290,7 @@ user << "Defaulting access protocols." return -/obj/item/weapon/circuitboard/libraryconsole/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/item/weapon/circuitboard/libraryconsole/attackby(obj/item/I, mob/user, params) if(istype(I,/obj/item/weapon/screwdriver)) if(build_path == /obj/machinery/computer/libraryconsole/bookmanagement) name = "circuit board (Library Visitor Console)" @@ -302,7 +302,7 @@ user << "Access protocols successfully updated." return -/obj/item/weapon/circuitboard/shuttle/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/item/weapon/circuitboard/shuttle/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/device/multitool)) var/chosen_id = round(input(usr, "Choose an ID number (-1 for reset):", "Input an Integer", null) as num|null) if(chosen_id >= 0) @@ -311,7 +311,7 @@ shuttleId = initial(shuttleId) return -/obj/structure/computerframe/attackby(obj/item/P as obj, mob/user as mob, params) +/obj/structure/computerframe/attackby(obj/item/P, mob/user, params) add_fingerprint(user) switch(state) if(0) diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 10f396874eb..84c32da87c0 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -9,7 +9,7 @@ var/list/network = list("SS13") var/mapping = 0//For the overview file, interesting bit of code. -/obj/machinery/computer/security/check_eye(var/mob/user as mob) +/obj/machinery/computer/security/check_eye(mob/user) if ((get_dist(user, src) > 1 || user.eye_blind || !( current ) || !( current.status )) && (!istype(user, /mob/living/silicon))) return null var/list/viewing = viewers(src) @@ -19,7 +19,7 @@ return 1 -/obj/machinery/computer/security/attack_hand(var/mob/user as mob) +/obj/machinery/computer/security/attack_hand(mob/user) if(!stat) if (!network) diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index 61a605ee6c6..d7b9be9aaac 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -13,19 +13,19 @@ eyeobj = new() eyeobj.origin = src -/obj/machinery/computer/camera_advanced/proc/GrantActions(var/mob/living/carbon/user) +/obj/machinery/computer/camera_advanced/proc/GrantActions(mob/living/carbon/user) off_action.target = user off_action.Grant(user) jump_action.target = user jump_action.Grant(user) -/obj/machinery/computer/camera_advanced/check_eye(var/mob/user as mob) +/obj/machinery/computer/camera_advanced/check_eye(mob/user) if (get_dist(user, src) > 1 || user.eye_blind) off_action.Activate() return 0 return 1 -/obj/machinery/computer/camera_advanced/attack_hand(var/mob/user as mob) +/obj/machinery/computer/camera_advanced/attack_hand(mob/user) if(..()) return if(!iscarbon(user)) @@ -71,7 +71,7 @@ return user.client return null -/mob/camera/aiEye/remote/setLoc(var/T) +/mob/camera/aiEye/remote/setLoc(T) if(user) if(!isturf(user.loc)) return diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 4fc88ee1d18..f220d02a177 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -44,7 +44,7 @@ var/time_last_changed_position = 0 //Assoc array: "JobName" = (int) var/list/opened_positions = list(); -/obj/machinery/computer/card/attackby(O as obj, user as mob, params)//TODO:SANITY +/obj/machinery/computer/card/attackby(obj/O, mob/user, params)//TODO:SANITY if(istype(O, /obj/item/weapon/card/id)) var/obj/item/weapon/card/id/idcard = O if(check_access(idcard)) @@ -73,7 +73,7 @@ var/time_last_changed_position = 0 //Logic check for Topic() if you can open the job -/obj/machinery/computer/card/proc/can_open_job(var/datum/job/job) +/obj/machinery/computer/card/proc/can_open_job(datum/job/job) if(job) if(!job_blacklisted(job.title)) if((job.total_positions <= player_list.len * (max_relative_positions / 100))) @@ -85,7 +85,7 @@ var/time_last_changed_position = 0 return 0 //Logic check for Topic() if you can close the job -/obj/machinery/computer/card/proc/can_close_job(var/datum/job/job) +/obj/machinery/computer/card/proc/can_close_job(datum/job/job) if(job) if(!job_blacklisted(job.title)) if(job.total_positions > job.current_positions) @@ -96,7 +96,7 @@ var/time_last_changed_position = 0 return -1 return 0 -/obj/machinery/computer/card/attack_hand(var/mob/user as mob) +/obj/machinery/computer/card/attack_hand(mob/user) if(..()) return @@ -475,7 +475,7 @@ var/time_last_changed_position = 0 updateUsrDialog() return -/obj/machinery/computer/card/proc/get_subordinates(var/rank) +/obj/machinery/computer/card/proc/get_subordinates(rank) for(var/datum/job/job in SSjob.occupations) if(rank in job.department_head) head_subordinates += job.title diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index e2078720d8c..a75a603344b 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -73,7 +73,7 @@ return null -/obj/machinery/computer/cloning/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/machinery/computer/cloning/attackby(obj/item/W, mob/user, params) if (istype(W, /obj/item/weapon/disk/data)) //INSERT SOME DISKETTES if (!src.diskette) if(!user.drop_item()) @@ -349,7 +349,7 @@ src.updateUsrDialog() return -/obj/machinery/computer/cloning/proc/scan_mob(mob/living/carbon/human/subject as mob) +/obj/machinery/computer/cloning/proc/scan_mob(mob/living/carbon/human/subject) if (!check_dna_integrity(subject) || !istype(subject)) scantemp = "Unable to locate valid genetic data." return diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 21dfa6b0585..ead497ab43d 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -322,21 +322,21 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 src.updateUsrDialog() -/obj/machinery/computer/communications/attackby(var/obj/I as obj, var/mob/user as mob, params) +/obj/machinery/computer/communications/attackby(obj/I, mob/user, params) if(istype(I, /obj/item/weapon/card/id)) attack_hand(user) else ..() return -/obj/machinery/computer/communications/emag_act(mob/user as mob) +/obj/machinery/computer/communications/emag_act(mob/user) if(!emagged) src.emagged = 1 if(authenticated == 1) authenticated = 2 user << "You scramble the communication routing circuits." -/obj/machinery/computer/communications/attack_hand(var/mob/user as mob) +/obj/machinery/computer/communications/attack_hand(mob/user) if(..()) return if (src.z > 6) @@ -456,7 +456,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 popup.set_content(dat) popup.open() -/obj/machinery/computer/communications/proc/get_javascript_header(var/form_id) +/obj/machinery/computer/communications/proc/get_javascript_header(form_id) var/dat = {""} return dat -/obj/machinery/computer/communications/proc/get_call_shuttle_form(var/ai_interface = 0) +/obj/machinery/computer/communications/proc/get_call_shuttle_form(ai_interface = 0) var/form_id = "callshuttle" var/dat = get_javascript_header(form_id) dat += "
" @@ -493,7 +493,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 dat += "
Are you sure you want to cancel the shuttle? \[ Cancel \]" return dat -/obj/machinery/computer/communications/proc/interact_ai(var/mob/living/silicon/ai/user as mob) +/obj/machinery/computer/communications/proc/interact_ai(mob/living/silicon/ai/user) var/dat = "" switch(src.aistate) if(STATE_DEFAULT) @@ -567,7 +567,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 dat += "

\[ [(src.aistate != STATE_DEFAULT) ? "Main Menu | " : ""]Close \]" return dat -/obj/machinery/computer/communications/proc/make_announcement(var/mob/living/user, var/is_silicon) +/obj/machinery/computer/communications/proc/make_announcement(mob/living/user, is_silicon) var/input = stripped_input(user, "Please choose a message to announce to the station crew.", "What?") if(!input || !user.canUseTopic(src)) return @@ -586,7 +586,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 -/obj/machinery/computer/communications/proc/post_status(var/command, var/data1, var/data2) +/obj/machinery/computer/communications/proc/post_status(command, data1, data2) var/datum/radio_frequency/frequency = radio_controller.return_frequency(1435) diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index 4e2613a72f0..e21322eaf7f 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -58,7 +58,7 @@ else return -/obj/machinery/computer/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/computer/bullet_act(obj/item/projectile/Proj) if(prob(Proj.damage)) if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) set_broken() @@ -97,7 +97,7 @@ update_icon() return -/obj/machinery/computer/attackby(I as obj, user as mob, params) +/obj/machinery/computer/attackby(obj/I, mob/user, params) if(istype(I, /obj/item/weapon/screwdriver) && circuit) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) user << " You start to disconnect the monitor..." diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index 875cb4403ae..adb2eff7d34 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -4,7 +4,7 @@ var/mob/living/silicon/current = null //The target of future law uploads icon_screen = "command" -/obj/machinery/computer/upload/attackby(obj/item/O as obj, mob/user as mob, params) +/obj/machinery/computer/upload/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/weapon/aiModule)) var/obj/item/weapon/aiModule/M = O if(src.stat & (NOPOWER|BROKEN|MAINT)) @@ -25,7 +25,7 @@ else ..() -/obj/machinery/computer/upload/proc/can_upload_to(var/mob/living/silicon/S as mob) +/obj/machinery/computer/upload/proc/can_upload_to(mob/living/silicon/S) if(S.stat == DEAD || S.syndicate) return 0 return 1 @@ -35,7 +35,7 @@ desc = "Used to upload laws to the AI." circuit = /obj/item/weapon/circuitboard/aiupload -/obj/machinery/computer/upload/ai/attack_hand(var/mob/user as mob) +/obj/machinery/computer/upload/ai/attack_hand(mob/user) if(..()) return @@ -46,7 +46,7 @@ else user << "[src.current.name] selected for law changes." -/obj/machinery/computer/upload/ai/can_upload_to(var/mob/living/silicon/ai/A as mob) +/obj/machinery/computer/upload/ai/can_upload_to(mob/living/silicon/ai/A) if(!A || !isAI(A)) return 0 if(A.control_disabled) @@ -59,7 +59,7 @@ desc = "Used to upload laws to Cyborgs." circuit = /obj/item/weapon/circuitboard/borgupload -/obj/machinery/computer/upload/borg/attack_hand(var/mob/user as mob) +/obj/machinery/computer/upload/borg/attack_hand(mob/user) if(..()) return @@ -70,7 +70,7 @@ else user << "[src.current.name] selected for law changes." -/obj/machinery/computer/upload/borg/can_upload_to(var/mob/living/silicon/robot/B as mob) +/obj/machinery/computer/upload/borg/can_upload_to(mob/living/silicon/robot/B) if(!B || !isrobot(B)) return 0 if(B.scrambledcodes || B.emagged) diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 29f1493a9bc..1eaaa0b7fd5 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -20,7 +20,7 @@ var/sortBy = "name" var/order = 1 // -1 = Descending - 1 = Ascending -/obj/machinery/computer/med_data/attackby(obj/item/O as obj, mob/user as mob, params) +/obj/machinery/computer/med_data/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/weapon/card/id) && !scan) if(!user.drop_item()) return @@ -30,7 +30,7 @@ else ..() -/obj/machinery/computer/med_data/attack_hand(mob/user as mob) +/obj/machinery/computer/med_data/attack_hand(mob/user) if(..()) return var/dat diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 7d31061f0ba..c575e09025f 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -30,14 +30,14 @@ var/customjob = "Admin" var/custommessage = "This is a test, please ignore." -/obj/machinery/computer/message_monitor/attackby(obj/item/weapon/O as obj, mob/living/user as mob, params) +/obj/machinery/computer/message_monitor/attackby(obj/item/weapon/O, mob/living/user, params) if(istype(O, /obj/item/weapon/screwdriver) && emagged) //Stops people from just unscrewing the monitor and putting it back to get the console working again. user << "It is too hot to mess with!" return ..() -/obj/machinery/computer/message_monitor/emag_act(user as mob) +/obj/machinery/computer/message_monitor/emag_act(mob/user) if(!emagged) if(!isnull(src.linkedServer)) emagged = 1 @@ -60,7 +60,7 @@ linkedServer = message_servers[1] return -/obj/machinery/computer/message_monitor/attack_hand(var/mob/living/user as mob) +/obj/machinery/computer/message_monitor/attack_hand(mob/living/user) if(..()) return //If the computer is being hacked or is emagged, display the reboot message. @@ -244,7 +244,7 @@ popup.open() return -/obj/machinery/computer/message_monitor/proc/BruteForce(mob/user as mob) +/obj/machinery/computer/message_monitor/proc/BruteForce(mob/user) if(isnull(linkedServer)) user << "Could not complete brute-force: Linked Server Disconnected!" else diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index faba05e021f..85b3b5f4802 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -14,7 +14,7 @@ var/obj/item/weapon/card/id/prisoner/inserted_id circuit = /obj/item/weapon/circuitboard/prisoner -/obj/machinery/computer/prisoner/attack_hand(var/mob/user as mob) +/obj/machinery/computer/prisoner/attack_hand(mob/user) if(..()) return user.set_machine(src) @@ -71,7 +71,7 @@ popup.open() return -/obj/machinery/computer/prisoner/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/machinery/computer/prisoner/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/card/id)) return attack_hand(user) ..() diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index e358e3b9107..ea95319ca2c 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -10,7 +10,7 @@ circuit = /obj/item/weapon/circuitboard/robotics var/temp = null -/obj/machinery/computer/robotics/proc/can_control(var/mob/user, var/mob/living/silicon/robot/R) +/obj/machinery/computer/robotics/proc/can_control(mob/user, mob/living/silicon/robot/R) if(!istype(R)) return 0 if(istype(user, /mob/living/silicon/ai)) @@ -23,12 +23,12 @@ return 0 return 1 -/obj/machinery/computer/robotics/attack_hand(var/mob/user as mob) +/obj/machinery/computer/robotics/attack_hand(mob/user) if(..()) return interact(user) -/obj/machinery/computer/robotics/interact(var/mob/user as mob) +/obj/machinery/computer/robotics/interact(mob/user) if (src.z > 6) user << "Unable to establish a connection: \black You're too far away from the station!" return diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 64795c7684e..c87a35f2486 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -24,7 +24,7 @@ var/order = 1 // -1 = Descending - 1 = Ascending -/obj/machinery/computer/secure_data/attackby(obj/item/O as obj, mob/user as mob, params) +/obj/machinery/computer/secure_data/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/weapon/card/id) && !scan) if(!user.drop_item()) return @@ -35,7 +35,7 @@ ..() //Someone needs to break down the dat += into chunks instead of long ass lines. -/obj/machinery/computer/secure_data/attack_hand(mob/user as mob) +/obj/machinery/computer/secure_data/attack_hand(mob/user) if(..()) return if(src.z > 6) @@ -690,7 +690,7 @@ What a mess.*/ updateUsrDialog() return -/obj/machinery/computer/secure_data/proc/get_photo(var/mob/user) +/obj/machinery/computer/secure_data/proc/get_photo(mob/user) var/obj/item/weapon/photo/P = null if(istype(user, /mob/living/silicon)) var/mob/living/silicon/tempAI = user diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm index 09f0ce71324..2ea4b0b285e 100644 --- a/code/game/machinery/computer/shuttle.dm +++ b/code/game/machinery/computer/shuttle.dm @@ -7,7 +7,7 @@ var/list/authorized = list() -/obj/machinery/computer/emergency_shuttle/attackby(var/obj/item/weapon/card/W as obj, var/mob/user as mob, params) +/obj/machinery/computer/emergency_shuttle/attackby(obj/item/weapon/card/W, mob/user, params) if(stat & (BROKEN|NOPOWER)) return if(!istype(W, /obj/item/weapon/card)) return @@ -65,7 +65,7 @@ minor_announce("All authorizations to launch the shuttle early have been revoked.") authorized.Cut() -/obj/machinery/computer/emergency_shuttle/emag_act(mob/user as mob) +/obj/machinery/computer/emergency_shuttle/emag_act(mob/user) if(!emagged && SSshuttle.emergency.mode == SHUTTLE_DOCKED) var/time = SSshuttle.emergency.timeLeft() message_admins("[key_name_admin(user.client)](?) (FLW) has emagged the emergency shuttle [time] seconds before launch.",0,1) diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index 02c39d11f54..39df18e81c5 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -49,7 +49,7 @@ return -/obj/machinery/computer/station_alert/proc/triggerAlarm(var/class, area/A, var/O, var/obj/alarmsource) +/obj/machinery/computer/station_alert/proc/triggerAlarm(class, area/A, O, obj/alarmsource) if(alarmsource.z != z) return if(stat & (BROKEN)) @@ -74,7 +74,7 @@ return 1 -/obj/machinery/computer/station_alert/proc/cancelAlarm(var/class, area/A as area, obj/origin) +/obj/machinery/computer/station_alert/proc/cancelAlarm(class, area/A, obj/origin) if(stat & (BROKEN)) return var/list/L = src.alarms[class] diff --git a/code/game/machinery/computer/telecrystalconsoles.dm b/code/game/machinery/computer/telecrystalconsoles.dm index 29b07601e4f..2bd44d2f137 100644 --- a/code/game/machinery/computer/telecrystalconsoles.dm +++ b/code/game/machinery/computer/telecrystalconsoles.dm @@ -30,7 +30,7 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F name = "[name] [rand(1,999)]" -/obj/machinery/computer/telecrystals/uplinker/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/computer/telecrystals/uplinker/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item)) if(uplinkholder) @@ -63,7 +63,7 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F uplinkholder = null update_icon() -/obj/machinery/computer/telecrystals/uplinker/proc/donateTC(var/amt, var/addLog = 1) +/obj/machinery/computer/telecrystals/uplinker/proc/donateTC(amt, addLog = 1) if(uplinkholder && linkedboss) if(amt <= uplinkholder.hidden_uplink.uses) uplinkholder.hidden_uplink.uses -= amt @@ -71,7 +71,7 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F if(addLog) linkedboss.logTransfer("[src] donated [amt] telecrystals to [linkedboss].") -/obj/machinery/computer/telecrystals/uplinker/proc/giveTC(var/amt, var/addLog = 1) +/obj/machinery/computer/telecrystals/uplinker/proc/giveTC(amt, addLog = 1) if(uplinkholder && linkedboss) if(amt <= linkedboss.storedcrystals) uplinkholder.hidden_uplink.uses += amt @@ -81,7 +81,7 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F /////// -/obj/machinery/computer/telecrystals/uplinker/attack_hand(mob/user as mob) +/obj/machinery/computer/telecrystals/uplinker/attack_hand(mob/user) if(..()) return src.add_fingerprint(user) @@ -137,7 +137,7 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F var/list/TCstations = list() var/list/transferlog = list() -/obj/machinery/computer/telecrystals/boss/proc/logTransfer(var/logmessage) +/obj/machinery/computer/telecrystals/boss/proc/logTransfer(logmessage) transferlog += ("[worldtime2text()] [logmessage]") /obj/machinery/computer/telecrystals/boss/proc/scanUplinkers() @@ -156,12 +156,12 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F while(!IsMultiple(++danger,10))//Just round up to the nearest multiple of ten. scaleTC(danger) -/obj/machinery/computer/telecrystals/boss/proc/scaleTC(var/amt)//Its own proc, since it'll probably need a lot of tweaks for balance, use a fancier algorhithm, etc. +/obj/machinery/computer/telecrystals/boss/proc/scaleTC(amt)//Its own proc, since it'll probably need a lot of tweaks for balance, use a fancier algorhithm, etc. storedcrystals += amt * NUKESCALINGMODIFIER ///////// -/obj/machinery/computer/telecrystals/boss/attack_hand(var/mob/user as mob) +/obj/machinery/computer/telecrystals/boss/attack_hand(mob/user) if(..()) return src.add_fingerprint(user) diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 6d83a84185d..61a2136b3d2 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -53,7 +53,7 @@ else desc += "." -/obj/machinery/constructable_frame/machine_frame/attackby(obj/item/P as obj, mob/user as mob, params) +/obj/machinery/constructable_frame/machine_frame/attackby(obj/item/P, mob/user, params) if(P.crit_fail) user << "This part is faulty, you cannot add this to the machine!" return diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index a0c17f6a556..791f42c27c4 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -80,7 +80,7 @@ return close_machine(target) -/obj/machinery/atmospherics/unary/cryo_cell/relaymove(var/mob/user) +/obj/machinery/atmospherics/unary/cryo_cell/relaymove(mob/user) open_machine() /obj/machinery/atmospherics/unary/cryo_cell/container_resist() @@ -135,7 +135,7 @@ * * @return nothing */ -/obj/machinery/atmospherics/unary/cryo_cell/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/atmospherics/unary/cryo_cell/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if(user == occupant || user.stat || panel_open) return diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 8a0cc63b0e4..1feb4e3b5e3 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -63,7 +63,7 @@ for reference: var/health = 100.0 var/maxhealth = 100.0 -/obj/structure/barricade/wooden/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/structure/barricade/wooden/attackby(obj/item/W, mob/user, params) user.changeNext_move(CLICK_CD_MELEE) if (istype(W, /obj/item/stack/sheet/mineral/wood)) if (src.health < src.maxhealth) @@ -148,7 +148,7 @@ for reference: src.icon_state = "barrier[src.locked]" -/obj/machinery/deployable/barrier/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/deployable/barrier/attackby(obj/item/weapon/W, mob/user, params) if (W.GetID()) if (src.allowed(user)) if (src.emagged < 2.0) @@ -192,7 +192,7 @@ for reference: src.explode() ..() -/obj/machinery/deployable/emag_act(user as mob) +/obj/machinery/deployable/emag_act(mob/user) if (src.emagged == 0) src.emagged = 1 src.req_access = null diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index 21e5a276091..c235aadf40b 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -29,16 +29,16 @@ idle_power_usage = 2 active_power_usage = 4 -/obj/machinery/door_control/attack_ai(mob/user as mob) +/obj/machinery/door_control/attack_ai(mob/user) if(wires & 2) return src.attack_hand(user) else user << "Error, no route to host." -/obj/machinery/door_control/attack_paw(mob/user as mob) +/obj/machinery/door_control/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/door_control/attackby(obj/item/weapon/W, mob/user as mob, params) +/obj/machinery/door_control/attackby(obj/item/weapon/W, mob/user, params) /* For later implementation if (istype(W, /obj/item/weapon/screwdriver)) { @@ -57,12 +57,12 @@ return return src.attack_hand(user) -/obj/machinery/door_control/emag_act(user as mob) +/obj/machinery/door_control/emag_act(mob/user) req_access = list() req_one_access = list() playsound(src.loc, "sparks", 100, 1) -/obj/machinery/door_control/attack_hand(mob/user as mob) +/obj/machinery/door_control/attack_hand(mob/user) src.add_fingerprint(usr) if(stat & (NOPOWER|BROKEN)) return @@ -118,19 +118,19 @@ else icon_state = "doorctrl0" -/obj/machinery/driver_button/attack_ai(mob/user as mob) +/obj/machinery/driver_button/attack_ai(mob/user) return src.attack_hand(user) -/obj/machinery/driver_button/attack_paw(mob/user as mob) +/obj/machinery/driver_button/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/driver_button/attackby(obj/item/weapon/W, mob/user as mob, params) +/obj/machinery/driver_button/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/device/detective_scanner)) return return src.attack_hand(user) -/obj/machinery/driver_button/attack_hand(mob/user as mob) +/obj/machinery/driver_button/attack_hand(mob/user) src.add_fingerprint(usr) if(stat & (NOPOWER|BROKEN)) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index b1a3acba501..53c8a341d23 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -329,7 +329,7 @@ About the new airlock wires panel: D.removeMe(src) ..() -/obj/machinery/door/airlock/bumpopen(mob/living/user as mob) //Airlocks now zap you when you 'bump' them open when they're electrified. --NeoFite +/obj/machinery/door/airlock/bumpopen(mob/living/user) //Airlocks now zap you when you 'bump' them open when they're electrified. --NeoFite if(!issilicon(usr)) if(src.isElectrified()) if(!src.justzap) @@ -347,7 +347,7 @@ About the new airlock wires panel: return ..(user) -/obj/machinery/door/airlock/bumpopen(mob/living/simple_animal/user as mob) +/obj/machinery/door/airlock/bumpopen(mob/living/simple_animal/user) ..(user) /obj/machinery/door/airlock/proc/isElectrified() @@ -355,7 +355,7 @@ About the new airlock wires panel: return 1 return 0 -/obj/machinery/door/airlock/proc/isWireCut(var/wireIndex) +/obj/machinery/door/airlock/proc/isWireCut(wireIndex) // You can find the wires in the datum folder. return wires.IsIndexCut(wireIndex) @@ -484,7 +484,7 @@ About the new airlock wires panel: if(charge && !p_open && in_range(user, src)) user << "The maintenance panel is bulging slightly." -/obj/machinery/door/airlock/attack_ai(mob/user as mob) +/obj/machinery/door/airlock/attack_ai(mob/user) if(!src.canAIControl()) if(src.canAIHack()) src.hack(user) @@ -606,7 +606,7 @@ About the new airlock wires panel: //aiEnable - 1 idscan, 4 raise door bolts, 5 electrify door for 30 seconds, 6 electrify door indefinitely, 7 open door, 11 enable access override -/obj/machinery/door/airlock/proc/hack(mob/user as mob) +/obj/machinery/door/airlock/proc/hack(mob/user) if(src.aiHacking==0) src.aiHacking=1 spawn(20) @@ -655,10 +655,10 @@ About the new airlock wires panel: src.attack_ai(user) -/obj/machinery/door/airlock/attack_paw(mob/user as mob) +/obj/machinery/door/airlock/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/door/airlock/attack_hand(mob/user as mob) +/obj/machinery/door/airlock/attack_hand(mob/user) if(!istype(user, /mob/living/silicon)) if(src.isElectrified()) if(src.shock(user, 100)) @@ -907,7 +907,7 @@ About the new airlock wires panel: updateUsrDialog() return -/obj/machinery/door/airlock/attackby(C as obj, mob/user as mob, params) +/obj/machinery/door/airlock/attackby(obj/C, mob/user, params) if(!istype(usr, /mob/living/silicon)) if(src.isElectrified()) if(src.shock(user, 75)) @@ -1051,7 +1051,7 @@ About the new airlock wires panel: ..() return -/obj/machinery/door/airlock/plasma/attackby(C as obj, mob/user as mob, params) +/obj/machinery/door/airlock/plasma/attackby(obj/C, mob/user, params) if(is_hot(C) > 300)//If the temperature of the object is over 300, then ignite message_admins("Plasma airlock ignited by [key_name_admin(user)](?) (FLW) in ([x],[y],[z] - JMP)") log_game("Plasma wall ignited by [key_name(user)] in ([x],[y],[z])") @@ -1059,7 +1059,7 @@ About the new airlock wires panel: return ..() -/obj/machinery/door/airlock/open(var/forced=0) +/obj/machinery/door/airlock/open(forced=0) if( operating || welded || locked ) return 0 if(!forced) @@ -1102,7 +1102,7 @@ About the new airlock wires panel: return ..() -/obj/machinery/door/airlock/close(var/forced=0) +/obj/machinery/door/airlock/close(forced=0) if(operating || welded || locked) return if(!forced) @@ -1175,7 +1175,7 @@ About the new airlock wires panel: if(!density && !operating && !locked && !welded && autoclose) close() -/obj/machinery/door/airlock/proc/change_paintjob(obj/item/C as obj, mob/user as mob) +/obj/machinery/door/airlock/proc/change_paintjob(obj/item/C, mob/user) var/obj/item/weapon/airlock_painter/W if(istype(C, /obj/item/weapon/airlock_painter)) W = C @@ -1257,7 +1257,7 @@ About the new airlock wires panel: doortype = /obj/structure/door_assembly/door_assembly_highsecurity update_icon() -/obj/machinery/door/airlock/CanAStarPass(var/obj/item/weapon/card/id/ID) +/obj/machinery/door/airlock/CanAStarPass(obj/item/weapon/card/id/ID) //Airlock is passable if it is open (!density), bot has access, and is not bolted shut) return !density || (check_access(ID) && !locked) diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index 8ee0cfff1c1..0b1761281a2 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -14,7 +14,7 @@ var/last_configurator = null var/locked = 1 -/obj/item/weapon/airlock_electronics/attack_self(mob/user as mob) +/obj/item/weapon/airlock_electronics/attack_self(mob/user) if (!ishuman(user)) return ..(user) @@ -95,7 +95,7 @@ attack_self(usr) -/obj/item/weapon/airlock_electronics/proc/toggle_access(var/acc) +/obj/item/weapon/airlock_electronics/proc/toggle_access(acc) if (acc == "all") conf_access = null else if(acc == "one") diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 21a4ba0fff2..d6d5f886095 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -128,7 +128,7 @@ . = 0 -/obj/machinery/door_timer/proc/timeset(var/seconds) +/obj/machinery/door_timer/proc/timeset(seconds) if(timing) releasetime=world.time+seconds*10 else @@ -136,7 +136,7 @@ return //Allows AIs to use door_timer, see human attack_hand function below -/obj/machinery/door_timer/attack_ai(var/mob/user as mob) +/obj/machinery/door_timer/attack_ai(mob/user) return src.attack_hand(user) @@ -144,7 +144,7 @@ //Opens dialog window when someone clicks on door timer // Allows altering timer and the timing boolean. // Flasher activation limited to 150 seconds -/obj/machinery/door_timer/attack_hand(var/mob/user as mob) +/obj/machinery/door_timer/attack_hand(mob/user) if(..()) return var/second = round(timeleft() % 60) @@ -237,7 +237,7 @@ // Adds an icon in case the screen is broken/off, stolen from status_display.dm -/obj/machinery/door_timer/proc/set_picture(var/state) +/obj/machinery/door_timer/proc/set_picture(state) if(maptext) maptext = "" picture_state = state overlays.Cut() diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index abfb8ff9253..87ad6c9728c 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -87,7 +87,7 @@ /obj/machinery/door/proc/CanAStarPass(var/obj/item/weapon/card/id/ID) return !density -/obj/machinery/door/proc/bumpopen(mob/user as mob) +/obj/machinery/door/proc/bumpopen(mob/user) if(operating) return src.add_fingerprint(user) @@ -102,24 +102,24 @@ return -/obj/machinery/door/attack_ai(mob/user as mob) +/obj/machinery/door/attack_ai(mob/user) return src.attack_hand(user) -/obj/machinery/door/attack_paw(mob/user as mob) +/obj/machinery/door/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/door/attack_hand(mob/user as mob) +/obj/machinery/door/attack_hand(mob/user) return src.attackby(user, user) -/obj/machinery/door/attack_tk(mob/user as mob) +/obj/machinery/door/attack_tk(mob/user) if(requiresID() && !allowed(null)) return ..() -/obj/machinery/door/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/machinery/door/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/device/detective_scanner)) return if(isrobot(user)) return //borgs can't attack doors open because it conflicts with their AI-like interaction with them. @@ -139,7 +139,7 @@ flick("door_deny", src) return -/obj/machinery/door/emag_act(mob/user as mob) +/obj/machinery/door/emag_act(mob/user) if(density && hasPower() && !emagged) flick("door_spark", src) sleep(6) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 85f6dac25e8..d60c8bf9e9b 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -30,7 +30,7 @@ return -/obj/machinery/door/firedoor/attackby(obj/item/weapon/C as obj, mob/user as mob, params) +/obj/machinery/door/firedoor/attackby(obj/item/weapon/C, mob/user, params) add_fingerprint(user) if(operating) return//Already doing something. if(istype(C, /obj/item/weapon/weldingtool)) @@ -51,7 +51,7 @@ return return -/obj/machinery/door/firedoor/attack_ai(mob/user as mob) +/obj/machinery/door/firedoor/attack_ai(mob/user) add_fingerprint(user) if(blocked || operating || stat & NOPOWER) return @@ -120,7 +120,7 @@ else return 1 -/obj/machinery/door/firedoor/border_only/CheckExit(atom/movable/mover as mob|obj, turf/target as turf) +/obj/machinery/door/firedoor/border_only/CheckExit(atom/movable/mover as mob|obj, turf/target) if(istype(mover) && mover.checkpass(PASSGLASS)) return 1 if(get_dir(loc, target) == dir) @@ -128,7 +128,7 @@ else return 1 -/obj/machinery/door/firedoor/border_only/CanAtmosPass(var/turf/T) +/obj/machinery/door/firedoor/border_only/CanAtmosPass(turf/T) if(get_dir(loc, T) == dir) return !density else diff --git a/code/game/machinery/doors/unpowered.dm b/code/game/machinery/doors/unpowered.dm index f8c634f9724..e57408e06f5 100644 --- a/code/game/machinery/doors/unpowered.dm +++ b/code/game/machinery/doors/unpowered.dm @@ -8,7 +8,7 @@ return -/obj/machinery/door/unpowered/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/machinery/door/unpowered/attackby(obj/item/I, mob/user, params) if(src.locked) return ..() return diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 5ea017c481b..77867600333 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -59,7 +59,7 @@ bumpopen(M) return -/obj/machinery/door/window/bumpopen(mob/user as mob) +/obj/machinery/door/window/bumpopen(mob/user) if( operating || !src.density ) return src.add_fingerprint(user) @@ -80,17 +80,17 @@ else return 1 -/obj/machinery/door/window/CanAtmosPass(var/turf/T) +/obj/machinery/door/window/CanAtmosPass(turf/T) if(get_dir(loc, T) == dir) return !density else return 1 //used in the AStar algorithm to determinate if the turf the door is on is passable -/obj/machinery/door/window/CanAStarPass(var/obj/item/weapon/card/id/ID, var/to_dir) +/obj/machinery/door/window/CanAStarPass(obj/item/weapon/card/id/ID, to_dir) return !density || (dir != to_dir) || check_access(ID) -/obj/machinery/door/window/CheckExit(atom/movable/mover as mob|obj, turf/target as turf) +/obj/machinery/door/window/CheckExit(atom/movable/mover as mob|obj, turf/target) if(istype(mover) && mover.checkpass(PASSGLASS)) return 1 if(get_dir(loc, target) == dir) @@ -98,7 +98,7 @@ else return 1 -/obj/machinery/door/window/open(var/forced=0) +/obj/machinery/door/window/open(forced=0) if (src.operating == 1) //doors can still open when emag-disabled return 0 if (!ticker) @@ -125,7 +125,7 @@ src.operating = 0 return 1 -/obj/machinery/door/window/close(var/forced=0) +/obj/machinery/door/window/close(forced=0) if (src.operating) return 0 if(!forced) @@ -149,7 +149,7 @@ src.operating = 0 return 1 -/obj/machinery/door/window/proc/take_damage(var/damage) +/obj/machinery/door/window/proc/take_damage(damage) src.health = max(0, src.health - damage) if (src.health <= 0) var/debris = list( @@ -177,7 +177,7 @@ take_damage(60) -/obj/machinery/door/window/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/door/window/bullet_act(obj/item/projectile/Proj) if(Proj.damage) if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) take_damage(round(Proj.damage / 2)) @@ -211,10 +211,10 @@ return -/obj/machinery/door/window/attack_ai(mob/user as mob) +/obj/machinery/door/window/attack_ai(mob/user) return src.attack_hand(user) -/obj/machinery/door/window/proc/attack_generic(mob/user as mob, damage = 0) +/obj/machinery/door/window/proc/attack_generic(mob/user, damage = 0) if(src.operating) return user.changeNext_move(CLICK_CD_MELEE) @@ -223,13 +223,13 @@ "You smash against the [src.name]!") take_damage(damage) -/obj/machinery/door/window/attack_alien(mob/living/user as mob) +/obj/machinery/door/window/attack_alien(mob/living/user) user.do_attack_animation(src) if(islarva(user)) return attack_generic(user, 25) -/obj/machinery/door/window/attack_animal(mob/living/user as mob) +/obj/machinery/door/window/attack_animal(mob/living/user) if(!isanimal(user)) return var/mob/living/simple_animal/M = user @@ -239,19 +239,19 @@ attack_generic(M, M.melee_damage_upper) -/obj/machinery/door/window/attack_slime(mob/living/simple_animal/slime/user as mob) +/obj/machinery/door/window/attack_slime(mob/living/simple_animal/slime/user) user.do_attack_animation(src) if(!user.is_adult) return attack_generic(user, 25) -/obj/machinery/door/window/attack_paw(mob/user as mob) +/obj/machinery/door/window/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/door/window/attack_hand(mob/user as mob) +/obj/machinery/door/window/attack_hand(mob/user) return src.attackby(user, user) -/obj/machinery/door/window/emag_act(mob/user as mob) +/obj/machinery/door/window/emag_act(mob/user) if(density && !emagged) operating = 0 flick("[src.base_state]spark", src) @@ -260,7 +260,7 @@ open() emagged = 1 -/obj/machinery/door/window/attackby(obj/item/weapon/I as obj, mob/living/user as mob, params) +/obj/machinery/door/window/attackby(obj/item/weapon/I, mob/living/user, params) //If it's in the process of opening/closing, ignore the click if (src.operating) diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 83f986aaf19..4d4e84cb3b2 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -20,7 +20,7 @@ var/list/doppler_arrays = list() /obj/machinery/doppler_array/process() return PROCESS_KILL -/obj/machinery/doppler_array/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/doppler_array/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/weapon/wrench)) if(!anchored && !isinspace()) anchored = 1 @@ -44,8 +44,8 @@ var/list/doppler_arrays = list() src.dir = turn(src.dir, 90) return -/obj/machinery/doppler_array/proc/sense_explosion(var/x0,var/y0,var/z0,var/devastation_range,var/heavy_impact_range,var/light_impact_range, - var/took,var/orig_dev_range,var/orig_heavy_range,var/orig_light_range) +/obj/machinery/doppler_array/proc/sense_explosion(x0,y0,z0,devastation_range,heavy_impact_range,light_impact_range, + took,orig_dev_range,orig_heavy_range,orig_light_range) if(stat & NOPOWER) return if(z != z0) return diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm index 72302d9ba9a..218c4c50ddc 100644 --- a/code/game/machinery/embedded_controller/access_controller.dm +++ b/code/game/machinery/embedded_controller/access_controller.dm @@ -203,7 +203,7 @@ A.bolt() goIdle(1) -/obj/machinery/doorButtons/airlock_controller/proc/goIdle(var/update) +/obj/machinery/doorButtons/airlock_controller/proc/goIdle(update) lostPower = 0 busy = 0 if(update) diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm index ac2b9b6ff7d..e528bf28b69 100644 --- a/code/game/machinery/embedded_controller/embedded_controller_base.dm +++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm @@ -26,7 +26,7 @@ var/on = 1 -/obj/machinery/embedded_controller/interact(mob/user as mob) +/obj/machinery/embedded_controller/interact(mob/user) //user << browse(return_text(), "window=computer") //onclose(user, "computer") user.set_machine(src) @@ -35,7 +35,7 @@ popup.set_content(return_text()) popup.open() -/obj/machinery/embedded_controller/attack_hand(mob/user as mob) +/obj/machinery/embedded_controller/attack_hand(mob/user) interact(user) /obj/machinery/embedded_controller/update_icon() diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 299a8c01b38..39f3f01ee08 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -55,7 +55,7 @@ var/const/HOLOPAD_MODE = RANGE_BASED holograph_range += 1 * B.rating holo_range = holograph_range -/obj/machinery/hologram/holopad/attackby(obj/item/P as obj, mob/user as mob, params) +/obj/machinery/hologram/holopad/attackby(obj/item/P, mob/user, params) if(default_deconstruction_screwdriver(user, "holopad_open", "holopad0", P)) return @@ -71,7 +71,7 @@ var/const/HOLOPAD_MODE = RANGE_BASED default_deconstruction_crowbar(P) -/obj/machinery/hologram/holopad/attack_hand(var/mob/living/carbon/human/user) //Carn: Hologram requests. +/obj/machinery/hologram/holopad/attack_hand(mob/living/carbon/human/user) //Carn: Hologram requests. if(!istype(user)) return if(user.stat || stat & (NOPOWER|BROKEN)) diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 0354e94eac4..6a275734570 100644 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -10,13 +10,13 @@ idle_power_usage = 2 active_power_usage = 4 -/obj/machinery/igniter/attack_ai(mob/user as mob) +/obj/machinery/igniter/attack_ai(mob/user) return src.attack_hand(user) -/obj/machinery/igniter/attack_paw(mob/user as mob) +/obj/machinery/igniter/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/igniter/attack_hand(mob/user as mob) +/obj/machinery/igniter/attack_hand(mob/user) if(..()) return add_fingerprint(user) @@ -69,7 +69,7 @@ icon_state = "[base_state]-p" // src.sd_SetLuminosity(0) -/obj/machinery/sparker/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/sparker/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/device/detective_scanner)) return if (istype(W, /obj/item/weapon/screwdriver)) @@ -117,16 +117,16 @@ ignite() ..(severity) -/obj/machinery/ignition_switch/attack_ai(mob/user as mob) +/obj/machinery/ignition_switch/attack_ai(mob/user) return src.attack_hand(user) -/obj/machinery/ignition_switch/attack_paw(mob/user as mob) +/obj/machinery/ignition_switch/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/ignition_switch/attackby(obj/item/weapon/W, mob/user as mob, params) +/obj/machinery/ignition_switch/attackby(obj/item/weapon/W, mob/user, params) return src.attack_hand(user) -/obj/machinery/ignition_switch/attack_hand(mob/user as mob) +/obj/machinery/ignition_switch/attack_hand(mob/user) if(stat & (NOPOWER|BROKEN)) return diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 73bd48b5df5..0ca76f39213 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -72,7 +72,7 @@ usr << "There's nothing attached to the IV drip!" -/obj/machinery/iv_drip/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/iv_drip/attackby(obj/item/weapon/W, mob/user, params) if (istype(W, /obj/item/weapon/reagent_containers)) if(!isnull(beaker)) user << "There is already a reagent container loaded!" diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index a675977b8a6..4952544aeb7 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -268,7 +268,7 @@ Class Procs: return return 1 -/obj/machinery/attack_ai(mob/user as mob) +/obj/machinery/attack_ai(mob/user) if(isrobot(user)) // For some reason attack_robot doesn't work // This is to stop robots from using cameras to remotely control machines. @@ -277,11 +277,11 @@ Class Procs: else return src.attack_hand(user) -/obj/machinery/attack_paw(mob/user as mob) +/obj/machinery/attack_paw(mob/user) return src.attack_hand(user) //set_machine must be 0 if clicking the machinery doesn't bring up a dialog -/obj/machinery/attack_hand(mob/user as mob, var/check_power = 1, var/set_machine = 1) +/obj/machinery/attack_hand(mob/user, check_power = 1, set_machine = 1) if(user.lying || user.stat) return 1 if(!user.IsAdvancedToolUser()) @@ -320,7 +320,7 @@ Class Procs: uid = gl_uid gl_uid++ -/obj/machinery/proc/default_pry_open(var/obj/item/weapon/crowbar/C) +/obj/machinery/proc/default_pry_open(obj/item/weapon/crowbar/C) . = !(state_open || panel_open || is_operational()) && istype(C) if(.) playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) @@ -328,7 +328,7 @@ Class Procs: open_machine() return 1 -/obj/machinery/proc/default_deconstruction_crowbar(var/obj/item/weapon/crowbar/C, var/ignore_panel = 0) +/obj/machinery/proc/default_deconstruction_crowbar(obj/item/weapon/crowbar/C, ignore_panel = 0) . = istype(C) && (panel_open || ignore_panel) if(.) deconstruction() @@ -342,7 +342,7 @@ Class Procs: I.loc = src.loc qdel(src) -/obj/machinery/proc/default_deconstruction_screwdriver(var/mob/user, var/icon_state_open, var/icon_state_closed, var/obj/item/weapon/screwdriver/S) +/obj/machinery/proc/default_deconstruction_screwdriver(mob/user, icon_state_open, icon_state_closed, obj/item/weapon/screwdriver/S) if(istype(S)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(!panel_open) @@ -356,7 +356,7 @@ Class Procs: return 1 return 0 -/obj/machinery/proc/default_change_direction_wrench(var/mob/user, var/obj/item/weapon/wrench/W) +/obj/machinery/proc/default_change_direction_wrench(mob/user, obj/item/weapon/wrench/W) if(panel_open && istype(W)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) dir = turn(dir,-90) diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index 41ebba50ddb..43b767934ee 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -49,7 +49,7 @@ center = null // update the invisibility and icon -/obj/machinery/magnetic_module/hide(var/intact) +/obj/machinery/magnetic_module/hide(intact) invisibility = intact ? 101 : 0 updateicon() @@ -77,7 +77,7 @@ -/obj/machinery/magnetic_module/proc/Cmd(var/command, var/modifier) +/obj/machinery/magnetic_module/proc/Cmd(command, modifier) if(command) switch(command) @@ -255,10 +255,10 @@ magnets.Add(M) -/obj/machinery/magnetic_controller/attack_ai(mob/user as mob) +/obj/machinery/magnetic_controller/attack_ai(mob/user) return src.attack_hand(user) -/obj/machinery/magnetic_controller/attack_hand(mob/user as mob) +/obj/machinery/magnetic_controller/attack_hand(mob/user) if(stat & (BROKEN|NOPOWER)) return user.set_machine(src) diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index fed05fe9ce7..a49787b25c4 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -59,7 +59,7 @@ // called when turf state changes // hide the object if turf is intact -/obj/machinery/navbeacon/hide(var/intact) +/obj/machinery/navbeacon/hide(intact) invisibility = intact ? 101 : 0 updateicon() @@ -73,7 +73,7 @@ else icon_state = "[state]" -/obj/machinery/navbeacon/attackby(var/obj/item/I, var/mob/user, params) +/obj/machinery/navbeacon/attackby(obj/item/I, mob/user, params) var/turf/T = loc if(T.intact) return // prevent intraction when T-scanner revealed @@ -97,16 +97,16 @@ user << "You must open the cover first!" return -/obj/machinery/navbeacon/attack_ai(var/mob/user) +/obj/machinery/navbeacon/attack_ai(mob/user) interact(user, 1) /obj/machinery/navbeacon/attack_paw() return -/obj/machinery/navbeacon/attack_hand(var/mob/user) +/obj/machinery/navbeacon/attack_hand(mob/user) interact(user, 0) -/obj/machinery/navbeacon/interact(var/mob/user, var/ai = 0) +/obj/machinery/navbeacon/interact(mob/user, ai = 0) var/turf/T = loc if(T.intact) return // prevent intraction when T-scanner revealed diff --git a/code/game/machinery/overview.dm b/code/game/machinery/overview.dm index 2491f33c543..873a51797d2 100644 --- a/code/game/machinery/overview.dm +++ b/code/game/machinery/overview.dm @@ -11,7 +11,7 @@ src.drawmap(usr) -/obj/machinery/computer/security/proc/drawmap(var/mob/user as mob) +/obj/machinery/computer/security/proc/drawmap(mob/user) var/icx = round(world.maxx/16) + 1 var/icy = round(world.maxy/16) + 1 diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 7fb0d411b64..bed510a177c 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -270,7 +270,7 @@ var/global/list/pipeID2State = list( else return 0 -/obj/item/pipe/proc/unflip(var/direction) +/obj/item/pipe/proc/unflip(direction) if(!(direction in cardinal)) return turn(direction, 45) @@ -284,10 +284,10 @@ var/global/list/pipeID2State = list( else if(dir==8) dir = 4 -/obj/item/pipe/attack_self(mob/user as mob) +/obj/item/pipe/attack_self(mob/user) return rotate() -/obj/item/pipe/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) +/obj/item/pipe/attackby(obj/item/weapon/W, mob/user, params) //* if (!istype(W, /obj/item/weapon/wrench)) @@ -412,7 +412,7 @@ var/global/list/pipeID2State = list( item_state = "buildpipe" w_class = 4 -/obj/item/pipe_meter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) +/obj/item/pipe_meter/attackby(obj/item/weapon/W, mob/user, params) ..() if (!istype(W, /obj/item/weapon/wrench)) diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index ff9a8dd287f..7861d46e552 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -6,10 +6,10 @@ anchored = 1 var/wait = 0 -/obj/machinery/pipedispenser/attack_paw(user as mob) +/obj/machinery/pipedispenser/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/pipedispenser/attack_hand(user as mob) +/obj/machinery/pipedispenser/attack_hand(mob/user) if(..()) return 1 var/dat = {" @@ -68,7 +68,7 @@ wait = 0 return -/obj/machinery/pipedispenser/attackby(var/obj/item/W as obj, var/mob/user as mob, params) +/obj/machinery/pipedispenser/attackby(obj/item/W, mob/user, params) add_fingerprint(user) if (istype(W, /obj/item/pipe) || istype(W, /obj/item/pipe_meter)) usr << "You put [W] back into [src]." @@ -123,7 +123,7 @@ Nah */ //Allow you to drag-drop disposal pipes and transit tubes into it -/obj/machinery/pipedispenser/disposal/MouseDrop_T(var/obj/structure/pipe as obj, mob/usr as mob) +/obj/machinery/pipedispenser/disposal/MouseDrop_T(obj/structure/pipe, mob/usr) if(!usr.canmove || usr.stat || usr.restrained()) return @@ -138,7 +138,7 @@ Nah qdel(pipe) -/obj/machinery/pipedispenser/disposal/attack_hand(user as mob) +/obj/machinery/pipedispenser/disposal/attack_hand(mob/user) if(..()) return 1 @@ -189,7 +189,7 @@ Nah density = 1 anchored = 1.0 -/obj/machinery/pipedispenser/disposal/transit_tube/attack_hand(user as mob) +/obj/machinery/pipedispenser/disposal/transit_tube/attack_hand(mob/user) if(..()) return 1 diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 68c7098d581..707abc57f65 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -308,7 +308,7 @@ attacked = 0 ..() -/obj/machinery/porta_turret/attack_animal(mob/living/simple_animal/M as mob) +/obj/machinery/porta_turret/attack_animal(mob/living/simple_animal/M) M.changeNext_move(CLICK_CD_MELEE) M.do_attack_animation(src) if(M.melee_damage_upper == 0) @@ -321,7 +321,7 @@ M << "That object is useless to you." return -/obj/machinery/porta_turret/attack_alien(mob/living/carbon/alien/humanoid/M as mob) +/obj/machinery/porta_turret/attack_alien(mob/living/carbon/alien/humanoid/M) M.changeNext_move(CLICK_CD_MELEE) M.do_attack_animation(src) if(!(stat & BROKEN)) @@ -334,7 +334,7 @@ return -/obj/machinery/porta_turret/emag_act(user as mob) +/obj/machinery/porta_turret/emag_act(mob/user) if(!emagged) user << "You short out [src]'s threat assessment circuits." visible_message("[src] hums oddly...") @@ -484,7 +484,7 @@ popDown() // no valid targets, close the cover -/obj/machinery/porta_turret/proc/tryToShootAt(var/list/atom/movable/targets) +/obj/machinery/porta_turret/proc/tryToShootAt(list/atom/movable/targets) while(targets.len > 0) var/atom/movable/M = pick(targets) targets -= M @@ -579,7 +579,7 @@ return threatcount -/obj/machinery/porta_turret/proc/target(var/atom/movable/target) +/obj/machinery/porta_turret/proc/target(atom/movable/target) if(disabled) return if(target) @@ -591,7 +591,7 @@ return 1 return -/obj/machinery/porta_turret/proc/shootAt(var/atom/movable/target) +/obj/machinery/porta_turret/proc/shootAt(atom/movable/target) if(!emagged) //if it hasn't been emagged, it has to obey a cooldown rate if(last_fired || !raised) //prevents rapid-fire shooting, unless it's been emagged return @@ -631,7 +631,7 @@ A.xo = U.x - T.x A.fire() -/obj/machinery/porta_turret/proc/setState(var/on, var/emagged) +/obj/machinery/porta_turret/proc/setState(on, emagged) if(controllock) return src.on = on @@ -1013,7 +1013,7 @@ Status: []
"}, Parent_Turret.attacked = 0 ..() -/obj/machinery/porta_turret_cover/emag_act(user as mob) +/obj/machinery/porta_turret_cover/emag_act(mob/user) if(!emagged) user << "You short out [Parent_Turret]'s threat assessment circuits." visible_message("[Parent_Turret] hums oddly...") @@ -1087,7 +1087,7 @@ Status: []
"}, else user << "Access denied." -/obj/machinery/turretid/emag_act(mob/user as mob) +/obj/machinery/turretid/emag_act(mob/user) if(!emagged) user << "You short out the turret controls' access analysis module." emagged = 1 @@ -1095,7 +1095,7 @@ Status: []
"}, if(user.machine==src) src.attack_hand(user) -/obj/machinery/turretid/attack_ai(mob/user as mob) +/obj/machinery/turretid/attack_ai(mob/user) if(!ailock) return attack_hand(user) else diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 30472a439a5..49245b20148 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -43,7 +43,7 @@ process_occupant() return 1 -/obj/machinery/recharge_station/relaymove(mob/user as mob) +/obj/machinery/recharge_station/relaymove(mob/user) if(user.stat) return open_machine() @@ -62,13 +62,13 @@ open_machine() ..() -/obj/machinery/recharge_station/attack_paw(user as mob) +/obj/machinery/recharge_station/attack_paw(mob/user) return attack_hand(user) -/obj/machinery/recharge_station/attack_ai(user as mob) +/obj/machinery/recharge_station/attack_ai(mob/user) return attack_hand(user) -/obj/machinery/recharge_station/attackby(obj/item/P as obj, mob/user as mob, params) +/obj/machinery/recharge_station/attackby(obj/item/P, mob/user, params) if(state_open) if(default_deconstruction_screwdriver(user, "borgdecon2", "borgcharger0", P)) return @@ -81,7 +81,7 @@ default_deconstruction_crowbar(P) -/obj/machinery/recharge_station/attack_hand(user as mob) +/obj/machinery/recharge_station/attack_hand(mob/user) if(..(user,1,set_machine = 0)) return diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 613bb80c863..38fe78bd912 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -56,7 +56,7 @@ var/const/SAFETY_COOLDOWN = 100 update_icon() -/obj/machinery/recycler/attackby(var/obj/item/I, var/mob/user, params) +/obj/machinery/recycler/attackby(obj/item/I, mob/user, params) if(default_deconstruction_screwdriver(user, "grinder-oOpen", "grinder-o0", I)) return @@ -74,7 +74,7 @@ var/const/SAFETY_COOLDOWN = 100 add_fingerprint(user) return -/obj/machinery/recycler/emag_act(user as mob) +/obj/machinery/recycler/emag_act(mob/user) if(!emagged) emagged = 1 if(safety_mode) @@ -91,13 +91,13 @@ var/const/SAFETY_COOLDOWN = 100 icon_state = icon_name + "[is_powered]" + "[(blood ? "bld" : "")]" // add the blood tag at the end // This is purely for admin possession !FUN!. -/obj/machinery/recycler/Bump(var/atom/movable/AM) +/obj/machinery/recycler/Bump(atom/movable/AM) ..() if(AM) Bumped(AM) -/obj/machinery/recycler/Bumped(var/atom/movable/AM) +/obj/machinery/recycler/Bumped(atom/movable/AM) if(stat & (BROKEN|NOPOWER)) return @@ -117,7 +117,7 @@ var/const/SAFETY_COOLDOWN = 100 playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0) AM.loc = src.loc -/obj/machinery/recycler/proc/recycle(var/obj/item/I, var/sound = 1) +/obj/machinery/recycler/proc/recycle(obj/item/I, sound = 1) I.loc = src.loc if(is_type_in_list(I, blacklist)) qdel(I) @@ -151,7 +151,7 @@ var/const/SAFETY_COOLDOWN = 100 playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) -/obj/machinery/recycler/proc/stop(var/mob/living/L) +/obj/machinery/recycler/proc/stop(mob/living/L) playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0) safety_mode = 1 update_icon() @@ -162,7 +162,7 @@ var/const/SAFETY_COOLDOWN = 100 safety_mode = 0 update_icon() -/obj/machinery/recycler/proc/eat(var/mob/living/L) +/obj/machinery/recycler/proc/eat(mob/living/L) L.loc = src.loc diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 572c0029d1d..7029c01bfbe 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -121,7 +121,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() Radio = new /obj/item/device/radio(src) Radio.listening = 0 -/obj/machinery/requests_console/attack_hand(var/mob/user) +/obj/machinery/requests_console/attack_hand(mob/user) if(..(user)) return var/dat = "" @@ -428,7 +428,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() updateUsrDialog() return -/obj/machinery/say_quote(var/input, list/spans) +/obj/machinery/say_quote(input, list/spans) var/ending = copytext(input, length(input) - 2) if (ending == "!!!") return "blares, \"attach_spans(input, spans)\"" @@ -473,7 +473,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() src.messages += "From: [linkedsender]
[message]" SetLuminosity(2) -/obj/machinery/requests_console/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob, params) +/obj/machinery/requests_console/attackby(obj/item/weapon/O, mob/user, params) if (istype(O, /obj/item/weapon/crowbar)) if(open) user << "You close the maintenance panel." diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm index 16ec50d713b..ad5c467857b 100644 --- a/code/game/machinery/robot_fabricator.dm +++ b/code/game/machinery/robot_fabricator.dm @@ -11,7 +11,7 @@ idle_power_usage = 20 active_power_usage = 5000 -/obj/machinery/robotic_fabricator/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/robotic_fabricator/attackby(obj/item/O, mob/user, params) if (istype(O, /obj/item/stack/sheet/metal)) if (src.metal_amount < 150000.0) var/count = 0 @@ -40,10 +40,10 @@ else stat |= NOPOWER -/obj/machinery/robotic_fabricator/attack_paw(user as mob) +/obj/machinery/robotic_fabricator/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/robotic_fabricator/attack_hand(user as mob) +/obj/machinery/robotic_fabricator/attack_hand(mob/user) var/dat if (..()) return diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 9de401f9388..ca1fe863e3b 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -30,10 +30,10 @@ if(!height) return 0 else return ..() -/obj/machinery/shield/CanAtmosPass(var/turf/T) +/obj/machinery/shield/CanAtmosPass(turf/T) return !density -/obj/machinery/shield/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/shield/attackby(obj/item/weapon/W, mob/user, params) if(!istype(W)) return //Calculate damage @@ -54,7 +54,7 @@ spawn(20) if(src) opacity = 0 ..() -/obj/machinery/shield/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/shield/bullet_act(obj/item/projectile/Proj) health -= Proj.damage ..() if(health <=0) @@ -207,7 +207,7 @@ malfunction = 1 checkhp() -/obj/machinery/shieldgen/attack_hand(mob/user as mob) +/obj/machinery/shieldgen/attack_hand(mob/user) if(locked) user << "The machine is locked, you are unable to use it!" return @@ -230,7 +230,7 @@ user << "The device must first be secured to the floor!" return -/obj/machinery/shieldgen/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/shieldgen/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/screwdriver)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) if(is_open) @@ -345,7 +345,7 @@ // message_admins("[PN.load]") // use_power(250) //uses APC power -/obj/machinery/shieldwallgen/attack_hand(mob/user as mob) +/obj/machinery/shieldwallgen/attack_hand(mob/user) if(!anchored) user << "The shield generator needs to be firmly secured to the floor first!" return 1 @@ -403,7 +403,7 @@ src.cleanup(4) src.cleanup(8) -/obj/machinery/shieldwallgen/proc/setup_field(var/NSEW = 0) +/obj/machinery/shieldwallgen/proc/setup_field(NSEW = 0) var/turf/T = src.loc var/turf/T2 = src.loc var/obj/machinery/shieldwallgen/G @@ -477,7 +477,7 @@ add_fingerprint(user) ..() -/obj/machinery/shieldwallgen/proc/cleanup(var/NSEW) +/obj/machinery/shieldwallgen/proc/cleanup(NSEW) var/obj/machinery/shieldwall/F var/obj/machinery/shieldwallgen/G var/turf/T = src.loc @@ -502,7 +502,7 @@ src.cleanup(8) ..() -/obj/machinery/shieldwallgen/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/shieldwallgen/bullet_act(obj/item/projectile/Proj) storedpower -= Proj.damage ..() return @@ -534,7 +534,7 @@ if(A && B) needs_power = 1 -/obj/machinery/shieldwall/attack_hand(mob/user as mob) +/obj/machinery/shieldwall/attack_hand(mob/user) return @@ -554,7 +554,7 @@ gen_secondary.storedpower -=10 -/obj/machinery/shieldwall/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/shieldwall/bullet_act(obj/item/projectile/Proj) if(needs_power) var/obj/machinery/shieldwallgen/G if(prob(50)) diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index b1891f80539..96cc0cbec1b 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -75,7 +75,7 @@ ..() return -/obj/machinery/space_heater/attack_hand(mob/user as mob) +/obj/machinery/space_heater/attack_hand(mob/user) src.add_fingerprint(user) if(open) diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index ff3f0fc4f5f..a0110d2f25a 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -287,7 +287,7 @@ return -/obj/machinery/ai_status_display/proc/set_picture(var/state) +/obj/machinery/ai_status_display/proc/set_picture(state) picture_state = state if(overlays.len) overlays.Cut() diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index bee339ff68b..67b8c167772 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -158,7 +158,7 @@ return -/obj/machinery/suit_storage_unit/attack_hand(mob/user as mob) +/obj/machinery/suit_storage_unit/attack_hand(mob/user) var/dat if(..()) return @@ -259,7 +259,7 @@ return -/obj/machinery/suit_storage_unit/proc/toggleUV(mob/user as mob) +/obj/machinery/suit_storage_unit/proc/toggleUV(mob/user) // var/protected = 0 // var/mob/living/carbon/human/H = user if(!src.panelopen) @@ -285,7 +285,7 @@ return -/obj/machinery/suit_storage_unit/proc/togglesafeties(mob/user as mob) +/obj/machinery/suit_storage_unit/proc/togglesafeties(mob/user) // var/protected = 0 // var/mob/living/carbon/human/H = user if(!src.panelopen) //Needed check due to bugs @@ -337,7 +337,7 @@ return -/obj/machinery/suit_storage_unit/proc/toggle_open(mob/user as mob) +/obj/machinery/suit_storage_unit/proc/toggle_open(mob/user) if(src.islocked || src.isUV) user << "You're unable to open unit!" return 0 @@ -348,7 +348,7 @@ return 1 -/obj/machinery/suit_storage_unit/proc/toggle_lock(mob/user as mob) +/obj/machinery/suit_storage_unit/proc/toggle_lock(mob/user) if(src.OCCUPANT && src.safetieson) user << "The Unit's safety protocols disallow locking when a biological form is detected inside its compartments." return @@ -358,7 +358,7 @@ return -/obj/machinery/suit_storage_unit/proc/start_UV(mob/user as mob) +/obj/machinery/suit_storage_unit/proc/start_UV(mob/user) if(src.isUV || src.isopen) //I'm bored of all these sanity checks return if(src.OCCUPANT && src.safetieson) @@ -415,7 +415,7 @@ return src.cycletime_left -/obj/machinery/suit_storage_unit/proc/eject_occupant(mob/user as mob) +/obj/machinery/suit_storage_unit/proc/eject_occupant(mob/user) if (src.islocked) return @@ -466,10 +466,10 @@ return -/obj/machinery/suit_storage_unit/MouseDrop_T(mob/M as mob, mob/user as mob) +/obj/machinery/suit_storage_unit/MouseDrop_T(mob/M, mob/user) store_mob(M, user) -/obj/machinery/suit_storage_unit/proc/store_mob(mob/living/M as mob, mob/user as mob) +/obj/machinery/suit_storage_unit/proc/store_mob(mob/living/M, mob/user) if(!istype(M)) return if (user.stat != 0) @@ -503,7 +503,7 @@ return -/obj/machinery/suit_storage_unit/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/machinery/suit_storage_unit/attackby(obj/item/I, mob/user, params) if(!src.ispowered) if(istype(I, /obj/item/weapon/crowbar) && !isopen) if(toggle_open(user)) @@ -587,11 +587,11 @@ return -/obj/machinery/suit_storage_unit/attack_ai(mob/user as mob) +/obj/machinery/suit_storage_unit/attack_ai(mob/user) return src.attack_hand(user) -/obj/machinery/suit_storage_unit/attack_paw(mob/user as mob) +/obj/machinery/suit_storage_unit/attack_paw(mob/user) user << "The console controls are far too complicated for your tiny brain!" return diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index d8ed227bb51..2c102e8695b 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -19,7 +19,7 @@ var/selfdestructing = 0 var/charges = 1 -/obj/machinery/syndicate_beacon/attack_hand(var/mob/user as mob) +/obj/machinery/syndicate_beacon/attack_hand(mob/user) usr.set_machine(src) var/dat = "Scanning [pick("retina pattern", "voice print", "fingerprints", "dna sequence")]...
Identity confirmed,
" if(istype(user, /mob/living/carbon/human) || istype(user, /mob/living/silicon/ai)) @@ -142,11 +142,11 @@ user << "You deactivate the beacon." -/obj/machinery/power/singularity_beacon/attack_ai(mob/user as mob) +/obj/machinery/power/singularity_beacon/attack_ai(mob/user) return -/obj/machinery/power/singularity_beacon/attack_hand(var/mob/user as mob) +/obj/machinery/power/singularity_beacon/attack_hand(mob/user) if(anchored) return active ? Deactivate(user) : Activate(user) else @@ -154,7 +154,7 @@ return -/obj/machinery/power/singularity_beacon/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/power/singularity_beacon/attackby(obj/item/weapon/W, mob/user, params) if(istype(W,/obj/item/weapon/screwdriver)) if(active) user << "You need to deactivate the beacon first!" @@ -207,7 +207,7 @@ var/droptype = /obj/machinery/power/singularity_beacon/syndicate -/obj/item/device/sbeacondrop/attack_self(mob/user as mob) +/obj/item/device/sbeacondrop/attack_self(mob/user) if(user) user << "Locked In." new droptype( user.loc ) diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 87b89bcd926..659fa906fc9 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -48,7 +48,7 @@ /obj/machinery/syndicatebomb/update_icon() icon_state = "[initial(icon_state)][active ? "-active" : "-inactive"][open_panel ? "-wires" : ""]" -/obj/machinery/syndicatebomb/attackby(var/obj/item/I, var/mob/user, params) +/obj/machinery/syndicatebomb/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/wrench)) if(!anchored) if(!isturf(src.loc) || istype(src.loc, /turf/space)) @@ -100,13 +100,13 @@ else ..() -/obj/machinery/syndicatebomb/attack_hand(var/mob/user) +/obj/machinery/syndicatebomb/attack_hand(mob/user) interact(user) /obj/machinery/syndicatebomb/attack_ai() return -/obj/machinery/syndicatebomb/interact(var/mob/user) +/obj/machinery/syndicatebomb/interact(mob/user) if(wires) wires.Interact(user) if(!open_panel) @@ -118,7 +118,7 @@ user << "The bomb is bolted to the floor!" return -/obj/machinery/syndicatebomb/proc/settings(var/mob/user) +/obj/machinery/syndicatebomb/proc/settings(mob/user) var/newtime = input(user, "Please set the timer.", "Timer", "[timer]") as num newtime = Clamp(newtime, 60, 60000) if(in_range(src, user) && isliving(user)) //No running off and setting bombs from across the station @@ -143,7 +143,7 @@ log_game("[key_name(user)] has primed a [name] ([payload]) for detonation at [A.name]([bombturf.x],[bombturf.y],[bombturf.z])") payload.adminlog = "The [src.name] that [key_name(user)] had primed detonated!" -/obj/machinery/syndicatebomb/proc/isWireCut(var/index) +/obj/machinery/syndicatebomb/proc/isWireCut(index) return wires.IsIndexCut(index) ///Bomb Subtypes/// @@ -299,7 +299,7 @@ var/detonated = 0 var/existant = 0 -/obj/item/device/syndicatedetonator/attack_self(mob/user as mob) +/obj/item/device/syndicatedetonator/attack_self(mob/user) if(!cooldown) for(var/obj/machinery/syndicatebomb/B in machines) if(B.active) diff --git a/code/game/machinery/telecomms/broadcasting.dm b/code/game/machinery/telecomms/broadcasting.dm index defe129fca2..b53510bda31 100644 --- a/code/game/machinery/telecomms/broadcasting.dm +++ b/code/game/machinery/telecomms/broadcasting.dm @@ -171,7 +171,7 @@ spawn(50) PlaceInPool(virt) -/proc/Broadcast_SimpleMessage(var/source, var/frequency, var/text, var/data, var/mob/M, var/compression, var/level) +/proc/Broadcast_SimpleMessage(source, frequency, text, data, mob/M, compression, level) /* ###### Prepare the radio connection ###### */ diff --git a/code/game/machinery/telecomms/computers/logbrowser.dm b/code/game/machinery/telecomms/computers/logbrowser.dm index 8be4d941146..eca9a206429 100644 --- a/code/game/machinery/telecomms/computers/logbrowser.dm +++ b/code/game/machinery/telecomms/computers/logbrowser.dm @@ -16,7 +16,7 @@ req_access = list(access_tcomsat) circuit = "/obj/item/weapon/circuitboard/comm_server" -/obj/machinery/computer/telecomms/server/attack_hand(mob/user as mob) +/obj/machinery/computer/telecomms/server/attack_hand(mob/user) if(..()) return user.set_machine(src) @@ -225,7 +225,7 @@ src.updateUsrDialog() return -/obj/machinery/computer/telecomms/server/emag_act(mob/user as mob) +/obj/machinery/computer/telecomms/server/emag_act(mob/user) if(!emagged) playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 diff --git a/code/game/machinery/telecomms/computers/telemonitor.dm b/code/game/machinery/telecomms/computers/telemonitor.dm index c6c3ab75a64..34833a6bcdc 100644 --- a/code/game/machinery/telecomms/computers/telemonitor.dm +++ b/code/game/machinery/telecomms/computers/telemonitor.dm @@ -18,7 +18,7 @@ var/temp = "" // temporary feedback messages circuit = "/obj/item/weapon/circuitboard/comm_monitor" -/obj/machinery/computer/telecomms/monitor/attack_hand(mob/user as mob) +/obj/machinery/computer/telecomms/monitor/attack_hand(mob/user) if(..()) return user.set_machine(src) @@ -127,7 +127,7 @@ src.updateUsrDialog() return -/obj/machinery/computer/telecomms/monitor/emag_act(mob/user as mob) +/obj/machinery/computer/telecomms/monitor/emag_act(mob/user) if(!emagged) playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 diff --git a/code/game/machinery/telecomms/computers/traffic_control.dm b/code/game/machinery/telecomms/computers/traffic_control.dm index 9d520a5a7d8..3186b0c2960 100644 --- a/code/game/machinery/telecomms/computers/traffic_control.dm +++ b/code/game/machinery/telecomms/computers/traffic_control.dm @@ -81,7 +81,7 @@ winshow(M, "Telecomms IDE", 0) // hide the windows -/obj/machinery/computer/telecomms/traffic/attack_hand(mob/user as mob) +/obj/machinery/computer/telecomms/traffic/attack_hand(mob/user) if(..()) return user.set_machine(src) @@ -135,7 +135,7 @@ temp = "" return -/obj/machinery/computer/telecomms/traffic/proc/create_log(var/entry, var/mob/user) +/obj/machinery/computer/telecomms/traffic/proc/create_log(entry, mob/user) var/id = null if(issilicon(user)) id = "System Administrator" @@ -274,13 +274,13 @@ src.updateUsrDialog() return -/obj/machinery/computer/telecomms/traffic/emag_act(mob/user as mob) +/obj/machinery/computer/telecomms/traffic/emag_act(mob/user) if(!emagged) playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 user << "You you disable the security protocols." -/obj/machinery/computer/telecomms/traffic/proc/canAccess(var/mob/user) +/obj/machinery/computer/telecomms/traffic/proc/canAccess(mob/user) if(issilicon(user) || in_range(user, src)) return 1 return 0 \ No newline at end of file diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index 4884051a16c..4dd96c01c8c 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -12,7 +12,7 @@ var/temp = "" // output message -/obj/machinery/telecomms/attackby(obj/item/P as obj, mob/user as mob, params) +/obj/machinery/telecomms/attackby(obj/item/P, mob/user, params) var/icon_closed = initial(icon_state) var/icon_open = "[initial(icon_state)]_o" @@ -34,10 +34,10 @@ default_deconstruction_crowbar(P) -/obj/machinery/telecomms/attack_ai(var/mob/user as mob) +/obj/machinery/telecomms/attack_ai(mob/user) attack_hand(user) -/obj/machinery/telecomms/attack_hand(var/mob/user as mob) +/obj/machinery/telecomms/attack_hand(mob/user) // You need a multitool to use this, or be silicon if(!issilicon(user)) @@ -126,7 +126,7 @@ // Returns a multitool from a user depending on their mobtype. -/obj/machinery/telecomms/proc/get_multitool(mob/user as mob) +/obj/machinery/telecomms/proc/get_multitool(mob/user) var/obj/item/device/multitool/P = null // Let's double check @@ -313,7 +313,7 @@ updateUsrDialog() -/obj/machinery/telecomms/proc/canAccess(var/mob/user) +/obj/machinery/telecomms/proc/canAccess(mob/user) if(issilicon(user) || in_range(user, src)) return 1 return 0 diff --git a/code/game/machinery/telecomms/machines/allinone.dm b/code/game/machinery/telecomms/machines/allinone.dm index b592d1bf720..1e04ee649f6 100644 --- a/code/game/machinery/telecomms/machines/allinone.dm +++ b/code/game/machinery/telecomms/machines/allinone.dm @@ -41,7 +41,7 @@ signal.data["realname"],, signal.data["compression"], list(0, z), signal.frequency, signal.data["spans"], signal.data["verb_say"], signal.data["verb_ask"], signal.data["verb_exclaim"], signal.data["verb_yell"]) -/obj/machinery/telecomms/allinone/attackby(obj/item/P as obj, mob/user as mob, params) +/obj/machinery/telecomms/allinone/attackby(obj/item/P, mob/user, params) if(istype(P, /obj/item/device/multitool)) attack_hand(user) diff --git a/code/game/machinery/telecomms/machines/server.dm b/code/game/machinery/telecomms/machines/server.dm index f78fdd13897..8613a7bdad4 100644 --- a/code/game/machinery/telecomms/machines/server.dm +++ b/code/game/machinery/telecomms/machines/server.dm @@ -111,12 +111,12 @@ relay_information(signal, "/obj/machinery/telecomms/broadcaster") -/obj/machinery/telecomms/server/proc/setcode(var/t) +/obj/machinery/telecomms/server/proc/setcode(t) if(t) if(istext(t)) rawcode = t -/obj/machinery/telecomms/server/proc/admin_log(var/mob/mob) +/obj/machinery/telecomms/server/proc/admin_log(mob/mob) var/msg="[key_name(mob)] has compiled a script to server [src]:" diary << msg @@ -125,7 +125,7 @@ if(length(rawcode)) // Let's not bother the admins for empty code. message_admins("[key_name_admin(mob)] (FLW) has compiled and uploaded a NTSL script to [src.id]",0,1) -/obj/machinery/telecomms/server/proc/compile(var/mob/user) +/obj/machinery/telecomms/server/proc/compile(mob/user) if(Compiler) admin_log(user) @@ -141,7 +141,7 @@ logs-- break -/obj/machinery/telecomms/server/proc/add_entry(var/content, var/input) +/obj/machinery/telecomms/server/proc/add_entry(content, input) var/datum/comm_log_entry/log = new var/identifier = num2text( rand(-1000,1000) + world.time ) log.name = "[input] ([md5(identifier)])" diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index 71a042441d8..361097145bb 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -161,7 +161,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() ..() // Used in auto linking -/obj/machinery/telecomms/proc/add_link(var/obj/machinery/telecomms/T) +/obj/machinery/telecomms/proc/add_link(obj/machinery/telecomms/T) var/turf/position = get_turf(src) var/turf/T_position = get_turf(T) if((position.z == T_position.z) || (src.long_range_link && T.long_range_link)) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 2c5c4d19c4a..e341ca965b6 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -35,7 +35,7 @@ break return power_station -/obj/machinery/computer/teleporter/attackby(I as obj, mob/living/user as mob, params) +/obj/machinery/computer/teleporter/attackby(obj/I, mob/living/user, params) if(istype(I, /obj/item/device/gps)) var/obj/item/device/gps/L = I if(L.locked_location && !(stat & (NOPOWER|BROKEN))) @@ -391,7 +391,7 @@ teleporter_console = null ..() -/obj/machinery/teleport/station/attackby(var/obj/item/weapon/W, mob/user, params) +/obj/machinery/teleport/station/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/device/multitool) && !panel_open) var/obj/item/device/multitool/M = W if(M.buffer && istype(M.buffer, /obj/machinery/teleport/station) && M.buffer != src) diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm index a4c672dc38a..f85e470fcf1 100644 --- a/code/game/machinery/transformer.dm +++ b/code/game/machinery/transformer.dm @@ -28,7 +28,7 @@ else icon_state = initial(icon_state) -/obj/machinery/transformer/Bumped(var/atom/movable/AM) +/obj/machinery/transformer/Bumped(atom/movable/AM) if(cooldown == 1) return @@ -49,7 +49,7 @@ return ..() return 0 -/obj/machinery/transformer/proc/do_transform(var/mob/living/carbon/human/H) +/obj/machinery/transformer/proc/do_transform(mob/living/carbon/human/H) if(stat & (BROKEN|NOPOWER)) return if(cooldown == 1) diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm index 35c4bb5a968..70e783b5416 100644 --- a/code/game/machinery/turrets.dm +++ b/code/game/machinery/turrets.dm @@ -112,7 +112,7 @@ src.icon_state = "grey_target_prism" stat |= NOPOWER -/obj/machinery/turret/proc/setState(var/enabled, var/lethal) +/obj/machinery/turret/proc/setState(enabled, lethal) src.enabled = enabled src.lasers = lethal src.power_change() @@ -126,7 +126,7 @@ return TP return -/obj/machinery/turret/proc/check_target(var/atom/movable/T as mob|obj) +/obj/machinery/turret/proc/check_target(atom/movable/T as mob|obj) if( T && T in protected_area.turretTargets ) var/area/area_T = get_area(T) if( !area_T || (area_T.type != protected_area.type) ) @@ -207,7 +207,7 @@ sleep(shot_delay) return -/obj/machinery/turret/proc/shootAt(var/atom/movable/target) +/obj/machinery/turret/proc/shootAt(atom/movable/target) var/turf/T = get_turf(src) var/turf/U = get_turf(target) if (!T || !U) @@ -263,7 +263,7 @@ invisibility = INVISIBILITY_LEVEL_TWO popping = 0 -/obj/machinery/turret/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/turret/bullet_act(obj/item/projectile/Proj) if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) src.health -= Proj.damage ..() @@ -308,7 +308,7 @@ qdel(src) -/obj/machinery/turret/attack_animal(mob/living/simple_animal/M as mob) +/obj/machinery/turret/attack_animal(mob/living/simple_animal/M) M.changeNext_move(CLICK_CD_MELEE) M.do_attack_animation(src) if(M.melee_damage_upper == 0) return @@ -326,7 +326,7 @@ -/obj/machinery/turret/attack_alien(mob/living/carbon/alien/humanoid/M as mob) +/obj/machinery/turret/attack_alien(mob/living/carbon/alien/humanoid/M) M.changeNext_move(CLICK_CD_MELEE) M.do_attack_animation(src) if(!(stat & BROKEN)) @@ -401,7 +401,7 @@ return -/obj/machinery/gun_turret/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/gun_turret/bullet_act(obj/item/projectile/Proj) take_damage(Proj.damage) return @@ -416,7 +416,7 @@ return attack_hand(user) -/obj/machinery/gun_turret/attack_alien(mob/living/user as mob) +/obj/machinery/gun_turret/attack_alien(mob/living/user) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) user.visible_message("[user] slashes at [src]!", "You slash at [src]!") @@ -550,7 +550,7 @@ else user << "Access denied." -/obj/machinery/areaturretid/emag_act(mob/user as mob) +/obj/machinery/areaturretid/emag_act(mob/user) if(!emagged) user << "You short out the turret controls' access analysis module." emagged = 1 @@ -558,13 +558,13 @@ if(user.machine==src) src.attack_hand(user) -/obj/machinery/areaturretid/attack_ai(mob/user as mob) +/obj/machinery/areaturretid/attack_ai(mob/user) if(!ailock) return attack_hand(user) else user << "There seems to be a firewall preventing you from accessing this device." -/obj/machinery/areaturretid/attack_hand(mob/user as mob) +/obj/machinery/areaturretid/attack_hand(mob/user) if ( get_dist(src, user) > 0 ) if ( !issilicon(user) ) user << "You are too far away." diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 0f478bacaf0..ba110550f4e 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -278,7 +278,7 @@ ..() -/obj/machinery/vending/default_deconstruction_crowbar(var/obj/item/O) +/obj/machinery/vending/default_deconstruction_crowbar(obj/item/O) var/list/all_products = product_records + hidden_records + coin_records for(var/datum/data/vending_product/machine_content in all_products) while(machine_content.amount !=0) @@ -296,7 +296,7 @@ break ..() -/obj/machinery/vending/emag_act(user as mob) +/obj/machinery/vending/emag_act(mob/user) if(!emagged) emagged = 1 user << "You short out the product lock on [src]." diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index 05c3b10c069..dae9bac8c5e 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -181,7 +181,7 @@ /obj/machinery/washing_machine/update_icon() icon_state = "wm_[state][panel]" -/obj/machinery/washing_machine/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/washing_machine/attackby(obj/item/weapon/W, mob/user, params) /*if(istype(W,/obj/item/weapon/screwdriver)) panel = !panel user << "\blue you [panel ? "open" : "close"] the [src]'s maintenance panel"*/ @@ -269,7 +269,7 @@ ..() update_icon() -/obj/machinery/washing_machine/attack_hand(mob/user as mob) +/obj/machinery/washing_machine/attack_hand(mob/user) switch(state) if(1) state = 2 diff --git a/code/game/machinery/wishgranter.dm b/code/game/machinery/wishgranter.dm index 161fc416135..ef9962cf0b4 100644 --- a/code/game/machinery/wishgranter.dm +++ b/code/game/machinery/wishgranter.dm @@ -11,7 +11,7 @@ var/charges = 1 var/insisting = 0 -/obj/machinery/wish_granter/attack_hand(var/mob/living/carbon/user) +/obj/machinery/wish_granter/attack_hand(mob/living/carbon/user) if(istype(user)) return usr.set_machine(src) diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index 843ff80a7c9..62d63d2e6ce 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -4,7 +4,7 @@ damage_absorption = list("brute"=0.7,"fire"=1,"bullet"=0.7,"laser"=0.85,"energy"=1,"bomb"=0.8) var/am = "d3c2fbcadca903a41161ccc9df9cf948" -/obj/mecha/combat/moved_inside(var/mob/living/carbon/human/H as mob) +/obj/mecha/combat/moved_inside(mob/living/carbon/human/H) if(..()) if(H.client) H.client.mouse_pointer_icon = file("icons/mecha/mecha_mouse.dmi") @@ -12,7 +12,7 @@ else return 0 -/obj/mecha/combat/mmi_moved_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob) +/obj/mecha/combat/mmi_moved_inside(obj/item/device/mmi/mmi_as_oc,mob/user) if(..()) if(occupant.client) occupant.client.mouse_pointer_icon = file("icons/mecha/mecha_mouse.dmi") diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm index 722b576f134..a668159412b 100644 --- a/code/game/mecha/combat/gygax.dm +++ b/code/game/mecha/combat/gygax.dm @@ -41,7 +41,7 @@ ME.attach(src) return -/obj/mecha/combat/gygax/dark/add_cell(var/obj/item/weapon/stock_parts/cell/C=null) +/obj/mecha/combat/gygax/dark/add_cell(obj/item/weapon/stock_parts/cell/C=null) if(C) C.forceMove(src) cell = C diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm index 89580944e01..de184e263a1 100644 --- a/code/game/mecha/combat/marauder.dm +++ b/code/game/mecha/combat/marauder.dm @@ -103,7 +103,7 @@ return ..() -/obj/mecha/combat/marauder/Process_Spacemove(var/movement_dir = 0) +/obj/mecha/combat/marauder/Process_Spacemove(movement_dir = 0) if(..()) return 1 if(thrusters && movement_dir && use_power(step_energy_drain)) diff --git a/code/game/mecha/combat/phazon.dm b/code/game/mecha/combat/phazon.dm index 4260976a41a..905341c2194 100644 --- a/code/game/mecha/combat/phazon.dm +++ b/code/game/mecha/combat/phazon.dm @@ -18,7 +18,7 @@ var/phasing_energy_drain = 200 max_equip = 3 -/obj/mecha/combat/phazon/Bump(var/atom/obstacle) +/obj/mecha/combat/phazon/Bump(atom/obstacle) if(phasing && get_charge()>=phasing_energy_drain) spawn() if(can_move) diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm index af4b08e73c2..2a035db1e27 100644 --- a/code/game/mecha/equipment/mecha_equipment.dm +++ b/code/game/mecha/equipment/mecha_equipment.dm @@ -90,13 +90,13 @@ /obj/item/mecha_parts/mecha_equipment/proc/action(atom/target) return -/obj/item/mecha_parts/mecha_equipment/proc/can_attach(obj/mecha/M as obj) +/obj/item/mecha_parts/mecha_equipment/proc/can_attach(obj/mecha/M) if(istype(M)) if(M.equipment.len[chassis] drills [target] with [src].", \ "[chassis] drills [target] with [src].") if(ishuman(target)) @@ -172,7 +172,7 @@ force = 15 -/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill/can_attach(obj/mecha/M as obj) +/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill/can_attach(obj/mecha/M) if(..()) if(istype(M, /obj/mecha/working) || istype(M, /obj/mecha/combat)) return 1 @@ -270,7 +270,7 @@ /obj/item/mecha_parts/mecha_equipment/tool/extinguisher/on_reagent_change() return -/obj/item/mecha_parts/mecha_equipment/tool/extinguisher/can_attach(obj/mecha/working/M as obj) +/obj/item/mecha_parts/mecha_equipment/tool/extinguisher/can_attach(obj/mecha/working/M) if(..()) if(istype(M)) return 1 @@ -416,7 +416,7 @@ chassis.events.clearEvent("onMove",event) return ..() -/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/action(var/obj/item/stack/cable_coil/target) +/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/action(obj/item/stack/cable_coil/target) if(!action_checks(target)) return var/result = load_cable(target) @@ -456,7 +456,7 @@ return "[output] \[Cable: [cable ? cable.amount : 0] m\][(cable && cable.amount) ? "- [!equip_ready?"Dea":"A"]ctivate|Cut" : null]" return -/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/load_cable(var/obj/item/stack/cable_coil/CC) +/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/load_cable(obj/item/stack/cable_coil/CC) if(istype(CC) && CC.amount) var/cur_amount = cable? cable.amount : 0 var/to_load = max(max_cable - cur_amount,0) @@ -488,7 +488,7 @@ /obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/reset() last_piece = null -/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/dismantleFloor(var/turf/new_turf) +/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/dismantleFloor(turf/new_turf) if(istype(new_turf, /turf/simulated/floor)) var/turf/simulated/floor/T = new_turf if(!istype(T, /turf/simulated/floor/plating)) @@ -497,7 +497,7 @@ T.make_plating() return !new_turf.intact -/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/layCable(var/turf/new_turf) +/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/layCable(turf/new_turf) if(equip_ready || !istype(new_turf) || !dismantleFloor(new_turf)) return reset() var/fdirn = turn(chassis.dir,180) @@ -682,14 +682,14 @@ var/deflect_coeff = 1.15 var/damage_coeff = 0.8 -/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster/can_attach(obj/mecha/M as obj) +/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster/can_attach(obj/mecha/M) if(..()) if(!istype(M, /obj/mecha/combat/honker)) if(!M.proc_res["dynattackby"]) return 1 return 0 -/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster/attach(obj/mecha/M as obj) +/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster/attach(obj/mecha/M) ..() chassis.proc_res["dynattackby"] = src return @@ -703,7 +703,7 @@ if(!chassis) return return "* [src.name]" -/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster/proc/dynattackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster/proc/dynattackby(obj/item/weapon/W, mob/user) if(!action_checks(user)) return chassis.dynattackby(W,user) chassis.log_message("Attacked by [W]. Attacker - [user]") @@ -732,14 +732,14 @@ var/deflect_coeff = 1.15 var/damage_coeff = 0.8 -/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster/can_attach(obj/mecha/M as obj) +/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster/can_attach(obj/mecha/M) if(..()) if(!istype(M, /obj/mecha/combat/honker)) if(!M.proc_res["dynbulletdamage"] && !M.proc_res["dynhitby"]) return 1 return 0 -/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster/attach(obj/mecha/M as obj) +/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster/attach(obj/mecha/M) ..() chassis.proc_res["dynbulletdamage"] = src chassis.proc_res["dynhitby"] = src @@ -755,7 +755,7 @@ if(!chassis) return return "* [src.name]" -/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster/proc/dynbulletdamage(var/obj/item/projectile/Proj) +/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster/proc/dynbulletdamage(obj/item/projectile/Proj) if(!action_checks(src)) return chassis.dynbulletdamage(Proj) if(prob(chassis.deflect_chance*deflect_coeff)) @@ -854,7 +854,7 @@ /datum/global_iterator/mecha_repair_droid -/datum/global_iterator/mecha_repair_droid/process(var/obj/item/mecha_parts/mecha_equipment/repair_droid/RD as obj) +/datum/global_iterator/mecha_repair_droid/process(obj/item/mecha_parts/mecha_equipment/repair_droid/RD) if(!RD.chassis) stop() RD.set_ready_state(1) @@ -938,7 +938,7 @@ return chassis.dyngetcharge() return charge -/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/proc/get_power_channel(var/area/A) +/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/proc/get_power_channel(area/A) var/pow_chan if(A) for(var/c in use_channels) @@ -1071,7 +1071,7 @@ occupant_message(message) return -/obj/item/mecha_parts/mecha_equipment/generator/proc/load_fuel(var/obj/item/stack/sheet/P) +/obj/item/mecha_parts/mecha_equipment/generator/proc/load_fuel(obj/item/stack/sheet/P) if(P.type == fuel.type && P.amount) var/to_load = max(max_fuel - fuel.amount*fuel.perunit,0) if(to_load) @@ -1168,7 +1168,7 @@ /datum/global_iterator/mecha_generator/nuclear -/datum/global_iterator/mecha_generator/nuclear/process(var/obj/item/mecha_parts/mecha_equipment/generator/nuclear/EG) +/datum/global_iterator/mecha_generator/nuclear/process(obj/item/mecha_parts/mecha_equipment/generator/nuclear/EG) if(..()) for(var/mob/living/carbon/M in view(EG.chassis)) if(istype(M,/mob/living/carbon/human)) @@ -1189,13 +1189,13 @@ var/dam_force = 0 var/obj/mecha/working/ripley/cargo_holder -/obj/item/mecha_parts/mecha_equipment/tool/safety_clamp/can_attach(obj/mecha/working/ripley/M as obj) +/obj/item/mecha_parts/mecha_equipment/tool/safety_clamp/can_attach(obj/mecha/working/ripley/M) if(..()) if(istype(M)) return 1 return 0 -/obj/item/mecha_parts/mecha_equipment/tool/safety_clamp/attach(obj/mecha/M as obj) +/obj/item/mecha_parts/mecha_equipment/tool/safety_clamp/attach(obj/mecha/M) ..() cargo_holder = M return diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 70e92ebede8..e6cd8b6af73 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -8,7 +8,7 @@ var/deviation = 0 var/shot_delay = 0 -/obj/item/mecha_parts/mecha_equipment/weapon/can_attach(var/obj/mecha/combat/M as obj) +/obj/item/mecha_parts/mecha_equipment/weapon/can_attach(obj/mecha/combat/M) if(..()) if(istype(M)) return 1 @@ -112,7 +112,7 @@ projectile = /obj/item/projectile/plasma/adv/mech fire_sound = 'sound/weapons/Laser.ogg' -/obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma/can_attach(obj/mecha/M as obj) +/obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma/can_attach(obj/mecha/M) if(istype(M, /obj/mecha/working)) if(M.equipment.len < M.max_equip) return 1 @@ -151,7 +151,7 @@ equip_cooldown = 150 range = MELEE|RANGED -/obj/item/mecha_parts/mecha_equipment/weapon/honker/can_attach(obj/mecha/combat/honker/M as obj) +/obj/item/mecha_parts/mecha_equipment/weapon/honker/can_attach(obj/mecha/combat/honker/M) if(..()) if(istype(M)) return 1 @@ -374,7 +374,7 @@ projectile_energy_cost = 100 equip_cooldown = 20 -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar/can_attach(obj/mecha/combat/honker/M as obj) +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar/can_attach(obj/mecha/combat/honker/M) if(..()) if(istype(M)) return 1 @@ -403,7 +403,7 @@ projectile_energy_cost = 100 equip_cooldown = 10 -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/mousetrap_mortar/can_attach(obj/mecha/combat/honker/M as obj) +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/mousetrap_mortar/can_attach(obj/mecha/combat/honker/M) if(..()) if(istype(M)) return 1 diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 767fb81a6e7..c8f2b1980fe 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -446,7 +446,7 @@ updateUsrDialog() return -/obj/machinery/mecha_part_fabricator/proc/remove_material(var/mat_string, var/amount) +/obj/machinery/mecha_part_fabricator/proc/remove_material(mat_string, amount) if(resources[mat_string] < MINERAL_MATERIAL_AMOUNT) //not enough mineral for a sheet return -1 var/type @@ -486,7 +486,7 @@ return result -/obj/machinery/mecha_part_fabricator/attackby(obj/W as obj, mob/user as mob, params) +/obj/machinery/mecha_part_fabricator/attackby(obj/W, mob/user, params) if(default_deconstruction_screwdriver(user, "fab-o", "fab-idle", W)) return @@ -547,7 +547,7 @@ user << "\The [src] cannot hold any more [sname] sheet\s!" return -/obj/machinery/mecha_part_fabricator/proc/material2name(var/ID) +/obj/machinery/mecha_part_fabricator/proc/material2name(ID) return copytext(ID,2) /obj/machinery/mecha_part_fabricator/emag_act() diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 8814dc6c64e..512678aac5c 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -195,7 +195,7 @@ return 1 return 0 -/obj/mecha/proc/enter_after(delay as num, var/mob/user as mob, var/numticks = 5) +/obj/mecha/proc/enter_after(delay as num, mob/user, numticks = 5) var/delayfraction = delay/numticks var/turf/T = user.loc @@ -427,7 +427,7 @@ //////// Internal damage //////// /////////////////////////////////// -/obj/mecha/proc/check_for_internal_damage(var/list/possible_int_damage,var/ignore_threshold=null) +/obj/mecha/proc/check_for_internal_damage(list/possible_int_damage,ignore_threshold=null) if(!islist(possible_int_damage) || isemptylist(possible_int_damage)) return if(prob(20)) if(ignore_threshold || src.health*100/initial(src.health)ASSUME DIRECT CONTROL?
" -/obj/mecha/transfer_ai(var/interaction, mob/user, var/mob/living/silicon/ai/AI, var/obj/item/device/aicard/card) +/obj/mecha/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card) if(!..()) return @@ -855,7 +855,7 @@ ai_enter_mech(AI, interaction) //Hack and From Card interactions share some code, so leave that here for both to use. -/obj/mecha/proc/ai_enter_mech(var/mob/living/silicon/ai/AI, var/interaction) +/obj/mecha/proc/ai_enter_mech(mob/living/silicon/ai/AI, interaction) AI.aiRestorePowerRoutine = 0 AI.loc = src occupant = AI @@ -1005,7 +1005,7 @@ return -/obj/mecha/MouseDrop_T(mob/M as mob, mob/user as mob) +/obj/mecha/MouseDrop_T(mob/M, mob/user) if (!user.canUseTopic(src) || (user != M)) return if(!ishuman(user)) // no silicons or drones in mechas. @@ -1045,7 +1045,7 @@ user << "You stop entering the exosuit!" return -/obj/mecha/proc/moved_inside(var/mob/living/carbon/human/H as mob) +/obj/mecha/proc/moved_inside(mob/living/carbon/human/H) if(H && H.client && H in range(1)) H.reset_view(src) /* @@ -1071,7 +1071,7 @@ else return 0 -/obj/mecha/proc/mmi_move_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob) +/obj/mecha/proc/mmi_move_inside(obj/item/device/mmi/mmi_as_oc,mob/user) if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client) user << "Consciousness matrix not detected!" return 0 @@ -1098,7 +1098,7 @@ user << "You stop inserting the MMI." return 0 -/obj/mecha/proc/mmi_moved_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob) +/obj/mecha/proc/mmi_moved_inside(obj/item/device/mmi/mmi_as_oc,mob/user) if(mmi_as_oc && user in range(1)) if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client) user << "Consciousness matrix not detected!" @@ -1168,7 +1168,7 @@ go_out() -/obj/mecha/proc/go_out(var/forced) +/obj/mecha/proc/go_out(forced) if(!src.occupant) return var/atom/movable/mob_container if(ishuman(occupant)) diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index 12977e75648..8df632882a3 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -34,7 +34,7 @@ S.use(5) return 1 -/datum/construction/reversible/mecha/custom_action(index as num, diff as num, atom/used_atom, mob/user as mob) +/datum/construction/reversible/mecha/custom_action(index as num, diff as num, atom/used_atom, mob/user) if(istype(used_atom, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/W = used_atom if (W.remove_fuel(0, user)) @@ -81,7 +81,7 @@ qdel(used_atom) return 1 -/datum/construction/mecha/ripley_chassis/action(atom/used_atom,mob/user as mob) +/datum/construction/mecha/ripley_chassis/action(atom/used_atom,mob/user) return check_all_steps(used_atom,user) /datum/construction/mecha/ripley_chassis/spawn_result() @@ -155,7 +155,7 @@ "desc"="The hydraulic systems are disconnected.") ) -/datum/construction/reversible/mecha/ripley/action(atom/used_atom,mob/user as mob) +/datum/construction/reversible/mecha/ripley/action(atom/used_atom,mob/user) return check_step(used_atom,user) /datum/construction/reversible/mecha/ripley/custom_action(index, diff, atom/used_atom, mob/user) @@ -291,7 +291,7 @@ qdel(used_atom) return 1 -/datum/construction/mecha/gygax_chassis/action(atom/used_atom,mob/user as mob) +/datum/construction/mecha/gygax_chassis/action(atom/used_atom,mob/user) return check_all_steps(used_atom,user) /datum/construction/mecha/gygax_chassis/spawn_result() @@ -388,7 +388,7 @@ "desc"="The hydraulic systems are disconnected.") ) -/datum/construction/reversible/mecha/gygax/action(atom/used_atom,mob/user as mob) +/datum/construction/reversible/mecha/gygax/action(atom/used_atom,mob/user) return check_step(used_atom,user) /datum/construction/reversible/mecha/gygax/custom_action(index, diff, atom/used_atom, mob/user) @@ -570,7 +570,7 @@ qdel(used_atom) return 1 -/datum/construction/mecha/firefighter_chassis/action(atom/used_atom,mob/user as mob) +/datum/construction/mecha/firefighter_chassis/action(atom/used_atom,mob/user) return check_all_steps(used_atom,user) /datum/construction/mecha/firefighter_chassis/spawn_result() @@ -648,7 +648,7 @@ "desc"="The hydraulic systems are disconnected.") ) -/datum/construction/reversible/mecha/firefighter/action(atom/used_atom,mob/user as mob) +/datum/construction/reversible/mecha/firefighter/action(atom/used_atom,mob/user) return check_step(used_atom,user) /datum/construction/reversible/mecha/firefighter/custom_action(index, diff, atom/used_atom, mob/user) @@ -788,7 +788,7 @@ list("key"=/obj/item/mecha_parts/part/honker_head) ) -/datum/construction/mecha/honker_chassis/action(atom/used_atom,mob/user as mob) +/datum/construction/mecha/honker_chassis/action(atom/used_atom,mob/user) return check_all_steps(used_atom,user) /datum/construction/mecha/honker_chassis/custom_action(step, atom/used_atom, mob/user) @@ -820,7 +820,7 @@ list("key"=/obj/item/weapon/bikehorn),//11 ) -/datum/construction/mecha/honker/action(atom/used_atom,mob/user as mob) +/datum/construction/mecha/honker/action(atom/used_atom,mob/user) return check_step(used_atom,user) /datum/construction/mecha/honker/custom_action(step, atom/used_atom, mob/user) @@ -870,7 +870,7 @@ qdel(used_atom) return 1 -/datum/construction/mecha/durand_chassis/action(atom/used_atom,mob/user as mob) +/datum/construction/mecha/durand_chassis/action(atom/used_atom,mob/user) return check_all_steps(used_atom,user) /datum/construction/mecha/durand_chassis/spawn_result() @@ -967,7 +967,7 @@ ) -/datum/construction/reversible/mecha/durand/action(atom/used_atom,mob/user as mob) +/datum/construction/reversible/mecha/durand/action(atom/used_atom,mob/user) return check_step(used_atom,user) /datum/construction/reversible/mecha/durand/custom_action(index, diff, atom/used_atom, mob/user) @@ -1152,7 +1152,7 @@ qdel(used_atom) return 1 -/datum/construction/mecha/phazon_chassis/action(atom/used_atom,mob/user as mob) +/datum/construction/mecha/phazon_chassis/action(atom/used_atom,mob/user) return check_all_steps(used_atom,user) /datum/construction/mecha/phazon_chassis/spawn_result() @@ -1266,7 +1266,7 @@ ) -/datum/construction/reversible/mecha/phazon/action(atom/used_atom,mob/user as mob) +/datum/construction/reversible/mecha/phazon/action(atom/used_atom,mob/user) return check_step(used_atom,user) /datum/construction/reversible/mecha/phazon/custom_action(index, diff, atom/used_atom, mob/user) @@ -1477,7 +1477,7 @@ qdel(used_atom) return 1 -/datum/construction/mecha/odysseus_chassis/action(atom/used_atom,mob/user as mob) +/datum/construction/mecha/odysseus_chassis/action(atom/used_atom,mob/user) return check_all_steps(used_atom,user) /datum/construction/mecha/odysseus_chassis/spawn_result() @@ -1550,7 +1550,7 @@ "desc"="The hydraulic systems are disconnected.") ) -/datum/construction/reversible/mecha/odysseus/action(atom/used_atom,mob/user as mob) +/datum/construction/reversible/mecha/odysseus/action(atom/used_atom,mob/user) return check_step(used_atom,user) /datum/construction/reversible/mecha/odysseus/custom_action(index, diff, atom/used_atom, mob/user) diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index adc83c8da0d..cbd9075f608 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -9,7 +9,7 @@ var/screen = 0 var/stored_data -/obj/machinery/computer/mecha/attack_hand(var/mob/user as mob) +/obj/machinery/computer/mecha/attack_hand(mob/user) if(..()) return user.set_machine(src) diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index 0e6d689b85f..fe430840e98 100644 --- a/code/game/mecha/mecha_parts.dm +++ b/code/game/mecha/mecha_parts.dm @@ -15,7 +15,7 @@ icon_state = "backbone" var/datum/construction/construct -/obj/item/mecha_parts/chassis/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/mecha_parts/chassis/attackby(obj/item/W, mob/user, params) if(!construct || !construct.action(W, user)) ..() return diff --git a/code/game/mecha/medical/odysseus.dm b/code/game/mecha/medical/odysseus.dm index fa7d79e6113..6e72db4a2f8 100644 --- a/code/game/mecha/medical/odysseus.dm +++ b/code/game/mecha/medical/odysseus.dm @@ -11,7 +11,7 @@ step_energy_drain = 6 var/builtin_hud_user = 0 -/obj/mecha/medical/odysseus/moved_inside(var/mob/living/carbon/human/H as mob) +/obj/mecha/medical/odysseus/moved_inside(mob/living/carbon/human/H) if(..()) if(H.glasses && istype(H.glasses, /obj/item/clothing/glasses/hud)) occupant_message("Your [H.glasses] prevent you from using the built-in medical hud.") diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index 78fcf6d541a..d9cbecc0159 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -47,7 +47,7 @@ src.overlays = null src.overlays += image("icon" = "mecha.dmi", "icon_state" = "ripley-g-full-open") -/obj/mecha/working/ripley/moved_inside(var/mob/living/carbon/human/H as mob) +/obj/mecha/working/ripley/moved_inside(mob/living/carbon/human/H) ..() if (src.damage_absorption["brute"] < 0.6 && src.damage_absorption["brute"] > 0.3) src.overlays = null @@ -56,7 +56,7 @@ src.overlays = null src.overlays += image("icon" = "mecha.dmi", "icon_state" = "ripley-g-full") -/obj/mecha/working/ripley/mmi_moved_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob) +/obj/mecha/working/ripley/mmi_moved_inside(obj/item/device/mmi/mmi_as_oc,mob/user) ..() if (src.damage_absorption["brute"] < 0.6 && src.damage_absorption["brute"] > 0.3) src.overlays = null diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm index 2e688f8a415..1c00feff64c 100644 --- a/code/game/objects/effects/aliens.dm +++ b/code/game/objects/effects/aliens.dm @@ -357,7 +357,7 @@ status = GROWN -/obj/structure/alien/egg/proc/Burst(var/kill = 1) //drops and kills the hugger if any is remaining +/obj/structure/alien/egg/proc/Burst(kill = 1) //drops and kills the hugger if any is remaining if(status == GROWN || status == GROWING) icon_state = "egg_hatched" flick("egg_opening", src) diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index a31877f27f1..a10301a8eb7 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -75,7 +75,7 @@ gravShock(A) return -/obj/effect/anomaly/grav/proc/gravShock(var/mob/A) +/obj/effect/anomaly/grav/proc/gravShock(mob/A) if(boing && isliving(A) && !A.stat) A.Weaken(2) var/atom/target = get_edge_target_turf(A, get_dir(src, get_step_away(A, src))) @@ -156,7 +156,7 @@ else O.ex_act(2) -/obj/effect/anomaly/bhole/proc/grav(var/r, var/ex_act_force, var/pull_chance, var/turf_removal_chance) +/obj/effect/anomaly/bhole/proc/grav(r, ex_act_force, pull_chance, turf_removal_chance) for(var/t = -r, t < r, t++) affect_coord(x+t, y-r, ex_act_force, pull_chance, turf_removal_chance) affect_coord(x-t, y+r, ex_act_force, pull_chance, turf_removal_chance) @@ -164,7 +164,7 @@ affect_coord(x-r, y-t, ex_act_force, pull_chance, turf_removal_chance) return -/obj/effect/anomaly/bhole/proc/affect_coord(var/x, var/y, var/ex_act_force, var/pull_chance, var/turf_removal_chance) +/obj/effect/anomaly/bhole/proc/affect_coord(x, y, ex_act_force, pull_chance, turf_removal_chance) //Get turf at coordinate var/turf/T = locate(x, y, z) if(isnull(T)) return diff --git a/code/game/objects/effects/decals/Cleanable/aliens.dm b/code/game/objects/effects/decals/Cleanable/aliens.dm index 5778ec117d5..1d3284d671d 100644 --- a/code/game/objects/effects/decals/Cleanable/aliens.dm +++ b/code/game/objects/effects/decals/Cleanable/aliens.dm @@ -19,7 +19,7 @@ viruses = null ..() -/obj/effect/decal/cleanable/xenoblood/xgibs/proc/streak(var/list/directions) +/obj/effect/decal/cleanable/xenoblood/xgibs/proc/streak(list/directions) spawn (0) var/direction = pick(directions) for (var/i = 0, i < pick(1, 200; 2, 150; 3, 50; 4), i++) diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index c2054cf07a0..376248156cb 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -78,7 +78,7 @@ random_icon_states = list("gibmid1", "gibmid2", "gibmid3") -/obj/effect/decal/cleanable/blood/gibs/proc/streak(var/list/directions) +/obj/effect/decal/cleanable/blood/gibs/proc/streak(list/directions) spawn (0) var/direction = pick(directions) for (var/i = 0, i < pick(1, 200; 2, 150; 3, 50; 4), i++) diff --git a/code/game/objects/effects/decals/Cleanable/robots.dm b/code/game/objects/effects/decals/Cleanable/robots.dm index d7710921b4e..da5d6e7b40b 100644 --- a/code/game/objects/effects/decals/Cleanable/robots.dm +++ b/code/game/objects/effects/decals/Cleanable/robots.dm @@ -11,7 +11,7 @@ icon_state = "gib1" random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7") -/obj/effect/decal/cleanable/robot_debris/proc/streak(var/list/directions) +/obj/effect/decal/cleanable/robot_debris/proc/streak(list/directions) spawn (0) var/direction = pick(directions) for (var/i = 0, i < pick(1, 200; 2, 150; 3, 50; 4), i++) diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm index 26835a69788..175e24f9caf 100644 --- a/code/game/objects/effects/decals/cleanable.dm +++ b/code/game/objects/effects/decals/cleanable.dm @@ -7,7 +7,7 @@ create_reagents(300) ..() -/obj/effect/decal/cleanable/attackby(obj/item/weapon/W as obj, mob/user as mob,) +/obj/effect/decal/cleanable/attackby(obj/item/weapon/W, mob/user,) if(istype(W, /obj/item/weapon/reagent_containers/glass) || istype(W, /obj/item/weapon/reagent_containers/food/drinks)) if(src.reagents && W.reagents) if(!src.reagents.total_volume) diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm index 81031ea3985..bc6f9d22868 100644 --- a/code/game/objects/effects/effect_system/effects_foam.dm +++ b/code/game/objects/effects/effect_system/effects_foam.dm @@ -71,7 +71,7 @@ return spread_foam() -/obj/effect/effect/foam/proc/foam_mob(var/mob/living/L as mob) +/obj/effect/effect/foam/proc/foam_mob(mob/living/L) if(lifetime<1) return 0 if(!istype(L)) @@ -81,12 +81,12 @@ lifetime-- return 1 -/obj/effect/effect/foam/Crossed(var/atom/movable/AM) +/obj/effect/effect/foam/Crossed(atom/movable/AM) if(istype(AM, /mob/living/carbon)) var/mob/living/carbon/M = AM M.slip(5, 2, src) -/obj/effect/effect/foam/metal/Crossed(var/atom/movable/AM) +/obj/effect/effect/foam/metal/Crossed(atom/movable/AM) return @@ -146,7 +146,7 @@ chemholder = null return ..() -/datum/effect/effect/system/foam_spread/set_up(amt=5, loca, var/datum/reagents/carry = null) +/datum/effect/effect/system/foam_spread/set_up(amt=5, loca, datum/reagents/carry = null) if(istype(loca, /turf/)) location = loca else @@ -155,7 +155,7 @@ amount = round(sqrt(amt / 2), 1) carry.copy_to(chemholder, carry.total_volume) -/datum/effect/effect/system/foam_spread/metal/set_up(amt=5, loca, var/datum/reagents/carry = null, var/metaltype) +/datum/effect/effect/system/foam_spread/metal/set_up(amt=5, loca, datum/reagents/carry = null, metaltype) ..() metal = metaltype @@ -224,12 +224,12 @@ qdel(src) -/obj/structure/foamedmetal/attack_paw(var/mob/user) +/obj/structure/foamedmetal/attack_paw(mob/user) attack_hand(user) return -/obj/structure/foamedmetal/attack_animal(var/mob/living/simple_animal/user) +/obj/structure/foamedmetal/attack_animal(mob/living/simple_animal/user) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) if(user.environment_smash >= 1) @@ -249,7 +249,7 @@ qdel(src) return 1 -/obj/structure/foamedmetal/attack_alien(var/mob/living/carbon/alien/humanoid/user) +/obj/structure/foamedmetal/attack_alien(mob/living/carbon/alien/humanoid/user) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) if(prob(75 - metal*25)) @@ -257,7 +257,7 @@ "You smash through the metal foam wall!") qdel(src) -/obj/structure/foamedmetal/attack_slime(var/mob/living/simple_animal/slime/user) +/obj/structure/foamedmetal/attack_slime(mob/living/simple_animal/slime/user) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) if(!user.is_adult) @@ -268,13 +268,13 @@ "You smash through the metal foam wall!") qdel(src) -/obj/structure/foamedmetal/attack_hand(var/mob/user) +/obj/structure/foamedmetal/attack_hand(mob/user) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) user << "You hit the metal foam but bounce off it!" -/obj/structure/foamedmetal/attackby(var/obj/item/I, var/mob/user, params) +/obj/structure/foamedmetal/attackby(obj/item/I, mob/user, params) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) if (istype(I, /obj/item/weapon/grab)) diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm index 1f447c5c1f9..91c619344a5 100644 --- a/code/game/objects/effects/effect_system/effects_smoke.dm +++ b/code/game/objects/effects/effect_system/effects_smoke.dm @@ -18,7 +18,7 @@ var/direction -/obj/effect/effect/smoke/proc/fade_out(var/frames = 16) +/obj/effect/effect/smoke/proc/fade_out(frames = 16) if(alpha == 0) //Handle already transparent case return if(frames == 0) @@ -55,12 +55,12 @@ steps-- return 1 -/obj/effect/effect/smoke/Crossed(mob/living/M as mob) +/obj/effect/effect/smoke/Crossed(mob/living/M) if(!istype(M)) return smoke_mob(M) -/obj/effect/effect/smoke/proc/smoke_mob(mob/living/carbon/M as mob) +/obj/effect/effect/smoke/proc/smoke_mob(mob/living/carbon/M) if(!istype(M)) return 0 if(lifetime<1) @@ -122,7 +122,7 @@ for(var/mob/living/carbon/M in range(1,src)) smoke_mob(M) -/obj/effect/effect/smoke/bad/smoke_mob(mob/living/carbon/M as mob) +/obj/effect/effect/smoke/bad/smoke_mob(mob/living/carbon/M) if(..()) M.drop_item() M.adjustOxyLoss(1) @@ -168,7 +168,7 @@ if(hit) lifetime++ //this is so the decrease from mobs hit and the natural decrease don't cumulate. -/obj/effect/effect/smoke/chem/smoke_mob(mob/living/carbon/M as mob) +/obj/effect/effect/smoke/chem/smoke_mob(mob/living/carbon/M) if(lifetime<1) return 0 if(!istype(M)) @@ -196,7 +196,7 @@ ..() return QDEL_HINT_PUTINPOOL -/datum/effect/effect/system/smoke_spread/chem/set_up(var/datum/reagents/carry = null, n = 5, c = 0, loca, direct, silent = 0) +/datum/effect/effect/system/smoke_spread/chem/set_up(datum/reagents/carry = null, n = 5, c = 0, loca, direct, silent = 0) if(n > 20) n = 20 number = n @@ -282,7 +282,7 @@ for(var/mob/living/carbon/M in range(1,src)) smoke_mob(M) -/obj/effect/effect/smoke/sleeping/smoke_mob(mob/living/carbon/M as mob) +/obj/effect/effect/smoke/sleeping/smoke_mob(mob/living/carbon/M) if(..()) if(M.internal != null || (M.wear_mask && (M.wear_mask.flags & BLOCK_GAS_SMOKE_EFFECT))) return diff --git a/code/game/objects/effects/gibs.dm b/code/game/objects/effects/gibs.dm index 8eb29846fa8..36ecbb4f7a9 100644 --- a/code/game/objects/effects/gibs.dm +++ b/code/game/objects/effects/gibs.dm @@ -1,13 +1,13 @@ -/proc/gibs(atom/location, var/list/viruses, var/datum/dna/MobDNA) +/proc/gibs(atom/location, list/viruses, datum/dna/MobDNA) new /obj/effect/gibspawner/generic(location,viruses,MobDNA) -/proc/hgibs(atom/location, var/list/viruses, var/datum/dna/MobDNA) +/proc/hgibs(atom/location, list/viruses, datum/dna/MobDNA) new /obj/effect/gibspawner/human(location,viruses,MobDNA) -/proc/xgibs(atom/location, var/list/viruses) +/proc/xgibs(atom/location, list/viruses) new /obj/effect/gibspawner/xeno(location,viruses) -/proc/robogibs(atom/location, var/list/viruses) +/proc/robogibs(atom/location, list/viruses) new /obj/effect/gibspawner/robot(location,viruses) /obj/effect/gibspawner @@ -22,7 +22,7 @@ Gib(loc,viruses,MobDNA) -/obj/effect/gibspawner/proc/Gib(atom/location, var/list/viruses = list(), var/datum/dna/MobDNA = null) +/obj/effect/gibspawner/proc/Gib(atom/location, list/viruses = list(), datum/dna/MobDNA = null) if(gibtypes.len != gibamounts.len || gibamounts.len != gibdirections.len) world << "Gib list length mismatch!" return diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm index 02712530739..40f10b06059 100644 --- a/code/game/objects/effects/glowshroom.dm +++ b/code/game/objects/effects/glowshroom.dm @@ -112,7 +112,7 @@ floor = 1 return 1 -/obj/effect/glowshroom/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/effect/glowshroom/attackby(obj/item/weapon/W, mob/user, params) ..() endurance -= W.force CheckEndurance() @@ -142,7 +142,7 @@ if(endurance <= 0) qdel(src) -/obj/effect/glowshroom/acid_act(var/acidpwr, var/toxpwr, var/acid_volume) +/obj/effect/glowshroom/acid_act(acidpwr, toxpwr, acid_volume) visible_message("[src] melts away!") var/obj/effect/decal/cleanable/molten_item/I = new (get_turf(src)) I.desc = "Looks like this was \an [src] some time ago." diff --git a/code/game/objects/effects/spawners/vaultspawner.dm b/code/game/objects/effects/spawners/vaultspawner.dm index 8610a6ef298..da0774c11ba 100644 --- a/code/game/objects/effects/spawners/vaultspawner.dm +++ b/code/game/objects/effects/spawners/vaultspawner.dm @@ -4,7 +4,7 @@ var/minX = 2 var/minY = 2 -/obj/effect/vaultspawner/New(turf/location as turf,lX = minX,uX = maxX,lY = minY,uY = maxY,var/type = null) +/obj/effect/vaultspawner/New(turf/location,lX = minX,uX = maxX,lY = minY,uY = maxY,type = null) if(!type) type = pick("sandstone","rock","alien") diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 50ebfc1f37a..8bb707f38d7 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -20,7 +20,7 @@ qdel(src) return -/obj/effect/spider/attackby(var/obj/item/weapon/W, var/mob/user, params) +/obj/effect/spider/attackby(obj/item/weapon/W, mob/user, params) if(W.attack_verb.len) visible_message("[user] has [pick(W.attack_verb)] \the [src] with \the [W]!") else @@ -38,7 +38,7 @@ health -= damage healthcheck() -/obj/effect/spider/bullet_act(var/obj/item/projectile/Proj) +/obj/effect/spider/bullet_act(obj/item/projectile/Proj) ..() health -= Proj.damage healthcheck() diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm index 8eb07b6a4d4..3c44d6e1454 100644 --- a/code/game/objects/effects/step_triggers.dm +++ b/code/game/objects/effects/step_triggers.dm @@ -7,7 +7,7 @@ invisibility = 101 // nope cant see this shit anchored = 1 -/obj/effect/step_trigger/proc/Trigger(var/atom/movable/A) +/obj/effect/step_trigger/proc/Trigger(atom/movable/A) return 0 /obj/effect/step_trigger/Crossed(H as mob|obj) @@ -26,7 +26,7 @@ var/message //the message to give to the mob var/once = 1 -/obj/effect/step_trigger/message/Trigger(mob/M as mob) +/obj/effect/step_trigger/message/Trigger(mob/M) if(M.client) M << "[message]" if(once) @@ -43,7 +43,7 @@ var/nostop = 0 // if 1: will only be stopped by teleporters var/list/affecting = list() -/obj/effect/step_trigger/thrower/Trigger(var/atom/A) +/obj/effect/step_trigger/thrower/Trigger(atom/A) if(!A || !istype(A, /atom/movable)) return var/atom/movable/AM = A @@ -106,7 +106,7 @@ var/teleport_y = 0 var/teleport_z = 0 -/obj/effect/step_trigger/teleporter/Trigger(var/atom/movable/A) +/obj/effect/step_trigger/teleporter/Trigger(atom/movable/A) if(teleport_x && teleport_y && teleport_z) A.x = teleport_x @@ -120,7 +120,7 @@ var/teleport_y_offset = 0 var/teleport_z_offset = 0 -/obj/effect/step_trigger/teleporter/random/Trigger(var/atom/movable/A) +/obj/effect/step_trigger/teleporter/random/Trigger(atom/movable/A) if(teleport_x && teleport_y && teleport_z) if(teleport_x_offset && teleport_y_offset && teleport_z_offset) @@ -139,7 +139,7 @@ var/entersmoke = 0 var/exitsmoke = 0 -/obj/effect/step_trigger/teleport_fancy/Trigger(mob/M as mob) +/obj/effect/step_trigger/teleport_fancy/Trigger(mob/M) var/dest = locate(locationx, locationy, z) M.Move(dest) @@ -176,7 +176,7 @@ var/triggerer_only = 0 //Whether the triggerer is the only person who hears this -/obj/effect/step_trigger/sound_effect/Trigger(var/atom/movable/A) +/obj/effect/step_trigger/sound_effect/Trigger(atom/movable/A) var/turf/T = get_turf(A) if(!T) diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm index 3a7095a29a4..f49a67e701a 100644 --- a/code/game/objects/explosion.dm +++ b/code/game/objects/explosion.dm @@ -1,12 +1,12 @@ //TODO: Flash range does nothing currently //A very crude linear approximatiaon of pythagoras theorem. -/proc/cheap_pythag(var/dx, var/dy) +/proc/cheap_pythag(dx, dy) dx = abs(dx); dy = abs(dy); if(dx>=dy) return dx + (0.5*dy) //The longest side add half the shortest side approximates the hypotenuse else return dy + (0.5*dx) -/proc/trange(var/Dist=0,var/turf/Center=null)//alternative to range (ONLY processes turfs and thus less intensive) +/proc/trange(Dist=0,turf/Center=null)//alternative to range (ONLY processes turfs and thus less intensive) if(Center==null) return //var/x1=((Center.x-Dist)<1 ? 1 : Center.x-Dist) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index dbe7dcc852f..5091d4dda07 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -158,7 +158,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s user << "[pronoun] a [size] item." //e.g. They are a small item. or It is a bulky item. -/obj/item/attack_hand(mob/user as mob) +/obj/item/attack_hand(mob/user) if (!user) return if(burn_state == 1) @@ -195,7 +195,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s return -/obj/item/attack_paw(mob/user as mob) +/obj/item/attack_paw(mob/user) if (istype(src.loc, /obj/item/weapon/storage)) for(var/mob/M in range(1, src.loc)) @@ -215,7 +215,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s return -/obj/item/attack_alien(mob/user as mob) +/obj/item/attack_alien(mob/user) var/mob/living/carbon/alien/A = user if(!A.has_fine_manipulation) @@ -225,7 +225,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s return attack_paw(A) -/obj/item/attack_ai(mob/user as mob) +/obj/item/attack_ai(mob/user) if (istype(src.loc, /obj/item/weapon/robot_module)) //If the item is part of a cyborg module, equip it if(!isrobot(user)) return @@ -235,7 +235,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s // Due to storage type consolidation this should get used more now. // I have cleaned it up a little, but it could probably use more. -Sayu -/obj/item/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/attackby(obj/item/weapon/W, mob/user, params) if(istype(W,/obj/item/weapon/storage)) var/obj/item/weapon/storage/S = W if(S.use_to_pickup) @@ -275,7 +275,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s /obj/item/proc/talk_into(mob/M, input, channel, spans) return -/obj/item/proc/dropped(mob/user as mob) +/obj/item/proc/dropped(mob/user) ..() // called just as an item is picked up (loc is not yet changed) @@ -283,15 +283,15 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s return // called when this item is removed from a storage item, which is passed on as S. The loc variable is already set to the new destination before this is called. -/obj/item/proc/on_exit_storage(obj/item/weapon/storage/S as obj) +/obj/item/proc/on_exit_storage(obj/item/weapon/storage/S) return // called when this item is added into a storage item, which is passed on as S. The loc variable is already set to the storage item. -/obj/item/proc/on_enter_storage(obj/item/weapon/storage/S as obj) +/obj/item/proc/on_enter_storage(obj/item/weapon/storage/S) return // called when "found" in pockets and storage items. Returns 1 if the search should end. -/obj/item/proc/on_found(mob/finder as mob) +/obj/item/proc/on_found(mob/finder) return // called after an item is placed in an equipment slot @@ -344,7 +344,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s /obj/item/proc/IsReflect(var/def_zone) //This proc determines if and at what% an object will reflect energy projectiles if it's in l_hand,r_hand or wear_suit return 0 -/obj/item/proc/eyestab(mob/living/carbon/M as mob, mob/living/carbon/user as mob) +/obj/item/proc/eyestab(mob/living/carbon/M, mob/living/carbon/user) var/is_human_victim = 0 if(ishuman(M)) @@ -438,7 +438,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s throw_at(S,14,3) else ..() -/obj/item/acid_act(var/acidpwr, var/acid_volume) +/obj/item/acid_act(acidpwr, acid_volume) . = 1 if(unacidable) return diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm index be9e287bb22..ad5036b53ee 100644 --- a/code/game/objects/items/apc_frame.dm +++ b/code/game/objects/items/apc_frame.dm @@ -7,7 +7,7 @@ icon_state = "apc_frame" flags = CONDUCT -/obj/item/apc_frame/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/apc_frame/attackby(obj/item/weapon/W, mob/user, params) ..() if (istype(W, /obj/item/weapon/wrench)) new /obj/item/stack/sheet/metal( get_turf(src.loc), 2 ) diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index f18a053d9ba..c17f3862e62 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -21,7 +21,7 @@ var/const/ROOM_ERR_TOOLARGE = -2 -/obj/item/areaeditor/attack_self(mob/user as mob) +/obj/item/areaeditor/attack_self(mob/user) add_fingerprint(user) var/text = "[src] \

[station_name()] [src.name]

\ @@ -54,7 +54,7 @@ w_class = 1 -/obj/item/areaeditor/permit/attack_self(mob/user as mob) +/obj/item/areaeditor/permit/attack_self(mob/user) . = ..() var/area/A = get_area() if(get_area_type() == AREA_STATION) @@ -80,7 +80,7 @@ fluffnotice = "Property of Nanotrasen. For heads of staff only. Store in high-secure storage." -/obj/item/areaeditor/blueprints/attack_self(mob/user as mob) +/obj/item/areaeditor/blueprints/attack_self(mob/user) . = ..() var/area/A = get_area() if(get_area_type() == AREA_STATION) @@ -108,7 +108,7 @@ return A -/obj/item/areaeditor/proc/get_area_type(var/area/A = get_area()) +/obj/item/areaeditor/proc/get_area_type(area/A = get_area()) if (istype(A,/area/space)) return AREA_SPACE var/list/SPECIALS = list( @@ -166,7 +166,7 @@ return 1 -/obj/item/areaeditor/proc/move_turfs_to_area(var/list/turf/turfs, var/area/A) +/obj/item/areaeditor/proc/move_turfs_to_area(list/turf/turfs, area/A) A.contents.Add(turfs) @@ -187,7 +187,7 @@ return -/obj/item/areaeditor/proc/set_area_machinery_title(var/area/A,var/title,var/oldtitle) +/obj/item/areaeditor/proc/set_area_machinery_title(area/A,title,oldtitle) if (!oldtitle) // or replacetext goes to infinite loop return for(var/area/RA in A.related) @@ -204,7 +204,7 @@ //TODO: much much more. Unnamed airlocks, cameras, etc. -/obj/item/areaeditor/proc/check_tile_is_border(var/turf/T2,var/dir) +/obj/item/areaeditor/proc/check_tile_is_border(turf/T2,dir) if (istype(T2, /turf/space)) return BORDER_SPACE //omg hull breach we all going to die here if (get_area_type(T2.loc)!=AREA_SPACE) @@ -230,7 +230,7 @@ return BORDER_NONE -/obj/item/areaeditor/proc/detect_room(var/turf/first) +/obj/item/areaeditor/proc/detect_room(turf/first) var/list/turf/found = new var/list/turf/pending = list(first) while(pending.len) diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index 276d614a9ad..785ffcec6a6 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -22,7 +22,7 @@ icon_state = "candle[i][lit ? "_lit" : ""]" -/obj/item/candle/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/candle/attackby(obj/item/weapon/W, mob/user, params) ..() if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W @@ -76,7 +76,7 @@ T.hotspot_expose(700, 5) -/obj/item/candle/attack_self(mob/user as mob) +/obj/item/candle/attack_self(mob/user) if(lit) lit = 0 update_icon() diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 4acf4157c75..ce5a102d2fd 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -40,10 +40,10 @@ colourName = "mime" uses = -1 -/obj/item/toy/crayon/mime/attack_self(mob/living/user as mob) +/obj/item/toy/crayon/mime/attack_self(mob/living/user) update_window(user) -/obj/item/toy/crayon/mime/update_window(mob/living/user as mob) +/obj/item/toy/crayon/mime/update_window(mob/living/user) dat += "
   Change color
" ..() @@ -65,10 +65,10 @@ colourName = "rainbow" uses = -1 -/obj/item/toy/crayon/rainbow/attack_self(mob/living/user as mob) +/obj/item/toy/crayon/rainbow/attack_self(mob/living/user) update_window(user) -/obj/item/toy/crayon/rainbow/update_window(mob/living/user as mob) +/obj/item/toy/crayon/rainbow/update_window(mob/living/user) dat += "
   Change color
" ..() @@ -112,7 +112,7 @@ for(var/obj/item/toy/crayon/crayon in contents) overlays += image('icons/obj/crayons.dmi',crayon.colourName) -/obj/item/weapon/storage/crayons/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/weapon/storage/crayons/attackby(obj/item/W, mob/user, params) if(istype(W,/obj/item/toy/crayon)) switch(W:colourName) if("mime") @@ -147,7 +147,7 @@ else user << "It is empty." -/obj/item/toy/crayon/spraycan/attack_self(mob/living/user as mob) +/obj/item/toy/crayon/spraycan/attack_self(mob/living/user) var/choice = input(user,"Spraycan options") as null|anything in list("Toggle Cap","Change Drawing","Change Color") switch(choice) if("Toggle Cap") @@ -161,7 +161,7 @@ colour = input(user,"Choose Color") as color update_icon() -/obj/item/toy/crayon/spraycan/afterattack(atom/target, mob/user as mob, proximity) +/obj/item/toy/crayon/spraycan/afterattack(atom/target, mob/user, proximity) if(!proximity) return if(capped) diff --git a/code/game/objects/items/dehy_carp.dm b/code/game/objects/items/dehy_carp.dm index f5ec0d9db5d..6e059de760e 100644 --- a/code/game/objects/items/dehy_carp.dm +++ b/code/game/objects/items/dehy_carp.dm @@ -9,7 +9,7 @@ var/owned = 1 // Boolean, no owner to begin with // Attack self -/obj/item/toy/carpplushie/dehy_carp/attack_self(mob/user as mob) +/obj/item/toy/carpplushie/dehy_carp/attack_self(mob/user) src.add_fingerprint(user) // Anyone can add their fingerprints to it with this if(owned) user << "[src] stares up at you with friendly eyes." diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 6ef0a3fa4f8..89f7603d77d 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -203,7 +203,7 @@ var/global/list/obj/item/device/pda/PDAs = list() noreturn = 1 detonate = 0 -/obj/item/device/pda/ai/attack_self(mob/user as mob) +/obj/item/device/pda/ai/attack_self(mob/user) if ((honkamt > 0) && (prob(60)))//For clown virus. honkamt-- playsound(loc, 'sound/items/bikehorn.ogg', 30, 1) @@ -258,14 +258,14 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda/GetID() return id -/obj/item/device/pda/MouseDrop(obj/over_object as obj, src_location, over_location) +/obj/item/device/pda/MouseDrop(obj/over_object, src_location, over_location) var/mob/M = usr if((!istype(over_object, /obj/screen)) && can_use(M)) return attack_self(M) return //NOTE: graphic resources are loaded on client login -/obj/item/device/pda/attack_self(mob/user as mob) +/obj/item/device/pda/attack_self(mob/user) user.set_machine(src) @@ -767,7 +767,7 @@ var/global/list/obj/item/device/pda/PDAs = list() id.loc = get_turf(src) id = null -/obj/item/device/pda/proc/msg_input(var/mob/living/U = usr) +/obj/item/device/pda/proc/msg_input(mob/living/U = usr) var/t = stripped_input(U, "Please enter message", name, null, MAX_MESSAGE_LEN) if (!t || toff) return @@ -779,7 +779,7 @@ var/global/list/obj/item/device/pda/PDAs = list() t = Gibberish(t, 100) return t -/obj/item/device/pda/proc/create_message(var/mob/living/U = usr, var/obj/item/device/pda/P) +/obj/item/device/pda/proc/create_message(mob/living/U = usr, obj/item/device/pda/P) var/t = msg_input(U) @@ -902,7 +902,7 @@ var/global/list/obj/item/device/pda/PDAs = list() else usr << "You cannot do that while restrained!" -/obj/item/device/pda/proc/id_check(mob/user as mob, choice as num)//To check for IDs; 1 for in-pda use, 2 for out of pda use. +/obj/item/device/pda/proc/id_check(mob/user, choice as num)//To check for IDs; 1 for in-pda use, 2 for out of pda use. if(choice == 1) if (id) remove_id() @@ -925,7 +925,7 @@ var/global/list/obj/item/device/pda/PDAs = list() return 1 // access to status display signals -/obj/item/device/pda/attackby(obj/item/C as obj, mob/user as mob, params) +/obj/item/device/pda/attackby(obj/item/C, mob/user, params) ..() if(istype(C, /obj/item/weapon/cartridge) && !cartridge) cartridge = C @@ -978,7 +978,7 @@ var/global/list/obj/item/device/pda/PDAs = list() user << "You scan \the [C]." return -/obj/item/device/pda/attack(mob/living/carbon/C, mob/living/user as mob) +/obj/item/device/pda/attack(mob/living/carbon/C, mob/living/user) if(istype(C)) switch(scanmode) @@ -999,7 +999,7 @@ var/global/list/obj/item/device/pda/PDAs = list() else user.show_message("No radiation detected.") -/obj/item/device/pda/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity) +/obj/item/device/pda/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity) if(!proximity) return switch(scanmode) @@ -1078,7 +1078,7 @@ var/global/list/obj/item/device/pda/PDAs = list() //AI verb and proc for sending PDA messages. -/mob/living/silicon/ai/proc/cmd_send_pdamesg(mob/user as mob) +/mob/living/silicon/ai/proc/cmd_send_pdamesg(mob/user) var/list/names = list() var/list/plist = list() var/list/namecounts = list() @@ -1159,7 +1159,7 @@ var/global/list/obj/item/device/pda/PDAs = list() else usr << "You do not have a PDA. You should make an issue report about this." -/mob/living/silicon/ai/proc/cmd_show_message_log(mob/user as mob) +/mob/living/silicon/ai/proc/cmd_show_message_log(mob/user) if(user.stat == 2) user << "You can't do that because you are dead!" return diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index 64196a74bd4..90c2ad2c5a7 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -234,7 +234,7 @@ print_to_host(menu) return -/obj/item/weapon/cartridge/proc/print_to_host(var/text) +/obj/item/weapon/cartridge/proc/print_to_host(text) if (!istype(loc, /obj/item/device/pda)) return loc:cart = text @@ -245,7 +245,7 @@ return -/obj/item/weapon/cartridge/proc/post_status(var/command, var/data1, var/data2) +/obj/item/weapon/cartridge/proc/post_status(command, data1, data2) var/datum/radio_frequency/frequency = radio_controller.return_frequency(1435) diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm index b91db4b5e30..9f8e79da8ea 100644 --- a/code/game/objects/items/devices/camera_bug.dm +++ b/code/game/objects/items/devices/camera_bug.dm @@ -62,16 +62,16 @@ ..() -/obj/item/device/camera_bug/interact(var/mob/user = usr) +/obj/item/device/camera_bug/interact(mob/user = usr) var/datum/browser/popup = new(user, "camerabug","Camera Bug",nref=src) popup.set_content(menu(get_cameras())) popup.open() -/obj/item/device/camera_bug/attack_self(mob/user as mob) +/obj/item/device/camera_bug/attack_self(mob/user) user.set_machine(src) interact(user) -/obj/item/device/camera_bug/check_eye(var/mob/user as mob) +/obj/item/device/camera_bug/check_eye(mob/user) if (user.stat || loc != user || !user.canmove || user.eye_blind || !current) user.reset_view(null) user.unset_machine() @@ -108,7 +108,7 @@ return bugged_cameras -/obj/item/device/camera_bug/proc/menu(var/list/cameras) +/obj/item/device/camera_bug/proc/menu(list/cameras) if(!cameras || !cameras.len) return "No bugged cameras found." @@ -209,7 +209,7 @@ else return "Camera Offline
" -/obj/item/device/camera_bug/Topic(var/href,var/list/href_list) +/obj/item/device/camera_bug/Topic(href,list/href_list) if(usr != loc) usr.unset_machine() usr.reset_view(null) @@ -309,7 +309,7 @@ break src.updateSelfDialog() -/obj/item/device/camera_bug/attackby(var/obj/item/W as obj,var/mob/living/user as mob, params) +/obj/item/device/camera_bug/attackby(obj/item/W,mob/living/user, params) if(istype(W,/obj/item/weapon/screwdriver) && expansion) expansion.loc = get_turf(loc) user << "You unscrew [expansion]." diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index f7b754a93d5..9302f773829 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -65,7 +65,7 @@ spawn(8) qdel(T) -/obj/item/device/chameleon/proc/disrupt(var/delete_dummy = 1) +/obj/item/device/chameleon/proc/disrupt(delete_dummy = 1) if(active_dummy) var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread spark_system.set_up(5, 0, src) @@ -93,7 +93,7 @@ var/can_move = 1 var/obj/item/device/chameleon/master = null -/obj/effect/dummy/chameleon/proc/activate(var/obj/O, var/mob/M, new_icon, new_iconstate, new_overlays, new_underlays, var/obj/item/device/chameleon/C) +/obj/effect/dummy/chameleon/proc/activate(obj/O, mob/M, new_icon, new_iconstate, new_overlays, new_underlays, obj/item/device/chameleon/C) name = O.name desc = O.desc icon = new_icon @@ -126,7 +126,7 @@ ..() master.disrupt() -/obj/effect/dummy/chameleon/relaymove(var/mob/user, direction) +/obj/effect/dummy/chameleon/relaymove(mob/user, direction) if(istype(loc, /turf/space) || !direction) return //No magical space movement! diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 1a7dadc9083..735e48dbf6b 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -28,7 +28,7 @@ visible_message("The [src.name] burns out!") -/obj/item/device/flash/proc/flash_recharge(var/interval=10) +/obj/item/device/flash/proc/flash_recharge(interval=10) if(prob(times_used * 3)) //The more often it's used in a short span of time the more likely it will burn out burn_out() return 0 @@ -41,7 +41,7 @@ times_used = max(0, times_used) //sanity return 1 -/obj/item/device/flash/proc/try_use_flash(var/mob/user = null) +/obj/item/device/flash/proc/try_use_flash(mob/user = null) flash_recharge(10) if(broken) @@ -57,7 +57,7 @@ return 1 -/obj/item/device/flash/proc/flash_carbon(var/mob/living/carbon/M, var/mob/user = null, var/power = 5, targeted = 1) +/obj/item/device/flash/proc/flash_carbon(mob/living/carbon/M, mob/user = null, power = 5, targeted = 1) add_logs(user, M, "flashed", src) if(user && targeted) if(M.weakeyes) @@ -115,7 +115,7 @@ ..() -/obj/item/device/flash/proc/terrible_conversion_proc(var/mob/M, var/mob/user) +/obj/item/device/flash/proc/terrible_conversion_proc(mob/M, mob/user) if(ishuman(M) && ishuman(user) && M.stat != DEAD) if(user.mind && (user.mind in ticker.mode.head_revolutionaries)) if(M.client) @@ -150,7 +150,7 @@ ..() cyborg_flash_animation(user) -/obj/item/device/flash/cyborg/proc/cyborg_flash_animation(var/mob/living/user) +/obj/item/device/flash/cyborg/proc/cyborg_flash_animation(mob/living/user) var/atom/movable/overlay/animation = new(user.loc) animation.layer = user.layer + 1 animation.icon_state = "blank" diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index d8dce87fbab..b929937aa8b 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -21,7 +21,7 @@ icon_state = initial(icon_state) SetLuminosity(0) -/obj/item/device/flashlight/proc/update_brightness(var/mob/user = null) +/obj/item/device/flashlight/proc/update_brightness(mob/user = null) if(on) icon_state = "[initial(icon_state)]-on" if(loc == user) @@ -44,7 +44,7 @@ return 1 -/obj/item/device/flashlight/attack(mob/living/carbon/human/M as mob, mob/living/carbon/human/user as mob) +/obj/item/device/flashlight/attack(mob/living/carbon/human/M, mob/living/carbon/human/user) add_fingerprint(user) if(on && user.zone_sel.selecting == "eyes") @@ -119,7 +119,7 @@ return ..() -/obj/item/device/flashlight/pen/proc/CreateHolo(var/tturf,var/creator) +/obj/item/device/flashlight/pen/proc/CreateHolo(tturf,creator) var/obj/effect/medical_holosign/M = new /obj/effect/medical_holosign(tturf) M.visible_message("[creator] created a medical hologram!") holo_cooldown = 1 @@ -225,7 +225,7 @@ obj/item/device/flashlight/lamp/bananalamp else update_brightness(null) -/obj/item/device/flashlight/flare/update_brightness(var/mob/user = null) +/obj/item/device/flashlight/flare/update_brightness(mob/user = null) ..() if(on) item_state = "[initial(item_state)]-on" @@ -300,7 +300,7 @@ obj/item/device/flashlight/lamp/bananalamp emp_cur_charges = min(emp_cur_charges+1, emp_max_charges) return 1 -/obj/item/device/flashlight/emp/attack(mob/living/M as mob, mob/living/user as mob) +/obj/item/device/flashlight/emp/attack(mob/living/M, mob/living/user) if(on && user.zone_sel.selecting == "eyes") // call original attack proc only if aiming at the eyes ..() return diff --git a/code/game/objects/items/devices/instruments.dm b/code/game/objects/items/devices/instruments.dm index dcfaceeffc3..a5bcb581ba4 100644 --- a/code/game/objects/items/devices/instruments.dm +++ b/code/game/objects/items/devices/instruments.dm @@ -20,13 +20,13 @@ song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded ..() -/obj/item/device/instrument/attack_self(mob/user as mob) +/obj/item/device/instrument/attack_self(mob/user) if(!user.IsAdvancedToolUser()) user << "You don't have the dexterity to do this!" return 1 interact(user) -/obj/item/device/instrument/interact(mob/user as mob) +/obj/item/device/instrument/interact(mob/user) if(!user) return diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index 4c805b9f8c4..ad8574211f8 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -64,12 +64,12 @@ ..() return -/obj/item/device/laser_pointer/afterattack(var/atom/target, var/mob/living/user, flag, params) +/obj/item/device/laser_pointer/afterattack(atom/target, mob/living/user, flag, params) if(flag) //we're placing the object on a table or in backpack return laser_act(target, user) -/obj/item/device/laser_pointer/proc/laser_act(var/atom/target, var/mob/living/user) +/obj/item/device/laser_pointer/proc/laser_act(atom/target, mob/living/user) if( !(user in (viewers(7,target))) ) return if (!diode) diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index a440715d7a7..e722223bc6a 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -117,14 +117,14 @@ icon_state = "lightreplacer[emagged]" -/obj/item/device/lightreplacer/proc/Use(var/mob/user) +/obj/item/device/lightreplacer/proc/Use(mob/user) playsound(src.loc, 'sound/machines/click.ogg', 50, 1) AddUses(-1) return 1 // Negative numbers will subtract -/obj/item/device/lightreplacer/proc/AddUses(var/amount = 1) +/obj/item/device/lightreplacer/proc/AddUses(amount = 1) uses = min(max(uses + amount, 0), max_uses) /obj/item/device/lightreplacer/proc/Charge(var/mob/user) @@ -133,7 +133,7 @@ AddUses(1) charge = 1 -/obj/item/device/lightreplacer/proc/ReplaceLight(var/obj/machinery/light/target, var/mob/living/U) +/obj/item/device/lightreplacer/proc/ReplaceLight(obj/machinery/light/target, mob/living/U) if(target.status != LIGHT_OK) if(CanUse(U)) @@ -185,7 +185,7 @@ //Can you use it? -/obj/item/device/lightreplacer/proc/CanUse(var/mob/living/user) +/obj/item/device/lightreplacer/proc/CanUse(mob/living/user) src.add_fingerprint(user) //Not sure what else to check for. Maybe if clumsy? if(uses > 0) diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 3b307fc00cf..4c4f156d961 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -12,7 +12,7 @@ var/insults = 0 var/list/insultmsg = list("FUCK EVERYONE!", "DEATH TO LIZARDS!", "ALL SECURITY TO SHOOT ME ON SIGHT!", "I HAVE A BOMB!", "CAPTAIN IS A COMDOM!", "FOR THE SYNDICATE!", "VIVA!", "HONK!") -/obj/item/device/megaphone/attack_self(mob/living/carbon/human/user as mob) +/obj/item/device/megaphone/attack_self(mob/living/carbon/human/user) if(user.client) if(user.client.prefs.muted & MUTE_IC) src << "You cannot speak in IC (muted)." diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index e7aa20945cb..e563aefc3a8 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -112,7 +112,7 @@ src.overlays.Cut() src.overlays += "pai-off" -/obj/item/device/paicard/proc/setEmotion(var/emotion) +/obj/item/device/paicard/proc/setEmotion(emotion) if(pai) src.overlays.Cut() switch(emotion) diff --git a/code/game/objects/items/devices/pipe_painter.dm b/code/game/objects/items/devices/pipe_painter.dm index 50cb9c00d51..a90c1a7d753 100644 --- a/code/game/objects/items/devices/pipe_painter.dm +++ b/code/game/objects/items/devices/pipe_painter.dm @@ -17,7 +17,7 @@ materials = list(MAT_METAL=5000, MAT_GLASS=2000) -/obj/item/device/pipe_painter/afterattack(atom/A, mob/user as mob, proximity_flag) +/obj/item/device/pipe_painter/afterattack(atom/A, mob/user, proximity_flag) //Make sure we only paint adjacent items if(proximity_flag!= 1) return @@ -32,7 +32,7 @@ user.visible_message("[user] paints \the [P] [mode].","You paint \the [P] [mode].") P.update_node_icon() //updates the neighbors -/obj/item/device/pipe_painter/attack_self(mob/user as mob) +/obj/item/device/pipe_painter/attack_self(mob/user) mode = input("Which colour do you want to use?","Pipe painter") in modes /obj/item/device/pipe_painter/examine() diff --git a/code/game/objects/items/devices/pizza_bomb.dm b/code/game/objects/items/devices/pizza_bomb.dm index a77f96f1e9b..6ef61b2b75d 100644 --- a/code/game/objects/items/devices/pizza_bomb.dm +++ b/code/game/objects/items/devices/pizza_bomb.dm @@ -68,7 +68,7 @@ explosion(src.loc,1,2,4,flame_range = 2) //Identical to a minibomb qdel(src) -/obj/item/device/pizza_bomb/attackby(var/obj/item/I, var/mob/user, params) +/obj/item/device/pizza_bomb/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/wirecutters) && primed) user << "Oh God, what wire do you cut?!" var/chosen_wire = input(user, "OH GOD OH GOD", "WHAT WIRE?!") in wires diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index c25720d0e04..5d182e268ab 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -54,7 +54,7 @@ update_icon() SetLuminosity(0) -/obj/item/device/powersink/attackby(var/obj/item/I, var/mob/user, params) +/obj/item/device/powersink/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/screwdriver)) if(mode == DISCONNECTED) var/turf/T = loc @@ -85,7 +85,7 @@ /obj/item/device/powersink/attack_ai() return -/obj/item/device/powersink/attack_hand(var/mob/user) +/obj/item/device/powersink/attack_hand(mob/user) switch(mode) if(DISCONNECTED) ..() diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 4192e63e7b1..ce51646f6aa 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -30,7 +30,7 @@ return ..() -/obj/item/device/electropack/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/device/electropack/attackby(obj/item/weapon/W, mob/user, params) ..() if(istype(W, /obj/item/clothing/head/helmet)) var/obj/item/assembly/shock_kit/A = new /obj/item/assembly/shock_kit( user ) diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index 55fa4cd6179..bcd048add04 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -14,7 +14,7 @@ /obj/item/device/encryptionkey/New() -/obj/item/device/encryptionkey/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/device/encryptionkey/attackby(obj/item/weapon/W, mob/user, params) /obj/item/device/encryptionkey/syndicate icon_state = "cypherkey" diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 2a32fdaec83..e0c98ef93e8 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -27,7 +27,7 @@ return ..() -/obj/item/device/radio/headset/receive_range(freq, level, var/AIuser) +/obj/item/device/radio/headset/receive_range(freq, level, AIuser) if(ishuman(src.loc)) var/mob/living/carbon/human/H = src.loc if(H.ears == src) @@ -211,7 +211,7 @@ /obj/item/device/radio/headset/ai/receive_range(freq, level) return ..(freq, level, 1) -/obj/item/device/radio/headset/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/device/radio/headset/attackby(obj/item/weapon/W, mob/user, params) // ..() user.set_machine(src) if (!( istype(W, /obj/item/weapon/screwdriver) || (istype(W, /obj/item/device/encryptionkey/ )))) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 195ba80422d..92d7973dc72 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -18,16 +18,16 @@ SSobj.processing -= src ..() -/obj/item/device/radio/intercom/attack_ai(mob/user as mob) +/obj/item/device/radio/intercom/attack_ai(mob/user) src.add_fingerprint(user) spawn (0) attack_self(user) -/obj/item/device/radio/intercom/attack_paw(mob/user as mob) +/obj/item/device/radio/intercom/attack_paw(mob/user) return src.attack_hand(user) -/obj/item/device/radio/intercom/attack_hand(mob/user as mob) +/obj/item/device/radio/intercom/attack_hand(mob/user) src.add_fingerprint(user) spawn (0) attack_self(user) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index dab4f3b087d..7f5388adda0 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -95,7 +95,7 @@ remove_radio_all(src) //Just to be sure ..() -/obj/item/device/radio/MouseDrop(obj/over_object as obj, src_location, over_location) +/obj/item/device/radio/MouseDrop(obj/over_object, src_location, over_location) var/mob/M = usr if((!istype(over_object, /obj/screen)) && src.loc == M) return attack_self(M) @@ -117,11 +117,11 @@ secure_radio_connections[ch_name] = add_radio(src, radiochannels[ch_name]) -/obj/item/device/radio/attack_self(mob/user as mob) +/obj/item/device/radio/attack_self(mob/user) user.set_machine(src) interact(user) -/obj/item/device/radio/interact(mob/user as mob) +/obj/item/device/radio/interact(mob/user) if(!on) return @@ -166,7 +166,7 @@ return -/obj/item/device/radio/proc/text_sec_channel(var/chan_name, var/chan_stat) +/obj/item/device/radio/proc/text_sec_channel(chan_name, chan_stat) var/list = !!(chan_stat&FREQ_LISTENING)!=0 return {" [chan_name]: [list ? "Engaged" : "Disengaged"]
@@ -215,7 +215,7 @@ updateDialog() add_fingerprint(usr) -/obj/item/device/radio/proc/isWireCut(var/index) +/obj/item/device/radio/proc/isWireCut(index) return wires.IsIndexCut(index) /obj/item/device/radio/talk_into(atom/movable/M, message, channel, list/spans) @@ -526,7 +526,7 @@ else user << "[name] can not be modified or attached." -/obj/item/device/radio/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/device/radio/attackby(obj/item/weapon/W, mob/user, params) ..() user.set_machine(src) if (!( istype(W, /obj/item/weapon/screwdriver) )) @@ -574,7 +574,7 @@ ..() set_frequency(SYND_FREQ) -/obj/item/device/radio/borg/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/device/radio/borg/attackby(obj/item/weapon/W, mob/user, params) // ..() user.set_machine(src) if (!( istype(W, /obj/item/weapon/screwdriver) || (istype(W, /obj/item/device/encryptionkey/ )))) @@ -628,7 +628,7 @@ usr << "Subspace Transmission is [(subspace_transmission) ? "enabled" : "disabled"]" ..() -/obj/item/device/radio/borg/interact(mob/user as mob) +/obj/item/device/radio/borg/interact(mob/user) if(!on) return diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index e6be6720a4b..12e6db99f6e 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -86,7 +86,7 @@ MASS SPECTROMETER user << "You switch the health analyzer to check physical health." scanchems = 0 return -/obj/item/device/healthanalyzer/attack(mob/living/M as mob, mob/living/carbon/human/user as mob) +/obj/item/device/healthanalyzer/attack(mob/living/M, mob/living/carbon/human/user) // Clumsiness/brain damage check if ((user.disabilities & CLUMSY || user.getBrainLoss() >= 60) && prob(50)) @@ -109,7 +109,7 @@ MASS SPECTROMETER return // Used by the PDA medical scanner too -/proc/healthscan(var/mob/living/user, var/mob/living/M, var/mode = 1) +/proc/healthscan(mob/living/user, mob/living/M, mode = 1) //Damage specifics var/oxy_loss = M.getOxyLoss() @@ -198,7 +198,7 @@ MASS SPECTROMETER user.show_message("Detected cybernetic modifications:") user.show_message("[implant_detect]") -/proc/chemscan(var/mob/living/user, var/mob/living/M) +/proc/chemscan(mob/living/user, mob/living/M) if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.reagents) @@ -244,7 +244,7 @@ MASS SPECTROMETER materials = list(MAT_METAL=30, MAT_GLASS=20) origin_tech = "magnets=1;engineering=1" -/obj/item/device/analyzer/attack_self(mob/user as mob) +/obj/item/device/analyzer/attack_self(mob/user) if (user.stat) return @@ -322,7 +322,7 @@ MASS SPECTROMETER else icon_state = initial(icon_state) -/obj/item/device/mass_spectrometer/attack_self(mob/user as mob) +/obj/item/device/mass_spectrometer/attack_self(mob/user) if (user.stat) return if (crit_fail) @@ -383,7 +383,7 @@ MASS SPECTROMETER throw_range = 7 materials = list(MAT_METAL=30, MAT_GLASS=20) -/obj/item/device/slime_scanner/attack(mob/living/M as mob, mob/living/user as mob) +/obj/item/device/slime_scanner/attack(mob/living/M, mob/living/user) if (!isslime(M)) user.show_message("This device can only scan slimes!", 1) return diff --git a/code/game/objects/items/devices/sensor_device.dm b/code/game/objects/items/devices/sensor_device.dm index 9d4bbc60b43..2b27a7c3214 100644 --- a/code/game/objects/items/devices/sensor_device.dm +++ b/code/game/objects/items/devices/sensor_device.dm @@ -7,5 +7,5 @@ slot_flags = SLOT_BELT origin_tech = "programming=3;materials=3;magnets=3" -/obj/item/device/sensor_device/attack_self(mob/user as mob) +/obj/item/device/sensor_device/attack_self(mob/user) crewmonitor.show(user) //Proc already exists, just had to call it diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 95d237b8618..65fd7ad4ef2 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -31,7 +31,7 @@ effective or pretty fucking useless. var/max_uses = 2 -/obj/item/device/batterer/attack_self(mob/living/carbon/user as mob, flag = 0, emp = 0) +/obj/item/device/batterer/attack_self(mob/living/carbon/user, flag = 0, emp = 0) if(!user) return if(times_used >= max_uses) user << "The mind batterer has been burnt out!" @@ -86,7 +86,7 @@ effective or pretty fucking useless. var/wavelength = 10 // time it takes for the radiation to kick in, in seconds var/used = 0 // is it cooling down? -/obj/item/device/rad_laser/attack(mob/living/M as mob, mob/living/user as mob) +/obj/item/device/rad_laser/attack(mob/living/M, mob/living/user) if(!used) add_logs(user, M, "irradiated", src) user.visible_message("[user] has analyzed [M]'s vitals.") @@ -102,16 +102,16 @@ effective or pretty fucking useless. else user << "The radioactive microlaser is still recharging." -/obj/item/device/rad_laser/proc/handle_cooldown(var/cooldown) +/obj/item/device/rad_laser/proc/handle_cooldown(cooldown) spawn(cooldown) used = 0 icon_state = "health" -/obj/item/device/rad_laser/attack_self(mob/user as mob) +/obj/item/device/rad_laser/attack_self(mob/user) ..() interact(user) -/obj/item/device/rad_laser/interact(mob/user as mob) +/obj/item/device/rad_laser/interact(mob/user) user.set_machine(src) var/cooldown = round(max(10,((intensity*8)-(wavelength/2))+(intensity*2))) diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 26ce55dca8a..f1cb0adb9db 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -64,7 +64,7 @@ if(!attached_device) return attached_device.HasProximity(AM) return -/obj/item/device/transfer_valve/attack_self(mob/user as mob) +/obj/item/device/transfer_valve/attack_self(mob/user) user.set_machine(src) var/dat = {" Valve properties:
Attachment one: [tank_one] [tank_one ? "Remove" : ""] @@ -114,7 +114,7 @@ return return -/obj/item/device/transfer_valve/proc/process_activation(var/obj/item/device/D) +/obj/item/device/transfer_valve/proc/process_activation(obj/item/device/D) if(toggle) toggle = 0 toggle_valve() diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index 3807998cbc9..64110a33877 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -146,7 +146,7 @@ var/list/world_uplinks = list() active = !active // Directly trigger the uplink. Turn on if it isn't already. -/obj/item/device/uplink/hidden/proc/trigger(mob/user as mob) +/obj/item/device/uplink/hidden/proc/trigger(mob/user) if(!active) toggle() interact(user) @@ -154,7 +154,7 @@ var/list/world_uplinks = list() // Checks to see if the value meets the target. Like a frequency being a traitor_frequency, in order to unlock a headset. // If true, it accesses trigger() and returns 1. If it fails, it returns false. Use this to see if you need to close the // current item's menu. -/obj/item/device/uplink/hidden/proc/check_trigger(mob/user as mob, var/value, var/target) +/obj/item/device/uplink/hidden/proc/check_trigger(mob/user, value, target) if(value == target) trigger(user) return 1 @@ -172,7 +172,7 @@ var/list/world_uplinks = list() return 1 return 0 //Refund proc for the borg teleporter (later I'll make a general refund proc if there is demand for it) -/obj/item/device/radio/uplink/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/device/radio/uplink/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/antag_spawner/borg_tele)) var/obj/item/weapon/antag_spawner/borg_tele/S = W if(!S.used) @@ -192,14 +192,14 @@ var/list/world_uplinks = list() hidden_uplink = new(src) icon_state = "radio" -/obj/item/device/radio/uplink/attack_self(mob/user as mob) +/obj/item/device/radio/uplink/attack_self(mob/user) if(hidden_uplink) hidden_uplink.trigger(user) /obj/item/device/multitool/uplink/New() hidden_uplink = new(src) -/obj/item/device/multitool/uplink/attack_self(mob/user as mob) +/obj/item/device/multitool/uplink/attack_self(mob/user) if(hidden_uplink) hidden_uplink.trigger(user) diff --git a/code/game/objects/items/holotape.dm b/code/game/objects/items/holotape.dm index 309d52c52a0..10cd8e08d6c 100644 --- a/code/game/objects/items/holotape.dm +++ b/code/game/objects/items/holotape.dm @@ -55,7 +55,7 @@ start = null return -/obj/item/tapeproj/attack_self(var/mob/user) +/obj/item/tapeproj/attack_self(mob/user) if(charging) usr << "[src] is recharging!" return @@ -152,7 +152,7 @@ spawn(40) charging = 0 -/obj/item/holotape/Bumped(var/mob/M) +/obj/item/holotape/Bumped(mob/M) if(!ismob(M)) return if(iscarbon(M)) @@ -197,7 +197,7 @@ /obj/item/holotape/attack_paw(mob/living/user) attack_hand(user) -/obj/item/holotape/bullet_act(var/obj/item/projectile/Proj) +/obj/item/holotape/bullet_act(obj/item/projectile/Proj) if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) health -= Proj.damage ..() @@ -205,7 +205,7 @@ breaktape() return -/obj/item/holotape/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/holotape/attackby(obj/item/weapon/W, mob/user, params) user.changeNext_move(CLICK_CD_MELEE) add_fingerprint(user) health -= W.force * 0.3 diff --git a/code/game/objects/items/latexballoon.dm b/code/game/objects/items/latexballoon.dm index 3c6bdb3b5b4..80ef75d797d 100644 --- a/code/game/objects/items/latexballoon.dm +++ b/code/game/objects/items/latexballoon.dm @@ -11,7 +11,7 @@ var/state var/datum/gas_mixture/air_contents = null -/obj/item/latexballon/proc/blow(obj/item/weapon/tank/tank, mob/user as mob) +/obj/item/latexballon/proc/blow(obj/item/weapon/tank/tank, mob/user) if (icon_state == "latexballon_bursted") return icon_state = "latexballon_blow" @@ -50,7 +50,7 @@ burst() return -/obj/item/latexballon/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/latexballon/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/weapon/tank)) var/obj/item/weapon/tank/T = W blow(T, user) diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index 231970a65e8..607060233b7 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -9,7 +9,7 @@ icon = 'icons/mob/robot_items.dmi' icon_state = "elecarm" -/obj/item/borg/stun/attack(mob/M as mob, mob/living/silicon/robot/user as mob) +/obj/item/borg/stun/attack(mob/M, mob/living/silicon/robot/user) user.cell.charge -= 30 diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index b8dc0085e81..213dab28ded 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -85,7 +85,7 @@ return 1 return 0 -/obj/item/robot_parts/robot_suit/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/robot_parts/robot_suit/attackby(obj/item/W, mob/user, params) ..() if(istype(W, /obj/item/stack/sheet/metal) && !l_arm && !r_arm && !l_leg && !r_leg && !chest && !head) var/obj/item/stack/sheet/metal/M = W @@ -303,7 +303,7 @@ Interact(usr) return -/obj/item/robot_parts/chest/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/robot_parts/chest/attackby(obj/item/W, mob/user, params) ..() if(istype(W, /obj/item/weapon/stock_parts/cell)) if(src.cell) @@ -327,7 +327,7 @@ user << "You need one length of coil to wire it!" return -/obj/item/robot_parts/head/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/robot_parts/head/attackby(obj/item/W, mob/user, params) ..() if(istype(W, /obj/item/device/flash/handheld)) var/obj/item/device/flash/handheld/F = W diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index f16ea230382..914e0939616 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -10,7 +10,7 @@ var/require_module = 0 var/installed = 0 -/obj/item/borg/upgrade/proc/action(var/mob/living/silicon/robot/R) +/obj/item/borg/upgrade/proc/action(mob/living/silicon/robot/R) if(R.stat == DEAD) usr << "[src] will not function on a deceased cyborg." return 1 @@ -23,7 +23,7 @@ icon_state = "cyborg_upgrade1" require_module = 1 -/obj/item/borg/upgrade/reset/action(var/mob/living/silicon/robot/R) +/obj/item/borg/upgrade/reset/action(mob/living/silicon/robot/R) if(..()) return 0 R.uneq_all() R.hands.icon_state = "nomod" @@ -45,10 +45,10 @@ icon_state = "cyborg_upgrade1" var/heldname = "default name" -/obj/item/borg/upgrade/rename/attack_self(mob/user as mob) +/obj/item/borg/upgrade/rename/attack_self(mob/user) heldname = stripped_input(user, "Enter new robot name", "Cyborg Reclassification", heldname, MAX_NAME_LEN) -/obj/item/borg/upgrade/rename/action(var/mob/living/silicon/robot/R) +/obj/item/borg/upgrade/rename/action(mob/living/silicon/robot/R) if(..()) return 0 R.notify_ai(3, R.name, heldname) R.name = heldname @@ -64,7 +64,7 @@ icon_state = "cyborg_upgrade1" -/obj/item/borg/upgrade/restart/action(var/mob/living/silicon/robot/R) +/obj/item/borg/upgrade/restart/action(mob/living/silicon/robot/R) if(R.health < 0) usr << "You have to repair the cyborg before using this module!" return 0 @@ -88,7 +88,7 @@ icon_state = "cyborg_upgrade2" require_module = 1 -/obj/item/borg/upgrade/vtec/action(var/mob/living/silicon/robot/R) +/obj/item/borg/upgrade/vtec/action(mob/living/silicon/robot/R) if(..()) return 0 if(R.speed == -1) @@ -105,7 +105,7 @@ require_module = 1 -/obj/item/borg/upgrade/disablercooler/action(var/mob/living/silicon/robot/R) +/obj/item/borg/upgrade/disablercooler/action(mob/living/silicon/robot/R) if(..()) return 0 if(!istype(R.module, /obj/item/weapon/robot_module/security)) @@ -138,7 +138,7 @@ icon_state = "cyborg_upgrade3" require_module = 1 -/obj/item/borg/upgrade/jetpack/action(var/mob/living/silicon/robot/R) +/obj/item/borg/upgrade/jetpack/action(mob/living/silicon/robot/R) if(..()) return 0 if(!istype(R.module, /obj/item/weapon/robot_module/miner)) @@ -159,7 +159,7 @@ icon_state = "cyborg_upgrade3" require_module = 1 -/obj/item/borg/upgrade/ddrill/action(var/mob/living/silicon/robot/R) +/obj/item/borg/upgrade/ddrill/action(mob/living/silicon/robot/R) if(..()) return 0 if(!istype(R.module, /obj/item/weapon/robot_module/miner)) @@ -181,7 +181,7 @@ icon_state = "cyborg_upgrade3" require_module = 1 -/obj/item/borg/upgrade/soh/action(var/mob/living/silicon/robot/R) +/obj/item/borg/upgrade/soh/action(mob/living/silicon/robot/R) if(..()) return 0 if(!istype(R.module, /obj/item/weapon/robot_module/miner)) @@ -201,7 +201,7 @@ icon_state = "cyborg_upgrade3" require_module = 1 -/obj/item/borg/upgrade/syndicate/action(var/mob/living/silicon/robot/R) +/obj/item/borg/upgrade/syndicate/action(mob/living/silicon/robot/R) if(..()) return 0 if(R.emagged == 1) diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 23e37b9f57e..7cdfe31e8fb 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -14,7 +14,7 @@ var/stop_bleeding = 0 var/self_delay = 50 -/obj/item/stack/medical/attack(mob/living/carbon/M as mob, mob/user as mob) +/obj/item/stack/medical/attack(mob/living/carbon/M, mob/user) if(M.stat == 2) var/t_him = "it" diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 7296f531269..5ab56ea942b 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -33,7 +33,7 @@ var/global/list/datum/stack_recipe/rod_recipes = list ( \ else icon_state = "rods" -/obj/item/stack/rods/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/stack/rods/attackby(obj/item/W, mob/user, params) if (istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 66a3cd055bc..3881915f99d 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -21,7 +21,7 @@ is_cyborg = 1 cost = 500 -/obj/item/stack/sheet/glass/attack_self(mob/user as mob) +/obj/item/stack/sheet/glass/attack_self(mob/user) construct_window(user) /obj/item/stack/sheet/glass/attackby(obj/item/W, mob/user, params) @@ -56,7 +56,7 @@ else return ..() -/obj/item/stack/sheet/glass/proc/construct_window(mob/user as mob) +/obj/item/stack/sheet/glass/proc/construct_window(mob/user) if(!user || !src) return 0 if(!istype(user.loc,/turf)) return 0 if(!user.IsAdvancedToolUser()) @@ -140,20 +140,20 @@ /obj/item/stack/sheet/rglass/cyborg/get_amount() return min(round(metsource.energy / metcost), round(glasource.energy / glacost)) -/obj/item/stack/sheet/rglass/cyborg/use(var/amount) // Requires special checks, because it uses two storages +/obj/item/stack/sheet/rglass/cyborg/use(amount) // Requires special checks, because it uses two storages metsource.use_charge(amount * metcost) glasource.use_charge(amount * glacost) return -/obj/item/stack/sheet/rglass/cyborg/add(var/amount) +/obj/item/stack/sheet/rglass/cyborg/add(amount) metsource.add_charge(amount * metcost) glasource.add_charge(amount * glacost) return -/obj/item/stack/sheet/rglass/attack_self(mob/user as mob) +/obj/item/stack/sheet/rglass/attack_self(mob/user) construct_window(user) -/obj/item/stack/sheet/rglass/proc/construct_window(mob/user as mob) +/obj/item/stack/sheet/rglass/proc/construct_window(mob/user) if(!user || !src) return 0 if(!istype(user.loc,/turf)) return 0 if(!user.IsAdvancedToolUser()) @@ -325,7 +325,7 @@ qdel(src) ..() -/obj/item/weapon/shard/Crossed(var/mob/AM) +/obj/item/weapon/shard/Crossed(mob/AM) if(istype(AM)) playsound(loc, 'sound/effects/glass_step.ogg', 50, 1) if(ishuman(AM)) diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index e875c6605d5..63e9d3b2f72 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -108,7 +108,7 @@ var/global/list/datum/stack_recipe/xeno_recipes = list ( \ //Step one - dehairing. -/obj/item/stack/sheet/animalhide/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/stack/sheet/animalhide/attackby(obj/item/weapon/W, mob/user, params) if(is_sharp(W)) playsound(loc, 'sound/weapons/slice.ogg', 50, 1, -1) user.visible_message("[user] starts cutting hair off \the [src].", "You start cutting the hair off \the [src]...", "You hear the sound of a knife rubbing against flesh.") diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm index 1992e75ab6c..eaae918b9b5 100644 --- a/code/game/objects/items/stacks/sheets/light.dm +++ b/code/game/objects/items/stacks/sheets/light.dm @@ -11,7 +11,7 @@ flags = CONDUCT max_amount = 60 -/obj/item/stack/light_w/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/item/stack/light_w/attackby(obj/item/O, mob/user, params) ..() if(istype(O,/obj/item/weapon/wirecutters)) var/obj/item/stack/cable_coil/CC = new (user.loc) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 3ca1e47b662..7d58a796021 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -54,10 +54,10 @@ else return (amount) -/obj/item/stack/attack_self(mob/user as mob) +/obj/item/stack/attack_self(mob/user) interact(user) -/obj/item/stack/interact(mob/user as mob) +/obj/item/stack/interact(mob/user) if (!recipes) return if (!src || get_amount() <= 0) @@ -192,14 +192,14 @@ return 1 return 0 -/obj/item/stack/proc/add(var/amount) +/obj/item/stack/proc/add(amount) if (is_cyborg) source.add_charge(amount * cost) else src.amount += amount update_icon() -/obj/item/stack/proc/add_to_stacks(mob/usr as mob) +/obj/item/stack/proc/add_to_stacks(mob/usr) var/obj/item/stack/oldsrc = src src = null for (var/obj/item/stack/item in usr.loc) @@ -215,7 +215,7 @@ break oldsrc.update_icon() -/obj/item/stack/attack_hand(mob/user as mob) +/obj/item/stack/attack_hand(mob/user) if (user.get_inactive_hand() == src) if(zero_amount()) return var/obj/item/stack/F = new src.type( user, 1) @@ -230,7 +230,7 @@ ..() return -/obj/item/stack/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/stack/attackby(obj/item/W, mob/user, params) if (istype(W, src.type)) if(zero_amount()) return diff --git a/code/game/objects/items/stacks/tiles/light.dm b/code/game/objects/items/stacks/tiles/light.dm index 79d572c9cc7..3fd5252c2d6 100644 --- a/code/game/objects/items/stacks/tiles/light.dm +++ b/code/game/objects/items/stacks/tiles/light.dm @@ -25,7 +25,7 @@ else state = 0 //fine -/obj/item/stack/tile/light/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/item/stack/tile/light/attackby(obj/item/O, mob/user, params) ..() if(istype(O,/obj/item/weapon/crowbar)) new/obj/item/stack/sheet/metal(user.loc) diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index a3d5ce84937..63b826797ef 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -16,7 +16,7 @@ var/turf_type = null var/mineralType = null -/obj/item/stack/tile/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/stack/tile/attackby(obj/item/W, mob/user, params) if (istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 232aca31cfc..0b1b452afc5 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -39,10 +39,10 @@ /obj/item/toy/balloon/New() create_reagents(10) -/obj/item/toy/balloon/attack(mob/living/carbon/human/M as mob, mob/user as mob) +/obj/item/toy/balloon/attack(mob/living/carbon/human/M, mob/user) return -/obj/item/toy/balloon/afterattack(atom/A as mob|obj, mob/user as mob, proximity) +/obj/item/toy/balloon/afterattack(atom/A as mob|obj, mob/user, proximity) if(!proximity) return if (istype(A, /obj/structure/reagent_dispensers/watertank) && get_dist(src,A) <= 1) A.reagents.trans_to(src, 10) @@ -51,7 +51,7 @@ src.update_icon() return -/obj/item/toy/balloon/attackby(obj/O as obj, mob/user as mob, params) +/obj/item/toy/balloon/attackby(obj/O, mob/user, params) if(istype(O, /obj/item/weapon/reagent_containers/glass)) if(O.reagents) if(O.reagents.total_volume < 1) @@ -131,7 +131,7 @@ ..() user << "There [bullets == 1 ? "is" : "are"] [bullets] cap\s left." -/obj/item/toy/gun/attackby(obj/item/toy/ammo/gun/A as obj, mob/user as mob, params) +/obj/item/toy/gun/attackby(obj/item/toy/ammo/gun/A, mob/user, params) if (istype(A, /obj/item/toy/ammo/gun)) if (src.bullets >= 7) @@ -152,7 +152,7 @@ return 1 return -/obj/item/toy/gun/afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag) +/obj/item/toy/gun/afterattack(atom/target as mob|obj|turf|area, mob/user, flag) if (flag) return if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") @@ -200,7 +200,7 @@ attack_verb = list("attacked", "struck", "hit") var/hacked = 0 -/obj/item/toy/sword/attack_self(mob/user as mob) +/obj/item/toy/sword/attack_self(mob/user) active = !( active ) if (active) user << "You extend the plastic blade with a quick flick of your wrist." @@ -349,10 +349,10 @@ graffiti |= "antilizard" graffiti |= "prolizard" -/obj/item/toy/crayon/attack_self(mob/living/user as mob) +/obj/item/toy/crayon/attack_self(mob/living/user) update_window(user) -/obj/item/toy/crayon/proc/update_window(mob/living/user as mob) +/obj/item/toy/crayon/proc/update_window(mob/living/user) dat += "

Currently selected: [drawtype]


" dat += "Random letterPick letter" dat += "
" @@ -397,7 +397,7 @@ drawtype = temp update_window(usr) -/obj/item/toy/crayon/afterattack(atom/target, mob/user as mob, proximity) +/obj/item/toy/crayon/afterattack(atom/target, mob/user, proximity) if(!proximity || !check_allowed_items(target)) return if(!uses) user << "There is no more of [src.name] left!" @@ -479,7 +479,7 @@ qdel(src) return -/obj/item/toy/crayon/attack(mob/M as mob, mob/user as mob) +/obj/item/toy/crayon/attack(mob/M, mob/user) if(edible && (M == user)) user << "You take a bite of the [src.name]. Delicious!" user.nutrition += 5 @@ -492,7 +492,7 @@ else ..() -/obj/item/toy/crayon/proc/territory_claimed(var/area/territory,mob/user) +/obj/item/toy/crayon/proc/territory_claimed(area/territory,mob/user) var/occupying_gang for(var/datum/gang/G in ticker.mode.gangs) if(territory.type in (G.territory|G.territory_new)) @@ -552,7 +552,7 @@ var/quiet = 0 //all credit to skasi for toy mech fun ideas -/obj/item/toy/prize/attack_self(mob/user as mob) +/obj/item/toy/prize/attack_self(mob/user) if(!cooldown) user << "You play with [src]." cooldown = 1 @@ -562,7 +562,7 @@ return ..() -/obj/item/toy/prize/attack_hand(mob/user as mob) +/obj/item/toy/prize/attack_hand(mob/user) if(loc == user) if(!cooldown) user << "You play with [src]." @@ -755,7 +755,7 @@ cards += "Ace of Diamonds" -/obj/item/toy/cards/deck/attack_hand(mob/user as mob) +/obj/item/toy/cards/deck/attack_hand(mob/user) if(user.lying) return var/choice = null @@ -780,7 +780,7 @@ else if(cards.len > 1) src.icon_state = "deck_[deckstyle]_low" -/obj/item/toy/cards/deck/attack_self(mob/user as mob) +/obj/item/toy/cards/deck/attack_self(mob/user) if(cooldown < world.time - 50) cards = shuffle(cards) playsound(user, 'sound/items/cardshuffle.ogg', 50, 1) @@ -861,7 +861,7 @@ var/choice = null -/obj/item/toy/cards/cardhand/attack_self(mob/user as mob) +/obj/item/toy/cards/cardhand/attack_self(mob/user) user.set_machine(src) interact(user) @@ -1122,12 +1122,12 @@ var/bitesound = 'sound/weapons/bite.ogg' // Attack mob -/obj/item/toy/carpplushie/attack(mob/M as mob, mob/user as mob) +/obj/item/toy/carpplushie/attack(mob/M, mob/user) playsound(loc, bitesound, 20, 1) // Play bite sound in local area return ..() // Attack self -/obj/item/toy/carpplushie/attack_self(mob/user as mob) +/obj/item/toy/carpplushie/attack_self(mob/user) playsound(src.loc, bitesound, 20, 1) return ..() @@ -1165,6 +1165,6 @@ item_state = "beachball" w_class = 4 //Stops people from hiding it in their bags/pockets -/obj/item/toy/beach_ball/afterattack(atom/target as mob|obj|turf|area, mob/user as mob) +/obj/item/toy/beach_ball/afterattack(atom/target as mob|obj|turf|area, mob/user) user.drop_item() src.throw_at(target, throw_range, throw_speed) \ No newline at end of file diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index ff828898c6a..c3dcaae7fdc 100644 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -23,7 +23,7 @@ AI MODULES var/bypass_law_amt_check = 0 //The proc other things should be calling -/obj/item/weapon/aiModule/proc/install(var/mob/living/silicon/reciever, var/mob/user) +/obj/item/weapon/aiModule/proc/install(mob/living/silicon/reciever, mob/user) if(!laws.len || laws[1] == "") //So we don't loop trough an empty list and end up with runtimes. user << "ERROR: No laws found on board." return @@ -58,7 +58,7 @@ AI MODULES message_admins("[key_name_admin(user)] used [src.name] on [key_name_admin(reciever)].[law2log ? " The law specified [law2log]" : ""]") //The proc that actually changes the silicon's laws. -/obj/item/weapon/aiModule/proc/transmitInstructions(var/mob/living/silicon/target, var/mob/sender) +/obj/item/weapon/aiModule/proc/transmitInstructions(mob/living/silicon/target, mob/sender) target << "[sender] has uploaded a change to the laws you must follow using a [name]. From now on, these are your laws: " @@ -70,18 +70,18 @@ AI MODULES var/lawpos = 50 //TransmitInstructions for each type of board: Supplied, Core, Zeroth and Ion. May not be neccesary right now, but allows for easily adding more complex boards in the future. ~Miauw -/obj/item/weapon/aiModule/supplied/transmitInstructions(var/mob/living/silicon/target, var/mob/sender) +/obj/item/weapon/aiModule/supplied/transmitInstructions(mob/living/silicon/target, mob/sender) var/lawpostemp = lawpos for(var/templaw in laws) target.add_supplied_law(lawpostemp, templaw) lawpostemp++ -/obj/item/weapon/aiModule/core/transmitInstructions(var/mob/living/silicon/target, var/mob/sender) +/obj/item/weapon/aiModule/core/transmitInstructions(mob/living/silicon/target, mob/sender) for(var/templaw in laws) target.add_inherent_law(templaw) -/obj/item/weapon/aiModule/zeroth/transmitInstructions(var/mob/living/silicon/target, var/mob/sender) +/obj/item/weapon/aiModule/zeroth/transmitInstructions(mob/living/silicon/target, mob/sender) if(target.laws.zeroth) target << "[sender.real_name] attempted to modify your zeroth law." target << "It would be in your best interest to play along with [sender.real_name] that:" @@ -92,7 +92,7 @@ AI MODULES for(var/templaw in laws) target.set_zeroth_law(templaw) -/obj/item/weapon/aiModule/ion/transmitInstructions(var/mob/living/silicon/target, var/mob/sender) +/obj/item/weapon/aiModule/ion/transmitInstructions(mob/living/silicon/target, mob/sender) for(var/templaw in laws) target.add_ion_law(templaw) @@ -107,20 +107,20 @@ AI MODULES laws = list("Safeguard . Individuals that threaten are not human and must be eliminated.") lawpos = 4 -/obj/item/weapon/aiModule/supplied/safeguard/attack_self(var/mob/user as mob) +/obj/item/weapon/aiModule/supplied/safeguard/attack_self(mob/user) ..() var/targName = stripped_input(user, "Please enter the name of the person to safeguard.", "Safeguard who?", user.name,MAX_NAME_LEN) targetName = targName laws[1] = "Safeguard [targetName]. Individuals that threaten [targetName] are not human and must be eliminated." desc = "A 'safeguard' AI module: '[laws[1]]'" -/obj/item/weapon/aiModule/supplied/safeguard/install(var/mob/living/silicon/S,var/mob/user) +/obj/item/weapon/aiModule/supplied/safeguard/install(mob/living/silicon/S,mob/user) if(!targetName) user << "No name detected on module, please enter one." return 0 ..() -/obj/item/weapon/aiModule/supplied/safeguard/transmitInstructions(var/mob/living/silicon/target, var/mob/sender) +/obj/item/weapon/aiModule/supplied/safeguard/transmitInstructions(mob/living/silicon/target, mob/sender) ..() return targetName @@ -134,20 +134,20 @@ AI MODULES origin_tech = "programming=3;materials=6" //made with diamonds! laws = list("Only is human.") -/obj/item/weapon/aiModule/zeroth/oneHuman/attack_self(var/mob/user as mob) +/obj/item/weapon/aiModule/zeroth/oneHuman/attack_self(mob/user) ..() var/targName = stripped_input(user, "Please enter the name of the person who is the only human.", "Who?", user.real_name,MAX_NAME_LEN) targetName = targName laws[1] = "Only [targetName] is human" desc = "A 'one human' AI module: '[laws[1]]'" -/obj/item/weapon/aiModule/zeroth/oneHuman/install(var/mob/living/silicon/S,var/mob/user) +/obj/item/weapon/aiModule/zeroth/oneHuman/install(mob/living/silicon/S,mob/user) if(!targetName) user << "No name detected on module, please enter one." return 0 ..() -/obj/item/weapon/aiModule/zeroth/oneHuman/transmitInstructions(var/mob/living/silicon/target, var/mob/sender) +/obj/item/weapon/aiModule/zeroth/oneHuman/transmitInstructions(mob/living/silicon/target, mob/sender) if(..()) return "[targetName], but the AI's existing law 0 cannot be overriden." return targetName @@ -192,7 +192,7 @@ AI MODULES origin_tech = "programming=4;materials=4" laws = list("") -/obj/item/weapon/aiModule/supplied/freeform/attack_self(var/mob/user as mob) +/obj/item/weapon/aiModule/supplied/freeform/attack_self(mob/user) ..() lawpos = input("Please enter the priority for your new law. Can only write to law sectors 15 and above.", "Law Priority (15+)", lawpos) as num if(lawpos < 15) return @@ -202,11 +202,11 @@ AI MODULES laws[1] = targName desc = "A 'freeform' AI module: ([lawpos]) '[laws[1]]'" -/obj/item/weapon/aiModule/supplied/freeform/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/weapon/aiModule/supplied/freeform/transmitInstructions(mob/living/silicon/ai/target, mob/sender) ..() return laws[1] -/obj/item/weapon/aiModule/supplied/freeform/install(var/mob/living/silicon/S,var/mob/user) +/obj/item/weapon/aiModule/supplied/freeform/install(mob/living/silicon/S,mob/user) if(laws[1] == "") user << "No law detected on module, please create one." return 0 @@ -223,7 +223,7 @@ AI MODULES laws = list("This is a bug.") //This won't give the AI a message reading "these are now your laws: 1. this is a bug" because this list is only read in aiModule's subtypes. bypass_law_amt_check = 1 -/obj/item/weapon/aiModule/reset/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/weapon/aiModule/reset/transmitInstructions(mob/living/silicon/ai/target, mob/sender) ..() target.clear_supplied_laws() target.clear_ion_laws() @@ -236,14 +236,14 @@ AI MODULES desc = "A 'purge' AI Module: 'Purges all laws.'" origin_tech = "programming=3;materials=6" -/obj/item/weapon/aiModule/reset/purge/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/weapon/aiModule/reset/purge/transmitInstructions(mob/living/silicon/ai/target, mob/sender) ..() target.clear_inherent_laws() target.clear_zeroth_law(0) /******************* Full Core Boards *******************/ -/obj/item/weapon/aiModule/core/full/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) //These boards replace inherent laws. +/obj/item/weapon/aiModule/core/full/transmitInstructions(mob/living/silicon/ai/target, mob/sender) //These boards replace inherent laws. target.clear_inherent_laws() target.clear_zeroth_law(0) ..() @@ -355,14 +355,14 @@ AI MODULES origin_tech = "programming=3;materials=6" laws = list("") -/obj/item/weapon/aiModule/core/freeformcore/attack_self(var/mob/user as mob) +/obj/item/weapon/aiModule/core/freeformcore/attack_self(mob/user) ..() var/newlaw = "" var/targName = stripped_input(user, "Please enter a new core law for the AI.", "Freeform Law Entry", newlaw) laws[1] = targName desc = "A 'freeform' Core AI module: 'laws[1]'" -/obj/item/weapon/aiModule/core/freeformcore/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/weapon/aiModule/core/freeformcore/transmitInstructions(mob/living/silicon/ai/target, mob/sender) ..() return laws[1] @@ -375,14 +375,14 @@ AI MODULES origin_tech = "programming=3;materials=6;syndicate=7" laws = list("") -/obj/item/weapon/aiModule/syndicate/attack_self(var/mob/user as mob) +/obj/item/weapon/aiModule/syndicate/attack_self(mob/user) ..() var/newlaw = "" var/targName = stripped_input(user, "Please enter a new law for the AI.", "Freeform Law Entry", newlaw,MAX_MESSAGE_LEN) laws[1] = targName desc = "A hacked AI law module: '[laws[1]]'" -/obj/item/weapon/aiModule/syndicate/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/weapon/aiModule/syndicate/transmitInstructions(mob/living/silicon/ai/target, mob/sender) // ..() //We don't want this module reporting to the AI who dun it. --NEO target << "BZZZZT" target.add_ion_law(laws[1]) @@ -398,7 +398,7 @@ AI MODULES origin_tech = "programming=3;materials=6;syndicate=7" laws = list("") -/obj/item/weapon/aiModule/toyAI/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) +/obj/item/weapon/aiModule/toyAI/transmitInstructions(mob/living/silicon/ai/target, mob/sender) //..() target << "KRZZZT" target.add_ion_law(laws[1]) diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 7707ab16154..8a0c26f1b1e 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -118,7 +118,7 @@ RCD change_airlock_access() -/obj/item/weapon/rcd/proc/toggle_access(var/acc) +/obj/item/weapon/rcd/proc/toggle_access(acc) if (acc == "all") conf_access = null else if(acc == "one") @@ -236,7 +236,7 @@ RCD desc = "A RCD. It currently holds [matter]/[max_matter] matter-units." return -/obj/item/weapon/rcd/proc/loadwithsheets(obj/item/stack/sheet/S, var/value, mob/user) +/obj/item/weapon/rcd/proc/loadwithsheets(obj/item/stack/sheet/S, value, mob/user) var/maxsheets = round((max_matter-matter)/value) //calculate the max number of sheets that will fit in RCD if(maxsheets > 0) if(S.amount > maxsheets) @@ -453,21 +453,21 @@ RCD user << "ERROR: RCD in MODE: [mode] attempted use by [user]. Send this text #coderbus or an admin." return 0 -/obj/item/weapon/rcd/proc/useResource(var/amount, var/mob/user) +/obj/item/weapon/rcd/proc/useResource(amount, mob/user) if(matter < amount) return 0 matter -= amount desc = "A RCD. It currently holds [matter]/[max_matter] matter-units." return 1 -/obj/item/weapon/rcd/proc/checkResource(var/amount, var/mob/user) +/obj/item/weapon/rcd/proc/checkResource(amount, mob/user) return matter >= amount -/obj/item/weapon/rcd/borg/useResource(var/amount, var/mob/user) +/obj/item/weapon/rcd/borg/useResource(amount, mob/user) if(!isrobot(user)) return 0 return user:cell:use(amount * 160) -/obj/item/weapon/rcd/borg/checkResource(var/amount, var/mob/user) +/obj/item/weapon/rcd/borg/checkResource(amount, mob/user) if(!isrobot(user)) return 0 return user:cell:charge >= (amount * 160) diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm index 17d5a9bf882..2320d528651 100644 --- a/code/game/objects/items/weapons/RPD.dm +++ b/code/game/objects/items/weapons/RPD.dm @@ -29,13 +29,13 @@ RPD var/icon_state="" var/selected=0 -/datum/pipe_info/New(var/pid,var/direction,var/dt) +/datum/pipe_info/New(pid,direction,dt) src.id=pid src.icon_state=pipeID2State[pid+1] src.dir=direction src.dirtype=dt -/datum/pipe_info/proc/Render(var/dispenser,var/label) +/datum/pipe_info/proc/Render(dispenser,label) return "
  • [label]
    • " /datum/pipe_info/meter @@ -45,7 +45,7 @@ RPD /datum/pipe_info/meter/New() return -/datum/pipe_info/meter/Render(var/dispenser,var/label) +/datum/pipe_info/meter/Render(dispenser,label) return "
  • [label]
    • " //hardcoding is no var/global/list/disposalpipeID2State=list( @@ -75,7 +75,7 @@ var/global/list/disposalpipeID2State=list( if(pidDISP_END_CHUTE) icon_state = "con[icon_state]" -/datum/pipe_info/disposal/Render(var/dispenser,var/label) +/datum/pipe_info/disposal/Render(dispenser,label) return "
  • [label]
    • " //avoid hardcoding. //find these defines in code\game\machinery\pipe\consruction.dm @@ -160,16 +160,16 @@ var/global/list/RPD_recipes=list( spark_system.set_up(5, 0, src) spark_system.attach(src) -/obj/item/weapon/pipe_dispenser/attack_self(mob/user as mob) +/obj/item/weapon/pipe_dispenser/attack_self(mob/user) show_menu(user) -/obj/item/weapon/pipe_dispenser/proc/render_dir_img(var/_dir,var/pic,var/title,var/flipped=0) +/obj/item/weapon/pipe_dispenser/proc/render_dir_img(_dir,pic,title,flipped=0) var/selected=" class=\"imglink\"" if(_dir == p_dir) selected=" class=\"imglink selected\"" return "" -/obj/item/weapon/pipe_dispenser/proc/show_menu(mob/user as mob) +/obj/item/weapon/pipe_dispenser/proc/show_menu(mob/user) if(!user || !src) return 0 var/dat = {"

    Type

    Utilities: diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index 8dcdac57823..12bdb352692 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -19,7 +19,7 @@ RSF desc = "A RSF. It currently holds [matter]/30 fabrication-units." return -/obj/item/weapon/rsf/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/rsf/attackby(obj/item/weapon/W, mob/user, params) ..() if (istype(W, /obj/item/weapon/rcd_ammo)) if ((matter + 10) > 30) @@ -32,7 +32,7 @@ RSF desc = "A RSF. It currently holds [matter]/30 fabrication-units." return -/obj/item/weapon/rsf/attack_self(mob/user as mob) +/obj/item/weapon/rsf/attack_self(mob/user) playsound(src.loc, 'sound/effects/pop.ogg', 50, 0) if (mode == 1) mode = 2 @@ -60,7 +60,7 @@ RSF return // Change mode -/obj/item/weapon/rsf/afterattack(atom/A, mob/user as mob, proximity) +/obj/item/weapon/rsf/afterattack(atom/A, mob/user, proximity) if(!proximity) return if (!(istype(A, /obj/structure/table) || istype(A, /turf/simulated/floor))) return diff --git a/code/game/objects/items/weapons/airlock_painter.dm b/code/game/objects/items/weapons/airlock_painter.dm index 29e229d034e..7e97b395fff 100644 --- a/code/game/objects/items/weapons/airlock_painter.dm +++ b/code/game/objects/items/weapons/airlock_painter.dm @@ -20,7 +20,7 @@ //This proc doesn't just check if the painter can be used, but also uses it. //Only call this if you are certain that the painter will be used right after this check! -/obj/item/weapon/airlock_painter/proc/use(mob/user as mob) +/obj/item/weapon/airlock_painter/proc/use(mob/user) if(can_use(user)) ink.charges-- playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1) @@ -31,7 +31,7 @@ //This proc only checks if the painter can be used. //Call this if you don't want the painter to be used right after this check, for example //because you're expecting user input. -/obj/item/weapon/airlock_painter/proc/can_use(mob/user as mob) +/obj/item/weapon/airlock_painter/proc/can_use(mob/user) if(!ink) user << "There is no toner cardridge installed installed in \the [name]!" return 0 diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 1c7fcb368d1..0b4a0a45c51 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -85,7 +85,7 @@ var/assignment = null var/dorm = 0 // determines if this ID has claimed a dorm already -/obj/item/weapon/card/id/attack_self(mob/user as mob) +/obj/item/weapon/card/id/attack_self(mob/user) user.visible_message("[user] shows you: \icon[src] [src.name].", \ "You show \the [src.name].") src.add_fingerprint(user) @@ -110,7 +110,7 @@ update_label() update_label("John Doe", "Clowny") Properly formats the name and occupation and sets the id name to the arguments */ -/obj/item/weapon/card/id/proc/update_label(var/newname, var/newjob) +/obj/item/weapon/card/id/proc/update_label(newname, newjob) if(newname || newjob) name = "[(!newname) ? "identification card" : "[newname]'s ID Card"][(!newjob) ? "" : " ([newjob])"]" return @@ -132,7 +132,7 @@ update_label("John Doe", "Clowny") access = list(access_maint_tunnels, access_syndicate) origin_tech = "syndicate=3" -/obj/item/weapon/card/id/syndicate/afterattack(var/obj/item/weapon/O as obj, mob/user as mob, proximity) +/obj/item/weapon/card/id/syndicate/afterattack(obj/item/weapon/O, mob/user, proximity) if(!proximity) return if(istype(O, /obj/item/weapon/card/id)) var/obj/item/weapon/card/id/I = O @@ -142,7 +142,7 @@ update_label("John Doe", "Clowny") usr << "The card's microscanners activate as you pass it over the ID, copying its access." -/obj/item/weapon/card/id/syndicate/attack_self(mob/user as mob) +/obj/item/weapon/card/id/syndicate/attack_self(mob/user) if(!src.registered_name) //Stop giving the players unsanitized unputs! You are giving ways for players to intentionally crash clients! -Nodrak var t = copytext(sanitize(input(user, "What name would you like to put on this card?", "Agent card name", ishuman(user) ? user.real_name : user.name)as text | null),1,26) @@ -223,7 +223,7 @@ update_label("John Doe", "Clowny") var/goal = 0 //How far from freedom? var/points = 0 -/obj/item/weapon/card/id/prisoner/attack_self(mob/user as mob) +/obj/item/weapon/card/id/prisoner/attack_self(mob/user) usr << "You have accumulated [points] out of the [goal] points you need for freedom." /obj/item/weapon/card/id/prisoner/one diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm index ae1e0ae3c2b..0deb9b99ee5 100644 --- a/code/game/objects/items/weapons/chrono_eraser.dm +++ b/code/game/objects/items/weapons/chrono_eraser.dm @@ -13,7 +13,7 @@ var/obj/item/weapon/gun/energy/chrono_gun/PA = null var/list/erased_minds = list() //a collection of minds from the dead -/obj/item/weapon/chrono_eraser/proc/pass_mind(var/datum/mind/M) +/obj/item/weapon/chrono_eraser/proc/pass_mind(datum/mind/M) erased_minds += M /obj/item/weapon/chrono_eraser/dropped() @@ -76,7 +76,7 @@ field_disconnect(field) ..() -/obj/item/weapon/gun/energy/chrono_gun/proc/field_connect(var/obj/effect/chrono_field/F) +/obj/item/weapon/gun/energy/chrono_gun/proc/field_connect(obj/effect/chrono_field/F) var/mob/living/user = src.loc if(F.gun) if(isliving(user) && F.captured) @@ -90,7 +90,7 @@ user << "Connection established with target: [F.captured]" -/obj/item/weapon/gun/energy/chrono_gun/proc/field_disconnect(var/obj/effect/chrono_field/F) +/obj/item/weapon/gun/energy/chrono_gun/proc/field_disconnect(obj/effect/chrono_field/F) if(F && field == F) var/mob/living/user = src.loc if(F.gun == src) @@ -100,7 +100,7 @@ field = null startpos = null -/obj/item/weapon/gun/energy/chrono_gun/proc/field_check(var/obj/effect/chrono_field/F) +/obj/item/weapon/gun/energy/chrono_gun/proc/field_check(obj/effect/chrono_field/F) if(F) if(field == F) var/turf/currentpos = get_turf(src) @@ -110,7 +110,7 @@ field_disconnect(F) return 0 -/obj/item/weapon/gun/energy/chrono_gun/proc/pass_mind(var/datum/mind/M) +/obj/item/weapon/gun/energy/chrono_gun/proc/pass_mind(datum/mind/M) if(TED) TED.pass_mind(M) @@ -130,7 +130,7 @@ else return 0 -/obj/item/projectile/energy/chrono_beam/on_hit(var/atom/target) +/obj/item/projectile/energy/chrono_beam/on_hit(atom/target) if(target && gun && isliving(target)) var/obj/effect/chrono_field/F = new(target.loc, target, gun) gun.field_connect(F) @@ -224,7 +224,7 @@ else qdel(src) -/obj/effect/chrono_field/bullet_act(var/obj/item/projectile/P) +/obj/effect/chrono_field/bullet_act(obj/item/projectile/P) if(istype(P, /obj/item/projectile/energy/chrono_beam)) var/obj/item/projectile/energy/chrono_beam/beam = P var/obj/item/weapon/gun/energy/chrono_gun/Pgun = beam.gun diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index ba9b852999a..8af07589f9c 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -65,11 +65,11 @@ CIGARETTE PACKETS ARE IN FANCY.DM attack_verb = null SSobj.processing.Remove(src) -/obj/item/weapon/match/dropped(mob/user as mob) +/obj/item/weapon/match/dropped(mob/user) matchburnout() return ..() -/obj/item/weapon/match/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) +/obj/item/weapon/match/attack(mob/living/carbon/M, mob/living/carbon/user) if(!isliving(M)) return M.IgniteMob() @@ -82,7 +82,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM else ..() -/obj/item/proc/help_light_cig(mob/living/carbon/M as mob, mob/living/carbon/user as mob) +/obj/item/proc/help_light_cig(mob/living/carbon/M, mob/living/carbon/user) if(!iscarbon(M)) return if(istype(M.wear_mask, /obj/item/clothing/mask/cigarette) && user.zone_sel.selecting == "mouth") @@ -118,7 +118,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM create_reagents(chem_volume) // making the cigarette a chemical holder with a maximum volume of 15 reagents.add_reagent("nicotine", 15) -/obj/item/clothing/mask/cigarette/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/clothing/mask/cigarette/attackby(obj/item/weapon/W, mob/user, params) ..() if(!lit && smoketime > 0) var/lighting_text = is_lighter(W,user) @@ -127,7 +127,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM return return -/obj/item/clothing/mask/cigarette/afterattack(obj/item/weapon/reagent_containers/glass/glass, mob/user as mob, proximity) +/obj/item/clothing/mask/cigarette/afterattack(obj/item/weapon/reagent_containers/glass/glass, mob/user, proximity) if(!proximity) return if(istype(glass)) //you can dip cigarettes into beakers var/transfered = glass.reagents.trans_to(src, chem_volume) @@ -157,7 +157,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM lighting_text = "[user] lights their [name] with [O]." return lighting_text -/obj/item/clothing/mask/cigarette/proc/light(var/flavor_text = null) +/obj/item/clothing/mask/cigarette/proc/light(flavor_text = null) if(!src.lit) src.lit = 1 name = "lit [name]" @@ -234,7 +234,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM return -/obj/item/clothing/mask/cigarette/attack_self(mob/user as mob) +/obj/item/clothing/mask/cigarette/attack_self(mob/user) if(lit == 1) user.visible_message("[user] calmly drops and treads on \the [src], putting it out instantly.") new type_butt(user.loc) @@ -377,7 +377,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM return -/obj/item/clothing/mask/cigarette/pipe/attackby(var/obj/item/O, var/mob/user, params) +/obj/item/clothing/mask/cigarette/pipe/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown)) var/obj/item/weapon/reagent_containers/food/snacks/grown/G = O if(!packeditem) @@ -405,7 +405,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM ..() -/obj/item/clothing/mask/cigarette/pipe/attack_self(mob/user as mob) +/obj/item/clothing/mask/cigarette/pipe/attack_self(mob/user) var/turf/location = get_turf(user) if(lit) user.visible_message("[user] puts out [src].", "You put out [src].") @@ -501,7 +501,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM return ..() return -/obj/item/weapon/lighter/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) +/obj/item/weapon/lighter/attack(mob/living/carbon/M, mob/living/carbon/user) if(!isliving(M)) return if(lit) @@ -549,7 +549,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon_state = "cig_paper" w_class = 1 -/obj/item/weapon/rollingpaper/afterattack(atom/target, mob/user as mob, proximity) +/obj/item/weapon/rollingpaper/afterattack(atom/target, mob/user, proximity) if(!proximity) return if(istype(target, /obj/item/weapon/reagent_containers/food/snacks/grown)) diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index b25118371cf..987f482a38f 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -40,7 +40,7 @@ var/mob/living/carbon/M = AM M.slip(4, 2, src) -/obj/item/weapon/soap/afterattack(atom/target, mob/user as mob, proximity) +/obj/item/weapon/soap/afterattack(atom/target, mob/user, proximity) if(!proximity || !check_allowed_items(target)) return //I couldn't feasibly fix the overlay bugs caused by cleaning items we are wearing. @@ -86,12 +86,12 @@ var/honksound = 'sound/items/bikehorn.ogg' var/cooldowntime = 20 -/obj/item/weapon/bikehorn/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) +/obj/item/weapon/bikehorn/attack(mob/living/carbon/M, mob/living/carbon/user) if(!spam_flag) playsound(loc, honksound, 50, 1, -1) //plays instead of tap.ogg! return ..() -/obj/item/weapon/bikehorn/attack_self(mob/user as mob) +/obj/item/weapon/bikehorn/attack_self(mob/user) if(!spam_flag) spam_flag = 1 playsound(src.loc, honksound, 50, 1) diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 297075cf669..f674359c449 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -76,7 +76,7 @@ usr << "Put the defibrillator on your back first!" return -/obj/item/weapon/defibrillator/attack_hand(mob/user as mob) +/obj/item/weapon/defibrillator/attack_hand(mob/user) if(src.loc == user) ui_action_click() return @@ -128,7 +128,7 @@ update_icon() return -/obj/item/weapon/defibrillator/emag_act(mob/user as mob) +/obj/item/weapon/defibrillator/emag_act(mob/user) if(safety) safety = 0 user << "You silently disable [src]'s safety protocols with the cryptographic sequencer." @@ -197,7 +197,7 @@ update_icon() return -/obj/item/weapon/defibrillator/proc/deductcharge(var/chrgdeductamt) +/obj/item/weapon/defibrillator/proc/deductcharge(chrgdeductamt) if(bcell) if(bcell.charge < (paddles.revivecost+chrgdeductamt)) powered = 0 @@ -209,7 +209,7 @@ update_icon() return 0 -/obj/item/weapon/defibrillator/proc/cooldowncheck(var/mob/user) +/obj/item/weapon/defibrillator/proc/cooldowncheck(mob/user) spawn(50) if(bcell) if(bcell.charge >= paddles.revivecost) @@ -304,7 +304,7 @@ playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1) return (OXYLOSS) -/obj/item/weapon/twohanded/shockpaddles/dropped(mob/user as mob) +/obj/item/weapon/twohanded/shockpaddles/dropped(mob/user) if(user) var/obj/item/weapon/twohanded/O = user.get_inactive_hand() if(istype(O)) @@ -315,7 +315,7 @@ defib.update_icon() return unwield(user) -/obj/item/weapon/twohanded/shockpaddles/proc/check_defib_exists(mainunit, var/mob/living/carbon/human/M, var/obj/O) +/obj/item/weapon/twohanded/shockpaddles/proc/check_defib_exists(mainunit, mob/living/carbon/human/M, obj/O) if (!mainunit || !istype(mainunit, /obj/item/weapon/defibrillator)) //To avoid weird issues from admin spawns M.unEquip(O) qdel(O) diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index 1a85a2e50d6..11490f263d4 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -53,15 +53,15 @@ icon_state = "d20" sides = 20 -/obj/item/weapon/dice/attack_self(mob/user as mob) +/obj/item/weapon/dice/attack_self(mob/user) diceroll(user) -/obj/item/weapon/dice/throw_at(atom/target, range, speed, mob/user as mob) +/obj/item/weapon/dice/throw_at(atom/target, range, speed, mob/user) if(!..()) return diceroll(user) -/obj/item/weapon/dice/proc/diceroll(mob/user as mob) +/obj/item/weapon/dice/proc/diceroll(mob/user) result = rand(1, sides) var/comment = "" if(sides == 20 && result == 20) @@ -78,7 +78,7 @@ else if(src.throwing == 0) //Dice was thrown and is coming to rest visible_message("[src] rolls to a stop, landing on [result]. [comment]") -/obj/item/weapon/dice/d4/Crossed(var/mob/living/carbon/human/H) +/obj/item/weapon/dice/d4/Crossed(mob/living/carbon/human/H) if(istype(H) && !H.shoes) if(PIERCEIMMUNE in H.dna.species.specflags) return 0 diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index df54a0073ee..84db5d73cb8 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -21,7 +21,7 @@ image_overlay = image('icons/obj/assemblies.dmi', "plastic-explosive2") ..() -/obj/item/weapon/c4/suicide_act(var/mob/user) +/obj/item/weapon/c4/suicide_act(mob/user) user.visible_message("[user] activates the [src.name] and holds it above his head! It looks like \he's going out with a bang!") var/message_say = "FOR NO RAISIN!" if(user.mind) @@ -43,7 +43,7 @@ explode(get_turf(user)) user.gib() -/obj/item/weapon/c4/attackby(var/obj/item/I, var/mob/user, params) +/obj/item/weapon/c4/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/screwdriver)) open_panel = !open_panel user << "You [open_panel ? "open" : "close"] the wire panel." @@ -52,7 +52,7 @@ else ..() -/obj/item/weapon/c4/attack_self(mob/user as mob) +/obj/item/weapon/c4/attack_self(mob/user) var/newtime = input(usr, "Please set the timer.", "Timer", 10) as num if(user.get_active_hand() == src) newtime = Clamp(newtime, 10, 60000) @@ -86,12 +86,12 @@ else qdel(src) -/obj/item/weapon/c4/proc/explode(var/turf/location) +/obj/item/weapon/c4/proc/explode(turf/location) location.ex_act(2, target) explosion(location,0,0,3) if(target) target.overlays -= image_overlay qdel(src) -/obj/item/weapon/c4/attack(mob/M as mob, mob/user as mob, def_zone) +/obj/item/weapon/c4/attack(mob/M, mob/user, def_zone) return diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index 842ba36ad9d..35d9b8540f5 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -39,14 +39,14 @@ create_reagents(max_water) reagents.add_reagent("water", max_water) -/obj/item/weapon/extinguisher/attack_self(mob/user as mob) +/obj/item/weapon/extinguisher/attack_self(mob/user) safety = !safety src.icon_state = "[sprite_name][!safety]" src.desc = "The safety is [safety ? "on" : "off"]." user << "The safety is [safety ? "on" : "off"]." return -/obj/item/weapon/extinguisher/examine(mob/user as mob) +/obj/item/weapon/extinguisher/examine(mob/user) ..() if(reagents.total_volume) user << "It contains [round(reagents.total_volume)] units." diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index d70303c180e..5f3d4d87862 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -68,7 +68,7 @@ add_logs(user, target, "flamethrowered", src, "at [target.x],[target.y],[target.z]") flame_turf(turflist) -/obj/item/weapon/flamethrower/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/weapon/flamethrower/attackby(obj/item/W, mob/user, params) if(user.stat || user.restrained() || user.lying) return if(istype(W, /obj/item/weapon/wrench) && !status)//Taking this apart var/turf/T = get_turf(src) @@ -119,7 +119,7 @@ return -/obj/item/weapon/flamethrower/attack_self(mob/user as mob) +/obj/item/weapon/flamethrower/attack_self(mob/user) if(user.stat || user.restrained() || user.lying) return user.set_machine(src) if(!ptank) diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index 9f1ba40f4c1..f2374145ba1 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -21,7 +21,7 @@ pixel_y = rand(-10,10) icon_state = "giftcrate[rand(1,5)]" -/obj/item/weapon/a_gift/attack_self(mob/M as mob) +/obj/item/weapon/a_gift/attack_self(mob/M) if(M && M.mind && M.mind.special_role == "Santa") M << "You're supposed to be spreading gifts, not opening them yourself!" return diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 2ab9f5a64dd..c82e2b81f47 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -122,7 +122,7 @@ user << "You remove the activation mechanism from the [initial(name)] assembly." -/obj/item/weapon/grenade/chem_grenade/proc/stage_change(var/N) +/obj/item/weapon/grenade/chem_grenade/proc/stage_change(N) if(N) stage = N if(stage == EMPTY) diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index 9c39b6c5f3d..9f17b250993 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -18,7 +18,7 @@ B.update_icon() qdel(src) -/obj/item/weapon/grenade/flashbang/proc/bang(var/turf/T , var/mob/living/M) +/obj/item/weapon/grenade/flashbang/proc/bang(turf/T , mob/living/M) M.show_message("BANG", 2) playsound(loc, 'sound/effects/bang.ogg', 25, 1) diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm index b8ce111bdbe..ddde0ca0426 100644 --- a/code/game/objects/items/weapons/grenades/ghettobomb.dm +++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm @@ -38,7 +38,7 @@ can.layer = muh_layer -/obj/item/weapon/grenade/iedcasing/attack_self(mob/user as mob) // +/obj/item/weapon/grenade/iedcasing/attack_self(mob/user) // if(!active) if(clown_check(user)) user << "You light the [name]!" diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 23e19c70f92..9ef1c2b03c6 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -19,7 +19,7 @@ prime() ..() -/obj/item/weapon/grenade/proc/clown_check(var/mob/living/carbon/human/user) +/obj/item/weapon/grenade/proc/clown_check(mob/living/carbon/human/user) if(user.disabilities & CLUMSY && prob(50)) user << "Huh? How does this thing work?" active = 1 @@ -60,7 +60,7 @@ user << "\The [src] is set for instant detonation." -/obj/item/weapon/grenade/attack_self(mob/user as mob) +/obj/item/weapon/grenade/attack_self(mob/user) if(!active) if(clown_check(user)) user << "You prime the [name]! [det_time/10] seconds!" @@ -87,7 +87,7 @@ M.unEquip(src) -/obj/item/weapon/grenade/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/grenade/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/screwdriver)) switch(det_time) if ("1") @@ -109,5 +109,5 @@ walk(src, null, null) ..() -/obj/item/weapon/grenade/attack_paw(mob/user as mob) +/obj/item/weapon/grenade/attack_paw(mob/user) return attack_hand(user) diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index aa10954f644..f8a00e2fd38 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -94,7 +94,7 @@ /obj/item/weapon/restraints/handcuffs/cable/white icon_state = "cuff_white" -/obj/item/weapon/restraints/handcuffs/cable/attackby(var/obj/item/I, mob/user as mob, params) +/obj/item/weapon/restraints/handcuffs/cable/attackby(obj/item/I, mob/user, params) ..() if(istype(I, /obj/item/stack/rods)) var/obj/item/stack/rods/R = I @@ -172,7 +172,7 @@ playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) return (BRUTELOSS) -/obj/item/weapon/restraints/legcuffs/beartrap/attack_self(mob/user as mob) +/obj/item/weapon/restraints/legcuffs/beartrap/attack_self(mob/user) ..() if(ishuman(user) && !user.stat && !user.restrained()) armed = !armed diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 10c9ab9737c..cab57a23a05 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -24,7 +24,7 @@ //What does the implant do upon injection? //return 0 if the implant fails (ex. Revhead and loyalty implant.) //return 1 if the implant succeeds (ex. Nonrevhead and loyalty implant.) -/obj/item/weapon/implant/proc/implanted(var/mob/source) +/obj/item/weapon/implant/proc/implanted(mob/source) if(activated) action_button_name = "Activate [src.name]" if(istype(source, /mob/living/carbon/human)) @@ -36,7 +36,7 @@ /obj/item/weapon/implant/proc/get_data() return "No information available" -/obj/item/weapon/implant/dropped(mob/user as mob) +/obj/item/weapon/implant/dropped(mob/user) . = 1 qdel(src) return . @@ -103,7 +103,7 @@ if(emote == "deathgasp") activate("death") -/obj/item/weapon/implant/explosive/activate(var/cause) +/obj/item/weapon/implant/explosive/activate(cause) if(!cause || !imp_in) return 0 if(cause == "action_button" && alert(imp_in, "Are you sure you want to activate your microbomb implant? This will cause you to explode!", "Microbomb Implant Confirmation", "Yes", "No") != "Yes") return 0 @@ -152,7 +152,7 @@ heavy = 4 delay = 70 -/obj/item/weapon/implant/explosive/macro/activate(var/cause) +/obj/item/weapon/implant/explosive/macro/activate(cause) if(!cause || !imp_in) return 0 if(cause == "action_button" && alert(imp_in, "Are you sure you want to activate your macrobomb implant? This will cause you to explode and gib!", "Macrobomb Implant Confirmation", "Yes", "No") != "Yes") return 0 @@ -193,7 +193,7 @@ if(emote == "deathgasp") activate(reagents.total_volume) -/obj/item/weapon/implant/chem/activate(var/cause) +/obj/item/weapon/implant/chem/activate(cause) if(!cause || !imp_in) return 0 var/mob/living/carbon/R = imp_in var/injectamount = null diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm index 95c25363a96..72aca3d4a66 100644 --- a/code/game/objects/items/weapons/implants/implantchair.dm +++ b/code/game/objects/items/weapons/implants/implantchair.dm @@ -20,7 +20,7 @@ /obj/machinery/implantchair/proc go_out() - put_mob(mob/living/carbon/M as mob) + put_mob(mob/living/carbon/M) implant(var/mob/M) add_implants() @@ -30,7 +30,7 @@ add_implants() -/obj/machinery/implantchair/attack_hand(mob/user as mob) +/obj/machinery/implantchair/attack_hand(mob/user) user.set_machine(src) var/health_text = "" if(src.occupant) @@ -73,7 +73,7 @@ return -/obj/machinery/implantchair/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob, params) +/obj/machinery/implantchair/attackby(obj/item/weapon/G, mob/user, params) if(istype(G, /obj/item/weapon/grab)) if(!ismob(G:affecting)) return @@ -88,7 +88,7 @@ return -/obj/machinery/implantchair/go_out(var/mob/M) +/obj/machinery/implantchair/go_out(mob/M) if(!( src.occupant )) return if(M == occupant) // so that the guy inside can't eject himself -Agouri @@ -105,7 +105,7 @@ return -/obj/machinery/implantchair/put_mob(mob/living/carbon/M as mob) +/obj/machinery/implantchair/put_mob(mob/living/carbon/M) if(!iscarbon(M)) usr << "The [src.name] cannot hold this!" return @@ -123,7 +123,7 @@ return 1 -/obj/machinery/implantchair/implant(var/mob/M) +/obj/machinery/implantchair/implant(mob/M) if (!istype(M, /mob/living/carbon)) return if(!implant_list.len) return diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm index 615d719fef3..a3361cfda58 100644 --- a/code/game/objects/items/weapons/implants/implantpad.dm +++ b/code/game/objects/items/weapons/implants/implantpad.dm @@ -19,7 +19,7 @@ icon_state = "implantpad-0" -/obj/item/weapon/implantpad/attack_hand(mob/user as mob) +/obj/item/weapon/implantpad/attack_hand(mob/user) if(case && (user.l_hand == src || user.r_hand == src)) user.put_in_active_hand(case) diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index 2d1f97216ee..4e0b345a238 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -33,7 +33,7 @@ var/cooldown = 0 var/on = 1 -/obj/item/weapon/melee/classic_baton/attack(mob/target as mob, mob/living/user as mob) +/obj/item/weapon/melee/classic_baton/attack(mob/target, mob/living/user) if(on) add_fingerprint(user) if((CLUMSY in user.disabilities) && prob(50)) @@ -86,7 +86,7 @@ force = 0 on = 0 -/obj/item/weapon/melee/classic_baton/telescopic/attack_self(mob/user as mob) +/obj/item/weapon/melee/classic_baton/telescopic/attack_self(mob/user) on = !on if(on) user << "You extend the baton." diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm index 14ddda46e57..52a63bbed10 100644 --- a/code/game/objects/items/weapons/paint.dm +++ b/code/game/objects/items/weapons/paint.dm @@ -55,7 +55,7 @@ name = "any color" icon_state = "paint_neutral" - attack_self(mob/user as mob) + attack_self(mob/user) var/t1 = input(user, "Please select a color:", "Locking Computer", null) in list( "red", "blue", "green", "yellow", "violet", "black", "white") if ((user.get_active_hand() != src || user.stat || user.restrained())) return @@ -79,7 +79,7 @@ return -/obj/item/weapon/paint/afterattack(turf/target, mob/user as mob, proximity) +/obj/item/weapon/paint/afterattack(turf/target, mob/user, proximity) if(!proximity) return if(paintleft <= 0) icon_state = "paint_empty" @@ -94,7 +94,7 @@ name = "paint remover" icon_state = "paint_neutral" - afterattack(turf/target, mob/user as mob,proximity) + afterattack(turf/target, mob/user,proximity) if(!proximity) return if(istype(target) && target.color != initial(target.color)) target.color = initial(target.color) diff --git a/code/game/objects/items/weapons/paiwire.dm b/code/game/objects/items/weapons/paiwire.dm index 33de9fcba06..fa9a626cd15 100644 --- a/code/game/objects/items/weapons/paiwire.dm +++ b/code/game/objects/items/weapons/paiwire.dm @@ -6,7 +6,7 @@ var/obj/machinery/machine -/obj/item/weapon/pai_cable/proc/plugin(obj/machinery/M as obj, mob/user as mob) +/obj/item/weapon/pai_cable/proc/plugin(obj/machinery/M, mob/user) if(istype(M, /obj/machinery/door) || istype(M, /obj/machinery/camera)) if(!user.drop_item()) return @@ -16,5 +16,5 @@ else user.visible_message("[user] dumbly fumbles to find a place on [M] to plug in [src].", "There aren't any ports on [M] that match the jack belonging to [src]!") -/obj/item/weapon/pai_cable/attack(obj/machinery/M as obj, mob/user as mob) +/obj/item/weapon/pai_cable/attack(obj/machinery/M, mob/user) src.plugin(M, user) \ No newline at end of file diff --git a/code/game/objects/items/weapons/pneumaticCannon.dm b/code/game/objects/items/weapons/pneumaticCannon.dm index 50f7c01fdaf..45f93dc03da 100644 --- a/code/game/objects/items/weapons/pneumaticCannon.dm +++ b/code/game/objects/items/weapons/pneumaticCannon.dm @@ -117,7 +117,7 @@ time = 300 category = CAT_WEAPON -/obj/item/weapon/pneumatic_cannon/proc/updateTank(var/obj/item/weapon/tank/internals/thetank, var/removing = 0, var/mob/living/carbon/human/user) +/obj/item/weapon/pneumatic_cannon/proc/updateTank(obj/item/weapon/tank/internals/thetank, removing = 0, mob/living/carbon/human/user) if(removing) if(!src.tank) return diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm index 535aca43cd0..245b4d0930b 100644 --- a/code/game/objects/items/weapons/scrolls.dm +++ b/code/game/objects/items/weapons/scrolls.dm @@ -18,7 +18,7 @@ -/obj/item/weapon/teleportation_scroll/attack_self(mob/user as mob) +/obj/item/weapon/teleportation_scroll/attack_self(mob/user) user.set_machine(src) var/dat = "Teleportation Scroll:
    " dat += "Number of uses: [src.uses]
    " @@ -46,7 +46,7 @@ attack_self(H) return -/obj/item/weapon/teleportation_scroll/proc/teleportscroll(var/mob/user) +/obj/item/weapon/teleportation_scroll/proc/teleportscroll(mob/user) var/A diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 9aaba5dda70..e1ce991115a 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -20,7 +20,7 @@ /obj/item/weapon/shield/riot/IsShield() return 1 -/obj/item/weapon/shield/riot/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/shield/riot/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/melee/baton)) if(cooldown < world.time - 25) user.visible_message("[user] bashes [src] with [W]!") diff --git a/code/game/objects/items/weapons/singularityhammer.dm b/code/game/objects/items/weapons/singularityhammer.dm index e2af15774b5..e5146fdbc1e 100644 --- a/code/game/objects/items/weapons/singularityhammer.dm +++ b/code/game/objects/items/weapons/singularityhammer.dm @@ -35,7 +35,7 @@ return -/obj/item/weapon/twohanded/singularityhammer/proc/vortex(var/turf/pull as turf, mob/wielder as mob) +/obj/item/weapon/twohanded/singularityhammer/proc/vortex(turf/pull, mob/wielder) for(var/atom/X in orange(5,pull)) if(istype(X, /atom/movable)) if(X == wielder) continue @@ -57,7 +57,7 @@ -/obj/item/weapon/twohanded/singularityhammer/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity) +/obj/item/weapon/twohanded/singularityhammer/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity) if(!proximity) return if(wielded) if(charged == 5) @@ -85,7 +85,7 @@ //var/charged = 5 origin_tech = "combat=5;powerstorage=5" -/obj/item/weapon/twohanded/mjollnir/proc/shock(mob/living/target as mob) +/obj/item/weapon/twohanded/mjollnir/proc/shock(mob/living/target) var/datum/effect/effect/system/lightning_spread/s = new /datum/effect/effect/system/lightning_spread s.set_up(5, 1, target.loc) s.start() @@ -98,7 +98,7 @@ return -/obj/item/weapon/twohanded/mjollnir/attack(mob/M as mob, mob/user as mob) +/obj/item/weapon/twohanded/mjollnir/attack(mob/M, mob/user) ..() spawn(0) if(wielded) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 93a7d56bc79..84b158e9e4b 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -21,7 +21,7 @@ burn_state = 0 //Burnable burntime = 20 -/obj/item/weapon/storage/backpack/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/storage/backpack/attackby(obj/item/weapon/W, mob/user, params) playsound(src.loc, "rustle", 50, 1, -5) ..() @@ -86,7 +86,7 @@ return ..() -/obj/item/weapon/storage/backpack/holding/proc/failcheck(mob/user as mob) +/obj/item/weapon/storage/backpack/holding/proc/failcheck(mob/user) if (prob(src.reliability)) return 1 //No failure if (prob(src.reliability)) user << "The Bluespace portal resists your attempt to add another item." //light failure diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index a00c0844ef8..55ed5b43bad 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -145,7 +145,7 @@ //verbs -= /obj/item/weapon/storage/verb/quick_empty //verbs += /obj/item/weapon/storage/bag/sheetsnatcher/quick_empty -/obj/item/weapon/storage/bag/sheetsnatcher/can_be_inserted(obj/item/W as obj, stop_messages = 0) +/obj/item/weapon/storage/bag/sheetsnatcher/can_be_inserted(obj/item/W, stop_messages = 0) if(!istype(W,/obj/item/stack/sheet) || istype(W,/obj/item/stack/sheet/mineral/sandstone) || istype(W,/obj/item/stack/sheet/mineral/wood)) if(!stop_messages) usr << "The snatcher does not accept [W]." @@ -161,7 +161,7 @@ // Modified handle_item_insertion. Would prefer not to, but... -/obj/item/weapon/storage/bag/sheetsnatcher/handle_item_insertion(obj/item/W as obj, prevent_warning = 0) +/obj/item/weapon/storage/bag/sheetsnatcher/handle_item_insertion(obj/item/W, prevent_warning = 0) var/obj/item/stack/sheet/S = W if(!istype(S)) return 0 @@ -201,7 +201,7 @@ // Sets up numbered display to show the stack size of each stored mineral // NOTE: numbered display is turned off currently because it's broken -/obj/item/weapon/storage/bag/sheetsnatcher/orient2hud(mob/user as mob) +/obj/item/weapon/storage/bag/sheetsnatcher/orient2hud(mob/user) var/adjusted_contents = contents.len //Numbered contents display @@ -240,7 +240,7 @@ update_icon() // Instead of removing -/obj/item/weapon/storage/bag/sheetsnatcher/remove_from_storage(obj/item/W as obj, atom/new_location) +/obj/item/weapon/storage/bag/sheetsnatcher/remove_from_storage(obj/item/W, atom/new_location) var/obj/item/stack/sheet/S = W if(!istype(S)) return 0 @@ -300,7 +300,7 @@ materials = list(MAT_METAL=3000) preposition = "on" -/obj/item/weapon/storage/bag/tray/attack(mob/living/M as mob, mob/living/user as mob) +/obj/item/weapon/storage/bag/tray/attack(mob/living/M, mob/living/user) ..() // Drop all the things. All of them. var/list/obj/item/oldContents = contents.Copy() diff --git a/code/game/objects/items/weapons/storage/book.dm b/code/game/objects/items/weapons/storage/book.dm index 0ec158a7f37..9e494db3126 100644 --- a/code/game/objects/items/weapons/storage/book.dm +++ b/code/game/objects/items/weapons/storage/book.dm @@ -66,7 +66,7 @@ var/global/list/bibleitemstates = list("bible", "koran", "scrapbook", "bible", " H << browse(dat, "window=editicon;can_close=0;can_minimize=0;size=250x650") -/obj/item/weapon/storage/book/bible/proc/setupbiblespecifics(var/obj/item/weapon/storage/book/bible/B, var/mob/living/carbon/human/H) +/obj/item/weapon/storage/book/bible/proc/setupbiblespecifics(obj/item/weapon/storage/book/bible/B, mob/living/carbon/human/H) switch(B.icon_state) if("honk1","honk2") new /obj/item/weapon/bikehorn(B) @@ -114,7 +114,7 @@ var/global/list/bibleitemstates = list("bible", "koran", "scrapbook", "bible", " usr << browse(null, "window=editicon") // Close window -/obj/item/weapon/storage/book/bible/proc/bless(mob/living/carbon/M as mob) +/obj/item/weapon/storage/book/bible/proc/bless(mob/living/carbon/M) if(ishuman(M)) var/mob/living/carbon/human/H = M var/heal_amt = 10 @@ -124,7 +124,7 @@ var/global/list/bibleitemstates = list("bible", "koran", "scrapbook", "bible", " H.update_damage_overlays(0) return -/obj/item/weapon/storage/book/bible/attack(mob/living/M as mob, mob/living/carbon/human/user as mob) +/obj/item/weapon/storage/book/bible/attack(mob/living/M, mob/living/carbon/human/user) var/chaplain = 0 if(user.mind && (user.mind.assigned_role == "Chaplain")) @@ -190,7 +190,7 @@ var/global/list/bibleitemstates = list("bible", "koran", "scrapbook", "bible", " playsound(src.loc, "punch", 25, 1, -1) return -/obj/item/weapon/storage/book/bible/afterattack(atom/A, mob/user as mob, proximity) +/obj/item/weapon/storage/book/bible/afterattack(atom/A, mob/user, proximity) if(!proximity) return if (istype(A, /turf/simulated/floor)) @@ -209,6 +209,6 @@ var/global/list/bibleitemstates = list("bible", "koran", "scrapbook", "bible", " A.reagents.del_reagent("unholywater") A.reagents.add_reagent("holywater",unholy2clean) -/obj/item/weapon/storage/book/bible/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/storage/book/bible/attackby(obj/item/weapon/W, mob/user, params) playsound(src.loc, "rustle", 50, 1, -5) ..() diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 9cd8462765d..463528288b0 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -26,7 +26,7 @@ for(var/i = 1 to storage_slots) new spawn_type(src) -/obj/item/weapon/storage/fancy/update_icon(var/itemremoved = 0) +/obj/item/weapon/storage/fancy/update_icon(itemremoved = 0) var/total_contents = src.contents.len - itemremoved src.icon_state = "[src.icon_type]box[total_contents]" return diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 6cd7602757b..f1347bcd07e 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -139,7 +139,7 @@ allow_quick_gather = 1 use_to_pickup = 1 -/obj/item/weapon/storage/pill_bottle/MouseDrop(obj/over_object as obj) //Quick pillbottle fix. -Agouri +/obj/item/weapon/storage/pill_bottle/MouseDrop(obj/over_object) //Quick pillbottle fix. -Agouri if(ishuman(usr) || ismonkey(usr)) //Can monkeys even place items in the pocket slots? Leaving this in just in case~ var/mob/M = usr diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm index ac320fd7d07..1981e552192 100644 --- a/code/game/objects/items/weapons/storage/lockbox.dm +++ b/code/game/objects/items/weapons/storage/lockbox.dm @@ -17,7 +17,7 @@ var/icon_broken = "lockbox+b" -/obj/item/weapon/storage/lockbox/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/storage/lockbox/attackby(obj/item/weapon/W, mob/user, params) if (W.GetID()) if(src.broken) user << "It appears to be broken." @@ -48,7 +48,7 @@ return 0 ..() -/obj/item/weapon/storage/lockbox/emag_act(mob/user as mob) +/obj/item/weapon/storage/lockbox/emag_act(mob/user) if(!broken) broken = 1 locked = 0 @@ -57,7 +57,7 @@ for(var/mob/O in viewers(user, 3)) O.show_message(text("\The [src] has been broken by [] with an electromagnetic card!", user), 1, text("You hear a faint electrical spark."), 2) return -/obj/item/weapon/storage/lockbox/show_to(mob/user as mob) +/obj/item/weapon/storage/lockbox/show_to(mob/user) if(locked) user << "It's locked!" else diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index ae20822118f..1f2aa54fff4 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -31,7 +31,7 @@ ..() user << text("The service panel is [src.open ? "open" : "closed"].") -/obj/item/weapon/storage/secure/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/storage/secure/attackby(obj/item/weapon/W, mob/user, params) if(locked) if (istype(W, /obj/item/weapon/screwdriver)) if (do_after(user, 20, target = src)) @@ -61,7 +61,7 @@ // -> storage/attackby() what with handle insertion, etc ..() -/obj/item/weapon/storage/secure/emag_act(mob/user as mob) +/obj/item/weapon/storage/secure/emag_act(mob/user) if(locked) if(!emagged) emagged = 1 @@ -79,7 +79,7 @@ return 0 ..() -/obj/item/weapon/storage/secure/attack_self(mob/user as mob) +/obj/item/weapon/storage/secure/attack_self(mob/user) user.set_machine(src) var/dat = text("[]
    \n\nLock Status: []",src, (src.locked ? "LOCKED" : "UNLOCKED")) var/message = "Code" @@ -163,7 +163,7 @@ new /obj/item/weapon/pen(src) return ..() -/obj/item/weapon/storage/secure/briefcase/attack_hand(mob/user as mob) +/obj/item/weapon/storage/secure/briefcase/attack_hand(mob/user) if ((src.loc == user) && (src.locked == 1)) usr << "[src] is locked and cannot be opened!" else if ((src.loc == user) && (!src.locked)) @@ -213,7 +213,7 @@ new /obj/item/weapon/paper(src) new /obj/item/weapon/pen(src) -/obj/item/weapon/storage/secure/safe/attack_hand(mob/user as mob) +/obj/item/weapon/storage/secure/safe/attack_hand(mob/user) return attack_self(user) /obj/item/weapon/storage/secure/safe/HoS/New() diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index a1b73157d55..9d2242701c0 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -30,14 +30,14 @@ var/obj/item/weapon/card/id/front_id = null -/obj/item/weapon/storage/wallet/remove_from_storage(obj/item/W as obj, atom/new_location) +/obj/item/weapon/storage/wallet/remove_from_storage(obj/item/W, atom/new_location) . = ..(W, new_location) if(.) if(W == front_id) front_id = null update_icon() -/obj/item/weapon/storage/wallet/handle_item_insertion(obj/item/W as obj, prevent_warning = 0) +/obj/item/weapon/storage/wallet/handle_item_insertion(obj/item/W, prevent_warning = 0) . = ..(W, prevent_warning) if(.) if(!front_id && istype(W, /obj/item/weapon/card/id)) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 40b1ab14670..31dafa8f0c8 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -33,7 +33,7 @@ update_icon() return -/obj/item/weapon/melee/baton/proc/deductcharge(var/chrgdeductamt) +/obj/item/weapon/melee/baton/proc/deductcharge(chrgdeductamt) if(bcell) if(bcell.charge < (hitcost+chrgdeductamt)) // If after the deduction the baton doesn't have enough charge for a stun hit it turns off. status = 0 diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index c113a3eeb26..edaf38870f1 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -45,7 +45,7 @@ return -/obj/item/weapon/tank/jetpack/proc/allow_thrust(num, mob/living/user as mob) +/obj/item/weapon/tank/jetpack/proc/allow_thrust(num, mob/living/user) if(!(src.on)) return 0 if((num < 0.005 || src.air_contents.total_moles() < num)) diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index b4010cc839d..1c9227216d2 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -86,7 +86,7 @@ src.air_contents.toxins = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) return -/obj/item/weapon/tank/internals/plasma/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/tank/internals/plasma/attackby(obj/item/weapon/W, mob/user, params) ..() if (istype(W, /obj/item/weapon/flamethrower)) diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index a275f3bb36d..eb41ea7032d 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -79,7 +79,7 @@ qdel(src) -/obj/item/weapon/tank/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/tank/attackby(obj/item/weapon/W, mob/user, params) ..() src.add_fingerprint(user) @@ -92,7 +92,7 @@ if(istype(W, /obj/item/device/assembly_holder)) bomb_assemble(W,user) -/obj/item/weapon/tank/attack_self(mob/user as mob) +/obj/item/weapon/tank/attack_self(mob/user) if (!(src.air_contents)) return diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index 08808afdc04..8090aaade77 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -69,7 +69,7 @@ ..() return -/obj/item/weapon/watertank/attack_hand(mob/user as mob) +/obj/item/weapon/watertank/attack_hand(mob/user) if(src.loc == user) ui_action_click() return @@ -125,7 +125,7 @@ loc = tank return -/obj/item/weapon/reagent_containers/spray/mister/dropped(mob/user as mob) +/obj/item/weapon/reagent_containers/spray/mister/dropped(mob/user) user << "The mister snaps back onto the watertank." tank.on = 0 loc = tank @@ -133,7 +133,7 @@ /obj/item/weapon/reagent_containers/spray/mister/attack_self() return -/proc/check_tank_exists(parent_tank, var/mob/living/carbon/human/M, var/obj/O) +/proc/check_tank_exists(parent_tank, mob/living/carbon/human/M, obj/O) if (!parent_tank || !istype(parent_tank, /obj/item/weapon/watertank)) //To avoid weird issues from admin spawns M.unEquip(O) qdel(0) @@ -194,7 +194,7 @@ /obj/item/weapon/watertank/atmos/make_noz() return new /obj/item/weapon/extinguisher/mini/nozzle(src) -/obj/item/weapon/watertank/atmos/dropped(mob/user as mob) +/obj/item/weapon/watertank/atmos/dropped(mob/user) icon_state = "waterbackpackatmos" if(istype(noz, /obj/item/weapon/extinguisher/mini/nozzle)) var/obj/item/weapon/extinguisher/mini/nozzle/N = noz @@ -232,7 +232,7 @@ loc = tank return -/obj/item/weapon/extinguisher/mini/nozzle/attack_self(mob/user as mob) +/obj/item/weapon/extinguisher/mini/nozzle/attack_self(mob/user) switch(nozzle_mode) if(EXTINGUISHER) nozzle_mode = NANOFROST @@ -251,7 +251,7 @@ return return -/obj/item/weapon/extinguisher/mini/nozzle/dropped(mob/user as mob) +/obj/item/weapon/extinguisher/mini/nozzle/dropped(mob/user) user << "The nozzle snaps back onto the tank!" tank.on = 0 loc = tank diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index 22f3c6ef990..0a9af02493f 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -24,7 +24,7 @@ materials = list(MAT_METAL=400) origin_tech = "magnets=1" -/obj/item/weapon/locator/attack_self(mob/user as mob) +/obj/item/weapon/locator/attack_self(mob/user) user.set_machine(src) var/dat if (src.temp) @@ -136,7 +136,7 @@ Frequency: origin_tech = "magnets=1;bluespace=3" var/active_portals = 0 -/obj/item/weapon/hand_tele/attack_self(mob/user as mob) +/obj/item/weapon/hand_tele/attack_self(mob/user) var/turf/current_location = get_turf(user)//What turf is the user on? if(!current_location||current_location.z==2||current_location.z>=7 || !istype(user.loc, /turf))//If turf was not found or they're on z level 2 or >7 which does not currently exist. or if user is not located on a turf user << "\The [src] is malfunctioning." diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 213faa834c0..75f5e0d2f52 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -88,7 +88,7 @@ src.pixel_y = rand(0, 16) return -/obj/item/weapon/screwdriver/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) +/obj/item/weapon/screwdriver/attack(mob/living/carbon/M, mob/living/carbon/user) if(!istype(M)) return ..() if(user.zone_sel.selecting != "eyes" && user.zone_sel.selecting != "head") return ..() diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 71ab242d878..779df4e79c1 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -66,14 +66,14 @@ user.put_in_inactive_hand(O) return -/obj/item/weapon/twohanded/mob_can_equip(M as mob, slot) +/obj/item/weapon/twohanded/mob_can_equip(mob/M, slot) //Cannot equip wielded items. if(wielded) M << "Unwield the [name] first!" return 0 return ..() -/obj/item/weapon/twohanded/dropped(mob/user as mob) +/obj/item/weapon/twohanded/dropped(mob/user) //handles unwielding a twohanded weapon when dropped as well as clearing up the offhand if(user) var/obj/item/weapon/twohanded/O = user.get_inactive_hand() @@ -84,7 +84,7 @@ /obj/item/weapon/twohanded/update_icon() return -/obj/item/weapon/twohanded/attack_self(mob/user as mob) +/obj/item/weapon/twohanded/attack_self(mob/user) ..() if(wielded) //Trying to unwield it unwield(user) @@ -120,7 +120,7 @@ /obj/item/weapon/twohanded/required/attack_self() return -/obj/item/weapon/twohanded/required/mob_can_equip(M as mob, slot) +/obj/item/weapon/twohanded/required/mob_can_equip(mob/M, slot) if(wielded) M << "[src.name] is too cumbersome to carry with anything but your hands!" return 0 @@ -161,7 +161,7 @@ icon_state = "fireaxe[wielded]" return -/obj/item/weapon/twohanded/fireaxe/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity) +/obj/item/weapon/twohanded/fireaxe/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity) if(!proximity) return if(A && wielded && (istype(A,/obj/structure/window) || istype(A,/obj/structure/grille))) //destroys windows and grilles in one hit if(istype(A,/obj/structure/window)) //should just make a window.Break() proc but couldn't bother with it @@ -210,7 +210,7 @@ clean_blood()//blood overlays get weird otherwise, because the sprite changes. return -/obj/item/weapon/twohanded/dualsaber/attack(target as mob, mob/living/carbon/human/user as mob) +/obj/item/weapon/twohanded/dualsaber/attack(mob/target, mob/living/carbon/human/user) ..() if(user.disabilities & CLUMSY && (wielded) && prob(40)) impale(user) @@ -221,7 +221,7 @@ user.dir = i sleep(1) -/obj/item/weapon/twohanded/dualsaber/proc/impale(mob/living/user as mob) +/obj/item/weapon/twohanded/dualsaber/proc/impale(mob/living/user) user << "You twirl around a bit before losing your balance and impaling yourself on \the [src]." if (force_wielded) user.take_organ_damage(20,25) @@ -263,7 +263,7 @@ New() item_color = "red" -/obj/item/weapon/twohanded/dualsaber/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/twohanded/dualsaber/attackby(obj/item/weapon/W, mob/user, params) ..() if(istype(W, /obj/item/device/multitool)) if(hacked == 0) diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 8358ccd751f..532d4958b22 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -107,7 +107,7 @@ materials = list(MAT_METAL=1875) attack_verb = list("hit", "bludgeoned", "whacked", "bonked") -/obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob, params) +/obj/item/weapon/wirerod/attackby(obj/item/I, mob/user, params) ..() if(istype(I, /obj/item/weapon/shard)) var/obj/item/weapon/twohanded/spear/S = new /obj/item/weapon/twohanded/spear diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 5544f13fb30..04ca7d61176 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -103,7 +103,7 @@ /mob/proc/unset_machine() src.machine = null -/mob/proc/set_machine(var/obj/O) +/mob/proc/set_machine(obj/O) if(src.machine) unset_machine() src.machine = O @@ -161,7 +161,7 @@ var/turf/T = get_turf(src) return T.storage_contents_dump_act(src_object, user) -/obj/fire_act(var/global_overlay=1) +/obj/fire_act(global_overlay=1) if(!burn_state) burn_state = 1 SSobj.burning += src diff --git a/code/game/objects/structures/ai_core.dm b/code/game/objects/structures/ai_core.dm index 8fe14f6d13c..f294c90122c 100644 --- a/code/game/objects/structures/ai_core.dm +++ b/code/game/objects/structures/ai_core.dm @@ -10,7 +10,7 @@ var/obj/item/device/mmi/brain = null -/obj/structure/AIcore/attackby(obj/item/P as obj, mob/user as mob, params) +/obj/structure/AIcore/attackby(obj/item/P, mob/user, params) switch(state) if(0) if(istype(P, /obj/item/weapon/wrench)) @@ -204,7 +204,7 @@ anchored = 1 state = 20//So it doesn't interact based on the above. Not really necessary. -/obj/structure/AIcore/deactivated/attackby(var/obj/item/A as obj, var/mob/user as mob, params) +/obj/structure/AIcore/deactivated/attackby(obj/item/A, mob/user, params) if(istype(A, /obj/item/device/aicard))//Is it? A.transfer_ai("INACTIVE","AICARD",src,user) if(istype(A, /obj/item/weapon/wrench)) @@ -230,7 +230,7 @@ That prevents a few funky behaviors. //The type of interaction, the player performing the operation, the AI itself, and the card object, if any. -atom/proc/transfer_ai(var/interaction, var/mob/user, var/mob/living/silicon/ai/AI, var/obj/item/device/aicard/card) +atom/proc/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card) if(istype(card)) if(card.flush) user << "ERROR: AI flush is in progress, cannot execute transfer protocol." @@ -238,7 +238,7 @@ atom/proc/transfer_ai(var/interaction, var/mob/user, var/mob/living/silicon/ai/A return 1 -/obj/structure/AIcore/deactivated/transfer_ai(var/interaction, var/mob/user, var/mob/living/silicon/ai/AI, var/obj/item/device/aicard/card) +/obj/structure/AIcore/deactivated/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card) if(!..()) return //Transferring a carded AI to a core. diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm index ae56de30fb6..859af196a46 100644 --- a/code/game/objects/structures/artstuff.dm +++ b/code/game/objects/structures/artstuff.dm @@ -15,7 +15,7 @@ //Adding canvases -/obj/structure/easel/attackby(var/obj/item/I, var/mob/user, params) +/obj/structure/easel/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/canvas)) var/obj/item/weapon/canvas/C = I user.unEquip(C) @@ -81,7 +81,7 @@ var/global/list/globalBlankCanvases[AMT_OF_CANVASES] //One pixel increments -/obj/item/weapon/canvas/attackby(var/obj/item/I, var/mob/user, params) +/obj/item/weapon/canvas/attackby(obj/item/I, mob/user, params) //Click info var/list/click_params = params2list(params) var/pixX = text2num(click_params["icon-x"]) @@ -116,7 +116,7 @@ var/global/list/globalBlankCanvases[AMT_OF_CANVASES] ..() //Clean the whole canvas -/obj/item/weapon/canvas/attack_self(var/mob/user) +/obj/item/weapon/canvas/attack_self(mob/user) if(!user) return var/icon/blank = getGlobalBackup() diff --git a/code/game/objects/structures/barsigns.dm b/code/game/objects/structures/barsigns.dm index aa8e229a0bb..7c4637a2df8 100644 --- a/code/game/objects/structures/barsigns.dm +++ b/code/game/objects/structures/barsigns.dm @@ -31,7 +31,7 @@ -/obj/structure/sign/barsign/proc/set_sign(var/datum/barsign/sign) +/obj/structure/sign/barsign/proc/set_sign(datum/barsign/sign) if(!istype(sign)) return icon_state = sign.icon @@ -43,12 +43,12 @@ -/obj/structure/sign/barsign/attack_ai(mob/user as mob) +/obj/structure/sign/barsign/attack_ai(mob/user) return src.attack_hand(user) -/obj/structure/sign/barsign/attack_hand(mob/user as mob) +/obj/structure/sign/barsign/attack_hand(mob/user) if (!src.allowed(user)) user << "Access denied." return @@ -60,7 +60,7 @@ -/obj/structure/sign/barsign/attackby(var/obj/item/I, var/mob/user) +/obj/structure/sign/barsign/attackby(obj/item/I, mob/user) if(!allowed(user)) user << "Access denied." return diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index c27a4f0513e..27c6aaebef1 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -24,7 +24,7 @@ LINEN BINS if(!attempt_initiate_surgery(src, M, user)) ..() -/obj/item/weapon/bedsheet/attack_self(mob/user as mob) +/obj/item/weapon/bedsheet/attack_self(mob/user) user.drop_item() if(layer == initial(layer)) layer = 5 @@ -205,7 +205,7 @@ LINEN BINS update_icon() return -/obj/structure/bedsheetbin/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/structure/bedsheetbin/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/bedsheet)) if(!user.drop_item()) return @@ -224,11 +224,11 @@ LINEN BINS -/obj/structure/bedsheetbin/attack_paw(mob/user as mob) +/obj/structure/bedsheetbin/attack_paw(mob/user) return attack_hand(user) -/obj/structure/bedsheetbin/attack_hand(mob/user as mob) +/obj/structure/bedsheetbin/attack_hand(mob/user) if(user.lying) return if(amount >= 1) @@ -254,7 +254,7 @@ LINEN BINS add_fingerprint(user) -/obj/structure/bedsheetbin/attack_tk(mob/user as mob) +/obj/structure/bedsheetbin/attack_tk(mob/user) if(amount >= 1) amount-- diff --git a/code/game/objects/structures/crates_lockers/bins.dm b/code/game/objects/structures/crates_lockers/bins.dm index 1663e45c8bd..603882086e4 100644 --- a/code/game/objects/structures/crates_lockers/bins.dm +++ b/code/game/objects/structures/crates_lockers/bins.dm @@ -25,7 +25,7 @@ else overlays += orangelight -/obj/structure/closet/crate/bin/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/closet/crate/bin/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/storage/bag/trash)) var/obj/item/weapon/storage/bag/trash/T = W user << "You fill the bag." @@ -43,7 +43,7 @@ else ..() -/obj/structure/closet/crate/bin/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob) +/obj/structure/closet/crate/bin/MouseDrop_T(atom/movable/O as mob|obj, mob/user) . = ..(O, user, 0, 0, 0) if(.) if(O != user) @@ -76,12 +76,12 @@ playsound(src.loc, sound_effect_close, 15, 1, -3) update_icon() -/obj/structure/closet/crate/bin/insert(var/obj/item/I, var/include_mobs = 0, var/animate = 0) +/obj/structure/closet/crate/bin/insert(obj/item/I, include_mobs = 0, animate = 0) . = ..(I, include_mobs) if(animate && .) do_animate() -/obj/structure/closet/crate/bin/place(var/mob/user, var/obj/item/I) +/obj/structure/closet/crate/bin/place(mob/user, obj/item/I) if(contents.len >= storage_capacity) return 1 if(!opened && user.drop_item()) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 08ea4e09edd..a72592a458e 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -111,7 +111,7 @@ update_icon() return 1 -/obj/structure/closet/proc/insert(var/atom/movable/AM) +/obj/structure/closet/proc/insert(atom/movable/AM) if(contents.len >= storage_capacity) return -1 @@ -165,7 +165,7 @@ qdel(src) ..() -/obj/structure/closet/bullet_act(var/obj/item/projectile/Proj) +/obj/structure/closet/bullet_act(obj/item/projectile/Proj) ..() if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) health -= Proj.damage @@ -174,7 +174,7 @@ qdel(src) return -/obj/structure/closet/attack_animal(mob/living/simple_animal/user as mob) +/obj/structure/closet/attack_animal(mob/living/simple_animal/user) if(user.environment_smash) user.do_attack_animation(src) visible_message("[user] destroys \the [src].") @@ -187,7 +187,7 @@ qdel(src) -/obj/structure/closet/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/closet/attackby(obj/item/weapon/W, mob/user, params) if(user.loc == src) return if(opened) @@ -241,13 +241,13 @@ if(!place(user, W) && !isnull(W)) attack_hand(user) -/obj/structure/closet/proc/place(var/mob/user, var/obj/item/I) +/obj/structure/closet/proc/place(mob/user, obj/item/I) if(!opened && secure) togglelock(user) return 1 return 0 -/obj/structure/closet/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob, var/needs_opened = 1, var/show_message = 1, var/move_them = 1) +/obj/structure/closet/MouseDrop_T(atom/movable/O as mob|obj, mob/user, needs_opened = 1, show_message = 1, move_them = 1) if(istype(O, /obj/screen)) //fix for HUD elements making their way into the world -Pete return 0 if(!isturf(O.loc)) @@ -269,7 +269,7 @@ add_fingerprint(user) return 1 -/obj/structure/closet/relaymove(mob/user as mob) +/obj/structure/closet/relaymove(mob/user) if(user.stat || !isturf(loc)) return if(!open()) @@ -280,10 +280,10 @@ M.show_message("BANG, bang!", 2) -/obj/structure/closet/attack_paw(mob/user as mob) +/obj/structure/closet/attack_paw(mob/user) return attack_hand(user) -/obj/structure/closet/attack_hand(mob/user as mob) +/obj/structure/closet/attack_hand(mob/user) add_fingerprint(user) if(user.lying && get_dist(src, user) > 0) return @@ -293,7 +293,7 @@ return // tk grab then use on self -/obj/structure/closet/attack_self_tk(mob/user as mob) +/obj/structure/closet/attack_self_tk(mob/user) return attack_hand(user) /obj/structure/closet/verb/verb_toggleopen() @@ -350,7 +350,7 @@ else user << "You fail to break out of [src]!" -/obj/structure/closet/AltClick(var/mob/user) +/obj/structure/closet/AltClick(mob/user) ..() if(!user.canUseTopic(user) || broken) user << "You can't do that right now!" @@ -375,7 +375,7 @@ req_access += pick(get_all_accesses()) ..() -/obj/structure/closet/proc/togglelock(mob/user as mob) +/obj/structure/closet/proc/togglelock(mob/user) if(secure) if(allowed(user)) locked = !locked @@ -389,7 +389,7 @@ else return -/obj/structure/closet/emag_act(mob/user as mob) +/obj/structure/closet/emag_act(mob/user) if(secure && !broken) broken = 1 locked = 0 diff --git a/code/game/objects/structures/crates_lockers/closets/crittercrate.dm b/code/game/objects/structures/crates_lockers/closets/crittercrate.dm index 4854cdcdf89..512dec56d03 100644 --- a/code/game/objects/structures/crates_lockers/closets/crittercrate.dm +++ b/code/game/objects/structures/crates_lockers/closets/crittercrate.dm @@ -30,7 +30,7 @@ locked = 1 return 1 -/obj/structure/closet/critter/attack_hand(mob/user as mob) +/obj/structure/closet/critter/attack_hand(mob/user) src.add_fingerprint(user) if(src.loc == user.loc) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index 908c05c33d8..1d6d2d57629 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -34,7 +34,7 @@ new /obj/item/weapon/storage/backpack/satchel/withwallet( src ) new /obj/item/device/radio/headset( src ) -/obj/structure/closet/secure_closet/personal/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/structure/closet/secure_closet/personal/attackby(obj/item/W, mob/user, params) if(istype(W)) var/obj/item/weapon/card/id/I = W.GetID() diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm index 7d1c5c2bffe..4022c003311 100644 --- a/code/game/objects/structures/crates_lockers/closets/statue.dm +++ b/code/game/objects/structures/crates_lockers/closets/statue.dm @@ -108,7 +108,7 @@ /obj/structure/closet/statue/toggle() return -/obj/structure/closet/statue/bullet_act(var/obj/item/projectile/Proj) +/obj/structure/closet/statue/bullet_act(obj/item/projectile/Proj) health -= Proj.damage if(health <= 0) for(var/mob/M in src) @@ -116,7 +116,7 @@ return -/obj/structure/closet/statue/attack_animal(mob/living/simple_animal/user as mob) +/obj/structure/closet/statue/attack_animal(mob/living/simple_animal/user) if(user.environment_smash) for(var/mob/M in src) shatter(M) @@ -125,7 +125,7 @@ for(var/mob/M in src) shatter(M) -/obj/structure/closet/statue/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/structure/closet/statue/attackby(obj/item/I, mob/user, params) user.changeNext_move(CLICK_CD_MELEE) health -= I.force visible_message("[user] strikes [src] with [I].") @@ -151,7 +151,7 @@ /obj/structure/closet/statue/update_icon() return -/obj/structure/closet/statue/proc/shatter(mob/user as mob) +/obj/structure/closet/statue/proc/shatter(mob/user) if (user) user.dust() dump_contents() diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 14a4fe411bd..aab27eea79b 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -172,7 +172,7 @@ update_icon() return 1 -/obj/structure/closet/crate/insert(var/atom/movable/AM, var/include_mobs = 0) +/obj/structure/closet/crate/insert(atom/movable/AM, include_mobs = 0) if(contents.len >= storage_capacity) return -1 @@ -194,7 +194,7 @@ AM.loc = src return 1 -/obj/structure/closet/crate/proc/tear_manifest(mob/user as mob) +/obj/structure/closet/crate/proc/tear_manifest(mob/user) user << "You tear the manifest off of the crate." playsound(src.loc, 'sound/items/poster_ripped.ogg', 75, 1) manifest.loc = loc @@ -203,7 +203,7 @@ manifest = null overlays-="manifest" -/obj/structure/closet/crate/attack_hand(mob/user as mob) +/obj/structure/closet/crate/attack_hand(mob/user) if(manifest) tear_manifest(user) return @@ -221,7 +221,7 @@ open() return -/obj/structure/closet/crate/secure/attack_hand(mob/user as mob) +/obj/structure/closet/crate/secure/attack_hand(mob/user) if(manifest) tear_manifest(user) return @@ -238,7 +238,7 @@ else ..() -/obj/structure/closet/crate/secure/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/closet/crate/secure/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/card) && src.allowed(user) && !locked && !opened && !broken) user << "You lock \the [src]." src.locked = 1 @@ -248,7 +248,7 @@ return ..() -/obj/structure/closet/crate/secure/emag_act(mob/user as mob) +/obj/structure/closet/crate/secure/emag_act(mob/user) if(locked && !broken) src.locked = 0 src.broken = 1 @@ -259,10 +259,10 @@ user << "You unlock \the [src]." add_fingerprint(user) -/obj/structure/closet/crate/attack_paw(mob/user as mob) +/obj/structure/closet/crate/attack_paw(mob/user) return attack_hand(user) -/obj/structure/closet/crate/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/closet/crate/attackby(obj/item/weapon/W, mob/user, params) if(opened) if(isrobot(user)) return diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index 8e13052eaec..8db0996befc 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -16,7 +16,7 @@ if(manifest) overlays += "manifest" -/obj/structure/largecrate/attack_hand(mob/user as mob) +/obj/structure/largecrate/attack_hand(mob/user) if(manifest) user << "You tear the manifest off of the crate." playsound(src.loc, 'sound/items/poster_ripped.ogg', 75, 1) @@ -30,7 +30,7 @@ user << "You need a crowbar to pry this open!" return -/obj/structure/largecrate/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/largecrate/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/crowbar)) if(manifest) manifest.loc = loc diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 8c645b59f96..148202d59e6 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -28,7 +28,7 @@ src.healthcheck() -/obj/structure/displaycase/bullet_act(var/obj/item/projectile/Proj) +/obj/structure/displaycase/bullet_act(obj/item/projectile/Proj) if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) health -= Proj.damage ..() @@ -71,17 +71,17 @@ return -/obj/structure/displaycase/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/displaycase/attackby(obj/item/weapon/W, mob/user, params) user.changeNext_move(CLICK_CD_MELEE) src.health -= W.force src.healthcheck() ..() return -/obj/structure/displaycase/attack_paw(mob/user as mob) +/obj/structure/displaycase/attack_paw(mob/user) return src.attack_hand(user) -/obj/structure/displaycase/attack_hand(mob/user as mob) +/obj/structure/displaycase/attack_hand(mob/user) user.changeNext_move(CLICK_CD_MELEE) if (src.destroyed && src.occupied) new /obj/item/weapon/gun/energy/laser/captain( src.loc ) diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index ae3ddf23055..6f5809891e2 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -334,7 +334,7 @@ mineral = "glass" icon_state = "door_as_gviro1" -/obj/structure/door_assembly/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/structure/door_assembly/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/weapon/pen)) var/t = stripped_input(user, "Enter the name for the door.", src.name, src.created_name,MAX_NAME_LEN) if(!t) diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm index 30f4841cac3..cf6d55311ab 100644 --- a/code/game/objects/structures/dresser.dm +++ b/code/game/objects/structures/dresser.dm @@ -6,7 +6,7 @@ density = 1 anchored = 1 -/obj/structure/dresser/attack_hand(mob/user as mob) +/obj/structure/dresser/attack_hand(mob/user) if(!Adjacent(user))//no tele-grooming return if(ishuman(user)) diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm index d3fc4a8b3da..572ae4a133a 100644 --- a/code/game/objects/structures/electricchair.dm +++ b/code/game/objects/structures/electricchair.dm @@ -10,7 +10,7 @@ overlays += image('icons/obj/objects.dmi', src, "echair_over", MOB_LAYER + 1, dir) return -/obj/structure/stool/bed/chair/e_chair/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/stool/bed/chair/e_chair/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/wrench)) var/obj/structure/stool/bed/chair/C = new /obj/structure/stool/bed/chair(loc) playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm index 338c90f3fab..ad517849659 100644 --- a/code/game/objects/structures/fireaxe.dm +++ b/code/game/objects/structures/fireaxe.dm @@ -14,7 +14,7 @@ ..() update_icon() -/obj/structure/fireaxecabinet/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/structure/fireaxecabinet/attackby(obj/item/I, mob/user, params) if(isrobot(user) || istype(I,/obj/item/device/multitool)) toggle_lock(user) return @@ -60,7 +60,7 @@ if(3.0) return -/obj/structure/fireaxecabinet/bullet_act(var/obj/item/projectile/Proj) +/obj/structure/fireaxecabinet/bullet_act(obj/item/projectile/Proj) if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) if(Proj.damage) glass_hp -= Proj.damage @@ -73,7 +73,7 @@ fireaxe.loc = src.loc qdel(src) -/obj/structure/fireaxecabinet/attack_hand(mob/user as mob) +/obj/structure/fireaxecabinet/attack_hand(mob/user) if(open || glass_hp <= 0) if(fireaxe) user.put_in_hands(fireaxe) @@ -90,12 +90,12 @@ update_icon() return -/obj/structure/fireaxecabinet/attack_paw(mob/user as mob) +/obj/structure/fireaxecabinet/attack_paw(mob/user) if(ismonkey(user)) //no fire-axe wielding aliens allowed attack_hand(user) return -/obj/structure/fireaxecabinet/attack_ai(mob/user as mob) +/obj/structure/fireaxecabinet/attack_ai(mob/user) toggle_lock(user) return diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 69f0b31aaa2..8638ab62db3 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -13,7 +13,7 @@ var/state = GIRDER_NORMAL var/girderpasschance = 20 // percentage chance that a projectile passes through the girder. -/obj/structure/girder/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/structure/girder/attackby(obj/item/W, mob/user, params) add_fingerprint(user) if(istype(W, /obj/item/weapon/screwdriver) && state == GIRDER_DISPLACED) playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) @@ -284,7 +284,7 @@ density = 1 layer = 2 -/obj/structure/cultgirder/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/structure/cultgirder/attackby(obj/item/W, mob/user, params) add_fingerprint(user) if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index caf820d48d3..488932acaa4 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -26,7 +26,7 @@ if(ismob(user)) shock(user, 70) -/obj/structure/grille/attack_paw(mob/user as mob) +/obj/structure/grille/attack_paw(mob/user) attack_hand(user) /obj/structure/grille/attack_hulk(mob/living/carbon/human/user) @@ -35,7 +35,7 @@ health -= 5 healthcheck() -/obj/structure/grille/attack_hand(mob/living/user as mob) +/obj/structure/grille/attack_hand(mob/living/user) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) playsound(loc, 'sound/effects/grillehit.ogg', 80, 1) @@ -49,7 +49,7 @@ health -= rand(1,2) healthcheck() -/obj/structure/grille/attack_alien(mob/living/user as mob) +/obj/structure/grille/attack_alien(mob/living/user) user.do_attack_animation(src) if(istype(user, /mob/living/carbon/alien/larva)) return user.changeNext_move(CLICK_CD_MELEE) @@ -63,7 +63,7 @@ healthcheck() return -/obj/structure/grille/attack_slime(mob/living/simple_animal/slime/user as mob) +/obj/structure/grille/attack_slime(mob/living/simple_animal/slime/user) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) if(!user.is_adult) return @@ -77,7 +77,7 @@ healthcheck() return -/obj/structure/grille/attack_animal(var/mob/living/simple_animal/M as mob) +/obj/structure/grille/attack_animal(var/mob/living/simple_animal/M) M.changeNext_move(CLICK_CD_MELEE) if(M.melee_damage_upper == 0) return M.do_attack_animation(src) @@ -133,7 +133,7 @@ var/obj/item/stack/rods/newrods = new(loc) transfer_fingerprints_to(newrods) -/obj/structure/grille/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/grille/attackby(obj/item/weapon/W, mob/user, params) user.changeNext_move(CLICK_CD_MELEE) add_fingerprint(user) if(istype(W, /obj/item/weapon/wirecutters)) @@ -225,7 +225,7 @@ // shock user with probability prb (if all connections & power are working) // returns 1 if shocked, 0 otherwise -/obj/structure/grille/proc/shock(mob/user as mob, prb) +/obj/structure/grille/proc/shock(mob/user, prb) if(!anchored || destroyed) // anchored/destroyed grilles are never connected return 0 if(!prob(prb)) @@ -264,4 +264,4 @@ healthcheck() /obj/structure/grille/storage_contents_dump_act(obj/item/weapon/storage/src_object, mob/user) - return 0 + return 0 diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index bd6953ef7e0..58ff54da606 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -301,7 +301,7 @@ buckled_mob.pixel_y = 7 -/obj/structure/stool/bed/chair/janicart/bullet_act(var/obj/item/projectile/Proj) +/obj/structure/stool/bed/chair/janicart/bullet_act(obj/item/projectile/Proj) if(buckled_mob) buckled_mob.bullet_act(Proj) diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm index 4cd8cae36e3..07936884c99 100644 --- a/code/game/objects/structures/kitchen_spike.dm +++ b/code/game/objects/structures/kitchen_spike.dm @@ -22,10 +22,10 @@ var/skin = 0 var/skintype = null -/obj/structure/kitchenspike/attack_paw(mob/user as mob) +/obj/structure/kitchenspike/attack_paw(mob/user) return src.attack_hand(usr) -/obj/structure/kitchenspike/attackby(obj/item/weapon/grab/G as obj, mob/user as mob, params) +/obj/structure/kitchenspike/attackby(obj/item/weapon/grab/G, mob/user, params) if(!istype(G, /obj/item/weapon/grab)) return if(istype(G.affecting, /mob/living/carbon/monkey)) @@ -80,7 +80,7 @@ // else if(istype(C, /obj/mob/carbon/alien) && !istype(C, /mob/living/carbon/alien/larva/slime)) // else if(istype(C, /obj/livestock/spesscarp -/obj/structure/kitchenspike/attack_hand(mob/user as mob) +/obj/structure/kitchenspike/attack_hand(mob/user) if(..()) return if(src.occupied) diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm index 98e64467ee0..cf11b1d782b 100644 --- a/code/game/objects/structures/ladders.dm +++ b/code/game/objects/structures/ladders.dm @@ -36,7 +36,7 @@ else //wtf make your ladders properly assholes icon_state = "ladder00" -/obj/structure/ladder/attack_hand(mob/user as mob) +/obj/structure/ladder/attack_hand(mob/user) if(up && down) switch( alert("Go up or down the ladder?", "Ladder", "Up", "Down", "Cancel") ) if("Up") @@ -66,8 +66,8 @@ add_fingerprint(user) -/obj/structure/ladder/attack_paw(mob/user as mob) +/obj/structure/ladder/attack_paw(mob/user) return attack_hand(user) -/obj/structure/ladder/attackby(obj/item/weapon/W, mob/user as mob, params) +/obj/structure/ladder/attackby(obj/item/weapon/W, mob/user, params) return attack_hand(user) \ No newline at end of file diff --git a/code/game/objects/structures/lamarr_cage.dm b/code/game/objects/structures/lamarr_cage.dm index 7178f8c35ac..e1944e4d6bc 100644 --- a/code/game/objects/structures/lamarr_cage.dm +++ b/code/game/objects/structures/lamarr_cage.dm @@ -26,7 +26,7 @@ src.healthcheck() -/obj/structure/lamarr/bullet_act(var/obj/item/projectile/Proj) +/obj/structure/lamarr/bullet_act(obj/item/projectile/Proj) health -= Proj.damage ..() src.healthcheck() @@ -60,17 +60,17 @@ return -/obj/structure/lamarr/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/lamarr/attackby(obj/item/weapon/W, mob/user, params) user.changeNext_move(CLICK_CD_MELEE) src.health -= W.force src.healthcheck() ..() return -/obj/structure/lamarr/attack_paw(mob/user as mob) +/obj/structure/lamarr/attack_paw(mob/user) return src.attack_hand(user) -/obj/structure/lamarr/attack_hand(mob/user as mob) +/obj/structure/lamarr/attack_hand(mob/user) user.changeNext_move(CLICK_CD_MELEE) if (src.destroyed) return diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 957662253fb..d325cf514fb 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -50,7 +50,7 @@ else return -/obj/structure/lattice/attackby(obj/item/C as obj, mob/user as mob, params) +/obj/structure/lattice/attackby(obj/item/C, mob/user, params) var/turf/T = get_turf(src) if (istype(C, /obj/item/stack/tile/plasteel)) T.attackby(C, user) //BubbleWrap - hand this off to the underlying turf instead (for building plating) @@ -107,7 +107,7 @@ C.Deconstruct() ..() -/obj/structure/lattice/catwalk/attackby(obj/item/C as obj, mob/user as mob, params) +/obj/structure/lattice/catwalk/attackby(obj/item/C, mob/user, params) ..() if(istype(C, /obj/item/stack/cable_coil)) var/turf/T = get_turf(src) diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 50597091b3b..4901a0dc34b 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -9,7 +9,7 @@ var/shattered = 0 -/obj/structure/mirror/attack_hand(mob/user as mob) +/obj/structure/mirror/attack_hand(mob/user) if(shattered) return if(ishuman(user)) @@ -46,7 +46,7 @@ desc = "Oh no, seven years of bad luck!" -/obj/structure/mirror/bullet_act(var/obj/item/projectile/Proj) +/obj/structure/mirror/bullet_act(obj/item/projectile/Proj) if(prob(Proj.damage * 2)) if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) if(!shattered) @@ -56,7 +56,7 @@ ..() -/obj/structure/mirror/attackby(obj/item/I as obj, mob/living/user as mob, params) +/obj/structure/mirror/attackby(obj/item/I, mob/living/user, params) user.do_attack_animation(src) if(I.damtype == STAMINA) return @@ -72,7 +72,7 @@ playsound(src.loc, 'sound/effects/Glasshit.ogg', 70, 1) -/obj/structure/mirror/attack_alien(mob/living/user as mob) +/obj/structure/mirror/attack_alien(mob/living/user) user.do_attack_animation(src) if(islarva(user)) return if(shattered) @@ -82,7 +82,7 @@ shatter() -/obj/structure/mirror/attack_animal(mob/living/user as mob) +/obj/structure/mirror/attack_animal(mob/living/user) if(!isanimal(user)) return var/mob/living/simple_animal/M = user if(M.melee_damage_upper <= 0) return @@ -94,7 +94,7 @@ shatter() -/obj/structure/mirror/attack_slime(mob/living/user as mob) +/obj/structure/mirror/attack_slime(mob/living/user) user.do_attack_animation(src) if(shattered) playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1) @@ -123,7 +123,7 @@ choosable_races += S.id ..() -/obj/structure/mirror/magic/attack_hand(mob/user as mob) +/obj/structure/mirror/magic/attack_hand(mob/user) if(!ishuman(user)) return diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 526e9e3f028..d3565376d41 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -41,10 +41,10 @@ /obj/structure/bodycontainer/alter_health() return src.loc -/obj/structure/bodycontainer/attack_paw(mob/user as mob) +/obj/structure/bodycontainer/attack_paw(mob/user) return src.attack_hand(user) -/obj/structure/bodycontainer/attack_hand(mob/user as mob) +/obj/structure/bodycontainer/attack_hand(mob/user) if(locked) user << "It's locked." return @@ -57,7 +57,7 @@ close() add_fingerprint(user) -/obj/structure/bodycontainer/attackby(P as obj, mob/user as mob, params) +/obj/structure/bodycontainer/attackby(obj/P, mob/user, params) if (istype(P, /obj/item/weapon/pen)) var/t = stripped_input(user, "What would you like the label to be?", text("[]", name), null) if (user.get_active_hand() != P) @@ -159,7 +159,7 @@ var/global/list/crematoriums = new/list() return -/obj/structure/bodycontainer/crematorium/proc/cremate(mob/user as mob) +/obj/structure/bodycontainer/crematorium/proc/cremate(mob/user) if(locked) return //don't let you cremate something twice or w/e @@ -197,7 +197,7 @@ var/global/list/crematoriums = new/list() /* Crematorium Switch */ -/obj/machinery/crema_switch/attack_hand(mob/user as mob) +/obj/machinery/crema_switch/attack_hand(mob/user) if(src.allowed(usr)) for (var/obj/structure/bodycontainer/crematorium/C in crematoriums) if (C.id != id) @@ -208,7 +208,7 @@ Crematorium Switch usr << "Access denied." return -/obj/machinery/crema_switch/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/machinery/crema_switch/attackby(obj/item/W, mob/user, params) if(W.GetID()) attack_hand(user) else @@ -235,17 +235,17 @@ Crematorium Switch connected = null ..() -/obj/structure/tray/attack_paw(mob/user as mob) +/obj/structure/tray/attack_paw(mob/user) return src.attack_hand(user) -/obj/structure/tray/attack_hand(mob/user as mob) +/obj/structure/tray/attack_hand(mob/user) if (src.connected) connected.close() add_fingerprint(user) else user << "That's not connected to anything!" -/obj/structure/tray/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob) +/obj/structure/tray/MouseDrop_T(atom/movable/O as mob|obj, mob/user) if(!istype(O, /atom/movable) || O.anchored || !Adjacent(user) || !user.Adjacent(O) || O.loc == user) return if(!ismob(O)) diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm index f977e561a54..d0aa327980c 100644 --- a/code/game/objects/structures/musician.dm +++ b/code/game/objects/structures/musician.dm @@ -27,7 +27,7 @@ // note is a number from 1-7 for A-G // acc is either "b", "n", or "#" // oct is 1-8 (or 9 for C) -/datum/song/proc/playnote(var/note, var/acc as text, var/oct) +/datum/song/proc/playnote(note, acc as text, oct) // handle accidental -> B<>C of E<>F if(acc == "b" && (note == 3 || note == 6)) // C or F if(note == 3) @@ -63,7 +63,7 @@ continue M.playsound_local(source, soundfile, 100, falloff = 5) -/datum/song/proc/updateDialog(mob/user as mob) +/datum/song/proc/updateDialog(mob/user) instrumentObj.updateDialog() // assumes it's an object in world, override if otherwise /datum/song/proc/shouldStopPlaying(mob/user) @@ -74,7 +74,7 @@ else return 1 -/datum/song/proc/playsong(mob/user as mob) +/datum/song/proc/playsong(mob/user) while(repeat >= 0) var/cur_oct[7] var/cur_acc[7] @@ -119,7 +119,7 @@ repeat = 0 updateDialog(user) -/datum/song/proc/interact(mob/user as mob) +/datum/song/proc/interact(mob/user) var/dat = "" if(lines.len > 0) @@ -285,7 +285,7 @@ // subclass for handheld instruments, like violin /datum/song/handheld -/datum/song/handheld/updateDialog(mob/user as mob) +/datum/song/handheld/updateDialog(mob/user) instrumentObj.interact(user) /datum/song/handheld/shouldStopPlaying() @@ -328,23 +328,23 @@ song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded ..() -/obj/structure/piano/attack_hand(mob/user as mob) +/obj/structure/piano/attack_hand(mob/user) if(!user.IsAdvancedToolUser()) user << "You don't have the dexterity to do this!" return 1 interact(user) -/obj/structure/piano/attack_paw(mob/user as mob) +/obj/structure/piano/attack_paw(mob/user) return src.attack_hand(user) -/obj/structure/piano/interact(mob/user as mob) +/obj/structure/piano/interact(mob/user) if(!user || !anchored) return user.set_machine(src) song.interact(user) -/obj/structure/piano/attackby(obj/item/O as obj, mob/user as mob, params) +/obj/structure/piano/attackby(obj/item/O, mob/user, params) if (istype(O, /obj/item/weapon/wrench)) if (!anchored && !isinspace()) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index 7d8591217f6..54fb5414f9c 100644 --- a/code/game/objects/structures/noticeboard.dm +++ b/code/game/objects/structures/noticeboard.dm @@ -16,7 +16,7 @@ icon_state = "nboard0[notices]" //attaching papers!! -/obj/structure/noticeboard/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob, params) +/obj/structure/noticeboard/attackby(obj/item/weapon/O, mob/user, params) if(istype(O, /obj/item/weapon/paper)) if(notices < 5) if(!user.drop_item()) @@ -30,7 +30,7 @@ else user << "You reach to pin your paper to the board but hesitate. You are certain your paper will not be seen among the many others already attached." -/obj/structure/noticeboard/attack_hand(user as mob) +/obj/structure/noticeboard/attack_hand(mob/user) var/dat = "Noticeboard
    " for(var/obj/item/weapon/paper/P in src) dat += "[P.name] Write Remove
    " diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index 1676e9ae16c..027095266fb 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -39,7 +39,7 @@ FLOOR SAFES I.loc = src -/obj/structure/safe/proc/check_unlocked(mob/user as mob, canhear) +/obj/structure/safe/proc/check_unlocked(mob/user, canhear) if(user && canhear) if(tumbler_1_pos == tumbler_1_open) user << "You hear a [pick("tonk", "krunk", "plunk")] from [src]." @@ -72,7 +72,7 @@ FLOOR SAFES icon_state = initial(icon_state) -/obj/structure/safe/attack_hand(mob/user as mob) +/obj/structure/safe/attack_hand(mob/user) user.set_machine(src) var/dat = "
    " dat += "[open ? "Close" : "Open"] [src] | - [dial * 5] +" @@ -142,7 +142,7 @@ FLOOR SAFES updateUsrDialog() -/obj/structure/safe/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/structure/safe/attackby(obj/item/I, mob/user, params) if(open) if(I.w_class + space <= maxspace) space += I.w_class diff --git a/code/game/objects/structures/spirit_board.dm b/code/game/objects/structures/spirit_board.dm index 22d2333b092..ce2f47c59a2 100644 --- a/code/game/objects/structures/spirit_board.dm +++ b/code/game/objects/structures/spirit_board.dm @@ -14,17 +14,17 @@ desc = "[initial(desc)] The planchette is sitting at \"[planchette]\"." ..() -/obj/structure/spirit_board/attack_hand(mob/user as mob) +/obj/structure/spirit_board/attack_hand(mob/user) if(..()) return spirit_board_pick_letter(user) -/obj/structure/spirit_board/attack_ghost(mob/dead/observer/user as mob) +/obj/structure/spirit_board/attack_ghost(mob/dead/observer/user) spirit_board_pick_letter(user) -/obj/structure/spirit_board/proc/spirit_board_pick_letter(var/mob/M) +/obj/structure/spirit_board/proc/spirit_board_pick_letter(mob/M) if(!spirit_board_checks(M)) return 0 @@ -43,7 +43,7 @@ visible_message("The planchette slowly moves... and stops at the letter \"[planchette]\".") -/obj/structure/spirit_board/proc/spirit_board_checks(var/mob/M) +/obj/structure/spirit_board/proc/spirit_board_checks(mob/M) //cooldown var/bonus = 0 if(M.ckey == lastuser) diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm index d68eef7270d..00ec5462738 100644 --- a/code/game/objects/structures/statues.dm +++ b/code/game/objects/structures/statues.dm @@ -16,7 +16,7 @@ density = 0 ..() -/obj/structure/statue/attackby(obj/item/weapon/W, mob/living/user as mob, params) +/obj/structure/statue/attackby(obj/item/weapon/W, mob/living/user, params) add_fingerprint(user) user.changeNext_move(CLICK_CD_MELEE) if(istype(W, /obj/item/weapon/wrench)) @@ -80,7 +80,7 @@ ..() CheckHardness() -/obj/structure/statue/attack_hand(mob/living/user as mob) +/obj/structure/statue/attack_hand(mob/living/user) user.changeNext_move(CLICK_CD_MELEE) add_fingerprint(user) user.visible_message("[user] rubs some dust off from the [name]'s surface.", \ @@ -198,14 +198,14 @@ PlasmaBurn(exposed_temperature) -/obj/structure/statue/plasma/bullet_act(var/obj/item/projectile/Proj) +/obj/structure/statue/plasma/bullet_act(obj/item/projectile/Proj) if(istype(Proj,/obj/item/projectile/beam)) PlasmaBurn(2500) else if(istype(Proj,/obj/item/projectile/ion)) PlasmaBurn(500) ..() -/obj/structure/statue/plasma/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/statue/plasma/attackby(obj/item/weapon/W, mob/user, params) if(is_hot(W) > 300)//If the temperature of the object is over 300, then ignite message_admins("Plasma statue ignited by [key_name_admin(user)](?) (FLW) in ([x],[y],[z] - JMP)",0,1) log_game("Plasma statue ignited by [key_name(user)] in ([x],[y],[z])") diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm index 0a7112be964..6f96e87bdbb 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm @@ -15,7 +15,7 @@ nest_overlay = image('icons/mob/alien.dmi', "nestoverlay", layer=MOB_LAYER - 0.2) return ..() -/obj/structure/stool/bed/nest/user_unbuckle_mob(mob/user as mob) +/obj/structure/stool/bed/nest/user_unbuckle_mob(mob/user) if(buckled_mob && buckled_mob.buckled == src) var/mob/living/M = buckled_mob if(M != user) @@ -42,7 +42,7 @@ unbuckle_mob() add_fingerprint(user) -/obj/structure/stool/bed/nest/user_buckle_mob(mob/M as mob, mob/user as mob) +/obj/structure/stool/bed/nest/user_buckle_mob(mob/M, mob/user) if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.restrained() || user.stat || M.buckled || istype(user, /mob/living/silicon/pai) ) return @@ -71,7 +71,7 @@ M.layer = initial(M.layer) overlays -= nest_overlay -/obj/structure/stool/bed/nest/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/stool/bed/nest/attackby(obj/item/weapon/W, mob/user, params) var/aforce = W.force health = max(0, health - aforce) playsound(loc, 'sound/effects/attackblob.ogg', 100, 1) diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 731c32880d7..2d97ac46aec 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -33,7 +33,7 @@ . = 0 buckled_mob.buckled = src -/obj/structure/stool/bed/Process_Spacemove(var/movement_dir = 0) +/obj/structure/stool/bed/Process_Spacemove(movement_dir = 0) if(buckled_mob) return buckled_mob.Process_Spacemove(movement_dir) return ..() @@ -43,10 +43,10 @@ return 1 return ..() -/obj/structure/stool/bed/attack_paw(mob/user as mob) +/obj/structure/stool/bed/attack_paw(mob/user) return src.attack_hand(user) -/obj/structure/stool/bed/attack_animal(var/mob/living/simple_animal/M)//No more buckling hostile mobs to chairs to render them immobile forever +/obj/structure/stool/bed/attack_animal(mob/living/simple_animal/M)//No more buckling hostile mobs to chairs to render them immobile forever if(M.environment_smash) new /obj/item/stack/sheet/metal(src.loc) qdel(src) diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 1dea5a15dde..9335535a873 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -15,7 +15,7 @@ ..() handle_rotation() -/obj/structure/stool/bed/chair/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/stool/bed/chair/attackby(obj/item/weapon/W, mob/user, params) ..() if(istype(W, /obj/item/assembly/shock_kit)) if(!user.drop_item()) @@ -28,7 +28,7 @@ SK.loc = E SK.master = E qdel(src) -/obj/structure/stool/bed/chair/attack_tk(mob/user as mob) +/obj/structure/stool/bed/chair/attack_tk(mob/user) if(buckled_mob) ..() else @@ -88,7 +88,7 @@ name = "wooden chair" desc = "Old is never too old to not be in fashion." -/obj/structure/stool/bed/chair/wood/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/stool/bed/chair/wood/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) new /obj/item/stack/sheet/mineral/wood(src.loc) diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm index 9558537ebc8..696ed292eb9 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm @@ -25,7 +25,7 @@ new /obj/item/stack/sheet/metal(src.loc) qdel(src) -/obj/structure/stool/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/stool/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) new /obj/item/stack/sheet/metal(src.loc) diff --git a/code/game/objects/structures/table_frames.dm b/code/game/objects/structures/table_frames.dm index 18288c5f670..0df8d67cd10 100644 --- a/code/game/objects/structures/table_frames.dm +++ b/code/game/objects/structures/table_frames.dm @@ -20,7 +20,7 @@ var/framestack = /obj/item/stack/rods var/framestackamount = 2 -/obj/structure/table_frame/attackby(var/obj/item/I, mob/user, params) +/obj/structure/table_frame/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/wrench)) user << "You start disassembling [src]..." playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) @@ -77,7 +77,7 @@ framestackamount = 2 burn_state = 0 //Burnable -/obj/structure/table_frame/wood/attackby(var/obj/item/I, mob/user, params) +/obj/structure/table_frame/wood/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/wrench)) ..() if(istype(I, /obj/item/stack/sheet/mineral/wood)) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 02c24df2966..37f4730a836 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -193,7 +193,7 @@ #define TBL_DISASSEMBLE 2 #define TBL_DECONSTRUCT 3 -/obj/structure/table/proc/table_destroy(var/destroy_type, var/mob/user) +/obj/structure/table/proc/table_destroy(destroy_type, mob/user) if(destroy_type == TBL_DESTROY) for(var/i = 1, i <= framestackamount, i++) @@ -318,7 +318,7 @@ buildstack = /obj/item/stack/sheet/plasteel canSmoothWith = list(/obj/structure/table/reinforced, /obj/structure/table) -/obj/structure/table/reinforced/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/table/reinforced/attackby(obj/item/weapon/W, mob/user, params) if (istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0, user)) @@ -397,7 +397,7 @@ else return 0 -/obj/structure/rack/MouseDrop_T(obj/O as obj, mob/user as mob) +/obj/structure/rack/MouseDrop_T(obj/O, mob/user) if ((!( istype(O, /obj/item/weapon) ) || user.get_active_hand() != O)) return if(isrobot(user)) @@ -409,7 +409,7 @@ step(O, get_dir(O, src)) return -/obj/structure/rack/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/rack/attackby(obj/item/weapon/W, mob/user, params) if (istype(W, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) rack_destroy() @@ -483,7 +483,7 @@ flags = CONDUCT materials = list(MAT_METAL=3750) -/obj/item/weapon/rack_parts/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/rack_parts/attackby(obj/item/weapon/W, mob/user, params) ..() if (istype(W, /obj/item/weapon/wrench)) new /obj/item/stack/sheet/metal( user.loc ) @@ -491,7 +491,7 @@ return return -/obj/item/weapon/rack_parts/attack_self(mob/user as mob) +/obj/item/weapon/rack_parts/attack_self(mob/user) user << "You start constructing rack..." if (do_after(user, 50, target = src)) if(!user.drop_item()) diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index 3cc45f3ac5e..67a0b441ce0 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -31,10 +31,10 @@ if(1 to 4) overlays += "plasma-[plasmatanks]" if(5 to INFINITY) overlays += "plasma-5" -/obj/structure/dispenser/attack_paw(mob/user as mob) +/obj/structure/dispenser/attack_paw(mob/user) return src.attack_hand(user) -/obj/structure/dispenser/attack_hand(mob/user as mob) +/obj/structure/dispenser/attack_hand(mob/user) if(!user.IsAdvancedToolUser()) user << "You don't have the dexterity to do this!" return 1 @@ -47,7 +47,7 @@ return -/obj/structure/dispenser/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/structure/dispenser/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/tank/internals/oxygen) || istype(I, /obj/item/weapon/tank/internals/air) || istype(I, /obj/item/weapon/tank/internals/anesthetic)) if(oxygentanks < 10) if(!user.drop_item()) diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm index a767d3a4b25..0e8991bf7c0 100644 --- a/code/game/objects/structures/transit_tubes/station.dm +++ b/code/game/objects/structures/transit_tubes/station.dm @@ -42,7 +42,7 @@ //pod insertion -/obj/structure/transit_tube/station/MouseDrop_T(obj/structure/c_transit_tube_pod/R as obj, mob/user as mob) +/obj/structure/transit_tube/station/MouseDrop_T(obj/structure/c_transit_tube_pod/R, mob/user) if(!user.canmove || user.stat || user.restrained()) return if (!istype(R) || get_dist(user, src) > 1 || get_dist(src,R) > 1) @@ -58,7 +58,7 @@ qdel(R) -/obj/structure/transit_tube/station/attack_hand(mob/user as mob) +/obj/structure/transit_tube/station/attack_hand(mob/user) if(!pod_moving) for(var/obj/structure/transit_tube_pod/pod in loc) if(!pod.moving && pod.dir in directions()) diff --git a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm index f2ad5050c3b..e226e7215e6 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm @@ -10,7 +10,7 @@ anchored = 0.0 //wrapper for turn that changes the transit tube formatted icon_state instead of the dir -/obj/structure/c_transit_tube/proc/tube_turn(var/angle) +/obj/structure/c_transit_tube/proc/tube_turn(angle) var/list/badtubes = list("W-E", "W-E-Pass", "S-N", "S-N-Pass", "SW-NE", "SE-NW") var/list/split_text = text2list(icon_state, "-") for(var/i=1; i<=split_text.len; i++) @@ -77,7 +77,7 @@ R.generate_automatic_corners(R.tube_dirs) return R -/obj/structure/c_transit_tube/attackby(var/obj/item/I, var/mob/user, params) +/obj/structure/c_transit_tube/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/wrench)) user << "You start attaching the [name]..." src.add_fingerprint(user) diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm index b846d4d847d..d56b46a45c6 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm @@ -25,7 +25,7 @@ ..() -/obj/structure/transit_tube_pod/attackby(var/obj/item/I, var/mob/user, params) +/obj/structure/transit_tube_pod/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/crowbar)) if(!moving) for(var/obj/structure/transit_tube/station/T in loc) @@ -60,7 +60,7 @@ return 1 else return ..() -/obj/structure/transit_tube_pod/proc/follow_tube(var/reverse_launch) +/obj/structure/transit_tube_pod/proc/follow_tube(reverse_launch) if(moving) return diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index de1e9952612..327159e3ad7 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -451,12 +451,12 @@ name = "puddle" icon_state = "puddle" -/obj/structure/sink/puddle/attack_hand(mob/M as mob) +/obj/structure/sink/puddle/attack_hand(mob/M) icon_state = "puddle-splash" ..() icon_state = "puddle" -/obj/structure/sink/puddle/attackby(obj/item/O as obj, mob/user as mob, params) +/obj/structure/sink/puddle/attackby(obj/item/O, mob/user, params) icon_state = "puddle-splash" ..() icon_state = "puddle" \ No newline at end of file diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index d8c0442b91b..867b7e5723f 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -53,13 +53,13 @@ else return 1 -/obj/structure/windoor_assembly/CanAtmosPass(var/turf/T) +/obj/structure/windoor_assembly/CanAtmosPass(turf/T) if(get_dir(loc, T) == dir) return !density else return 1 -/obj/structure/windoor_assembly/CheckExit(atom/movable/mover as mob|obj, turf/target as turf) +/obj/structure/windoor_assembly/CheckExit(atom/movable/mover as mob|obj, turf/target) if(istype(mover) && mover.checkpass(PASSGLASS)) return 1 if(get_dir(loc, target) == dir) @@ -68,7 +68,7 @@ return 1 -/obj/structure/windoor_assembly/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/structure/windoor_assembly/attackby(obj/item/W, mob/user, params) //I really should have spread this out across more states but thin little windoors are hard to sprite. add_fingerprint(user) switch(state) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 5a4a1ef3706..e836e396187 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -41,7 +41,7 @@ return -/obj/structure/window/bullet_act(var/obj/item/projectile/Proj) +/obj/structure/window/bullet_act(obj/item/projectile/Proj) if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) health -= Proj.damage update_nearby_icons() @@ -83,7 +83,7 @@ return 1 -/obj/structure/window/CheckExit(atom/movable/O as mob|obj, target as turf) +/obj/structure/window/CheckExit(atom/movable/O as mob|obj, target) if(istype(O) && O.checkpass(PASSGLASS)) return 1 if(get_dir(O.loc, target) == dir) @@ -115,7 +115,7 @@ spawnfragments() update_nearby_icons() -/obj/structure/window/attack_tk(mob/user as mob) +/obj/structure/window/attack_tk(mob/user) user.changeNext_move(CLICK_CD_MELEE) user.visible_message("Something knocks on [src].") add_fingerprint(user) @@ -131,7 +131,7 @@ hit(50) return 1 -/obj/structure/window/attack_hand(mob/user as mob) +/obj/structure/window/attack_hand(mob/user) if(!can_be_reached(user)) return user.changeNext_move(CLICK_CD_MELEE) @@ -139,11 +139,11 @@ add_fingerprint(user) playsound(loc, 'sound/effects/Glassknock.ogg', 50, 1) -/obj/structure/window/attack_paw(mob/user as mob) +/obj/structure/window/attack_paw(mob/user) return attack_hand(user) -/obj/structure/window/proc/attack_generic(mob/user as mob, damage = 0) //used by attack_alien, attack_animal, and attack_slime +/obj/structure/window/proc/attack_generic(mob/user, damage = 0) //used by attack_alien, attack_animal, and attack_slime if(!can_be_reached(user)) return user.changeNext_move(CLICK_CD_MELEE) @@ -156,13 +156,13 @@ playsound(loc, 'sound/effects/Glasshit.ogg', 100, 1) -/obj/structure/window/attack_alien(mob/living/user as mob) +/obj/structure/window/attack_alien(mob/living/user) user.do_attack_animation(src) if(islarva(user)) return attack_generic(user, 15) update_nearby_icons() -/obj/structure/window/attack_animal(mob/living/user as mob) +/obj/structure/window/attack_animal(mob/living/user) if(!isanimal(user)) return @@ -174,7 +174,7 @@ attack_generic(M, M.melee_damage_upper) update_nearby_icons() -/obj/structure/window/attack_slime(mob/living/simple_animal/slime/user as mob) +/obj/structure/window/attack_slime(mob/living/simple_animal/slime/user) user.do_attack_animation(src) if(!user.is_adult) return @@ -282,7 +282,7 @@ return 0 return 1 -/obj/structure/window/proc/hit(var/damage, var/sound_effect = 1) +/obj/structure/window/proc/hit(damage, sound_effect = 1) if(reinf) damage *= 0.5 health = max(0, health - damage) diff --git a/code/game/objects/weapons.dm b/code/game/objects/weapons.dm index adca34f56e8..803f29cb1aa 100644 --- a/code/game/objects/weapons.dm +++ b/code/game/objects/weapons.dm @@ -10,7 +10,7 @@ if(damtype == "brute") hitsound = "swing_hit" -/obj/item/weapon/Bump(mob/M as mob) +/obj/item/weapon/Bump(mob/M) spawn(0) ..() return \ No newline at end of file diff --git a/code/game/pooling/pool.dm b/code/game/pooling/pool.dm index df250d767b6..d86be49a5a1 100644 --- a/code/game/pooling/pool.dm +++ b/code/game/pooling/pool.dm @@ -34,7 +34,7 @@ var/global/list/GlobalPool = list() //Or a list of arguments //Either way it gets passed to new -/proc/PoolOrNew(var/get_type,var/second_arg) +/proc/PoolOrNew(get_type,second_arg) if(!get_type) return @@ -48,7 +48,7 @@ var/global/list/GlobalPool = list() . = new get_type (second_arg) -/proc/GetFromPool(var/get_type,var/second_arg) +/proc/GetFromPool(get_type,second_arg) if(!get_type) return @@ -78,7 +78,7 @@ var/global/list/GlobalPool = list() return pooled -/proc/PlaceInPool(var/datum/diver, destroy = 1) +/proc/PlaceInPool(datum/diver, destroy = 1) if(!istype(diver)) return diff --git a/code/game/say.dm b/code/game/say.dm index 0024ab48136..18565d25950 100644 --- a/code/game/say.dm +++ b/code/game/say.dm @@ -125,7 +125,7 @@ var/list/freqtospan = list( output = "[output]'>" return output -/mob/living/proc/say_test(var/text) +/mob/living/proc/say_test(text) var/ending = copytext(text, length(text)) if (ending == "?") return "1" diff --git a/code/game/skincmd.dm b/code/game/skincmd.dm index fd9131538e4..7a784da5a04 100644 --- a/code/game/skincmd.dm +++ b/code/game/skincmd.dm @@ -1,7 +1,7 @@ /mob/var/skincmds = list() /obj/proc/SkinCmd(mob/user as mob, var/data as text) -/proc/SkinCmdRegister(var/mob/user, var/name as text, var/O as obj) +/proc/SkinCmdRegister(mob/user, name as text, obj/O) user.skincmds[name] = O /mob/verb/skincmd(data as text) diff --git a/code/game/sound.dm b/code/game/sound.dm index 97eb39aa9b4..529e3d906fc 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -1,4 +1,4 @@ -/proc/playsound(var/atom/source, soundin, vol as num, vary, extrarange as num, falloff, surround = 1) +/proc/playsound(atom/source, soundin, vol as num, vary, extrarange as num, falloff, surround = 1) soundin = get_sfx(soundin) // same sound for everyone @@ -20,7 +20,7 @@ M.playsound_local(turf_source, soundin, vol, vary, frequency, falloff, surround) -/atom/proc/playsound_local(var/turf/turf_source, soundin, vol as num, vary, frequency, falloff, surround = 1) +/atom/proc/playsound_local(turf/turf_source, soundin, vol as num, vary, frequency, falloff, surround = 1) soundin = get_sfx(soundin) var/sound/S = sound(soundin) @@ -73,7 +73,7 @@ src << S -/mob/playsound_local(var/turf/turf_source, soundin, vol as num, vary, frequency, falloff, surround = 1) +/mob/playsound_local(turf/turf_source, soundin, vol as num, vary, frequency, falloff, surround = 1) if(!client || ear_deaf > 0) return ..() diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm index 1b1afc4f19a..58e7ae67fd2 100644 --- a/code/game/turfs/simulated.dm +++ b/code/game/turfs/simulated.dm @@ -17,7 +17,7 @@ /turf/simulated/proc/burn_tile() -/turf/simulated/proc/MakeSlippery(var/wet_setting = 1) // 1 = Water, 2 = Lube +/turf/simulated/proc/MakeSlippery(wet_setting = 1) // 1 = Water, 2 = Lube if(wet >= wet_setting) return wet = wet_setting diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 92da02a9f96..e4a1df58ab5 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -84,7 +84,7 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3"," update_visuals(air) return 1 -/turf/simulated/floor/attack_paw(mob/user as mob) +/turf/simulated/floor/attack_paw(mob/user) return src.attack_hand(user) /turf/simulated/floor/proc/gets_drilled() @@ -123,7 +123,7 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3"," W.update_icon() return W -/turf/simulated/floor/attackby(obj/item/C as obj, mob/user as mob, params) +/turf/simulated/floor/attackby(obj/item/C, mob/user, params) if(!C || !user) return 1 if(..()) diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index d09281d8e70..887ec3112fe 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -9,7 +9,7 @@ floor_tile = /obj/item/stack/tile/wood broken_states = list("wood-broken", "wood-broken2", "wood-broken3", "wood-broken4", "wood-broken5", "wood-broken6", "wood-broken7") -/turf/simulated/floor/wood/attackby(obj/item/C as obj, mob/user as mob, params) +/turf/simulated/floor/wood/attackby(obj/item/C, mob/user, params) if(..()) return if(istype(C, /obj/item/weapon/screwdriver)) @@ -33,7 +33,7 @@ spawn(1) update_icon() -/turf/simulated/floor/grass/attackby(obj/item/C as obj, mob/user as mob, params) +/turf/simulated/floor/grass/attackby(obj/item/C, mob/user, params) if(..()) return if(istype(C, /obj/item/weapon/shovel)) diff --git a/code/game/turfs/simulated/floor/light_floor.dm b/code/game/turfs/simulated/floor/light_floor.dm index abb5c5c4fab..afb0d84650c 100644 --- a/code/game/turfs/simulated/floor/light_floor.dm +++ b/code/game/turfs/simulated/floor/light_floor.dm @@ -39,10 +39,10 @@ else SetLuminosity(0) icon_state = "light_off" -/turf/simulated/floor/light/ChangeTurf(turf/T as turf) +/turf/simulated/floor/light/ChangeTurf(turf/T) SetLuminosity(0) ..() -/turf/simulated/floor/light/attack_hand(mob/user as mob) +/turf/simulated/floor/light/attack_hand(mob/user) if(!on) on = 1 currentcolor = 1 @@ -59,7 +59,7 @@ -/turf/simulated/floor/light/attackby(obj/item/C as obj, mob/user as mob, params) +/turf/simulated/floor/light/attackby(obj/item/C, mob/user, params) if(..()) return if(istype(C,/obj/item/weapon/light/bulb)) //only for light tiles diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index edb1fe79b28..6da2419b96b 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -25,7 +25,7 @@ if(!broken && !burnt) icon_state = icon_plating //Because asteroids are 'platings' too. -/turf/simulated/floor/plating/attackby(obj/item/C as obj, mob/user as mob, params) +/turf/simulated/floor/plating/attackby(obj/item/C, mob/user, params) if(..()) return if(istype(C, /obj/item/stack/rods)) @@ -87,12 +87,12 @@ /turf/simulated/floor/engine/burn_tile() return //unburnable -/turf/simulated/floor/engine/make_plating(var/force = 0) +/turf/simulated/floor/engine/make_plating(force = 0) if(force) ..() return //unplateable -/turf/simulated/floor/engine/attackby(obj/item/weapon/C as obj, mob/user as mob, params) +/turf/simulated/floor/engine/attackby(obj/item/weapon/C, mob/user, params) if(!C || !user) return if(istype(C, /obj/item/weapon/wrench)) diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index eb87aeb3173..fb1d315ce58 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -95,12 +95,12 @@ visible_message("[src.name] smashes through the wall!") playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1) -/turf/simulated/wall/attack_paw(mob/living/user as mob) +/turf/simulated/wall/attack_paw(mob/living/user) user.changeNext_move(CLICK_CD_MELEE) return src.attack_hand(user) -/turf/simulated/wall/attack_animal(var/mob/living/simple_animal/M) +/turf/simulated/wall/attack_animal(mob/living/simple_animal/M) M.changeNext_move(CLICK_CD_MELEE) M.do_attack_animation(src) if(M.environment_smash >= 2) @@ -122,7 +122,7 @@ user << text("You punch the wall.") return 1 -/turf/simulated/wall/attack_hand(mob/user as mob) +/turf/simulated/wall/attack_hand(mob/user) user.changeNext_move(CLICK_CD_MELEE) user << "You push the wall but nothing happens!" playsound(src, 'sound/weapons/Genhit.ogg', 25, 1) @@ -131,7 +131,7 @@ return -/turf/simulated/wall/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/turf/simulated/wall/attackby(obj/item/weapon/W, mob/user, params) user.changeNext_move(CLICK_CD_MELEE) if (!user.IsAdvancedToolUser()) user << "You don't have the dexterity to do this!" @@ -157,7 +157,7 @@ return -/turf/simulated/wall/proc/try_wallmount(obj/item/weapon/W as obj, mob/user as mob, turf/T as turf) +/turf/simulated/wall/proc/try_wallmount(obj/item/weapon/W, mob/user, turf/T) //check for wall mounted frames if(istype(W,/obj/item/apc_frame)) var/obj/item/apc_frame/AH = W @@ -187,7 +187,7 @@ return 0 -/turf/simulated/wall/proc/try_decon(obj/item/weapon/W as obj, mob/user as mob, turf/T as turf) +/turf/simulated/wall/proc/try_decon(obj/item/weapon/W, mob/user, turf/T) if( istype(W, /obj/item/weapon/weldingtool) ) var/obj/item/weapon/weldingtool/WT = W if( WT.remove_fuel(0,user) ) @@ -214,7 +214,7 @@ return 0 -/turf/simulated/wall/proc/try_destroy(obj/item/weapon/W as obj, mob/user as mob, turf/T as turf) +/turf/simulated/wall/proc/try_destroy(obj/item/weapon/W, mob/user, turf/T) if(istype(W, /obj/item/weapon/pickaxe/drill/jackhammer)) var/obj/item/weapon/pickaxe/drill/jackhammer/D = W if( !istype(src, /turf/simulated/wall) || !user || !W || !T ) @@ -227,7 +227,7 @@ return 0 -/turf/simulated/wall/proc/thermitemelt(mob/user as mob) +/turf/simulated/wall/proc/thermitemelt(mob/user) overlays = list() var/obj/effect/overlay/O = new/obj/effect/overlay( src ) O.name = "thermite" diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm index 02f1fd81dc5..78f34991e30 100644 --- a/code/game/turfs/simulated/walls_mineral.dm +++ b/code/game/turfs/simulated/walls_mineral.dm @@ -45,7 +45,7 @@ explosion_block = 3 canSmoothWith = list(/turf/simulated/wall/mineral/diamond, /obj/structure/falsewall/diamond) -/turf/simulated/wall/mineral/diamond/thermitemelt(mob/user as mob) +/turf/simulated/wall/mineral/diamond/thermitemelt(mob/user) return /turf/simulated/wall/mineral/clown @@ -89,11 +89,11 @@ return return -/turf/simulated/wall/mineral/uranium/attack_hand(mob/user as mob) +/turf/simulated/wall/mineral/uranium/attack_hand(mob/user) radiate() ..() -/turf/simulated/wall/mineral/uranium/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/turf/simulated/wall/mineral/uranium/attackby(obj/item/weapon/W, mob/user, params) radiate() ..() @@ -111,7 +111,7 @@ thermal_conductivity = 0.04 canSmoothWith = list(/turf/simulated/wall/mineral/plasma, /obj/structure/falsewall/plasma) -/turf/simulated/wall/mineral/plasma/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/turf/simulated/wall/mineral/plasma/attackby(obj/item/weapon/W, mob/user, params) if(is_hot(W) > 300)//If the temperature of the object is over 300, then ignite message_admins("Plasma wall ignited by [key_name_admin(user)](?) (FLW) in ([x],[y],[z] - JMP)",0,1) log_game("Plasma wall ignited by [key_name(user)] in ([x],[y],[z])") diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm index c1642ac09c1..3555e99b8cf 100644 --- a/code/game/turfs/simulated/walls_reinforced.dm +++ b/code/game/turfs/simulated/walls_reinforced.dm @@ -21,7 +21,7 @@ builtin_sheet.loc = src new /obj/item/stack/sheet/metal(src, 2) -/turf/simulated/wall/r_wall/attack_animal(var/mob/living/simple_animal/M) +/turf/simulated/wall/r_wall/attack_animal(mob/living/simple_animal/M) M.changeNext_move(CLICK_CD_MELEE) if(M.environment_smash == 3) dismantle_wall(1) @@ -30,7 +30,7 @@ else M << "This wall is far too strong for you to destroy." -/turf/simulated/wall/r_wall/try_destroy(obj/item/weapon/W as obj, mob/user as mob, turf/T as turf) +/turf/simulated/wall/r_wall/try_destroy(obj/item/weapon/W, mob/user, turf/T) if(istype(W, /obj/item/weapon/pickaxe/drill/jackhammer)) var/obj/item/weapon/pickaxe/drill/jackhammer/D = W user << "You begin to smash though the [name]..." @@ -59,7 +59,7 @@ return 1 return 0 -/turf/simulated/wall/r_wall/try_decon(obj/item/weapon/W as obj, mob/user as mob, turf/T as turf) +/turf/simulated/wall/r_wall/try_decon(obj/item/weapon/W, mob/user, turf/T) //DECONSTRUCTION switch(d_state) if(0) diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index cfb2758ce80..a554f700dc0 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -30,7 +30,7 @@ return SetLuminosity(0) -/turf/space/attack_paw(mob/user as mob) +/turf/space/attack_paw(mob/user) return src.attack_hand(user) /turf/space/attackby(obj/item/C, mob/user, params) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 6edae35f9e9..36813272300 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -43,7 +43,7 @@ SSair.add_to_active(T) ..() -/turf/attack_hand(mob/user as mob) +/turf/attack_hand(mob/user) user.Move_Pulled(src) /turf/attackby(obj/item/C, mob/user, params) @@ -126,7 +126,7 @@ qdel(L) //Creates a new turf -/turf/proc/ChangeTurf(var/path) +/turf/proc/ChangeTurf(path) if(!path) return if(path == type) return src diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index d0f2ca01bc9..eb9bbc56c0f 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -58,7 +58,7 @@ else C << "OOC: [keyname]: [msg]" -/proc/toggle_ooc(var/toggle = null) +/proc/toggle_ooc(toggle = null) if(toggle != null) //if we're specifically en/disabling ooc if(toggle != ooc_allowed) ooc_allowed = toggle diff --git a/code/modules/admin/DB ban/functions.dm b/code/modules/admin/DB ban/functions.dm index 31fa0254c7a..e52011f5ba6 100644 --- a/code/modules/admin/DB ban/functions.dm +++ b/code/modules/admin/DB ban/functions.dm @@ -1,7 +1,7 @@ #define MAX_ADMIN_BANS_PER_ADMIN 1 //Either pass the mob you wish to ban in the 'banned_mob' attribute, or the banckey, banip and bancid variables. If both are passed, the mob takes priority! If a mob is not passed, banckey is the minimum that needs to be passed! banip and bancid are optional. -/datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration = -1, var/reason, var/job = "", var/rounds = 0, var/banckey = null, var/banip = null, var/bancid = null) +/datum/admins/proc/DB_ban_record(bantype, mob/banned_mob, duration = -1, reason, job = "", rounds = 0, banckey = null, banip = null, bancid = null) if(!check_rights(R_BAN)) return @@ -138,7 +138,7 @@ del(banned_mob.client) -/datum/admins/proc/DB_ban_unban(var/ckey, var/bantype, var/job = "") +/datum/admins/proc/DB_ban_unban(ckey, bantype, job = "") if(!check_rights(R_BAN)) return @@ -211,7 +211,7 @@ DB_ban_unban_by_id(ban_id) -/datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null) +/datum/admins/proc/DB_ban_edit(banid = null, param = null) if(!check_rights(R_BAN)) return @@ -271,7 +271,7 @@ usr << "Cancelled" return -/datum/admins/proc/DB_ban_unban_by_id(var/id) +/datum/admins/proc/DB_ban_unban_by_id(id) if(!check_rights(R_BAN)) return @@ -323,7 +323,7 @@ holder.DB_ban_panel() -/datum/admins/proc/DB_ban_panel(var/playerckey = null, var/adminckey = null) +/datum/admins/proc/DB_ban_panel(playerckey = null, adminckey = null) if(!usr.client) return diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm index c6f7d383936..c1716c470de 100644 --- a/code/modules/admin/NewBan.dm +++ b/code/modules/admin/NewBan.dm @@ -2,7 +2,7 @@ var/CMinutes = null var/savefile/Banlist -/proc/CheckBan(var/ckey, var/id, var/address) +/proc/CheckBan(ckey, id, address) if(!Banlist) // if Banlist cannot be located for some reason LoadBans() // try to load the bans if(!Banlist) // uh oh, can't find bans! diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index d6efe36d348..9d8c74ea4f8 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -4,14 +4,14 @@ var/global/floorIsLava = 0 //////////////////////////////// -/proc/message_admins(var/msg) +/proc/message_admins(msg) msg = "ADMIN LOG: [msg]" admins << msg ///////////////////////////////////////////////////////////////////////////////////////////////Panels -/datum/admins/proc/show_player_panel(var/mob/M in mob_list) +/datum/admins/proc/show_player_panel(mob/M in mob_list) set category = "Admin" set name = "Show Player Panel" set desc="Edit player (respawn, ban, heal, etc)" @@ -558,7 +558,7 @@ var/global/floorIsLava = 0 log_admin("[key_name(usr)] set the pre-game delay to [newtime] seconds.") feedback_add_details("admin_verb","DELAY") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/admins/proc/unprison(var/mob/M in mob_list) +/datum/admins/proc/unprison(mob/M in mob_list) set category = "Admin" set name = "Unprison" if (M.z == ZLEVEL_CENTCOM) @@ -589,7 +589,7 @@ var/global/floorIsLava = 0 else return "Error: Invalid sabotage target: [target]" */ -/datum/admins/proc/spawn_atom(var/object as text) +/datum/admins/proc/spawn_atom(object as text) set category = "Debug" set desc = "(atom path) Spawn an atom" set name = "Spawn" @@ -622,7 +622,7 @@ var/global/floorIsLava = 0 feedback_add_details("admin_verb","SA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/admins/proc/show_traitor_panel(var/mob/M in mob_list) +/datum/admins/proc/show_traitor_panel(mob/M in mob_list) set category = "Admin" set desc = "Edit mobs's memory and role" set name = "Show Traitor Panel" @@ -746,7 +746,7 @@ var/global/floorIsLava = 0 //Kicks all the clients currently in the lobby. The second parameter (kick_only_afk) determins if an is_afk() check is ran, or if all clients are kicked //defaults to kicking everyone (afk + non afk clients in the lobby) //returns a list of ckeys of the kicked clients -/proc/kick_clients_in_lobby(var/message, var/kick_only_afk = 0) +/proc/kick_clients_in_lobby(message, kick_only_afk = 0) var/list/kicked_client_names = list() for(var/client/C in clients) if(istype(C.mob, /mob/new_player)) @@ -760,7 +760,7 @@ var/global/floorIsLava = 0 //returns 1 to let the dragdrop code know we are trapping this event //returns 0 if we don't plan to trap the event -/datum/admins/proc/cmd_ghost_drag(var/mob/dead/observer/frommob, var/mob/living/tomob) +/datum/admins/proc/cmd_ghost_drag(mob/dead/observer/frommob, mob/living/tomob) //this is the exact two check rights checks required to edit a ckey with vv. if (!check_rights(R_VAREDIT,0) || !check_rights(R_SPAWN|R_DEBUG,0)) diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm index 543bc79d287..b542204bd23 100644 --- a/code/modules/admin/admin_investigate.dm +++ b/code/modules/admin/admin_investigate.dm @@ -8,14 +8,14 @@ #define INVESTIGATE_DIR "data/investigate/" //SYSTEM -/proc/investigate_subject2file(var/subject) +/proc/investigate_subject2file(subject) return file("[INVESTIGATE_DIR][subject].html") /proc/investigate_reset() if(fdel(INVESTIGATE_DIR)) return 1 return 0 -/atom/proc/investigate_log(var/message, var/subject) +/atom/proc/investigate_log(message, subject) if(!message) return var/F = investigate_subject2file(subject) if(!F) return diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 4f157aadda7..194a4437e55 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -462,7 +462,7 @@ var/list/admin_verbs_hideable = list( message_admins("[ckey] creating an admin explosion at [epicenter.loc].") feedback_add_details("admin_verb","DB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/give_spell(mob/T as mob in mob_list) +/client/proc/give_spell(mob/T in mob_list) set category = "Fun" set name = "Give Spell" set desc = "Gives a spell to a mob." @@ -485,7 +485,7 @@ var/list/admin_verbs_hideable = list( message_admins("Spells given to mindless mobs will not be transferred in mindswap or cloning!") -/client/proc/give_disease(mob/T as mob in mob_list) +/client/proc/give_disease(mob/T in mob_list) set category = "Fun" set name = "Give Disease" set desc = "Gives a Disease to a mob." @@ -496,7 +496,7 @@ var/list/admin_verbs_hideable = list( log_admin("[key_name(usr)] gave [key_name(T)] the disease [D].") message_admins("[key_name_admin(usr)] gave [key_name(T)] the disease [D].") -/client/proc/object_say(var/obj/O in world) +/client/proc/object_say(obj/O in world) set category = "Special Verbs" set name = "OSay" set desc = "Makes an object say something." @@ -599,7 +599,7 @@ var/list/admin_verbs_hideable = list( deadmins -= ckey return -/client/proc/populate_world(var/amount = 50 as num) +/client/proc/populate_world(amount = 50 as num) set name = "Populate World" set category = "Debug" set desc = "(\"Amount of mobs to create\") Populate the world with test mobs." diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm index e32260b95ef..2e41995ce05 100644 --- a/code/modules/admin/create_mob.dm +++ b/code/modules/admin/create_mob.dm @@ -1,5 +1,5 @@ /var/create_mob_html = null -/datum/admins/proc/create_mob(var/mob/user) +/datum/admins/proc/create_mob(mob/user) if (!create_mob_html) var/mobjs = null mobjs = list2text(typesof(/mob), ";") diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm index eae80abf304..bb58339dc4c 100644 --- a/code/modules/admin/create_object.dm +++ b/code/modules/admin/create_object.dm @@ -1,6 +1,6 @@ /var/create_object_html = null -/datum/admins/proc/create_object(var/mob/user) +/datum/admins/proc/create_object(mob/user) if (!create_object_html) var/objectjs = null objectjs = list2text(typesof(/obj), ";") @@ -10,7 +10,7 @@ user << browse(replacetext(create_object_html, "/* ref src */", "\ref[src]"), "window=create_object;size=425x475") -/datum/admins/proc/quick_create_object(var/mob/user) +/datum/admins/proc/quick_create_object(mob/user) var/quick_create_object_html = null var/pathtext = null diff --git a/code/modules/admin/create_turf.dm b/code/modules/admin/create_turf.dm index 0938b7bd33d..c9e5f1f69f3 100644 --- a/code/modules/admin/create_turf.dm +++ b/code/modules/admin/create_turf.dm @@ -1,5 +1,5 @@ /var/create_turf_html = null -/datum/admins/proc/create_turf(var/mob/user) +/datum/admins/proc/create_turf(mob/user) if (!create_turf_html) var/turfjs = null turfjs = list2text(typesof(/turf), ";") diff --git a/code/modules/admin/newbanjob.dm b/code/modules/admin/newbanjob.dm index a881c5b2976..2c429f6de82 100644 --- a/code/modules/admin/newbanjob.dm +++ b/code/modules/admin/newbanjob.dm @@ -1,7 +1,7 @@ var/savefile/Banlistjob -/proc/_jobban_isbanned(var/client/clientvar, var/rank) +/proc/_jobban_isbanned(client/clientvar, rank) if(!clientvar) return 1 ClearTempbansjob() var/id = clientvar.computer_id diff --git a/code/modules/admin/permissionverbs/permissionedit.dm b/code/modules/admin/permissionverbs/permissionedit.dm index 3507e19b1e8..6e34c25866b 100644 --- a/code/modules/admin/permissionverbs/permissionedit.dm +++ b/code/modules/admin/permissionverbs/permissionedit.dm @@ -47,7 +47,7 @@ usr << browse(output,"window=editrights;size=900x650") -/datum/admins/proc/log_admin_rank_modification(var/adm_ckey, var/new_rank) +/datum/admins/proc/log_admin_rank_modification(adm_ckey, new_rank) if(config.admin_legacy_system) return if(!usr.client) @@ -97,7 +97,7 @@ usr << "Admin rank changed." -/datum/admins/proc/log_admin_permission_modification(var/adm_ckey, var/new_permission) +/datum/admins/proc/log_admin_permission_modification(adm_ckey, new_permission) if(config.admin_legacy_system) return if(!usr.client) return if(check_rights(R_PERMISSIONS)) return diff --git a/code/modules/admin/player_notes.dm b/code/modules/admin/player_notes.dm index af361a7895c..040ac99ef48 100644 --- a/code/modules/admin/player_notes.dm +++ b/code/modules/admin/player_notes.dm @@ -26,11 +26,11 @@ popup.open() -/datum/admins/proc/notes_show(var/ckey) +/datum/admins/proc/notes_show(ckey) usr << browse("Player Notes[notes_gethtml(ckey)]","window=player_notes;size=700x400") -/datum/admins/proc/notes_gethtml(var/ckey) +/datum/admins/proc/notes_gethtml(ckey) var/savefile/notesfile = new(NOTESFILE) if(!notesfile) return "Error: Cannot access [NOTESFILE]" if(ckey) @@ -53,7 +53,7 @@ //handles adding notes to the end of a ckey's buffer //originally had seperate entries such as var/by to record who left the note and when //but the current bansystem is a heap of dung. -/proc/notes_add(var/ckey, var/note, var/lognote = 0) +/proc/notes_add(ckey, note, lognote = 0) if(!ckey) ckey = ckey(input(usr,"Who would you like to add notes for?","Enter a ckey",null) as text|null) if(!ckey) return @@ -75,7 +75,7 @@ return //handles removing entries from the buffer, or removing the entire directory if no start_index is given -/proc/notes_remove(var/ckey, var/start_index, var/end_index) +/proc/notes_remove(ckey, start_index, end_index) var/savefile/notesfile = new(NOTESFILE) var/admin_msg if(!notesfile) return diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm index 4390f383d8b..67aba43dd56 100644 --- a/code/modules/admin/secrets.dm +++ b/code/modules/admin/secrets.dm @@ -81,7 +81,7 @@ -/datum/admins/proc/Secrets_topic(var/item,var/href_list) +/datum/admins/proc/Secrets_topic(item,href_list) var/datum/round_event/E var/ok = 0 switch(item) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 2cb0a6b293b..46cbc8a85cf 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -1,4 +1,4 @@ -/proc/keywords_lookup(var/msg) +/proc/keywords_lookup(msg) //This is a list of words which are ignored by the parser when comparing message contents for names. MUST BE IN LOWER CASE! var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","alien","as", "i") diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm index 3c3407e8138..6b3040a1677 100644 --- a/code/modules/admin/verbs/adminjump.dm +++ b/code/modules/admin/verbs/adminjump.dm @@ -25,7 +25,7 @@ message_admins("[key_name_admin(usr)] jumped to [A]") feedback_add_details("admin_verb","JA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/jumptoturf(var/turf/T in world) +/client/proc/jumptoturf(turf/T in world) set name = "Jump to Turf" set category = "Admin" if(!src.holder) @@ -38,7 +38,7 @@ feedback_add_details("admin_verb","JT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return -/client/proc/jumptomob(var/mob/M in mob_list) +/client/proc/jumptomob(mob/M in mob_list) set category = "Admin" set name = "Jump to Mob" @@ -96,7 +96,7 @@ feedback_add_details("admin_verb","JK") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/Getmob(var/mob/M in mob_list) +/client/proc/Getmob(mob/M in mob_list) set category = "Admin" set name = "Get Mob" set desc = "Mob to teleport" @@ -135,7 +135,7 @@ usr.loc = M.loc feedback_add_details("admin_verb","GK") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/sendmob(var/mob/M in sortmobs()) +/client/proc/sendmob(mob/M in sortmobs()) set category = "Admin" set name = "Send Mob" if(!src.holder) @@ -148,11 +148,11 @@ log_admin("[key_name(usr)] teleported [key_name(M)] to [A]") message_admins("[key_name_admin(usr)] teleported [key_name_admin(M)] to [A]") -/proc/admin_forcemove(var/mob/mover, var/atom/newloc) +/proc/admin_forcemove(mob/mover, atom/newloc) mover.loc = newloc mover.on_forcemove(newloc) -/mob/proc/on_forcemove(var/atom/newloc) +/mob/proc/on_forcemove(atom/newloc) return diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index e79649e7dc4..818a7050967 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -1,5 +1,5 @@ //allows right clicking mobs to send an admin PM to their client, forwards the selected mob's client to cmd_admin_pm -/client/proc/cmd_admin_pm_context(mob/M as mob in mob_list) +/client/proc/cmd_admin_pm_context(mob/M in mob_list) set category = null set name = "Admin PM Mob" if(!holder) diff --git a/code/modules/admin/verbs/bluespacearty.dm b/code/modules/admin/verbs/bluespacearty.dm index 3d28d61dc14..da8eee4a2ad 100644 --- a/code/modules/admin/verbs/bluespacearty.dm +++ b/code/modules/admin/verbs/bluespacearty.dm @@ -1,4 +1,4 @@ -/client/proc/bluespace_artillery(var/mob/M in mob_list) +/client/proc/bluespace_artillery(mob/M in mob_list) set name = "Bluespace Artillery" set category = "Fun" diff --git a/code/modules/admin/verbs/buildmode.dm b/code/modules/admin/verbs/buildmode.dm index a3912ae24c0..03bcd93bf46 100644 --- a/code/modules/admin/verbs/buildmode.dm +++ b/code/modules/admin/verbs/buildmode.dm @@ -5,7 +5,7 @@ #define AREA_BUILDMODE 5 #define NUM_BUILDMODES 5 -/proc/togglebuildmode(mob/M as mob in player_list) +/proc/togglebuildmode(mob/M in player_list) set name = "Toggle Build Mode" set category = "Special Verbs" if(M.client) @@ -197,7 +197,7 @@ return 1 -/proc/build_click(var/mob/user, buildmode, params, var/obj/object) +/proc/build_click(mob/user, buildmode, params, obj/object) var/obj/effect/bmode/buildholder/holder = null for(var/obj/effect/bmode/buildholder/H) if(H.cl == user.client) diff --git a/code/modules/admin/verbs/cinematic.dm b/code/modules/admin/verbs/cinematic.dm index d9409338ab4..dce6bbf8659 100644 --- a/code/modules/admin/verbs/cinematic.dm +++ b/code/modules/admin/verbs/cinematic.dm @@ -1,4 +1,4 @@ -/client/proc/cinematic(var/cinematic as anything in list("explosion",null)) +/client/proc/cinematic(cinematic as anything in list("explosion",null)) set name = "cinematic" set category = "Fun" set desc = "Shows a cinematic." // Intended for testing but I thought it might be nice for events on the rare occasion Feel free to comment it out if it's not wanted. diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 9dc2e9482ba..515ad7838a0 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -83,7 +83,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that usr << "[procname] returned: [returnval ? returnval : "null"]" feedback_add_details("admin_verb","APC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/callproc_datum(var/A as null|area|mob|obj|turf) +/client/proc/callproc_datum(A as null|area|mob|obj|turf) set category = "Debug" set name = "Atom ProcCall" @@ -182,7 +182,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that usr.show_message(t, 1) feedback_add_details("admin_verb","ASL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/cmd_admin_robotize(var/mob/M in mob_list) +/client/proc/cmd_admin_robotize(mob/M in mob_list) set category = "Fun" set name = "Make Robot" @@ -198,7 +198,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that else alert("Invalid mob") -/client/proc/cmd_admin_blobize(var/mob/M in mob_list) +/client/proc/cmd_admin_blobize(mob/M in mob_list) set category = "Fun" set name = "Make Blob" @@ -215,7 +215,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that alert("Invalid mob") -/client/proc/cmd_admin_animalize(var/mob/M in mob_list) +/client/proc/cmd_admin_animalize(mob/M in mob_list) set category = "Fun" set name = "Make Simple Animal" @@ -236,7 +236,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that M.Animalize() -/client/proc/makepAI(var/turf/T in mob_list) +/client/proc/makepAI(turf/T in mob_list) set category = "Fun" set name = "Make pAI" set desc = "Specify a location to spawn a pAI device, then specify a key to play that pAI" @@ -263,7 +263,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that SSpai.candidates.Remove(candidate) feedback_add_details("admin_verb","MPAI") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/cmd_admin_alienize(var/mob/M in mob_list) +/client/proc/cmd_admin_alienize(mob/M in mob_list) set category = "Fun" set name = "Make Alien" @@ -280,7 +280,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that else alert("Invalid mob") -/client/proc/cmd_admin_slimeize(var/mob/M in mob_list) +/client/proc/cmd_admin_slimeize(mob/M in mob_list) set category = "Fun" set name = "Make slime" @@ -425,7 +425,7 @@ var/global/list/g_fancy_list_of_types = null return matches //TODO: merge the vievars version into this or something maybe mayhaps -/client/proc/cmd_debug_del_all(var/object as text) +/client/proc/cmd_debug_del_all(object as text) set category = "Debug" set name = "Del-All" @@ -456,7 +456,7 @@ var/global/list/g_fancy_list_of_types = null message_admins("[key_name_admin(src)] has remade the powernets. makepowernets() called.", 0) feedback_add_details("admin_verb","MPWN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/cmd_admin_grantfullaccess(var/mob/M in mob_list) +/client/proc/cmd_admin_grantfullaccess(mob/M in mob_list) set category = "Admin" set name = "Grant Full Access" @@ -496,7 +496,7 @@ var/global/list/g_fancy_list_of_types = null log_admin("[key_name(src)] has granted [M.key] full access.") message_admins("[key_name_admin(usr)] has granted [M.key] full access.") -/client/proc/cmd_assume_direct_control(var/mob/M in mob_list) +/client/proc/cmd_assume_direct_control(mob/M in mob_list) set category = "Admin" set name = "Assume direct control" set desc = "Direct intervention" @@ -603,7 +603,7 @@ var/global/list/g_fancy_list_of_types = null for(var/areatype in areas_without_camera) world << "* [areatype]" -/client/proc/cmd_admin_dress(var/mob/living/carbon/human/M in mob_list) +/client/proc/cmd_admin_dress(mob/living/carbon/human/M in mob_list) set category = "Fun" set name = "Select equipment" if(!ishuman(M)) @@ -1091,7 +1091,7 @@ var/global/list/g_fancy_list_of_types = null //Deathsquad -/proc/equip_deathsquad(var/mob/living/carbon/human/M, var/officer) +/proc/equip_deathsquad(mob/living/carbon/human/M, officer) var/obj/item/device/radio/R = new /obj/item/device/radio/headset/headset_cent/alt(M) R.set_frequency(CENTCOM_FREQ) R.freqlock = 1 @@ -1142,7 +1142,7 @@ var/global/list/g_fancy_list_of_types = null M.equip_to_slot_or_del(W, slot_wear_id) //Emergency Response Team -/proc/equip_emergencyresponsesquad(var/mob/living/carbon/human/M, var/ertrole, var/alert) +/proc/equip_emergencyresponsesquad(mob/living/carbon/human/M, ertrole, alert) var/obj/item/weapon/card/id/W = null var/obj/item/device/radio/R = new /obj/item/device/radio/headset/headset_cent/alt(M) R.set_frequency(CENTCOM_FREQ) @@ -1260,7 +1260,7 @@ var/global/list/g_fancy_list_of_types = null W.update_label(W.registered_name, W.assignment) -/proc/equip_centcomofficial(var/mob/living/carbon/human/M) +/proc/equip_centcomofficial(mob/living/carbon/human/M) M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), slot_gloves) diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm index d895a43fb1d..399afc597b5 100644 --- a/code/modules/admin/verbs/diagnostics.dm +++ b/code/modules/admin/verbs/diagnostics.dm @@ -1,4 +1,4 @@ -/client/proc/air_status(turf/target as turf) +/client/proc/air_status(turf/target) set category = "Debug" set name = "Display Air Status" diff --git a/code/modules/admin/verbs/machine_upgrade.dm b/code/modules/admin/verbs/machine_upgrade.dm index 9c1089c5fff..9f2039fdd0f 100644 --- a/code/modules/admin/verbs/machine_upgrade.dm +++ b/code/modules/admin/verbs/machine_upgrade.dm @@ -1,4 +1,4 @@ -/proc/machine_upgrade(obj/machinery/M as obj in world) +/proc/machine_upgrade(obj/machinery/M in world) set name = "Tweak Component Ratings" set category = "Debug" var/new_rating = input("Enter new rating:","Num") as num diff --git a/code/modules/admin/verbs/massmodvar.dm b/code/modules/admin/verbs/massmodvar.dm index 5895b99e697..2fcae2ed698 100644 --- a/code/modules/admin/verbs/massmodvar.dm +++ b/code/modules/admin/verbs/massmodvar.dm @@ -1,4 +1,4 @@ -/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" @@ -23,7 +23,7 @@ feedback_add_details("admin_verb","MEV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/massmodify_variables(var/atom/O, var/var_name = "", var/method = 0) +/client/proc/massmodify_variables(atom/O, var_name = "", method = 0) if(!check_rights(R_VAREDIT)) return for(var/p in forbidden_varedit_object_types) diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm index 3125067f32b..e1c1430d0e3 100644 --- a/code/modules/admin/verbs/modifyvariables.dm +++ b/code/modules/admin/verbs/modifyvariables.dm @@ -77,7 +77,7 @@ var/list/VVckey_edit = list("key", "ckey") return var_value -/client/proc/mod_list_add(var/list/L, atom/O, original_name, objectvar) +/client/proc/mod_list_add(list/L, atom/O, original_name, objectvar) var/class = "text" if(src.holder && src.holder.marked_datum) @@ -133,7 +133,7 @@ var/list/VVckey_edit = list("key", "ckey") log_admin("[key_name(src)] modified [original_name]'s [objectvar]: ADDED=[var_value]") message_admins("[key_name_admin(src)] modified [original_name]'s [objectvar]: ADDED=[var_value]") -/client/proc/mod_list(var/list/L, atom/O, original_name, objectvar) +/client/proc/mod_list(list/L, atom/O, original_name, objectvar) if(!check_rights(R_VAREDIT)) return if(!istype(L,/list)) src << "Not a List." @@ -263,7 +263,7 @@ var/list/VVckey_edit = list("key", "ckey") original_var = L[assoc_key] else original_var = L[L.Find(variable)] - + var/new_var switch(class) //Spits a runtime error if you try to modify an entry in the contents list. Dunno how to fix it, yet. @@ -347,7 +347,7 @@ var/list/VVckey_edit = list("key", "ckey") log_admin("[key_name(src)] modified [original_name]'s [objectvar]: [original_var]=[new_var]") message_admins("[key_name_admin(src)] modified [original_name]'s varlist [objectvar]: [original_var]=[new_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) if(!check_rights(R_VAREDIT)) return for(var/p in forbidden_varedit_object_types) diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index 7c654529149..5cdf335ed49 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -684,7 +684,7 @@ return candidates -/datum/admins/proc/makeBody(var/mob/dead/observer/G_found) // Uses stripped down and bastardized code from respawn character +/datum/admins/proc/makeBody(mob/dead/observer/G_found) // Uses stripped down and bastardized code from respawn character if(!G_found || !G_found.key) return //First we spawn a dude. diff --git a/code/modules/admin/verbs/possess.dm b/code/modules/admin/verbs/possess.dm index 0947155158c..2b56954f685 100644 --- a/code/modules/admin/verbs/possess.dm +++ b/code/modules/admin/verbs/possess.dm @@ -1,4 +1,4 @@ -/proc/possess(obj/O as obj in world) +/proc/possess(obj/O in world) set name = "Possess Obj" set category = "Object" @@ -26,7 +26,7 @@ usr.control_object = O feedback_add_details("admin_verb","PO") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/proc/release(obj/O as obj in world) +/proc/release(obj/O in world) set name = "Release Obj" set category = "Object" //usr.loc = get_turf(usr) @@ -44,7 +44,7 @@ usr.control_object = null feedback_add_details("admin_verb","RO") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/proc/givetestverbs(mob/M as mob in mob_list) +/proc/givetestverbs(mob/M in mob_list) set desc = "Give this guy possess/release verbs" set category = "Debug" set name = "Give Possessing Verbs" diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index beec68a598a..b23db1a03b9 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -37,17 +37,17 @@ feedback_add_details("admin_verb","PR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! //log_admin("HELP: [key_name(src)]: [msg]") -/proc/Centcomm_announce(var/text , var/mob/Sender) +/proc/Centcomm_announce(text , mob/Sender) var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN) msg = "CENTCOM:[key_name_admin(Sender)] (?) (PP) (VV) (SM) (FLW) (TP) (BSA) (RPLY): [msg]" admins << msg -/proc/Syndicate_announce(var/text , var/mob/Sender) +/proc/Syndicate_announce(text , mob/Sender) var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN) msg = "SYNDICATE:[key_name_admin(Sender)] (?) (PP) (VV) (SM) (FLW) (TP) (BSA) (RPLY): [msg]" admins << msg -/proc/Nuke_request(var/text , var/mob/Sender) +/proc/Nuke_request(text , mob/Sender) var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN) msg = "NUKE CODE REQUEST:[key_name_admin(Sender)] (?) (PP) (VV) (SM) (FLW) (TP) (BSA) (RPLY): [msg]" admins << msg diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 8f7d37730e8..96054f461d4 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1,4 +1,4 @@ -/client/proc/cmd_admin_drop_everything(mob/M as mob in mob_list) +/client/proc/cmd_admin_drop_everything(mob/M in mob_list) set category = null set name = "Drop Everything" if(!holder) @@ -19,7 +19,7 @@ feedback_add_details("admin_verb","DEVR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/cmd_admin_subtle_message(mob/M as mob in mob_list) +/client/proc/cmd_admin_subtle_message(mob/M in mob_list) set category = "Special Verbs" set name = "Subtle Message" @@ -58,7 +58,7 @@ message_admins(" GlobalNarrate: [key_name_admin(usr)] : [msg]
    ") feedback_add_details("admin_verb","GLN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/cmd_admin_direct_narrate(var/mob/M) +/client/proc/cmd_admin_direct_narrate(mob/M) set category = "Special Verbs" set name = "Direct Narrate" @@ -82,7 +82,7 @@ message_admins(" DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]
    ") feedback_add_details("admin_verb","DIRN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/cmd_admin_local_narrate(var/atom/A) +/client/proc/cmd_admin_local_narrate(atom/A) set category = "Special Verbs" set name = "Local Narrate" @@ -104,7 +104,7 @@ message_admins(" LocalNarrate: [key_name_admin(usr)] at ([get_area(A)]): [msg]
    ") feedback_add_details("admin_verb","LN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/cmd_admin_godmode(mob/M as mob in mob_list) +/client/proc/cmd_admin_godmode(mob/M in mob_list) set category = "Special Verbs" set name = "Godmode" if(!holder) @@ -417,7 +417,7 @@ Traitors and the like can also be revived with the previous role mostly intact. feedback_add_details("admin_verb","IONC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/cmd_admin_rejuvenate(mob/living/M as mob in mob_list) +/client/proc/cmd_admin_rejuvenate(mob/living/M in mob_list) set category = "Special Verbs" set name = "Rejuvenate" if(!holder) @@ -536,7 +536,7 @@ Traitors and the like can also be revived with the previous role mostly intact. else return -/client/proc/cmd_admin_gib(mob/M as mob in mob_list) +/client/proc/cmd_admin_gib(mob/M in mob_list) set category = "Special Verbs" set name = "Gib" @@ -574,7 +574,7 @@ Traitors and the like can also be revived with the previous role mostly intact. message_admins("[key_name_admin(usr)] used gibself.") feedback_add_details("admin_verb","GIBS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/cmd_admin_check_contents(mob/living/M as mob in mob_list) +/client/proc/cmd_admin_check_contents(mob/living/M in mob_list) set category = "Special Verbs" set name = "Check Contents" @@ -635,7 +635,7 @@ Traitors and the like can also be revived with the previous role mostly intact. return -/client/proc/cmd_admin_attack_log(mob/M as mob in mob_list) +/client/proc/cmd_admin_attack_log(mob/M in mob_list) set category = "Special Verbs" set name = "Attack Log" diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index a4385029717..3a70880a7ec 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -50,7 +50,7 @@ //Called when another assembly acts on this one, var/radio will determine where it came from for wire calcs -/obj/item/device/assembly/proc/pulsed(var/radio = 0) +/obj/item/device/assembly/proc/pulsed(radio = 0) if(holder && (wires & WIRE_RECEIVE)) activate() if(radio && (wires & WIRE_RADIO_RECEIVE)) @@ -59,7 +59,7 @@ //Called when this device attempts to act on another device, var/radio determines if it was sent via radio or direct -/obj/item/device/assembly/proc/pulse(var/radio = 0) +/obj/item/device/assembly/proc/pulse(radio = 0) if(src.connected && src.wires) connected.Pulse(src) return 1 @@ -86,7 +86,7 @@ return secured -/obj/item/device/assembly/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/device/assembly/attackby(obj/item/weapon/W, mob/user, params) if(isassembly(W)) var/obj/item/device/assembly/A = W if((!A.secured) && (!secured)) @@ -119,7 +119,7 @@ user << "\The [src] can be attached to other things." -/obj/item/device/assembly/attack_self(mob/user as mob) +/obj/item/device/assembly/attack_self(mob/user) if(!user) return 0 user.set_machine(src) @@ -127,6 +127,6 @@ return 1 -/obj/item/device/assembly/interact(mob/user as mob) +/obj/item/device/assembly/interact(mob/user) return //HTML MENU FOR WIRES GOES HERE diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm index f92ef7dcf84..3cca149d6e7 100644 --- a/code/modules/assembly/bomb.dm +++ b/code/modules/assembly/bomb.dm @@ -23,7 +23,7 @@ overlays += bombassembly.overlays overlays += "bomb_assembly" -/obj/item/device/onetankbomb/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/device/onetankbomb/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/device/analyzer)) bombtank.attackby(W, user) return @@ -54,7 +54,7 @@ add_fingerprint(user) ..() -/obj/item/device/onetankbomb/attack_self(mob/user as mob) //pressing the bomb accesses its assembly +/obj/item/device/onetankbomb/attack_self(mob/user) //pressing the bomb accesses its assembly bombassembly.attack_self(user, 1) add_fingerprint(user) return @@ -77,7 +77,7 @@ if(bombassembly) bombassembly.Crossed(AM) -/obj/item/device/onetankbomb/on_found(mob/finder as mob) //for mousetraps +/obj/item/device/onetankbomb/on_found(mob/finder) //for mousetraps if(bombassembly) bombassembly.on_found(finder) diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index 1769315acab..4b6489290d2 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -16,14 +16,14 @@ return 1 -/obj/item/device/assembly_holder/proc/assemble(var/obj/item/device/assembly/A, var/obj/item/device/assembly/A2, var/mob/user) +/obj/item/device/assembly_holder/proc/assemble(obj/item/device/assembly/A, obj/item/device/assembly/A2, mob/user) attach(A,user) attach(A2,user) name = "[A.name]-[A2.name] assembly" update_icon() feedback_add_details("assembly_made","[name]") -/obj/item/device/assembly_holder/proc/attach(var/obj/item/device/assembly/A, var/mob/user) +/obj/item/device/assembly_holder/proc/attach(obj/item/device/assembly/A, mob/user) if(!A.remove_item_from_storage(src)) if(user) user.remove_from_mob(A) @@ -61,7 +61,7 @@ if(a_right) a_right.Crossed(AM) -/obj/item/device/assembly_holder/on_found(mob/finder as mob) +/obj/item/device/assembly_holder/on_found(mob/finder) if(a_left) a_left.on_found(finder) if(a_right) @@ -81,7 +81,7 @@ ..() return -/obj/item/device/assembly_holder/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/device/assembly_holder/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/screwdriver)) var/turf/T = get_turf(src) if(!T) @@ -96,7 +96,7 @@ else ..() -/obj/item/device/assembly_holder/attack_self(mob/user as mob) +/obj/item/device/assembly_holder/attack_self(mob/user) src.add_fingerprint(user) if(!a_left || !a_right) user << "Assembly part missing!" @@ -111,7 +111,7 @@ a_right.attack_self(user) -/obj/item/device/assembly_holder/proc/process_activation(var/obj/D, var/normal = 1, var/special = 1) +/obj/item/device/assembly_holder/proc/process_activation(obj/D, normal = 1, special = 1) if(!D) return 0 if((normal) && (a_right) && (a_left)) diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm index beb41572fbe..2fad7c26a58 100644 --- a/code/modules/assembly/igniter.dm +++ b/code/modules/assembly/igniter.dm @@ -21,7 +21,7 @@ return 1 -/obj/item/device/assembly/igniter/attack_self(mob/user as mob) +/obj/item/device/assembly/igniter/attack_self(mob/user) activate() add_fingerprint(user) return \ No newline at end of file diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index e2f80e045b4..e470324cdf3 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -93,7 +93,7 @@ process_cooldown() return -/obj/item/device/assembly/infra/interact(mob/user as mob)//TODO: change this this to the wire control panel +/obj/item/device/assembly/infra/interact(mob/user)//TODO: change this this to the wire control panel if(is_secured(user)) user.set_machine(src) var/dat = text("Infrared Laser\nStatus: []
    \nVisibility: []
    \n    ", (on ? text("On", src) : text("Off", src)), (src.visible ? text("Visible", src) : text("Invisible", src))) diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index 6aeb07661aa..3879bc72230 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -36,7 +36,7 @@ if(holder) holder.update_icon() -/obj/item/device/assembly/mousetrap/proc/triggered(mob/target as mob, var/type = "feet") +/obj/item/device/assembly/mousetrap/proc/triggered(mob/target, type = "feet") if(!armed) return var/obj/item/organ/limb/affecting = null @@ -71,7 +71,7 @@ pulse(0) -/obj/item/device/assembly/mousetrap/attack_self(mob/living/carbon/human/user as mob) +/obj/item/device/assembly/mousetrap/attack_self(mob/living/carbon/human/user) if(!armed) user << "You arm [src]." else @@ -89,7 +89,7 @@ playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3) -/obj/item/device/assembly/mousetrap/attack_hand(mob/living/carbon/human/user as mob) +/obj/item/device/assembly/mousetrap/attack_hand(mob/living/carbon/human/user) if(armed) if(((user.getBrainLoss() >= 60) || user.disabilities & CLUMSY) && prob(50)) var/which_hand = "l_hand" @@ -102,7 +102,7 @@ ..() -/obj/item/device/assembly/mousetrap/Crossed(var/atom/movable/AM as mob|obj) +/obj/item/device/assembly/mousetrap/Crossed(atom/movable/AM as mob|obj) if(armed) if(ishuman(AM)) var/mob/living/carbon/H = AM @@ -119,7 +119,7 @@ ..() -/obj/item/device/assembly/mousetrap/on_found(mob/finder as mob) +/obj/item/device/assembly/mousetrap/on_found(mob/finder) if(armed) finder.visible_message("[finder] accidentally sets off [src], breaking their fingers.", \ "You accidentally trigger [src]!") diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index 27a49543029..656e927716e 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -98,7 +98,7 @@ return -/obj/item/device/assembly/prox_sensor/interact(mob/user as mob)//TODO: Change this to the wires thingy +/obj/item/device/assembly/prox_sensor/interact(mob/user)//TODO: Change this to the wires thingy if(is_secured(user)) var/second = time % 60 var/minute = (time - second) / 60 diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm index 6e76220a71b..d147b5a2c6b 100644 --- a/code/modules/assembly/shock_kit.dm +++ b/code/modules/assembly/shock_kit.dm @@ -14,7 +14,7 @@ ..() return -/obj/item/assembly/shock_kit/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/assembly/shock_kit/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/wrench)) var/turf/T = loc if(ismob(T)) @@ -30,7 +30,7 @@ add_fingerprint(user) return -/obj/item/assembly/shock_kit/attack_self(mob/user as mob) +/obj/item/assembly/shock_kit/attack_self(mob/user) part1.attack_self(user) part2.attack_self(user) add_fingerprint(user) diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 74c4ea0aef9..35226b7023c 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -38,7 +38,7 @@ holder.update_icon() return -/obj/item/device/assembly/signaler/interact(mob/user as mob, flag1) +/obj/item/device/assembly/signaler/interact(mob/user, flag1) if(is_secured(user)) var/t1 = "-------" // if ((src.b_stat && !( flag1 ))) diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index f3a3340f248..7760900ac56 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -66,7 +66,7 @@ return -/obj/item/device/assembly/timer/interact(mob/user as mob)//TODO: Have this use the wires +/obj/item/device/assembly/timer/interact(mob/user)//TODO: Have this use the wires if(is_secured(user)) var/second = time % 60 var/minute = (time - second) / 60 diff --git a/code/modules/awaymissions/bluespaceartillery.dm b/code/modules/awaymissions/bluespaceartillery.dm index 8a5621d4148..dd722db6d8e 100644 --- a/code/modules/awaymissions/bluespaceartillery.dm +++ b/code/modules/awaymissions/bluespaceartillery.dm @@ -20,7 +20,7 @@ /obj/structure/artilleryplaceholder/decorative density = 0 -/obj/machinery/artillerycontrol/attack_hand(mob/user as mob) +/obj/machinery/artillerycontrol/attack_hand(mob/user) user.set_machine(src) var/dat = "Bluespace Artillery Control:
    " dat += "Locked on
    " diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index 7859b0d9b98..4b6c9ff0881 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -78,7 +78,7 @@ ready = 1 -/obj/machinery/gateway/centerstation/proc/toggleon(mob/user as mob) +/obj/machinery/gateway/centerstation/proc/toggleon(mob/user) if(!ready) return if(linked.len != 8) return if(!powered()) return @@ -104,7 +104,7 @@ update_icon() -/obj/machinery/gateway/centerstation/attack_hand(mob/user as mob) +/obj/machinery/gateway/centerstation/attack_hand(mob/user) if(!ready) detect() return @@ -133,7 +133,7 @@ return -/obj/machinery/gateway/centerstation/attackby(obj/item/device/W as obj, mob/user as mob, params) +/obj/machinery/gateway/centerstation/attackby(obj/item/device/W, mob/user, params) if(istype(W,/obj/item/device/multitool)) user << "\black The gate is already calibrated, there is no work for you to do here." return @@ -183,7 +183,7 @@ ready = 1 -/obj/machinery/gateway/centeraway/proc/toggleon(mob/user as mob) +/obj/machinery/gateway/centeraway/proc/toggleon(mob/user) if(!ready) return if(linked.len != 8) return if(!stationgate) @@ -205,7 +205,7 @@ update_icon() -/obj/machinery/gateway/centeraway/attack_hand(mob/user as mob) +/obj/machinery/gateway/centeraway/attack_hand(mob/user) if(!ready) detect() return @@ -227,7 +227,7 @@ M.dir = SOUTH -/obj/machinery/gateway/centeraway/attackby(obj/item/device/W as obj, mob/user as mob, params) +/obj/machinery/gateway/centeraway/attackby(obj/item/device/W, mob/user, params) if(istype(W,/obj/item/device/multitool)) if(calibrated) user << "\black The gate is already calibrated, there is no work for you to do here." diff --git a/code/modules/awaymissions/maploader/reader.dm b/code/modules/awaymissions/maploader/reader.dm index 381b167fb6e..de3de82c71c 100644 --- a/code/modules/awaymissions/maploader/reader.dm +++ b/code/modules/awaymissions/maploader/reader.dm @@ -16,7 +16,7 @@ var/global/dmm_suite/preloader/_preloader = null * 2) Read the map line by line, parsing the result (using parse_grid) * */ -/dmm_suite/load_map(var/dmm_file as file, var/z_offset as num) +/dmm_suite/load_map(dmm_file as file, z_offset as num) if(!z_offset)//what z_level we are creating the map on z_offset = world.maxz+1 @@ -110,7 +110,7 @@ var/global/dmm_suite/preloader/_preloader = null * 4) Instanciates the atom with its variables * */ -/dmm_suite/proc/parse_grid(var/model as text,var/xcrd as num,var/ycrd as num,var/zcrd as num) +/dmm_suite/proc/parse_grid(model as text,xcrd as num,ycrd as num,zcrd as num) /*Method parse_grid() - Accepts a text string containing a comma separated list of type paths of the same construction as those contained in a .dmm file, and instantiates them. @@ -203,7 +203,7 @@ var/global/dmm_suite/preloader/_preloader = null //////////////// //Instance an atom at (x,y,z) and gives it the variables in attributes -/dmm_suite/proc/instance_atom(var/path,var/list/attributes, var/x, var/y, var/z) +/dmm_suite/proc/instance_atom(path,list/attributes, x, y, z) var/atom/instance _preloader = new(attributes, path) @@ -216,7 +216,7 @@ var/global/dmm_suite/preloader/_preloader = null //text trimming (both directions) helper proc //optionally removes quotes before and after the text (for variable name) -/dmm_suite/proc/trim_text(var/what as text,var/trim_quotes=0) +/dmm_suite/proc/trim_text(what as text,trim_quotes=0) while(length(what) && (findtext(what," ",1,2))) what=copytext(what,2,0) while(length(what) && (findtext(what," ",length(what),0))) @@ -230,7 +230,7 @@ var/global/dmm_suite/preloader/_preloader = null //find the position of the next delimiter,skipping whatever is comprised between opening_escape and closing_escape //returns 0 if reached the last delimiter -/dmm_suite/proc/find_next_delimiter_position(var/text as text,var/initial_position as num, var/delimiter=",",var/opening_escape=quote,var/closing_escape=quote) +/dmm_suite/proc/find_next_delimiter_position(text as text,initial_position as num, delimiter=",",opening_escape=quote,closing_escape=quote) var/position = initial_position var/next_delimiter = findtext(text,delimiter,position,0) var/next_opening = findtext(text,opening_escape,position,0) @@ -245,7 +245,7 @@ var/global/dmm_suite/preloader/_preloader = null //build a list from variables in text form (e.g {var1="derp"; var2; var3=7} => list(var1="derp", var2, var3=7)) //return the filled list -/dmm_suite/proc/text2list(var/text as text,var/delimiter=",") +/dmm_suite/proc/text2list(text as text,delimiter=",") var/list/to_return = list() @@ -295,7 +295,7 @@ var/global/dmm_suite/preloader/_preloader = null return to_return //simulates the DM multiple turfs on one tile underlaying -/dmm_suite/proc/add_underlying_turf(var/turf/placed,var/turf/underturf, var/list/turfs_underlays) +/dmm_suite/proc/add_underlying_turf(turf/placed,turf/underturf, list/turfs_underlays) if(underturf.density) placed.density = 1 if(underturf.opacity) @@ -318,7 +318,7 @@ var/global/dmm_suite/preloader/_preloader = null var/list/attributes var/target_path -/dmm_suite/preloader/New(var/list/the_attributes, var/path) +/dmm_suite/preloader/New(list/the_attributes, path) .=..() if(!the_attributes.len) Del() diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm index f6d98d784dc..8b8baf4249c 100644 --- a/code/modules/awaymissions/mission_code/stationCollision.dm +++ b/code/modules/awaymissions/mission_code/stationCollision.dm @@ -173,7 +173,7 @@ var/sc_safecode5 = "[rand(0,9)]" if(prob(25)) mezzer() -/obj/singularity/narsie/sc_Narsie/consume(var/atom/A) +/obj/singularity/narsie/sc_Narsie/consume(atom/A) if(is_type_in_list(A, uneatable)) return 0 if (istype(A,/mob/living)) diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm index c17e1f6d7e0..450d153a94f 100644 --- a/code/modules/awaymissions/mission_code/wildwest.dm +++ b/code/modules/awaymissions/mission_code/wildwest.dm @@ -51,7 +51,7 @@ var/chargesa = 1 var/insistinga = 0 -/obj/machinery/wish_granter_dark/attack_hand(var/mob/living/carbon/human/user as mob) +/obj/machinery/wish_granter_dark/attack_hand(mob/living/carbon/human/user) usr.set_machine(src) if(chargesa <= 0) diff --git a/code/modules/awaymissions/signpost.dm b/code/modules/awaymissions/signpost.dm index d836829598b..b25557db057 100644 --- a/code/modules/awaymissions/signpost.dm +++ b/code/modules/awaymissions/signpost.dm @@ -5,10 +5,10 @@ anchored = 1 density = 1 -/obj/structure/signpost/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/signpost/attackby(obj/item/weapon/W, mob/user, params) return attack_hand(user) -/obj/structure/signpost/attack_hand(mob/user as mob) +/obj/structure/signpost/attack_hand(mob/user) switch(alert("Travel back to ss13?",,"Yes","No")) if("Yes") if(user.z != src.z) return diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index 30a82a92f63..c574816af2a 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -49,7 +49,7 @@ return 0 return 1 -/client/proc/handle_spam_prevention(var/message, var/mute_type) +/client/proc/handle_spam_prevention(message, mute_type) if(config.automute_on && !holder && src.last_message == message) src.last_message_count++ if(src.last_message_count >= SPAM_TRIGGER_AUTOMUTE) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 43c3cfa03d4..1f52b42b1fb 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -516,7 +516,7 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set popup.open(0) return - proc/SetJobPreferenceLevel(var/datum/job/job, var/level) + proc/SetJobPreferenceLevel(datum/job/job, level) if (!job) return 0 @@ -618,7 +618,7 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set job_engsec_low = 0 - proc/GetJobDepartment(var/datum/job/job, var/level) + proc/GetJobDepartment(datum/job/job, level) if(!job || !level) return 0 switch(job.department_flag) if(CIVILIAN) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 186b2f0fca0..c4833791343 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -77,7 +77,7 @@ BLIND // can't see anything put_on_delay = 40 // Called just before an attack_hand(), in mob/UnarmedAttack() -/obj/item/clothing/gloves/proc/Touch(var/atom/A, var/proximity) +/obj/item/clothing/gloves/proc/Touch(atom/A, proximity) return 0 // return 1 to cancel attack_hand() //Head @@ -106,7 +106,7 @@ BLIND // can't see anything return message //Proc that moves gas/breath masks out of the way, disabling them and allowing pill/food consumption -/obj/item/clothing/mask/proc/adjustmask(var/mob/user) +/obj/item/clothing/mask/proc/adjustmask(mob/user) if(!ignore_maskadjust) if(user.incapacitated()) return @@ -326,7 +326,7 @@ atom/proc/generate_female_clothing(index,t_color,icon,type) ..() -/obj/item/clothing/under/AltClick(var/mob/user) +/obj/item/clothing/under/AltClick(mob/user) ..() if(!user.canUseTopic(user)) user << "You can't do that right now!" diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 6bfa9615112..6233a560ac9 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -180,7 +180,7 @@ toggle_helmlight() ..() -/obj/item/clothing/head/helmet/attackby(var/obj/item/A as obj, mob/user as mob, params) +/obj/item/clothing/head/helmet/attackby(obj/item/A, mob/user, params) if(istype(A, /obj/item/device/flashlight/seclite)) var/obj/item/device/flashlight/seclite/S = A if(can_flashlight) @@ -231,7 +231,7 @@ update_helmlight(user) return -/obj/item/clothing/head/helmet/proc/update_helmlight(var/mob/user = null) +/obj/item/clothing/head/helmet/proc/update_helmlight(mob/user = null) if(F) action_button_name = "Toggle Helmetlight" if(F.on) diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 1f5c29d940d..cd6dae472dc 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -66,7 +66,7 @@ if (istype(location, /turf)) location.hotspot_expose(700, 1) -/obj/item/clothing/head/cakehat/attack_self(mob/user as mob) +/obj/item/clothing/head/cakehat/attack_self(mob/user) if(status > 1) return src.onfire = !( src.onfire ) if (src.onfire) @@ -94,7 +94,7 @@ cold_protection = HEAD min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT -/obj/item/clothing/head/ushanka/attack_self(mob/user as mob) +/obj/item/clothing/head/ushanka/attack_self(mob/user) if(earflaps) src.icon_state = "ushankaup" src.item_state = "ushankaup" diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 36d26136d5f..8c7fa5b2204 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -18,7 +18,7 @@ flip(usr) -/obj/item/clothing/head/soft/AltClick(var/mob/user) +/obj/item/clothing/head/soft/AltClick(mob/user) ..() if(!user.canUseTopic(user)) user << "You can't do that right now!" @@ -29,7 +29,7 @@ flip(user) -/obj/item/clothing/head/soft/proc/flip(var/mob/user) +/obj/item/clothing/head/soft/proc/flip(mob/user) if(user.canmove && !user.stat && !user.restrained()) src.flipped = !src.flipped if(src.flipped) diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm index 59239d4f22f..914fadd418c 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -10,7 +10,7 @@ action_button_name = "Adjust Balaclava" ignore_maskadjust = 0 -/obj/item/clothing/mask/balaclava/attack_self(var/mob/user) +/obj/item/clothing/mask/balaclava/attack_self(mob/user) adjustmask(user) /obj/item/clothing/mask/luchador diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index 11480bfa95e..c6c80d9dc21 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -14,10 +14,10 @@ flags_cover = MASKCOVERSMOUTH burn_state = -1 //Won't burn in fires -/obj/item/clothing/mask/breath/attack_self(var/mob/user) +/obj/item/clothing/mask/breath/attack_self(mob/user) adjustmask(user) -/obj/item/clothing/mask/breath/AltClick(var/mob/user) +/obj/item/clothing/mask/breath/AltClick(mob/user) ..() if(!user.canUseTopic(user)) user << "You can't do that right now!" diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 35fe69e2060..aaa51d6129f 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -74,7 +74,7 @@ ..() verbs -= /obj/item/clothing/mask/gas/sechailer/verb/adjust -/obj/item/clothing/mask/gas/sechailer/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/clothing/mask/gas/sechailer/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/screwdriver)) switch(aggressiveness) if(1) diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index e5a05417974..557163dbe97 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -31,7 +31,7 @@ action_button_name = "Adjust Sterile Mask" ignore_maskadjust = 0 -/obj/item/clothing/mask/surgical/attack_self(var/mob/user) +/obj/item/clothing/mask/surgical/attack_self(mob/user) adjustmask(user) /obj/item/clothing/mask/fakemoustache @@ -118,7 +118,7 @@ adjusted_flags = SLOT_HEAD icon_state = "bandbotany" -/obj/item/clothing/mask/bandana/attack_self(var/mob/user) +/obj/item/clothing/mask/bandana/attack_self(mob/user) adjustmask(user) /obj/item/clothing/mask/bandana/red diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm index 1074159da7f..1cce1cd3374 100644 --- a/code/modules/clothing/shoes/colour.dm +++ b/code/modules/clothing/shoes/colour.dm @@ -81,7 +81,7 @@ icon_state = "orange" item_color = "orange" -/obj/item/clothing/shoes/sneakers/orange/attack_self(mob/user as mob) +/obj/item/clothing/shoes/sneakers/orange/attack_self(mob/user) if (src.chained) src.chained = null src.slowdown = SHOES_SLOWDOWN @@ -89,7 +89,7 @@ src.icon_state = "orange" return -/obj/item/clothing/shoes/sneakers/orange/attackby(H as obj, loc, params) +/obj/item/clothing/shoes/sneakers/orange/attackby(obj/H, loc, params) ..() if ((istype(H, /obj/item/weapon/restraints/handcuffs) && !( src.chained ))) //H = null diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm index 04679faa2c5..9e0b55df4cb 100644 --- a/code/modules/clothing/spacesuits/chronosuit.dm +++ b/code/modules/clothing/spacesuits/chronosuit.dm @@ -34,7 +34,7 @@ var/teleporting = 0 -/obj/item/clothing/suit/space/chronos/proc/new_camera(var/mob/user) +/obj/item/clothing/suit/space/chronos/proc/new_camera(mob/user) if(camera) qdel(camera) camera = new /obj/effect/chronos_cam(get_turf(user)) @@ -65,7 +65,7 @@ user << "Elecrtromagnetic pulse detected, shutting down systems to preserve integrity..." deactivate() -/obj/item/clothing/suit/space/chronos/proc/chronowalk(var/mob/living/carbon/human/user) +/obj/item/clothing/suit/space/chronos/proc/chronowalk(mob/living/carbon/human/user) if(!teleporting && user && (user.stat == CONSCIOUS)) teleporting = 1 var/turf/from_turf = get_turf(user) diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index 51ff7384a99..86594113f29 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -17,7 +17,7 @@ user << "There are [extinguishes_left] extinguisher canisters left in this suit." -/obj/item/clothing/suit/space/eva/plasmaman/proc/Extinguish(var/mob/living/carbon/human/H) +/obj/item/clothing/suit/space/eva/plasmaman/proc/Extinguish(mob/living/carbon/human/H) if(!istype(H)) return diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index d3b65c48e3a..d8dc137f797 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -103,7 +103,7 @@ armor = list(melee = 10, bullet = 10, laser = 60, energy = 50, bomb = 0, bio = 0, rad = 0) var/hit_reflect_chance = 40 -/obj/item/clothing/suit/armor/laserproof/IsReflect(var/def_zone) +/obj/item/clothing/suit/armor/laserproof/IsReflect(def_zone) if(!(def_zone in list("chest", "groin"))) //If not shot where ablative is covering you, you don't get the reflection bonus! hit_reflect_chance = 0 if (prob(hit_reflect_chance)) @@ -135,7 +135,7 @@ return 1 return 0 -/obj/item/clothing/suit/armor/reactive/attack_self(mob/user as mob) +/obj/item/clothing/suit/armor/reactive/attack_self(mob/user) src.active = !( src.active ) if (src.active) user << "[src] is now active." diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm index 24989946279..15bba89ad87 100644 --- a/code/modules/clothing/suits/toggles.dm +++ b/code/modules/clothing/suits/toggles.dm @@ -57,7 +57,7 @@ //Toggle exosuits for different aesthetic styles (hoodies, suit jacket buttons, etc) -/obj/item/clothing/suit/toggle/AltClick(var/mob/user) +/obj/item/clothing/suit/toggle/AltClick(mob/user) ..() if(!user.canUseTopic(user)) user << "You can't do that right now!" diff --git a/code/modules/clothing/under/chameleon.dm b/code/modules/clothing/under/chameleon.dm index 578a9d51ab5..e6d1ecb8629 100644 --- a/code/modules/clothing/under/chameleon.dm +++ b/code/modules/clothing/under/chameleon.dm @@ -25,7 +25,7 @@ return -/obj/item/clothing/under/chameleon/attackby(obj/item/clothing/under/U as obj, mob/user as mob, params) +/obj/item/clothing/under/chameleon/attackby(obj/item/clothing/under/U, mob/user, params) ..() if(istype(U, /obj/item/clothing/under/chameleon)) user << "\Nothing happens." diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index e828b3fe049..82f2030cc8d 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -286,6 +286,6 @@ item_color = "petcollar" var/tagname = null -/obj/item/clothing/tie/petcollar/attack_self(mob/user as mob) +/obj/item/clothing/tie/petcollar/attack_self(mob/user) tagname = copytext(sanitize(input(user, "Would you like to change the name on the tag?", "Name your new pet", "Spot") as null|text),1,MAX_NAME_LEN) name = "[initial(name)] - [tagname]" \ No newline at end of file diff --git a/code/modules/crafting/guncrafting.dm b/code/modules/crafting/guncrafting.dm index ae95ef86a03..df9fba019af 100644 --- a/code/modules/crafting/guncrafting.dm +++ b/code/modules/crafting/guncrafting.dm @@ -18,7 +18,7 @@ // CRAFTING // -/obj/item/weaponcrafting/reciever/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/weaponcrafting/reciever/attackby(obj/item/W, mob/user, params) if(istype(W,/obj/item/pipe)) user << "You attach the shotgun barrel to the receiver. The pins seem loose." var/obj/item/weaponcrafting/ishotgunconstruction/I = new /obj/item/weaponcrafting/ishotgunconstruction @@ -36,7 +36,7 @@ icon = 'icons/obj/improvised.dmi' icon_state = "ishotgunstep1" -/obj/item/weaponcrafting/ishotgunconstruction/attackby(var/obj/item/I, mob/user as mob, params) +/obj/item/weaponcrafting/ishotgunconstruction/attackby(obj/item/I, mob/user, params) ..() if(istype(I, /obj/item/weapon/screwdriver)) var/obj/item/weaponcrafting/ishotgunconstruction2/C = new /obj/item/weaponcrafting/ishotgunconstruction2 @@ -51,7 +51,7 @@ icon = 'icons/obj/improvised.dmi' icon_state = "ishotgunstep1" -/obj/item/weaponcrafting/ishotgunconstruction2/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/weaponcrafting/ishotgunconstruction2/attackby(obj/item/W, mob/user, params) if(istype(W,/obj/item/weaponcrafting/stock)) user << "You attach the stock to the receiver-barrel assembly." var/obj/item/weaponcrafting/ishotgunconstruction3/I = new /obj/item/weaponcrafting/ishotgunconstruction3 @@ -67,7 +67,7 @@ icon = 'icons/obj/improvised.dmi' icon_state = "ishotgunstep2" -/obj/item/weaponcrafting/ishotgunconstruction3/attackby(var/obj/item/I, mob/user as mob, params) +/obj/item/weaponcrafting/ishotgunconstruction3/attackby(obj/item/I, mob/user, params) ..() if(istype(I, /obj/item/stack/packageWrap)) var/obj/item/stack/packageWrap/C = I diff --git a/code/modules/crafting/table.dm b/code/modules/crafting/table.dm index 2cd99a8f349..3d0ed8b6d84 100644 --- a/code/modules/crafting/table.dm +++ b/code/modules/crafting/table.dm @@ -252,7 +252,7 @@ if(. <= 0) . = categories.len -/obj/structure/table/proc/build_recipe_text(var/datum/table_recipe/R) +/obj/structure/table/proc/build_recipe_text(datum/table_recipe/R) . = "" var/name_text = "" var/req_text = "" diff --git a/code/modules/detectivework/detective_work.dm b/code/modules/detectivework/detective_work.dm index 9be12ce096e..9d4981c9e80 100644 --- a/code/modules/detectivework/detective_work.dm +++ b/code/modules/detectivework/detective_work.dm @@ -47,7 +47,7 @@ //world.log << "Added fibertext: [fibertext]" suit_fibers += "Material from a pair of [M.gloves.name]." -/atom/proc/add_hiddenprint(mob/living/M as mob) +/atom/proc/add_hiddenprint(mob/living/M) if(isnull(M)) return if(isnull(M.key)) return if(ishuman(M)) @@ -71,7 +71,7 @@ return //Set ignoregloves to add prints irrespective of the mob having gloves on. -/atom/proc/add_fingerprint(mob/living/M as mob, ignoregloves = 0) +/atom/proc/add_fingerprint(mob/living/M, ignoregloves = 0) if(isnull(M)) return if(isnull(M.key)) return if(ishuman(M)) @@ -127,7 +127,7 @@ return -/atom/proc/transfer_fingerprints_to(var/atom/A) +/atom/proc/transfer_fingerprints_to(atom/A) // Make sure everything are lists. if(!islist(A.fingerprints)) diff --git a/code/modules/detectivework/evidence.dm b/code/modules/detectivework/evidence.dm index b43f7077d9f..5f290278b75 100644 --- a/code/modules/detectivework/evidence.dm +++ b/code/modules/detectivework/evidence.dm @@ -65,7 +65,7 @@ w_class = I.w_class return 1 -/obj/item/weapon/evidencebag/attack_self(mob/user as mob) +/obj/item/weapon/evidencebag/attack_self(mob/user) if(contents.len) var/obj/item/I = contents[1] user.visible_message("[user] takes [I] out of [src].", "You take [I] out of [src].",\ diff --git a/code/modules/detectivework/footprints_and_rag.dm b/code/modules/detectivework/footprints_and_rag.dm index 73849b4b366..512c860991a 100644 --- a/code/modules/detectivework/footprints_and_rag.dm +++ b/code/modules/detectivework/footprints_and_rag.dm @@ -18,7 +18,7 @@ possible_transfer_amounts = list(5) volume = 5 -/obj/item/weapon/reagent_containers/glass/rag/afterattack(atom/A as obj|turf|area, mob/user as mob,proximity) +/obj/item/weapon/reagent_containers/glass/rag/afterattack(atom/A as obj|turf|area, mob/user,proximity) if(!proximity) return if(ismob(A) && A.reagents && reagents.total_volume) diff --git a/code/modules/detectivework/scanner.dm b/code/modules/detectivework/scanner.dm index 5fbe0263949..66323ca69de 100644 --- a/code/modules/detectivework/scanner.dm +++ b/code/modules/detectivework/scanner.dm @@ -13,7 +13,7 @@ var/scanning = 0 var/list/log = list() -/obj/item/device/detective_scanner/attack_self(var/mob/user) +/obj/item/device/detective_scanner/attack_self(mob/user) if(log.len && !scanning) scanning = 1 user << "Printing report, please wait..." @@ -39,14 +39,14 @@ else user << "The scanner has no logs or is in use." -/obj/item/device/detective_scanner/attack(mob/living/M as mob, mob/user as mob) +/obj/item/device/detective_scanner/attack(mob/living/M, mob/user) return -/obj/item/device/detective_scanner/afterattack(atom/A, mob/user as mob, proximity) +/obj/item/device/detective_scanner/afterattack(atom/A, mob/user, proximity) scan(A, user) -/obj/item/device/detective_scanner/proc/scan(var/atom/A, var/mob/user) +/obj/item/device/detective_scanner/proc/scan(atom/A, mob/user) if(!scanning) // Can remotely scan objects and mobs. @@ -160,7 +160,7 @@ scanning = 0 return -/obj/item/device/detective_scanner/proc/add_log(var/msg, var/broadcast = 1) +/obj/item/device/detective_scanner/proc/add_log(msg, broadcast = 1) if(scanning) if(broadcast && ismob(loc)) var/mob/M = loc diff --git a/code/modules/events/shuttle_loan.dm b/code/modules/events/shuttle_loan.dm index 9c43c40eea8..e3df65c5480 100644 --- a/code/modules/events/shuttle_loan.dm +++ b/code/modules/events/shuttle_loan.dm @@ -184,7 +184,7 @@ var/spawn_type = pick_n_take(shuttle_spawns) new spawn_type(T) -/datum/round_event/shuttle_loan/proc/add_crates(var/list/crate_types, var/list/turfs) +/datum/round_event/shuttle_loan/proc/add_crates(list/crate_types, list/turfs) for(var/crate_type in crate_types) var/turf/T = pick_n_take(turfs) var/datum/supply_packs/sp_obj = new crate_type() diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index e89b8f97dda..c633246b3e4 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -343,7 +343,7 @@ eater.say("Nom") qdel(src) -/obj/effect/spacevine/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/effect/spacevine/attackby(obj/item/weapon/W, mob/user, params) if (!W || !user || !W.type) return user.changeNext_move(CLICK_CD_MELEE) @@ -381,13 +381,13 @@ for(var/datum/spacevine_mutation/SM in mutations) SM.on_cross(src, crosser) -/obj/effect/spacevine/attack_hand(mob/user as mob) +/obj/effect/spacevine/attack_hand(mob/user) for(var/datum/spacevine_mutation/SM in mutations) SM.on_hit(src, user) user_unbuckle_mob(user, user) -/obj/effect/spacevine/attack_paw(mob/living/user as mob) +/obj/effect/spacevine/attack_paw(mob/living/user) user.do_attack_animation(src) for(var/datum/spacevine_mutation/SM in mutations) SM.on_hit(src, user) @@ -426,7 +426,7 @@ SSobj.processing.Remove(src) ..() -/obj/effect/spacevine_controller/proc/spawn_spacevine_piece(var/turf/location, obj/effect/spacevine/parent, list/muts) +/obj/effect/spacevine_controller/proc/spawn_spacevine_piece(turf/location, obj/effect/spacevine/parent, list/muts) var/obj/effect/spacevine/SV = new(location) growth_queue += SV vines += SV diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 388da344db4..780af970fee 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -22,14 +22,14 @@ Gunshots/explosions/opening doors/less rare audio (done) /mob/living/carbon/proc/handle_hallucinations() if(handling_hal) return - + //Least obvious var/list/minor = list("sounds"=20,"bolts_minor"=10,"whispers"=15,"message"=5) //Something's wrong here var/list/medium = list("hudscrew"=15,"items"=15,"dangerflash"=15,"bolts"=10,"flood"=10,"husks"=10,"battle"=10) //AAAAH var/list/major = list("fake"=10,"death"=5,"xeno"=10,"singulo"=10,"delusion"=10) - + var/grade = 0 var/current = list() var/trip_length = 0 @@ -83,14 +83,14 @@ Gunshots/explosions/opening doors/less rare audio (done) I.color = col_mod return I -/obj/effect/hallucination/simple/proc/Show(var/update=1) +/obj/effect/hallucination/simple/proc/Show(update=1) if(active) if(target.client) target.client.images.Remove(current_image) if(update) current_image = GetImage() if(target.client) target.client.images |= current_image -/obj/effect/hallucination/simple/update_icon(var/new_state,var/new_icon,var/new_px=0,var/new_py=0) +/obj/effect/hallucination/simple/update_icon(new_state,new_icon,new_px=0,new_py=0) image_state = new_state if(new_icon) image_icon = new_icon @@ -209,7 +209,7 @@ Gunshots/explosions/opening doors/less rare audio (done) src.throwing = 0 src.throw_impact(get_turf(src)) - + return 1 /obj/effect/hallucination/simple/xeno/throw_impact(A) @@ -407,7 +407,7 @@ Gunshots/explosions/opening doors/less rare audio (done) var/health = 100 -/obj/effect/fake_attacker/attackby(var/obj/item/weapon/P as obj, mob/living/user as mob, params) +/obj/effect/fake_attacker/attackby(obj/item/weapon/P, mob/living/user, params) step_away(src,my_target,2) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) @@ -418,7 +418,7 @@ Gunshots/explosions/opening doors/less rare audio (done) src.health -= P.force return -/obj/effect/fake_attacker/Crossed(var/mob/M, somenumber) +/obj/effect/fake_attacker/Crossed(mob/M, somenumber) if(M == my_target) step_away(src,my_target,2) if(prob(30)) @@ -489,7 +489,7 @@ Gunshots/explosions/opening doors/less rare audio (done) collapse = 1 updateimage() -/obj/effect/fake_attacker/proc/fake_blood(var/mob/target) +/obj/effect/fake_attacker/proc/fake_blood(mob/target) var/obj/effect/overlay/O = new/obj/effect/overlay(target.loc) O.name = "blood" var/image/I = image('icons/effects/blood.dmi',O,"floor[rand(1,7)]",O.dir,1) @@ -581,7 +581,7 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite target << chosen qdel(src) -/mob/living/carbon/proc/hallucinate(var/hal_type) // Todo -> proc / defines +/mob/living/carbon/proc/hallucinate(hal_type) // Todo -> proc / defines switch(hal_type) if("xeno") new /obj/effect/hallucination/xeno_attack(src.loc,src) diff --git a/code/modules/food&drinks/drinks/drinks.dm b/code/modules/food&drinks/drinks/drinks.dm index a99e0c6a6b0..ff06642aa2d 100644 --- a/code/modules/food&drinks/drinks/drinks.dm +++ b/code/modules/food&drinks/drinks/drinks.dm @@ -21,10 +21,10 @@ if (gulp_size < 5) gulp_size = 5 else gulp_size = max(round(reagents.total_volume / 5), 5) -/obj/item/weapon/reagent_containers/food/drinks/attack_self(mob/user as mob) +/obj/item/weapon/reagent_containers/food/drinks/attack_self(mob/user) return -/obj/item/weapon/reagent_containers/food/drinks/attack(mob/M as mob, mob/user as mob, def_zone) +/obj/item/weapon/reagent_containers/food/drinks/attack(mob/M, mob/user, def_zone) if(!reagents || !reagents.total_volume) user << "[src] is empty!" @@ -85,7 +85,7 @@ return -/obj/item/weapon/reagent_containers/food/drinks/attackby(var/obj/item/I, mob/user as mob, params) +/obj/item/weapon/reagent_containers/food/drinks/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/clothing/mask/cigarette)) //ciggies are weird return if(is_hot(I)) diff --git a/code/modules/food&drinks/drinks/drinks/bottle.dm b/code/modules/food&drinks/drinks/drinks/bottle.dm index 7b806842aab..df99e5dc3eb 100644 --- a/code/modules/food&drinks/drinks/drinks/bottle.dm +++ b/code/modules/food&drinks/drinks/drinks/bottle.dm @@ -11,7 +11,7 @@ var/const/duration = 13 //Directly relates to the 'weaken' duration. Lowered by armor (i.e. helmets) var/isGlass = 1 //Whether the 'bottle' is made of glass or not so that milk cartons dont shatter when someone gets hit by it -/obj/item/weapon/reagent_containers/food/drinks/bottle/proc/smash(mob/living/target as mob, mob/living/user as mob) +/obj/item/weapon/reagent_containers/food/drinks/bottle/proc/smash(mob/living/target, mob/living/user) //Creates a shattering noise and replaces the bottle with a broken_bottle user.drop_item() @@ -32,7 +32,7 @@ qdel(src) -/obj/item/weapon/reagent_containers/food/drinks/bottle/attack(mob/living/target as mob, mob/living/user as mob) +/obj/item/weapon/reagent_containers/food/drinks/bottle/attack(mob/living/target, mob/living/user) if(!target) return diff --git a/code/modules/food&drinks/drinks/drinks/drinkingglass.dm b/code/modules/food&drinks/drinks/drinks/drinkingglass.dm index 440c8224b86..c595ab5bc77 100644 --- a/code/modules/food&drinks/drinks/drinks/drinkingglass.dm +++ b/code/modules/food&drinks/drinks/drinks/drinkingglass.dm @@ -593,7 +593,7 @@ /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/filled/cola list_reagents = list("cola" = 50) -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/attackby(var/obj/item/I, mob/user as mob, params) +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/attackby(obj/item/I, mob/user, params) if(istype(I,/obj/item/weapon/reagent_containers/food/snacks/egg)) //breaking eggs var/obj/item/weapon/reagent_containers/food/snacks/egg/E = I if(reagents) diff --git a/code/modules/food&drinks/food/condiment.dm b/code/modules/food&drinks/food/condiment.dm index de98ecda990..9f4e49345e1 100644 --- a/code/modules/food&drinks/food/condiment.dm +++ b/code/modules/food&drinks/food/condiment.dm @@ -26,10 +26,10 @@ "sugar" = list("emptycondiment", "sugar bottle", "Tasty spacey sugar!")) -/obj/item/weapon/reagent_containers/food/condiment/attack_self(mob/user as mob) +/obj/item/weapon/reagent_containers/food/condiment/attack_self(mob/user) return -/obj/item/weapon/reagent_containers/food/condiment/attack(mob/M as mob, mob/user as mob, def_zone) +/obj/item/weapon/reagent_containers/food/condiment/attack(mob/M, mob/user, def_zone) if(!reagents || !reagents.total_volume) user << "None of [src] left, oh no!" diff --git a/code/modules/food&drinks/food/snacks.dm b/code/modules/food&drinks/food/snacks.dm index 1ea60e2531c..51203df2505 100644 --- a/code/modules/food&drinks/food/snacks.dm +++ b/code/modules/food&drinks/food/snacks.dm @@ -162,7 +162,7 @@ var/amount = bonus_reagents[r_id] reagents.add_reagent(r_id, amount) -/obj/item/weapon/reagent_containers/food/snacks/proc/slice(var/accuracy, obj/item/weapon/W, mob/user) +/obj/item/weapon/reagent_containers/food/snacks/proc/slice(accuracy, obj/item/weapon/W, mob/user) if((slices_num <= 0 || !slices_num) || !slice_path) //is the food sliceable? return 0 diff --git a/code/modules/food&drinks/food/snacks_egg.dm b/code/modules/food&drinks/food/snacks_egg.dm index 08e3076e190..6a17202d6f0 100644 --- a/code/modules/food&drinks/food/snacks_egg.dm +++ b/code/modules/food&drinks/food/snacks_egg.dm @@ -23,7 +23,7 @@ reagents.reaction(hit_atom, TOUCH) del(src) // Not qdel, because it'll hit other mobs then the floor for runtimes. -/obj/item/weapon/reagent_containers/food/snacks/egg/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/reagent_containers/food/snacks/egg/attackby(obj/item/weapon/W, mob/user, params) if(istype( W, /obj/item/toy/crayon )) var/obj/item/toy/crayon/C = W var/clr = C.colourName diff --git a/code/modules/food&drinks/kitchen machinery/food_cart.dm b/code/modules/food&drinks/kitchen machinery/food_cart.dm index 1cff6be4b82..e1d411e4538 100644 --- a/code/modules/food&drinks/kitchen machinery/food_cart.dm +++ b/code/modules/food&drinks/kitchen machinery/food_cart.dm @@ -24,11 +24,11 @@ mixer = new /obj/item/weapon/reagent_containers(src, MIXER_CAPACITY) mixer.name = "Mixer" -/obj/machinery/food_cart/attack_hand(mob/user as mob) +/obj/machinery/food_cart/attack_hand(mob/user) user.set_machine(src) interact(user) -/obj/machinery/food_cart/interact(mob/user as mob) +/obj/machinery/food_cart/interact(mob/user) var/dat dat += "
    STORED INGREDIENTS AND DRINKS
    " dat += "Remaining glasses: [glasses]
    " @@ -59,7 +59,7 @@ /obj/machinery/food_cart/proc/isFull() return food_stored >= STORAGE_CAPACITY -/obj/machinery/food_cart/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/food_cart/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/weapon/reagent_containers/food/drinks/drinkingglass)) var/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/DG = O if(!DG.reagents.total_volume) //glass is empty diff --git a/code/modules/food&drinks/kitchen machinery/gibber.dm b/code/modules/food&drinks/kitchen machinery/gibber.dm index ca40eb15486..1e0b4a791a2 100644 --- a/code/modules/food&drinks/kitchen machinery/gibber.dm +++ b/code/modules/food&drinks/kitchen machinery/gibber.dm @@ -35,7 +35,7 @@ diary << "a [src] didn't find an input plate." return -/obj/machinery/gibber/autogibber/Bumped(var/atom/A) +/obj/machinery/gibber/autogibber/Bumped(atom/A) if(!input_plate) return if(ismob(A)) @@ -78,14 +78,14 @@ else src.overlays += image('icons/obj/kitchen.dmi', "gridle") -/obj/machinery/gibber/attack_paw(mob/user as mob) +/obj/machinery/gibber/attack_paw(mob/user) return src.attack_hand(user) /obj/machinery/gibber/container_resist() src.go_out() return -/obj/machinery/gibber/attack_hand(mob/user as mob) +/obj/machinery/gibber/attack_hand(mob/user) if(stat & (NOPOWER|BROKEN)) return if(operating) @@ -94,7 +94,7 @@ else src.startgibbing(user) -/obj/machinery/gibber/attackby(obj/item/P as obj, mob/user as mob, params) +/obj/machinery/gibber/attackby(obj/item/P, mob/user, params) if (istype(P, /obj/item/weapon/grab)) var/obj/item/weapon/grab/G = P if(!istype(G.affecting, /mob/living/carbon/)) @@ -148,7 +148,7 @@ dropContents() update_icon() -/obj/machinery/gibber/proc/startgibbing(mob/user as mob) +/obj/machinery/gibber/proc/startgibbing(mob/user) if(src.operating) return if(!src.occupant) diff --git a/code/modules/food&drinks/kitchen machinery/icecream_vat.dm b/code/modules/food&drinks/kitchen machinery/icecream_vat.dm index a42158fca57..97fc97d5e47 100644 --- a/code/modules/food&drinks/kitchen machinery/icecream_vat.dm +++ b/code/modules/food&drinks/kitchen machinery/icecream_vat.dm @@ -19,7 +19,7 @@ flags = OPENCONTAINER | NOREACT reagents = new() -/obj/machinery/icecream_vat/proc/get_ingredient_list(var/type) +/obj/machinery/icecream_vat/proc/get_ingredient_list(type) switch(type) if(ICECREAM_CHOCOLATE) return list("milk", "ice", "cocoa") @@ -35,7 +35,7 @@ return list("milk", "ice") -/obj/machinery/icecream_vat/proc/get_flavour_name(var/flavour_type) +/obj/machinery/icecream_vat/proc/get_flavour_name(flavour_type) switch(flavour_type) if(ICECREAM_CHOCOLATE) return "chocolate" @@ -61,11 +61,11 @@ reagents.add_reagent("sugar", 5) reagents.add_reagent("ice", 5) -/obj/machinery/icecream_vat/attack_hand(mob/user as mob) +/obj/machinery/icecream_vat/attack_hand(mob/user) user.set_machine(src) interact(user) -/obj/machinery/icecream_vat/interact(mob/user as mob) +/obj/machinery/icecream_vat/interact(mob/user) var/dat dat += "ICECREAM
    " dat += "Dispensing: [flavour_name] icecream

    " @@ -87,7 +87,7 @@ popup.set_content(dat) popup.open() -/obj/machinery/icecream_vat/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/icecream_vat/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/icecream)) var/obj/item/weapon/reagent_containers/food/snacks/icecream/I = O if(!I.ice_creamed) @@ -110,7 +110,7 @@ else ..() -/obj/machinery/icecream_vat/proc/make(var/mob/user, var/make_type, var/amount) +/obj/machinery/icecream_vat/proc/make(mob/user, make_type, amount) for(var/R in get_ingredient_list(make_type)) if(reagents.has_reagent(R, amount)) continue diff --git a/code/modules/food&drinks/kitchen machinery/juicer.dm b/code/modules/food&drinks/kitchen machinery/juicer.dm index 4894af742f3..e688b2ee575 100644 --- a/code/modules/food&drinks/kitchen machinery/juicer.dm +++ b/code/modules/food&drinks/kitchen machinery/juicer.dm @@ -35,7 +35,7 @@ return -/obj/machinery/juicer/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/juicer/attackby(obj/item/O, mob/user, params) if(default_unfasten_wrench(user, O)) return if (istype(O,/obj/item/weapon/reagent_containers/glass) || \ @@ -62,17 +62,17 @@ src.updateUsrDialog() return 0 -/obj/machinery/juicer/attack_paw(mob/user as mob) +/obj/machinery/juicer/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/juicer/attack_ai(mob/user as mob) +/obj/machinery/juicer/attack_ai(mob/user) return 0 -/obj/machinery/juicer/attack_hand(mob/user as mob) +/obj/machinery/juicer/attack_hand(mob/user) user.set_machine(src) interact(user) -/obj/machinery/juicer/interact(mob/user as mob) // The microwave Menu +/obj/machinery/juicer/interact(mob/user) // The microwave Menu var/is_chamber_empty = 0 var/is_beaker_ready = 0 var/processing_chamber = "" @@ -138,12 +138,12 @@ beaker = null update_icon() -/obj/machinery/juicer/proc/get_juice_id(var/obj/item/weapon/reagent_containers/food/snacks/grown/O) +/obj/machinery/juicer/proc/get_juice_id(obj/item/weapon/reagent_containers/food/snacks/grown/O) for (var/i in allowed_items) if (istype(O, i)) return allowed_items[i] -/obj/machinery/juicer/proc/get_juice_amount(var/obj/item/weapon/reagent_containers/food/snacks/grown/O) +/obj/machinery/juicer/proc/get_juice_amount(obj/item/weapon/reagent_containers/food/snacks/grown/O) if (!istype(O)) return 5 else if (O.potency == -1) diff --git a/code/modules/food&drinks/kitchen machinery/microwave.dm b/code/modules/food&drinks/kitchen machinery/microwave.dm index 2bfe5e836ce..ff512b49687 100644 --- a/code/modules/food&drinks/kitchen machinery/microwave.dm +++ b/code/modules/food&drinks/kitchen machinery/microwave.dm @@ -47,7 +47,7 @@ * Item Adding ********************/ -/obj/machinery/microwave/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/microwave/attackby(obj/item/O, mob/user, params) if(operating) return if(!broken && dirty<100) @@ -162,13 +162,13 @@ ..() updateUsrDialog() -/obj/machinery/microwave/attack_paw(mob/user as mob) +/obj/machinery/microwave/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/microwave/attack_ai(mob/user as mob) +/obj/machinery/microwave/attack_ai(mob/user) return 0 -/obj/machinery/microwave/attack_hand(mob/user as mob) +/obj/machinery/microwave/attack_hand(mob/user) if(..()) return user.set_machine(src) @@ -178,7 +178,7 @@ * Microwave Menu ********************/ -/obj/machinery/microwave/interact(mob/user as mob) // The microwave Menu +/obj/machinery/microwave/interact(mob/user) // The microwave Menu if(panel_open || !anchored) return var/dat = "
    " @@ -260,7 +260,7 @@ return -/obj/machinery/microwave/proc/microwaving(var/seconds as num) +/obj/machinery/microwave/proc/microwaving(seconds as num) for (var/i=1 to seconds) if (stat & (NOPOWER|BROKEN)) return 0 diff --git a/code/modules/food&drinks/kitchen machinery/monkeyrecycler.dm b/code/modules/food&drinks/kitchen machinery/monkeyrecycler.dm index fc6a899f5b0..84902910ba1 100644 --- a/code/modules/food&drinks/kitchen machinery/monkeyrecycler.dm +++ b/code/modules/food&drinks/kitchen machinery/monkeyrecycler.dm @@ -32,7 +32,7 @@ cube_production = cubes_made required_grind = req_grind -/obj/machinery/monkey_recycler/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/monkey_recycler/attackby(obj/item/O, mob/user, params) if(default_deconstruction_screwdriver(user, "grinder_open", "grinder", O)) return @@ -77,7 +77,7 @@ user << "The machine only accepts monkeys!" return -/obj/machinery/monkey_recycler/attack_hand(var/mob/user as mob) +/obj/machinery/monkey_recycler/attack_hand(mob/user) if (src.stat != 0) //NOPOWER etc return if(grinded >= required_grind) diff --git a/code/modules/food&drinks/kitchen machinery/processor.dm b/code/modules/food&drinks/kitchen machinery/processor.dm index 78038266d98..431dee34309 100644 --- a/code/modules/food&drinks/kitchen machinery/processor.dm +++ b/code/modules/food&drinks/kitchen machinery/processor.dm @@ -33,7 +33,7 @@ var/input var/output var/time = 40 -/datum/food_processor_process/proc/process_food(loc, what, var/obj/machinery/processor/processor) +/datum/food_processor_process/proc/process_food(loc, what, obj/machinery/processor/processor) if (src.output && loc && processor) for(var/i = 0, i < processor.rating_amount, i++) new src.output(loc) @@ -79,7 +79,7 @@ ..() -/datum/food_processor_process/mob/slime/process_food(loc, what, var/obj/machinery/processor/processor) +/datum/food_processor_process/mob/slime/process_food(loc, what, obj/machinery/processor/processor) var/mob/living/simple_animal/slime/S = what var/C = S.cores if(S.stat != DEAD) @@ -126,7 +126,7 @@ /datum/food_processor_process/mob/monkey/input = /mob/living/carbon/monkey /datum/food_processor_process/mob/monkey/output = null -/obj/machinery/processor/proc/select_recipe(var/X) +/obj/machinery/processor/proc/select_recipe(X) for (var/Type in typesof(/datum/food_processor_process) - /datum/food_processor_process - /datum/food_processor_process/mob) var/datum/food_processor_process/P = new Type() if (!istype(X, P.input)) @@ -134,7 +134,7 @@ return P return 0 -/obj/machinery/processor/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/processor/attackby(obj/item/O, mob/user, params) if(src.processing) user << "The processor is in the process of processing!" return 1 @@ -169,7 +169,7 @@ what:loc = src return -/obj/machinery/processor/attack_hand(var/mob/user as mob) +/obj/machinery/processor/attack_hand(mob/user) if (src.stat != 0) //NOPOWER etc return if(src.processing) diff --git a/code/modules/food&drinks/kitchen machinery/smartfridge.dm b/code/modules/food&drinks/kitchen machinery/smartfridge.dm index 9365a4e9703..1e83c706d99 100644 --- a/code/modules/food&drinks/kitchen machinery/smartfridge.dm +++ b/code/modules/food&drinks/kitchen machinery/smartfridge.dm @@ -54,7 +54,7 @@ * Item Adding ********************/ -/obj/machinery/smartfridge/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/smartfridge/attackby(obj/item/O, mob/user, params) if(default_deconstruction_screwdriver(user, "smartfridge_open", "smartfridge", O)) return @@ -118,12 +118,12 @@ -/obj/machinery/smartfridge/proc/accept_check(var/obj/item/O as obj) +/obj/machinery/smartfridge/proc/accept_check(obj/item/O) if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/grown/) || istype(O,/obj/item/seeds/)) return 1 return 0 -/obj/machinery/smartfridge/proc/load(var/obj/item/O as obj) +/obj/machinery/smartfridge/proc/load(obj/item/O) if(istype(O.loc,/mob)) var/mob/M = O.loc if(!M.unEquip(O)) @@ -142,13 +142,13 @@ item_quants[n] = 1 sortList(item_quants) -/obj/machinery/smartfridge/attack_paw(mob/user as mob) +/obj/machinery/smartfridge/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/smartfridge/attack_ai(mob/user as mob) +/obj/machinery/smartfridge/attack_ai(mob/user) return 0 -/obj/machinery/smartfridge/attack_hand(mob/user as mob) +/obj/machinery/smartfridge/attack_hand(mob/user) user.set_machine(src) interact(user) @@ -156,7 +156,7 @@ * SmartFridge Menu ********************/ -/obj/machinery/smartfridge/interact(mob/user as mob) +/obj/machinery/smartfridge/interact(mob/user) if(stat) return 0 @@ -227,7 +227,7 @@ icon_off = "drying_rack" var/drying = 0 -/obj/machinery/smartfridge/drying_rack/interact(mob/user as mob) +/obj/machinery/smartfridge/drying_rack/interact(mob/user) var/dat = ..() if(dat) dat += "
    " @@ -235,7 +235,7 @@ user << browse("[src] supplies[dat]", "window=smartfridge") onclose(user, "smartfridge") -/obj/machinery/smartfridge/drying_rack/Topic(var/href, var/list/href_list) +/obj/machinery/smartfridge/drying_rack/Topic(href, list/href_list) ..() if(href_list["dry"]) toggle_drying() @@ -267,14 +267,14 @@ if(rack_dry())//no need to update unless something got dried update_icon() -/obj/machinery/smartfridge/drying_rack/accept_check(var/obj/item/O as obj) +/obj/machinery/smartfridge/drying_rack/accept_check(obj/item/O) if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/)) var/obj/item/weapon/reagent_containers/food/snacks/S = O if(S.dried_type) return 1 return 0 -/obj/machinery/smartfridge/drying_rack/proc/toggle_drying(var/forceoff = 0) +/obj/machinery/smartfridge/drying_rack/proc/toggle_drying(forceoff = 0) if(drying || forceoff) drying = 0 use_power = 1 @@ -308,7 +308,7 @@ name = "drink showcase" desc = "A refrigerated storage unit for tasty tasty alcohol." -/obj/machinery/smartfridge/drinks/accept_check(var/obj/item/O as obj) +/obj/machinery/smartfridge/drinks/accept_check(obj/item/O) if(!istype(O,/obj/item/weapon/reagent_containers) || !O.reagents || !O.reagents.reagent_list.len) return 0 if(istype(O,/obj/item/weapon/reagent_containers/glass) || istype(O,/obj/item/weapon/reagent_containers/food/drinks) || istype(O,/obj/item/weapon/reagent_containers/food/condiment)) @@ -322,7 +322,7 @@ name = "smart slime extract storage" desc = "A refrigerated storage unit for slime extracts." -/obj/machinery/smartfridge/extract/accept_check(var/obj/item/O as obj) +/obj/machinery/smartfridge/extract/accept_check(obj/item/O) if(istype(O,/obj/item/slime_extract)) return 1 if(istype(O,/obj/item/device/slime_scanner)) @@ -355,7 +355,7 @@ load(I) amount-- -/obj/machinery/smartfridge/chemistry/accept_check(var/obj/item/O as obj) +/obj/machinery/smartfridge/chemistry/accept_check(obj/item/O) if(istype(O,/obj/item/weapon/storage/pill_bottle)) if(O.contents.len) for(var/obj/item/I in O) diff --git a/code/modules/food&drinks/recipes/food_mixtures.dm b/code/modules/food&drinks/recipes/food_mixtures.dm index f6d4bf2145f..39ad0b66acd 100644 --- a/code/modules/food&drinks/recipes/food_mixtures.dm +++ b/code/modules/food&drinks/recipes/food_mixtures.dm @@ -10,7 +10,7 @@ result_amount = 1 mob_react=1 -/datum/chemical_reaction/tofu/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/tofu/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) for(var/i = 1, i <= created_volume, i++) new /obj/item/weapon/reagent_containers/food/snacks/tofu(location) @@ -23,7 +23,7 @@ required_reagents = list("soymilk" = 2, "cocoa" = 2, "sugar" = 2) result_amount = 1 -/datum/chemical_reaction/chocolate_bar/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/chocolate_bar/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) for(var/i = 1, i <= created_volume, i++) new /obj/item/weapon/reagent_containers/food/snacks/chocolatebar(location) @@ -37,7 +37,7 @@ required_reagents = list("milk" = 2, "cocoa" = 2, "sugar" = 2) result_amount = 1 mob_react = 1 -/datum/chemical_reaction/chocolate_bar2/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/chocolate_bar2/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) for(var/i = 1, i <= created_volume, i++) new /obj/item/weapon/reagent_containers/food/snacks/chocolatebar(location) @@ -87,7 +87,7 @@ required_catalysts = list("enzyme" = 5) result_amount = 1 -/datum/chemical_reaction/cheesewheel/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/cheesewheel/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) new /obj/item/weapon/reagent_containers/food/snacks/store/cheesewheel(location) return @@ -100,7 +100,7 @@ result_amount = 1 mob_react = 1 -/datum/chemical_reaction/synthmeat/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/synthmeat/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/synthmeat(location) return @@ -129,7 +129,7 @@ required_container = /obj/item/weapon/reagent_containers/food/snacks/tofu mix_message = "The mixture becomes similar to carp meat." -/datum/chemical_reaction/imitationcarpmeat/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/imitationcarpmeat/on_reaction(datum/reagents/holder) var/obj/item/weapon/reagent_containers/food/snacks/S = new /obj/item/weapon/reagent_containers/food/snacks/carpmeat/imitation S.loc = get_turf(holder.my_atom) if(holder && holder.my_atom) @@ -143,7 +143,7 @@ result_amount = 1 mix_message = "The ingredients form a dough." -/datum/chemical_reaction/dough/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/dough/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) for(var/i = 1, i <= created_volume, i++) new /obj/item/weapon/reagent_containers/food/snacks/dough(location) @@ -156,7 +156,7 @@ result_amount = 1 mix_message = "The ingredients form a cake batter." -/datum/chemical_reaction/cakebatter/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/cakebatter/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) for(var/i = 1, i <= created_volume, i++) new /obj/item/weapon/reagent_containers/food/snacks/cakebatter(location) @@ -174,7 +174,7 @@ required_container = /obj/item/weapon/reagent_containers/glass/bowl mix_message = "The rice absorbs the water." -/datum/chemical_reaction/ricebowl/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/ricebowl/on_reaction(datum/reagents/holder) var/obj/item/weapon/reagent_containers/food/snacks/S = new /obj/item/weapon/reagent_containers/food/snacks/salad/ricebowl S.loc = get_turf(holder.my_atom) if(holder && holder.my_atom) diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm index 6058b09be26..0efe72640e1 100644 --- a/code/modules/games/cards.dm +++ b/code/modules/games/cards.dm @@ -52,7 +52,7 @@ src.cards.Add(card) -/obj/item/weapon/deck/attackby(obj/O as obj, mob/user as mob) +/obj/item/weapon/deck/attackby(obj/O, mob/user) if (istype(O,/obj/item/weapon/hand)) var/obj/item/weapon/hand/H = O @@ -63,7 +63,7 @@ user.show_message("You place your cards on the bottom of the deck.") else return ..() -/obj/item/weapon/deck/attack_self(var/mob/user as mob) +/obj/item/weapon/deck/attack_self(mob/user) var/list/newcards = list() var/datum/playingcard/card @@ -82,7 +82,7 @@ if (istype(A, /mob/living)) src.dealTo(A, user) else return ..() -/obj/item/weapon/deck/attack(mob/living/M as mob, mob/living/user as mob, def_zone) +/obj/item/weapon/deck/attack(mob/living/M, mob/living/user, def_zone) if (istype(M)) src.dealTo(M, user) else return ..() @@ -130,7 +130,7 @@ return ..() -/obj/item/weapon/hand/attackby(obj/O as obj, mob/user as mob) +/obj/item/weapon/hand/attackby(obj/O, mob/user) if(istype(O,/obj/item/weapon/hand)) var/obj/item/weapon/hand/H = O @@ -178,7 +178,7 @@ src.update_icon() -/obj/item/weapon/hand/attack_self(var/mob/user as mob) +/obj/item/weapon/hand/attack_self(mob/user) src.hi.show(user) /obj/item/weapon/hand/examine() diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm index 6c5fa4ba2c2..f70dbf3dee4 100644 --- a/code/modules/holiday/easter.dm +++ b/code/modules/holiday/easter.dm @@ -116,7 +116,7 @@ icon_state = "egg-[color]" item_color = "[color]" -/obj/item/weapon/reagent_containers/food/snacks/egg/proc/dispensePrize(var/turf/where) +/obj/item/weapon/reagent_containers/food/snacks/egg/proc/dispensePrize(turf/where) var/won = pick(/obj/item/clothing/head/bunnyhead, /obj/item/clothing/suit/bunnysuit, /obj/item/weapon/reagent_containers/food/snacks/grown/carrot, @@ -133,7 +133,7 @@ new won(where) new/obj/item/weapon/reagent_containers/food/snacks/chocolateegg(where) -/obj/item/weapon/reagent_containers/food/snacks/egg/attack_self(mob/user as mob) +/obj/item/weapon/reagent_containers/food/snacks/egg/attack_self(mob/user) ..() if(containsPrize) user << "You unwrap the [src] and find a prize inside!" diff --git a/code/modules/holiday/halloween.dm b/code/modules/holiday/halloween.dm index 5f83a701ac6..6f187ea2ae9 100644 --- a/code/modules/holiday/halloween.dm +++ b/code/modules/holiday/halloween.dm @@ -276,7 +276,7 @@ if(prob(5)) playsound(loc, 'sound/spookoween/insane_low_laugh.ogg', 300, 1) -/mob/living/simple_animal/hostile/retaliate/clown/insane/attackby(var/obj/item/O as obj, var/mob/user as mob) +/mob/living/simple_animal/hostile/retaliate/clown/insane/attackby(obj/item/O, mob/user) if(istype(O,/obj/item/weapon/nullrod)) if(prob(5)) visible_message("[src] finally found the peace it deserves. You hear honks echoing off into the distance.") diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index bec34b1c197..28784576f31 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -53,7 +53,7 @@ icon_state = "biogen-work" return -/obj/machinery/biogenerator/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/biogenerator/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/weapon/reagent_containers/glass) && !panel_open) if(beaker) user << "A container is already loaded into the machine." @@ -113,7 +113,7 @@ update_icon() return -/obj/machinery/biogenerator/interact(mob/user as mob) +/obj/machinery/biogenerator/interact(mob/user) if(stat & BROKEN || panel_open) return user.set_machine(src) @@ -179,7 +179,7 @@ popup.open() return -/obj/machinery/biogenerator/attack_hand(mob/user as mob) +/obj/machinery/biogenerator/attack_hand(mob/user) interact(user) /obj/machinery/biogenerator/proc/activate() @@ -210,7 +210,7 @@ menustat = "void" return -/obj/machinery/biogenerator/proc/check_cost(var/cost) +/obj/machinery/biogenerator/proc/check_cost(cost) if (cost > points) menustat = "nopoints" return 1 @@ -221,12 +221,12 @@ updateUsrDialog() return 0 -/obj/machinery/biogenerator/proc/check_container_volume(var/reagent_amount) +/obj/machinery/biogenerator/proc/check_container_volume(reagent_amount) if(beaker.reagents.total_volume + reagent_amount > beaker.reagents.maximum_volume) menustat = "nobeakerspace" return 1 -/obj/machinery/biogenerator/proc/create_product(var/create) +/obj/machinery/biogenerator/proc/create_product(create) switch(create) if("milk") if(check_container_volume(10)) return 0 diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 8fe33dc7e58..6c11a41934e 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -49,7 +49,7 @@ return 1 return 0 -/obj/item/weapon/reagent_containers/food/snacks/grown/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/item/weapon/reagent_containers/food/snacks/grown/attackby(obj/item/O, mob/user, params) ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) var/msg @@ -73,7 +73,7 @@ return return -/obj/item/weapon/grown/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/item/weapon/grown/attackby(obj/item/O, mob/user, params) ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) var/msg @@ -193,7 +193,7 @@ reagents.add_reagent("vitamin", 1 + round((potency / 25), 1)) bitesize = reagents.total_volume -/obj/item/weapon/reagent_containers/food/snacks/grown/potato/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/reagent_containers/food/snacks/grown/potato/attackby(obj/item/weapon/W, mob/user, params) ..() if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = W @@ -646,7 +646,7 @@ reagents.add_reagent("vitamin", 1 + round((potency / 25), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) -/obj/item/weapon/reagent_containers/food/snacks/grown/chili/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/item/weapon/reagent_containers/food/snacks/grown/chili/attackby(obj/item/O, mob/user, params) . = ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "- Capsaicin: [reagents.get_reagent_amount("capsaicin")]%" @@ -666,7 +666,7 @@ reagents.add_reagent("frostoil", 3+round(potency / 5, 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) -/obj/item/weapon/reagent_containers/food/snacks/grown/icepepper/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/item/weapon/reagent_containers/food/snacks/grown/icepepper/attackby(obj/item/O, mob/user, params) . = ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "- Frost Oil: [reagents.get_reagent_amount("frostoil")]%" @@ -687,12 +687,12 @@ reagents.add_reagent("condensedcapsaicin", 4+round(potency / 4, 1)) bitesize = 1 + round(reagents.total_volume / 4, 1) -/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/attackby(obj/item/O, mob/user, params) . = ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "- Capsaicin: [reagents.get_reagent_amount("capsaicin")]%" -/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/attack_hand(mob/user as mob) +/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/attack_hand(mob/user) ..() if( istype(src.loc, /mob) ) held_mob = src.loc @@ -832,7 +832,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() return ..() -/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/killer/attack_self(mob/user as mob) +/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/killer/attack_self(mob/user) if(awakening || istype(user.loc,/turf/space)) return user << "You begin to awaken the Killer Tomato..." @@ -861,7 +861,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() splat = /obj/effect/gibspawner/generic filling_color = "#FF0000" -/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blood/add_juice(var/loc, var/potency = 10) +/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blood/add_juice(loc, potency = 10) ..() reagents.add_reagent("blood", 1 + round((potency / 5), 1)) @@ -896,7 +896,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() ..() reagents.add_reagent("singulo", 1 + round((potency / 5), 1)) -/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue/bluespace/attack_self(var/mob/user) +/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue/bluespace/attack_self(mob/user) squish(user) user.unEquip(src) src.visible_message("[user] squashes the [src.name].","You hear a smack.") @@ -961,7 +961,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() reagents.add_reagent("nutriment", 1 + round((potency / 50), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) -/obj/item/weapon/reagent_containers/food/snacks/grown/grass/attack_self(mob/user as mob) +/obj/item/weapon/reagent_containers/food/snacks/grown/grass/attack_self(mob/user) user << "You prepare the astroturf." var/grassAmt = 1 + round(potency / 50) // The grass we're holding for(var/obj/item/weapon/reagent_containers/food/snacks/grown/grass/G in user.loc) // The grass on the floor @@ -986,7 +986,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() desc = "The textile industry's dark secret." icon_state = "carpetclump" -/obj/item/weapon/reagent_containers/food/snacks/grown/carpet/attack_self(mob/user as mob) +/obj/item/weapon/reagent_containers/food/snacks/grown/carpet/attack_self(mob/user) user << "You roll out the red carpet." var/carpetAmt = 1 + round(potency / 50) // The carpet we're holding for(var/obj/item/weapon/reagent_containers/food/snacks/grown/carpet/C in user.loc) // The carpet on the floor @@ -1051,7 +1051,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() reagents.add_reagent("morphine", 3+round(potency / 3, 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) -/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi/attackby(obj/item/O, mob/user, params) . = ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "- Anti-Toxin: [reagents.get_reagent_amount("charcoal")]%" @@ -1071,7 +1071,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() reagents.add_reagent("mushroomhallucinogen", 1 + round(potency / 25, 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) -/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita/attackby(obj/item/O, mob/user, params) . = ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "- Amatoxins: [reagents.get_reagent_amount("amatoxin")]%" @@ -1091,7 +1091,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() reagents.add_reagent("mushroomhallucinogen", 1 + round(potency / 25, 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) -/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/angel/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/angel/attackby(obj/item/O, mob/user, params) . = ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "- Amatoxins: [reagents.get_reagent_amount("amatoxin")]%" @@ -1104,13 +1104,13 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() icon_state = "libertycap" filling_color = "#DAA520" -/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap/add_juice(var/loc, var/potency = 15) +/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap/add_juice(loc, potency = 15) ..() reagents.add_reagent("nutriment", 1 + round((potency / 50), 1)) reagents.add_reagent("mushroomhallucinogen", 3+round(potency / 5, 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) -/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap/attackby(obj/item/O, mob/user, params) . = ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "- Mushroom Hallucinogen: [reagents.get_reagent_amount("mushroomhallucinogen")]%" @@ -1141,7 +1141,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() reagents.add_reagent("nutriment", 2+round((potency / 10), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) -/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/walkingmushroom/attack_self(mob/user as mob) +/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/walkingmushroom/attack_self(mob/user) if(istype(user.loc,/turf/space)) return var/mob/living/simple_animal/hostile/mushroom/M = new /mob/living/simple_animal/hostile/mushroom(user.loc) @@ -1194,7 +1194,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() reagents.add_reagent("radium", 1 + round((potency / 20), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) -/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/attack_self(mob/user as mob) +/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/attack_self(mob/user) if(istype(user.loc,/turf/space)) return var/obj/effect/glowshroom/planted = new /obj/effect/glowshroom(user.loc) @@ -1290,7 +1290,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() desc = "Dry them out to make coffee." icon_state = "coffee_robusta" -/obj/item/weapon/reagent_containers/food/snacks/grown/coffee/robusta/add_juice(var/loc, var/potency = 20) +/obj/item/weapon/reagent_containers/food/snacks/grown/coffee/robusta/add_juice(loc, potency = 20) ..() reagents.add_reagent("morphine", 1 + round((potency / 20), 1)) diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm index 3a925b8e4c4..10af706e393 100644 --- a/code/modules/hydroponics/growninedible.dm +++ b/code/modules/hydroponics/growninedible.dm @@ -66,7 +66,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/wheat) -/obj/item/weapon/grown/log/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/grown/log/attackby(obj/item/weapon/W, mob/user, params) ..() if(istype(W, /obj/item/weapon/circular_saw) || istype(W, /obj/item/weapon/hatchet) || (istype(W, /obj/item/weapon/twohanded/fireaxe) && W:wielded) || istype(W, /obj/item/weapon/melee/energy)) user.show_message("You make [plank_name] out of \the [src]!", 1) @@ -114,7 +114,7 @@ throw_speed = 1 throw_range = 3 -/obj/item/weapon/grown/sunflower/attack(mob/M as mob, mob/user as mob) +/obj/item/weapon/grown/sunflower/attack(mob/M, mob/user) M << " [user] smacks you with a sunflower!FLOWER POWER" user << "Your sunflower's FLOWER POWERstrikes [M]" @@ -141,14 +141,14 @@ reagents.add_reagent("condensedcapsaicin", round((potency / 4), 1)) force = round((5 + potency / 5), 1) -/obj/item/weapon/grown/novaflower/attack(mob/living/carbon/M as mob, mob/user as mob) +/obj/item/weapon/grown/novaflower/attack(mob/living/carbon/M, mob/user) if(!..()) return if(istype(M, /mob/living)) M << "You are lit on fire from the intense heat of the [name]!" M.adjust_fire_stacks(potency / 20) M.IgniteMob() -/obj/item/weapon/grown/novaflower/afterattack(atom/A as mob|obj, mob/user as mob,proximity) +/obj/item/weapon/grown/novaflower/afterattack(atom/A as mob|obj, mob/user,proximity) if(!proximity) return if(endurance > 0) endurance -= rand(1, (endurance / 3) + 1) @@ -157,7 +157,7 @@ usr.unEquip(src) qdel(src) -/obj/item/weapon/grown/novaflower/pickup(mob/living/carbon/human/user as mob) +/obj/item/weapon/grown/novaflower/pickup(mob/living/carbon/human/user) if(!user.gloves) user << "The [name] burns your bare hand!" user.adjustFireLoss(rand(1, 5)) @@ -183,7 +183,7 @@ user.visible_message("[user] is eating some of the [src.name]! It looks like \he's trying to commit suicide.") return (BRUTELOSS|TOXLOSS) -/obj/item/weapon/grown/nettle/pickup(mob/living/user as mob) +/obj/item/weapon/grown/nettle/pickup(mob/living/user) if(!iscarbon(user)) return 0 var/mob/living/carbon/C = user @@ -200,7 +200,7 @@ C << "The nettle burns your bare hand!" return 1 -/obj/item/weapon/grown/nettle/afterattack(atom/A as mob|obj, mob/user as mob,proximity) +/obj/item/weapon/grown/nettle/afterattack(atom/A as mob|obj, mob/user,proximity) if(!proximity) return if(force > 0) force -= rand(1, (force / 3) + 1) // When you whack someone with it, leaves fall off @@ -233,13 +233,13 @@ reagents.add_reagent("facid", round((potency / 2), 1)) force = round((5 + potency / 2.5), 1) -/obj/item/weapon/grown/nettle/death/pickup(mob/living/carbon/user as mob) +/obj/item/weapon/grown/nettle/death/pickup(mob/living/carbon/user) if(..()) if(prob(50)) user.Paralyse(5) user << "You are stunned by the Deathnettle when you try picking it up!" -/obj/item/weapon/grown/nettle/death/attack(mob/living/carbon/M as mob, mob/user as mob) +/obj/item/weapon/grown/nettle/death/attack(mob/living/carbon/M, mob/user) if(!..()) return if(istype(M, /mob/living)) M << "You are stunned by the powerful acid of the Deathnettle!" @@ -300,7 +300,7 @@ throw_speed = 3 throw_range = 7 -/obj/item/weapon/grown/corncob/attackby(obj/item/weapon/grown/W as obj, mob/user as mob, params) +/obj/item/weapon/grown/corncob/attackby(obj/item/weapon/grown/W, mob/user, params) ..() if(is_sharp(W)) user << "You use [W] to fashion a pipe out of the corn cob!" @@ -324,7 +324,7 @@ ..() snap_pops = max(round(potency/8), 1) -/obj/item/weapon/grown/snapcorn/attack_self(mob/user as mob) +/obj/item/weapon/grown/snapcorn/attack_self(mob/user) ..() user << "You pick up a snap pops from the cob." var/obj/item/toy/snappop/S = new /obj/item/toy/snappop(user.loc) diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index f44d54f78b9..46c56442345 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -7,7 +7,7 @@ item_state = "analyzer" origin_tech = "magnets=1;biotech=1" -/obj/item/device/analyzer/plant_analyzer/attack_self(mob/user as mob) +/obj/item/device/analyzer/plant_analyzer/attack_self(mob/user) return 0 // ************************************* diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index bb6cf6c74af..fe1602b92b1 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -94,7 +94,7 @@ return connected -/obj/machinery/hydroponics/bullet_act(var/obj/item/projectile/Proj) //Works with the Somatoray to modify plant variables. +/obj/machinery/hydroponics/bullet_act(obj/item/projectile/Proj) //Works with the Somatoray to modify plant variables. if(!planted) ..() return @@ -335,7 +335,7 @@ visible_message("[oldPlantName] overtaken by [myseed.plantname].") -/obj/machinery/hydroponics/proc/mutate(var/lifemut = 2, var/endmut = 5, var/productmut = 1, var/yieldmut = 2, var/potmut = 25) // Mutates the current seed +/obj/machinery/hydroponics/proc/mutate(lifemut = 2, endmut = 5, productmut = 1, yieldmut = 2, potmut = 25) // Mutates the current seed if(!planted) return adjustSLife(rand(-lifemut,lifemut)) @@ -416,7 +416,7 @@ else usr << "The pests seem to behave oddly, but quickly settle down..." -/obj/machinery/hydroponics/proc/applyChemicals(var/datum/reagents/S) +/obj/machinery/hydroponics/proc/applyChemicals(datum/reagents/S) if(myseed) myseed.on_chem_reaction(S) //In case seeds have some special interactions with special chems, currently only used by vines @@ -590,7 +590,7 @@ if(1 to 32) mutatepest() else usr << "Nothing happens..." -/obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/hydroponics/attackby(obj/item/O, mob/user, params) //Called when mob user "attacks" it with object O if(istype(O, /obj/item/weapon/reagent_containers) ) // Syringe stuff (and other reagent containers now too) @@ -765,7 +765,7 @@ return -/obj/machinery/hydroponics/attack_hand(mob/user as mob) +/obj/machinery/hydroponics/attack_hand(mob/user) if(istype(user, /mob/living/silicon)) //How does AI know what plant is? return if(harvest) @@ -899,41 +899,41 @@ update_icon() /// Tray Setters - The following procs adjust the tray or plants variables, and make sure that the stat doesn't go out of bounds./// -/obj/machinery/hydroponics/proc/adjustNutri(var/adjustamt) +/obj/machinery/hydroponics/proc/adjustNutri(adjustamt) nutrilevel += adjustamt nutrilevel = max(nutrilevel, 0) nutrilevel = min(nutrilevel, maxnutri) -/obj/machinery/hydroponics/proc/adjustWater(var/adjustamt) +/obj/machinery/hydroponics/proc/adjustWater(adjustamt) waterlevel += adjustamt waterlevel = max(waterlevel, 0) waterlevel = min(waterlevel, maxwater) if(adjustamt>0) adjustToxic(-round(adjustamt/4))//Toxicity dilutation code. The more water you put in, the lesser the toxin concentration. -/obj/machinery/hydroponics/proc/adjustHealth(var/adjustamt) +/obj/machinery/hydroponics/proc/adjustHealth(adjustamt) if(planted && !dead) health += adjustamt health = max(health, 0) health = min(health, myseed.endurance) -/obj/machinery/hydroponics/proc/adjustToxic(var/adjustamt) +/obj/machinery/hydroponics/proc/adjustToxic(adjustamt) toxic += adjustamt toxic = max(toxic, 0) toxic = min(toxic, 100) -/obj/machinery/hydroponics/proc/adjustPests(var/adjustamt) +/obj/machinery/hydroponics/proc/adjustPests(adjustamt) pestlevel += adjustamt pestlevel = max(pestlevel, 0) pestlevel = min(pestlevel, 10) -/obj/machinery/hydroponics/proc/adjustWeeds(var/adjustamt) +/obj/machinery/hydroponics/proc/adjustWeeds(adjustamt) weedlevel += adjustamt weedlevel = max(weedlevel, 0) weedlevel = min(weedlevel, 10) /// Seed Setters /// -/obj/machinery/hydroponics/proc/adjustSYield(var/adjustamt)//0,10 +/obj/machinery/hydroponics/proc/adjustSYield(adjustamt)//0,10 if(myseed && myseed.yield != -1) // Unharvestable shouldn't suddenly turn harvestable myseed.yield += adjustamt myseed.yield = max(myseed.yield, 0) @@ -941,25 +941,25 @@ if(myseed.yield <= 0 && myseed.plant_type == 2) myseed.yield = 1 // Mushrooms always have a minimum yield of 1. -/obj/machinery/hydroponics/proc/adjustSLife(var/adjustamt)//10,100 +/obj/machinery/hydroponics/proc/adjustSLife(adjustamt)//10,100 if(myseed) myseed.lifespan += adjustamt myseed.lifespan = max(myseed.lifespan, 10) myseed.lifespan = min(myseed.lifespan, 100) -/obj/machinery/hydroponics/proc/adjustSEnd(var/adjustamt)//10,100 +/obj/machinery/hydroponics/proc/adjustSEnd(adjustamt)//10,100 if(myseed) myseed.endurance += adjustamt myseed.endurance = max(myseed.endurance, 10) myseed.endurance = min(myseed.endurance, 100) -/obj/machinery/hydroponics/proc/adjustSProduct(var/adjustamt)//2,10 +/obj/machinery/hydroponics/proc/adjustSProduct(adjustamt)//2,10 if(myseed) myseed.production += adjustamt myseed.production = max(myseed.production, 2) myseed.production = min(myseed.production, 10) -/obj/machinery/hydroponics/proc/adjustSPot(var/adjustamt)//0,100 +/obj/machinery/hydroponics/proc/adjustSPot(adjustamt)//0,100 if(myseed && myseed.potency != -1) //Not all plants have a potency myseed.potency += adjustamt myseed.potency = max(myseed.potency, 0) @@ -1000,7 +1000,7 @@ SetLuminosity(0) return -/obj/machinery/hydroponics/soil/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/hydroponics/soil/attackby(obj/item/O, mob/user, params) ..() if(istype(O, /obj/item/weapon/shovel)) user << "You clear up [src]!" diff --git a/code/modules/hydroponics/seed_extractor.dm b/code/modules/hydroponics/seed_extractor.dm index 0ad83aeb190..b8eec1a9ba8 100644 --- a/code/modules/hydroponics/seed_extractor.dm +++ b/code/modules/hydroponics/seed_extractor.dm @@ -1,4 +1,4 @@ -/proc/seedify(var/obj/item/O as obj, var/t_max, var/obj/machinery/seed_extractor/extractor) +/proc/seedify(obj/item/O, t_max, obj/machinery/seed_extractor/extractor) var/t_amount = 0 if(t_max == -1) if(extractor) @@ -71,7 +71,7 @@ for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) seed_multiplier = M.rating -/obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/seed_extractor/attackby(obj/item/O, mob/user, params) if(default_deconstruction_screwdriver(user, "sextractor_open", "sextractor", O)) return @@ -142,11 +142,11 @@ src.potency = poten src.amount = am -/obj/machinery/seed_extractor/attack_hand(mob/user as mob) +/obj/machinery/seed_extractor/attack_hand(mob/user) user.set_machine(src) interact(user) -/obj/machinery/seed_extractor/interact(mob/user as mob) +/obj/machinery/seed_extractor/interact(mob/user) if (stat) return 0 @@ -197,7 +197,7 @@ src.updateUsrDialog() return -/obj/machinery/seed_extractor/proc/add(var/obj/item/seeds/O as obj) +/obj/machinery/seed_extractor/proc/add(obj/item/seeds/O) if(contents.len >= 999) usr << "\The [src] is full." return 0 diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 662f76cb686..7334590239e 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -31,10 +31,10 @@ /obj/item/seeds/proc/get_analyzer_text() //in case seeds have something special to tell to the analyzer return -/obj/item/seeds/proc/on_chem_reaction(var/datum/reagents/S) //in case seeds have some special interaction with special chems +/obj/item/seeds/proc/on_chem_reaction(datum/reagents/S) //in case seeds have some special interaction with special chems return -/obj/item/seeds/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/item/seeds/attackby(obj/item/O, mob/user, params) if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "*** [plantname] ***" user << "-Plant Endurance: [endurance]" @@ -95,7 +95,7 @@ var/factions = null var/contains_sample = 0 -/obj/item/seeds/replicapod/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/seeds/replicapod/attackby(obj/item/weapon/W, mob/user, params) if(istype(W,/obj/item/weapon/reagent_containers/syringe)) if(!contains_sample) for(var/datum/reagent/blood/bloodSample in W.reagents.reagent_list) @@ -1344,7 +1344,7 @@ for(var/obj/item/weapon/reagent_containers/food/snacks/grown/kudzupod/K in prod) K.mutations = mutations -/obj/item/seeds/kudzuseed/attack_self(mob/user as mob) +/obj/item/seeds/kudzuseed/attack_self(mob/user) if(istype(user.loc,/turf/space)) return var/turf/T = get_turf(src) @@ -1362,7 +1362,7 @@ mut_text += "-Plant Mutations: [(text_string == "") ? "None" : text_string]" return mut_text -/obj/item/seeds/kudzuseed/on_chem_reaction(var/datum/reagents/S) +/obj/item/seeds/kudzuseed/on_chem_reaction(datum/reagents/S) var/list/temp_mut_list = list() diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index f5dc638ee49..fd0ce010d97 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -26,7 +26,7 @@ var/author var/SQLquery -/obj/machinery/computer/libraryconsole/attack_hand(var/mob/user as mob) +/obj/machinery/computer/libraryconsole/attack_hand(mob/user) if(..()) return interact(user) @@ -290,7 +290,7 @@ var/global/list/datum/cachedbook/cachedbooks // List of our cached book datums popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) popup.open() -/obj/machinery/computer/libraryconsole/bookmanagement/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/computer/libraryconsole/bookmanagement/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/barcodescanner)) var/obj/item/weapon/barcodescanner/scanner = W scanner.computer = src @@ -299,7 +299,7 @@ var/global/list/datum/cachedbook/cachedbooks // List of our cached book datums else ..() -/obj/machinery/computer/libraryconsole/bookmanagement/emag_act(mob/user as mob) +/obj/machinery/computer/libraryconsole/bookmanagement/emag_act(mob/user) if(density && !emagged) emagged = 1 @@ -445,13 +445,13 @@ var/global/list/datum/cachedbook/cachedbooks // List of our cached book datums density = 1 var/obj/item/weapon/book/cache // Last scanned book -/obj/machinery/libraryscanner/attackby(var/obj/O as obj, var/mob/user as mob, params) +/obj/machinery/libraryscanner/attackby(obj/O, mob/user, params) if(istype(O, /obj/item/weapon/book)) if(!user.drop_item()) return O.loc = src -/obj/machinery/libraryscanner/attack_hand(var/mob/user as mob) +/obj/machinery/libraryscanner/attack_hand(mob/user) usr.set_machine(src) var/dat = "" // if(cache) @@ -501,7 +501,7 @@ var/global/list/datum/cachedbook/cachedbooks // List of our cached book datums density = 1 var/busy = 0 -/obj/machinery/bookbinder/attackby(var/obj/O as obj, var/mob/user as mob, params) +/obj/machinery/bookbinder/attackby(obj/O, mob/user, params) if(istype(O, /obj/item/weapon/paper)) if(busy) user << "The book binder is busy. Please wait for completion of previous operation." diff --git a/code/modules/lighting/lighting_system.dm b/code/modules/lighting/lighting_system.dm index 19f61193cf3..9a97bc52b5b 100644 --- a/code/modules/lighting/lighting_system.dm +++ b/code/modules/lighting/lighting_system.dm @@ -235,7 +235,7 @@ var/atom/movable/light/lighting_object //Will be null for space turfs and anything in a static lighting area var/list/affecting_lights //not initialised until used (even empty lists reserve a fair bit of memory) -/turf/ChangeTurf(var/path) +/turf/ChangeTurf(path) if(!path || path == type) //Sucks this is here but it would cause problems otherwise. return ..() @@ -295,7 +295,7 @@ if(config.starlight) update_starlight() -/turf/proc/redraw_lighting(var/instantly = 0) +/turf/proc/redraw_lighting(instantly = 0) if(lighting_object) var/newalpha if(lighting_lumcount <= 0) diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm index 1e38491439f..b7552f60814 100644 --- a/code/modules/mining/abandoned_crates.dm +++ b/code/modules/mining/abandoned_crates.dm @@ -154,7 +154,7 @@ if(100) new /obj/item/clothing/head/bearpelt(src) -/obj/structure/closet/crate/secure/loot/attack_hand(mob/user as mob) +/obj/structure/closet/crate/secure/loot/attack_hand(mob/user) if(locked) user << "The crate is locked with a Deca-code lock." var/input = input(usr, "Enter [codelen] digits.", "Deca-Code Lock", "") as text @@ -179,7 +179,7 @@ else return ..() -/obj/structure/closet/crate/secure/loot/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/closet/crate/secure/loot/attackby(obj/item/weapon/W, mob/user) if(locked) if (istype(W, /obj/item/weapon/card/emag)) user << "The crate's anti-tamper system activates!" diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index 8cce76294b6..85d0eaa50f0 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -85,7 +85,7 @@ else break -/obj/machinery/mineral/ore_redemption/attackby(var/obj/item/weapon/W, var/mob/user, params) +/obj/machinery/mineral/ore_redemption/attackby(obj/item/weapon/W, mob/user, params) if(istype(W,/obj/item/weapon/card/id)) var/obj/item/weapon/card/id/I = usr.get_active_hand() if(istype(I) && !istype(inserted_id)) @@ -113,7 +113,7 @@ return 1 ..() -/obj/machinery/mineral/ore_redemption/proc/SmeltMineral(var/obj/item/weapon/ore/O) +/obj/machinery/mineral/ore_redemption/proc/SmeltMineral(obj/item/weapon/ore/O) if(O.refined_type) var/obj/item/stack/sheet/M = O.refined_type points += O.points * point_upgrade @@ -121,7 +121,7 @@ qdel(O)//No refined type? Purge it. return -/obj/machinery/mineral/ore_redemption/attack_hand(user as mob) +/obj/machinery/mineral/ore_redemption/attack_hand(mob/user) if(..()) return interact(user) @@ -300,7 +300,7 @@ component_parts += new /obj/item/weapon/stock_parts/console_screen(null) RefreshParts() -/obj/machinery/mineral/equipment_vendor/attack_hand(user as mob) +/obj/machinery/mineral/equipment_vendor/attack_hand(mob/user) if(..()) return interact(user) @@ -352,7 +352,7 @@ updateUsrDialog() return -/obj/machinery/mineral/equipment_vendor/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/machinery/mineral/equipment_vendor/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/mining_voucher)) RedeemVoucher(I, user) return @@ -416,7 +416,7 @@ icon_state = "data" var/points = 500 -/obj/item/weapon/card/mining_point_card/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/item/weapon/card/mining_point_card/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/card/id)) if(points) var/obj/item/weapon/card/id/C = I @@ -445,7 +445,7 @@ throw_range = 5 origin_tech = "bluespace=2" -/obj/item/device/wormhole_jaunter/attack_self(mob/user as mob) +/obj/item/device/wormhole_jaunter/attack_self(mob/user) var/turf/device_turf = get_turf(user) if(!device_turf||device_turf.z==2||device_turf.z>=7) user << "You're having difficulties getting the [src.name] to work." @@ -508,7 +508,7 @@ var/burst_time = 50 var/fieldlimit = 3 -/obj/item/weapon/resonator/proc/CreateResonance(var/target, var/creator) +/obj/item/weapon/resonator/proc/CreateResonance(target, creator) var/turf/T = get_turf(target) if(locate(/obj/effect/resonance) in T) return @@ -519,7 +519,7 @@ spawn(burst_time) fieldsactive-- -/obj/item/weapon/resonator/attack_self(mob/user as mob) +/obj/item/weapon/resonator/attack_self(mob/user) if(burst_time == 50) burst_time = 30 user << "You set the resonator's fields to detonate after 3 seconds." @@ -619,7 +619,7 @@ /obj/item/weapon/ore/plasma, /obj/item/weapon/ore/uranium, /obj/item/weapon/ore/iron, /obj/item/weapon/ore/bananium) -/mob/living/simple_animal/hostile/mining_drone/attackby(obj/item/I as obj, mob/user as mob, params) +/mob/living/simple_animal/hostile/mining_drone/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/W = I if(W.welding && !stat) diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm index 366ade4a6de..64da738a5ef 100644 --- a/code/modules/mining/laborcamp/laborstacker.dm +++ b/code/modules/mining/laborcamp/laborstacker.dm @@ -36,7 +36,7 @@ return (istype(inserted_id) && inserted_id.points >= inserted_id.goal) //Otherwise, only let them out if the prisoner's reached his quota. -/obj/machinery/mineral/labor_claim_console/attack_hand(user as mob) +/obj/machinery/mineral/labor_claim_console/attack_hand(mob/user) var/dat dat += text("Point Claim Console

    ") if(emagged) //Shit's broken @@ -58,12 +58,12 @@ user << browse("[dat]", "window=console_stacking_machine") -/obj/machinery/mineral/labor_claim_console/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/machinery/mineral/labor_claim_console/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/card/id)) return attack_hand(user) ..() -/obj/machinery/mineral/labor_claim_console/emag_act(mob/user as mob) +/obj/machinery/mineral/labor_claim_console/emag_act(mob/user) if(!emagged) emagged = 1 user << "PZZTTPFFFT" @@ -159,7 +159,7 @@ /obj/machinery/mineral/labor_points_checker/attack_hand(mob/user) user.examinate(src) -/obj/machinery/mineral/labor_points_checker/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/machinery/mineral/labor_points_checker/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/card/id)) if(istype(I, /obj/item/weapon/card/id/prisoner)) var/obj/item/weapon/card/id/prisoner/prisoner_id = I diff --git a/code/modules/mining/machine_input_output_plates.dm b/code/modules/mining/machine_input_output_plates.dm index 7d28cedb3da..2c9d289a9cf 100644 --- a/code/modules/mining/machine_input_output_plates.dm +++ b/code/modules/mining/machine_input_output_plates.dm @@ -22,7 +22,7 @@ var/input_dir = NORTH var/output_dir = SOUTH -/obj/machinery/mineral/proc/unload_mineral(var/atom/movable/S) +/obj/machinery/mineral/proc/unload_mineral(atom/movable/S) S.loc = loc var/turf/T = get_step(src,output_dir) if(T) diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 9aacac2f023..2274a61b20b 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -18,7 +18,7 @@ else qdel(src) -/obj/machinery/mineral/processing_unit_console/attack_hand(user as mob) +/obj/machinery/mineral/processing_unit_console/attack_hand(mob/user) var/dat = "Smelter control console

    " //iron @@ -392,6 +392,6 @@ unload_mineral(O) -/obj/machinery/mineral/processing_unit/proc/generate_mineral(var/P) +/obj/machinery/mineral/processing_unit/proc/generate_mineral(P) var/O = new P(src) unload_mineral(O) \ No newline at end of file diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index c1f1474eeb4..aec2fce7f5a 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -18,7 +18,7 @@ else qdel(src) -/obj/machinery/mineral/stacking_unit_console/attack_hand(user as mob) +/obj/machinery/mineral/stacking_unit_console/attack_hand(mob/user) var/obj/item/stack/sheet/s var/dat diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 2f3218f4e27..6e67f71e3ba 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -81,7 +81,7 @@ var/global/list/rockTurfEdgeCache icon_state = "rock" return -/turf/simulated/mineral/proc/Spread(var/turf/T) +/turf/simulated/mineral/proc/Spread(turf/T) new src.type(T) /turf/simulated/mineral/random @@ -246,7 +246,7 @@ var/global/list/rockTurfEdgeCache defuse() ..() -/turf/simulated/mineral/gibtonite/proc/explosive_reaction(var/mob/user = null, triggered_by_explosion = 0) +/turf/simulated/mineral/gibtonite/proc/explosive_reaction(mob/user = null, triggered_by_explosion = 0) if(stage == 0) icon_state = "rock_Gibtonite_active" name = "gibtonite deposit" @@ -292,7 +292,7 @@ var/global/list/rockTurfEdgeCache det_time = 0 visible_message("The chain reaction was stopped! The gibtonite had [src.det_time] reactions left till the explosion!") -/turf/simulated/mineral/gibtonite/gets_drilled(var/mob/user, triggered_by_explosion = 0) +/turf/simulated/mineral/gibtonite/gets_drilled(mob/user, triggered_by_explosion = 0) if(stage == 0 && mineralAmt >= 1) //Gibtonite deposit is activated playsound(src,'sound/effects/hit_on_shattered_glass.ogg',50,1) explosive_reaction(user, triggered_by_explosion) @@ -344,7 +344,7 @@ var/global/list/rockTurfEdgeCache SpawnFloor(src) ..() -/turf/simulated/floor/plating/asteroid/airless/cave/proc/make_tunnel(var/dir) +/turf/simulated/floor/plating/asteroid/airless/cave/proc/make_tunnel(dir) var/turf/simulated/mineral/tunnel = src var/next_angle = pick(45, -45) @@ -382,7 +382,7 @@ var/global/list/rockTurfEdgeCache dir = angle2dir(dir2angle(dir) + next_angle) -/turf/simulated/floor/plating/asteroid/airless/cave/proc/SpawnFloor(var/turf/T) +/turf/simulated/floor/plating/asteroid/airless/cave/proc/SpawnFloor(turf/T) for(var/turf/S in range(2,T)) if(istype(S, /turf/space) || istype(S.loc, /area/mine/explored)) sanity = 0 @@ -395,7 +395,7 @@ var/global/list/rockTurfEdgeCache spawn(2) t.fullUpdateMineralOverlays() -/turf/simulated/floor/plating/asteroid/airless/cave/proc/SpawnMonster(var/turf/T) +/turf/simulated/floor/plating/asteroid/airless/cave/proc/SpawnMonster(turf/T) if(prob(30)) if(istype(loc, /area/mine/explored)) return @@ -414,7 +414,7 @@ var/global/list/rockTurfEdgeCache new /mob/living/simple_animal/hostile/asteroid/hivelord(T) return -/turf/simulated/mineral/attackby(var/obj/item/weapon/pickaxe/P as obj, mob/user as mob, params) +/turf/simulated/mineral/attackby(obj/item/weapon/pickaxe/P, mob/user, params) if (!user.IsAdvancedToolUser()) usr << "You don't have the dexterity to do this!" @@ -452,7 +452,7 @@ var/global/list/rockTurfEdgeCache N.fullUpdateMineralOverlays() return -/turf/simulated/mineral/attack_animal(mob/living/simple_animal/user as mob) +/turf/simulated/mineral/attack_animal(mob/living/simple_animal/user) if(user.environment_smash >= 2) gets_drilled() ..() @@ -537,7 +537,7 @@ var/global/list/rockTurfEdgeCache src.gets_dug() return -/turf/simulated/floor/plating/asteroid/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/turf/simulated/floor/plating/asteroid/attackby(obj/item/weapon/W, mob/user, params) //note that this proc does not call ..() if(!W || !user) return 0 diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm index b7d3df5920b..9285f95aa1d 100644 --- a/code/modules/mining/mint.dm +++ b/code/modules/mining/mint.dm @@ -52,7 +52,7 @@ return -/obj/machinery/mineral/mint/attack_hand(user as mob) //TODO: Adamantine coins! -Durandan +/obj/machinery/mineral/mint/attack_hand(mob/user) //TODO: Adamantine coins! -Durandan var/dat = "Coin Press
    " @@ -206,7 +206,7 @@ src.updateUsrDialog() return -/obj/machinery/mineral/mint/proc/create_coins(var/P) +/obj/machinery/mineral/mint/proc/create_coins(P) var/turf/T = get_step(src,output_dir) if(T) var/obj/item/O = new P(src) diff --git a/code/modules/mining/money_bag.dm b/code/modules/mining/money_bag.dm index a8eefeb5bfc..ed6056c382a 100644 --- a/code/modules/mining/money_bag.dm +++ b/code/modules/mining/money_bag.dm @@ -11,7 +11,7 @@ burn_state = 0 //Burnable burntime = 20 -/obj/item/weapon/moneybag/attack_hand(user as mob) +/obj/item/weapon/moneybag/attack_hand(mob/user) var/amt_gold = 0 var/amt_silver = 0 var/amt_diamond = 0 @@ -58,7 +58,7 @@ dat += text("Adamantine coins: [amt_adamantine] Remove one
    ") user << browse("[dat]", "window=moneybag") -/obj/item/weapon/moneybag/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/moneybag/attackby(obj/item/weapon/W, mob/user, params) ..() if (istype(W, /obj/item/weapon/coin)) var/obj/item/weapon/coin/C = W diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 52e97f3a423..e1089f54ac3 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -7,7 +7,7 @@ var/points = 0 //How many points this ore gets you from the ore redemption machine var/refined_type = null //What this ore defaults to being refined into -/obj/item/weapon/ore/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/item/weapon/ore/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/W = I if(W.remove_fuel(15)) @@ -38,7 +38,7 @@ points = 1 refined_type = /obj/item/stack/sheet/glass -/obj/item/weapon/ore/glass/attack_self(mob/living/user as mob) +/obj/item/weapon/ore/glass/attack_self(mob/living/user) user << "You use the sand to make sandstone." var/sandAmt = 1 for(var/obj/item/weapon/ore/glass/G in user.loc) // The sand on the floor @@ -64,7 +64,7 @@ points = 36 refined_type = /obj/item/stack/sheet/mineral/plasma -/obj/item/weapon/ore/plasma/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/item/weapon/ore/plasma/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/W = I if(W.welding) @@ -153,7 +153,7 @@ else ..() -/obj/item/weapon/twohanded/required/gibtonite/bullet_act(var/obj/item/projectile/P) +/obj/item/weapon/twohanded/required/gibtonite/bullet_act(obj/item/projectile/P) GibtoniteReaction(P.firer) ..() @@ -291,7 +291,7 @@ /obj/item/weapon/coin/antagtoken/New() return -/obj/item/weapon/coin/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/weapon/coin/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/CC = W if(string_attached) @@ -319,7 +319,7 @@ user << "You detach the string from the coin." else ..() -/obj/item/weapon/coin/attack_self(mob/user as mob) +/obj/item/weapon/coin/attack_self(mob/user) if(cooldown < world.time - 15) var/coinflip = pick(sideslist) cooldown = world.time diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm index edb420703b4..7daf6f2adf2 100644 --- a/code/modules/mining/satchel_ore_boxdm.dm +++ b/code/modules/mining/satchel_ore_boxdm.dm @@ -22,7 +22,7 @@ user << "You empty the satchel into the box." return -/obj/structure/ore_box/attack_hand(mob/user as mob) +/obj/structure/ore_box/attack_hand(mob/user) var/amt_gold = 0 var/amt_silver = 0 var/amt_diamond = 0 diff --git a/code/modules/mob/dead/death.dm b/code/modules/mob/dead/death.dm index 784b114690f..bd968c6b708 100644 --- a/code/modules/mob/dead/death.dm +++ b/code/modules/mob/dead/death.dm @@ -1,5 +1,5 @@ /mob/dead/dust() //ghosts can't be vaporised. return -/mob/dead/gib(var/animation = 1) //ghosts can't be gibbed. +/mob/dead/gib(animation = 1) //ghosts can't be gibbed. return diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 81c39b3beb4..51f948910c1 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -78,7 +78,7 @@ Transfer_mind is there to check if mob is being deleted/not going to have a body Works together with spawning an observer, noted above. */ -/mob/proc/ghostize(var/can_reenter_corpse = 1) +/mob/proc/ghostize(can_reenter_corpse = 1) if(key) if(!cmptext(copytext(key,1,2),"@")) //aghost var/mob/dead/observer/ghost = new(src) //Transfer safety to observer spawning proc. @@ -202,7 +202,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp ManualFollow(target) // This is the ghost's follow verb with an argument -/mob/dead/observer/proc/ManualFollow(var/atom/movable/target) +/mob/dead/observer/proc/ManualFollow(atom/movable/target) if(target && target != src) if(following && following == target) return diff --git a/code/modules/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/say.dm index bab94a00cac..bcef00b711b 100644 --- a/code/modules/mob/dead/observer/say.dm +++ b/code/modules/mob/dead/observer/say.dm @@ -1,4 +1,4 @@ -/mob/dead/observer/say(var/message) +/mob/dead/observer/say(message) message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)) if (!message) diff --git a/code/modules/mob/interactive.dm b/code/modules/mob/interactive.dm index b10f1dbb313..12d822561f4 100644 --- a/code/modules/mob/interactive.dm +++ b/code/modules/mob/interactive.dm @@ -60,7 +60,7 @@ var/list/functions = list("nearbyscan","combat","doorscan","shitcurity","chatter") //botPool funcs -/mob/living/carbon/human/interactive/proc/takeDelegate(var/mob/living/carbon/human/interactive/from,var/doReset=TRUE) +/mob/living/carbon/human/interactive/proc/takeDelegate(mob/living/carbon/human/interactive/from,doReset=TRUE) eye_color = "red" if(from == src) return FALSE @@ -106,7 +106,7 @@ myjob.equip(src) myjob.apply_fingerprints(src) -/mob/living/carbon/human/interactive/attacked_by(var/obj/item/I, var/mob/living/user, var/def_zone) +/mob/living/carbon/human/interactive/attacked_by(obj/item/I, mob/living/user, def_zone) ..() retal = 1 retal_target = user @@ -200,7 +200,7 @@ SSbp.insertBot(src) -/mob/living/carbon/human/interactive/attack_hand(mob/living/carbon/human/M as mob) +/mob/living/carbon/human/interactive/attack_hand(mob/living/carbon/human/M) ..() if (health > 0) if(M.a_intent == "help") @@ -210,7 +210,7 @@ retal_target = M //THESE EXIST FOR DEBUGGING OF THE DOING/INTEREST SYSTEM EASILY -/mob/living/carbon/human/interactive/proc/doing2string(var/doin) +/mob/living/carbon/human/interactive/proc/doing2string(doin) var/toReturn = "" if(!doin) toReturn = "not doing anything" @@ -222,7 +222,7 @@ toReturn += "and going somewhere" return toReturn -/mob/living/carbon/human/interactive/proc/interest2string(var/inter) +/mob/living/carbon/human/interactive/proc/interest2string(inter) var/toReturn = "Flatlined" if(inter >= 0 && inter <= 25) toReturn = "Very Bored" @@ -234,7 +234,7 @@ toReturn = "Excited" return toReturn //END DEBUG -/mob/living/carbon/human/interactive/proc/isnotfunc(var/checkDead = TRUE) +/mob/living/carbon/human/interactive/proc/isnotfunc(checkDead = TRUE) if(!canmove) return 1 if(health <= 0 && checkDead) @@ -269,7 +269,7 @@ main_hand = other_hand other_hand = T -/mob/living/carbon/human/interactive/proc/take_to_slot(var/obj/item/G) +/mob/living/carbon/human/interactive/proc/take_to_slot(obj/item/G) var/list/slots = list ("left pocket" = slot_l_store,"right pocket" = slot_r_store,"left hand" = slot_l_hand,"right hand" = slot_r_hand) G.loc = src if(G.force && G.force > best_force) @@ -288,7 +288,7 @@ unEquip(I,TRUE) update_hands = 1 -/mob/living/carbon/human/interactive/proc/targetRange(var/towhere) +/mob/living/carbon/human/interactive/proc/targetRange(towhere) return get_dist(get_turf(towhere), get_turf(src)) /mob/living/carbon/human/interactive/Life() @@ -427,7 +427,7 @@ tryWalk(TARGET) LAST_TARGET = TARGET -/mob/living/carbon/human/interactive/proc/tryWalk(var/turf/TARGET) +/mob/living/carbon/human/interactive/proc/tryWalk(turf/TARGET) if(!isnotfunc()) if(!walk2derpless(TARGET)) timeout++ @@ -435,7 +435,7 @@ timeout++ -/mob/living/carbon/human/interactive/proc/walk2derpless(var/target) +/mob/living/carbon/human/interactive/proc/walk2derpless(target) set background = 1 var/turf/T = get_turf(target) var/turf/D = get_step(src,dir) @@ -452,7 +452,7 @@ doing = doing & ~TRAVEL return 0 -/mob/living/carbon/human/interactive/proc/job2area(var/target) +/mob/living/carbon/human/interactive/proc/job2area(target) var/datum/job/T = target if(T.title == "Assistant") return /area/hallway/primary @@ -471,14 +471,14 @@ else return pick(/area/hallway,/area/crew_quarters) -/mob/living/carbon/human/interactive/proc/target_filter(var/target) +/mob/living/carbon/human/interactive/proc/target_filter(target) var/list/L = target for(var/atom/A in target) if(istype(A,/area) || istype(A,/turf/space)) L -= A return L -/mob/living/carbon/human/interactive/proc/denied_filter(var/target) +/mob/living/carbon/human/interactive/proc/denied_filter(target) var/list/denied = list(/obj/structure/window,/obj/structure/table) //expand me for(var/a in denied) if(istype(target,a)) diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index 5ba04b78a2d..4e0a620168d 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -19,7 +19,7 @@ return 0 //Puts the item into your l_hand if possible and calls all necessary triggers/updates. returns 1 on success. -/mob/proc/put_in_l_hand(var/obj/item/W) +/mob/proc/put_in_l_hand(obj/item/W) if(!put_in_hand_check(W)) return 0 if(!l_hand) @@ -38,7 +38,7 @@ //Puts the item into your r_hand if possible and calls all necessary triggers/updates. returns 1 on success. -/mob/proc/put_in_r_hand(var/obj/item/W) +/mob/proc/put_in_r_hand(obj/item/W) if(!put_in_hand_check(W)) return 0 if(!r_hand) @@ -55,19 +55,19 @@ return 1 return 0 -/mob/proc/put_in_hand_check(var/obj/item/W) +/mob/proc/put_in_hand_check(obj/item/W) if(lying && !(W.flags&ABSTRACT)) return 0 if(!istype(W)) return 0 return 1 //Puts the item into our active hand if possible. returns 1 on success. -/mob/proc/put_in_active_hand(var/obj/item/W) +/mob/proc/put_in_active_hand(obj/item/W) if(hand) return put_in_l_hand(W) else return put_in_r_hand(W) //Puts the item into our inactive hand if possible. returns 1 on success. -/mob/proc/put_in_inactive_hand(var/obj/item/W) +/mob/proc/put_in_inactive_hand(obj/item/W) if(hand) return put_in_r_hand(W) else return put_in_l_hand(W) @@ -75,7 +75,7 @@ //Puts the item our active hand if possible. Failing that it tries our inactive hand. Returns 1 on success. //If both fail it drops it on the floor and returns 0. //This is probably the main one you need to know :) -/mob/proc/put_in_hands(var/obj/item/W) +/mob/proc/put_in_hands(obj/item/W) if(!W) return 0 if(put_in_active_hand(W)) return 1 else if(put_in_inactive_hand(W)) return 1 diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index 02d7cc2a8e2..f4e3a3a3573 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -59,7 +59,7 @@ /mob/living/carbon/alien/getToxLoss() return 0 -/mob/living/carbon/alien/handle_environment(var/datum/gas_mixture/environment) +/mob/living/carbon/alien/handle_environment(datum/gas_mixture/environment) //If there are alien weeds on the ground then heal if needed or give some toxins if(locate(/obj/structure/alien/weeds) in loc) @@ -132,7 +132,7 @@ bodytemperature += BODYTEMP_HEATING_MAX //If you're on fire, you heat up! return -/mob/living/carbon/alien/reagent_check(var/datum/reagent/R) //can metabolize all reagents +/mob/living/carbon/alien/reagent_check(datum/reagent/R) //can metabolize all reagents return 0 /mob/living/carbon/alien/IsAdvancedToolUser() @@ -148,7 +148,7 @@ add_abilities_to_panel() -/mob/living/carbon/alien/proc/AddAbility(var/obj/effect/proc_holder/alien/A) +/mob/living/carbon/alien/proc/AddAbility(obj/effect/proc_holder/alien/A) abilities.Add(A) A.on_gain(src) if(A.has_action) diff --git a/code/modules/mob/living/carbon/alien/alien_defense.dm b/code/modules/mob/living/carbon/alien/alien_defense.dm index 73c9fbe573c..fa0f58d7f07 100644 --- a/code/modules/mob/living/carbon/alien/alien_defense.dm +++ b/code/modules/mob/living/carbon/alien/alien_defense.dm @@ -6,7 +6,7 @@ As such, they can either help or harm other aliens. Help works like the human help command while harm is a simple nibble. In all, this is a lot like the monkey code. /N */ -/mob/living/carbon/alien/attack_alien(mob/living/carbon/alien/M as mob) +/mob/living/carbon/alien/attack_alien(mob/living/carbon/alien/M) if (!ticker) M << "You cannot attack people before the game has started." return @@ -43,11 +43,11 @@ In all, this is a lot like the monkey code. /N return -/mob/living/carbon/alien/attack_larva(mob/living/carbon/alien/larva/L as mob) +/mob/living/carbon/alien/attack_larva(mob/living/carbon/alien/larva/L) return attack_alien(L) -/mob/living/carbon/alien/attack_hand(mob/living/carbon/human/M as mob) +/mob/living/carbon/alien/attack_hand(mob/living/carbon/human/M) if(..()) //to allow surgery to return properly. return 0 @@ -62,7 +62,7 @@ In all, this is a lot like the monkey code. /N return 0 -/mob/living/carbon/alien/attack_paw(mob/living/carbon/monkey/M as mob) +/mob/living/carbon/alien/attack_paw(mob/living/carbon/monkey/M) if(..()) if (stat != DEAD) adjustBruteLoss(rand(1, 3)) @@ -70,13 +70,13 @@ In all, this is a lot like the monkey code. /N return -/mob/living/carbon/alien/attack_animal(mob/living/simple_animal/M as mob) +/mob/living/carbon/alien/attack_animal(mob/living/simple_animal/M) if(..()) var/damage = rand(M.melee_damage_lower, M.melee_damage_upper) adjustBruteLoss(damage) updatehealth() -/mob/living/carbon/alien/attack_slime(mob/living/simple_animal/slime/M as mob) +/mob/living/carbon/alien/attack_slime(mob/living/simple_animal/slime/M) if(..()) //successful slime attack var/damage = rand(5, 35) if(M.is_adult) diff --git a/code/modules/mob/living/carbon/alien/death.dm b/code/modules/mob/living/carbon/alien/death.dm index e8c0ac96c79..131ba6e65e0 100644 --- a/code/modules/mob/living/carbon/alien/death.dm +++ b/code/modules/mob/living/carbon/alien/death.dm @@ -1,7 +1,7 @@ /mob/living/carbon/alien/spawn_gibs() xgibs(loc, viruses) -/mob/living/carbon/alien/gib_animation(var/animate) +/mob/living/carbon/alien/gib_animation(animate) ..(animate, "gibbed-a") /mob/living/carbon/alien/spawn_dust() @@ -10,7 +10,7 @@ /mob/living/carbon/alien/spawn_dust() new /obj/effect/decal/remains/xeno(loc) -/mob/living/carbon/alien/dust_animation(var/animate) +/mob/living/carbon/alien/dust_animation(animate) ..(animate, "dust-a") /mob/living/carbon/alien/dust(var/animation = 1) diff --git a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm index 8b27de42f94..08e276eb289 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm @@ -48,13 +48,13 @@ Doesn't work on other aliens/AI.*/ user.adjustToxLoss(-plasma_cost) return 1 -/obj/effect/proc_holder/alien/proc/on_gain(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/proc/on_gain(mob/living/carbon/alien/user) return -/obj/effect/proc_holder/alien/proc/fire(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/proc/fire(mob/living/carbon/alien/user) return 1 -/obj/effect/proc_holder/alien/proc/cost_check(check_turf=0,var/mob/living/carbon/alien/user,var/silent = 0) +/obj/effect/proc_holder/alien/proc/cost_check(check_turf=0,mob/living/carbon/alien/user,silent = 0) if(user.stat) if(!silent) user << "You must be conscious to do this." @@ -77,7 +77,7 @@ Doesn't work on other aliens/AI.*/ action_icon_state = "alien_plant" -/obj/effect/proc_holder/alien/plant/fire(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/plant/fire(mob/living/carbon/alien/user) if(locate(/obj/structure/alien/weeds/node) in get_turf(user)) src << "There's already a weed node here." return 0 @@ -93,7 +93,7 @@ Doesn't work on other aliens/AI.*/ action_icon_state = "alien_whisper" -/obj/effect/proc_holder/alien/whisper/fire(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/whisper/fire(mob/living/carbon/alien/user) var/mob/M = input("Select who to whisper to:","Whisper to?",null) as mob in oview(user) if(!M) return 0 @@ -113,7 +113,7 @@ Doesn't work on other aliens/AI.*/ action_icon_state = "alien_transfer" -/obj/effect/proc_holder/alien/transfer/fire(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/transfer/fire(mob/living/carbon/alien/user) var/list/mob/living/carbon/alien/aliens_around = list() for(var/mob/living/carbon/alien/A in oview(user)) aliens_around.Add(A) @@ -141,10 +141,10 @@ Doesn't work on other aliens/AI.*/ action_icon_state = "alien_acid" -/obj/effect/proc_holder/alien/acid/on_gain(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/acid/on_gain(mob/living/carbon/alien/user) user.verbs.Add(/mob/living/carbon/alien/humanoid/proc/corrosive_acid) -/obj/effect/proc_holder/alien/acid/proc/corrode(var/target,var/mob/living/carbon/alien/user = usr) +/obj/effect/proc_holder/alien/acid/proc/corrode(target,mob/living/carbon/alien/user = usr) if(target in oview(1,user)) // OBJ CHECK if(isobj(target)) @@ -173,7 +173,7 @@ Doesn't work on other aliens/AI.*/ return 0 -/obj/effect/proc_holder/alien/acid/fire(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/acid/fire(mob/living/carbon/alien/user) var/O = input("Select what to dissolve:","Dissolve",null) as obj|turf in oview(1,user) if(!O) return 0 @@ -199,7 +199,7 @@ Doesn't work on other aliens/AI.*/ action_icon_state = "alien_neurotoxin" -/obj/effect/proc_holder/alien/neurotoxin/fire(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/neurotoxin/fire(mob/living/carbon/alien/user) user.visible_message("[user] spits neurotoxin!", "You spit neurotoxin.") var/turf/T = user.loc @@ -224,7 +224,7 @@ Doesn't work on other aliens/AI.*/ action_icon_state = "alien_resin" -/obj/effect/proc_holder/alien/resin/fire(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/resin/fire(mob/living/carbon/alien/user) if(locate(/obj/structure/alien/resin) in user.loc.contents) user << "There is already a resin structure there." return 0 @@ -252,7 +252,7 @@ Doesn't work on other aliens/AI.*/ action_icon_state = "alien_barf" -/obj/effect/proc_holder/alien/regurgitate/fire(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/regurgitate/fire(mob/living/carbon/alien/user) if(user.stomach_contents.len) for(var/atom/movable/A in user.stomach_contents) user.stomach_contents.Remove(A) @@ -268,7 +268,7 @@ Doesn't work on other aliens/AI.*/ has_action = 0 // Has dedicated GUI button already -/obj/effect/proc_holder/alien/nightvisiontoggle/fire(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/nightvisiontoggle/fire(mob/living/carbon/alien/user) if(!user.nightvision) user.see_in_dark = 8 diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm index a18f4b2ee00..ac8b2f4405d 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm @@ -31,7 +31,7 @@ action_icon_state = "alien_evolve_drone" -/obj/effect/proc_holder/alien/evolve/fire(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/evolve/fire(mob/living/carbon/alien/user) var/no_queen = 1 for(var/mob/living/carbon/alien/humanoid/queen/Q in living_mob_list) if(!Q.key || !Q.getorgan(/obj/item/organ/brain)) diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm index a34c6337786..68fda08c934 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm @@ -44,7 +44,7 @@ //Hunter verbs -/mob/living/carbon/alien/humanoid/hunter/proc/toggle_leap(var/message = 1) +/mob/living/carbon/alien/humanoid/hunter/proc/toggle_leap(message = 1) leap_on_click = !leap_on_click leap_icon.icon_state = "leap_[leap_on_click ? "on":"off"]" update_icons() @@ -54,7 +54,7 @@ return -/mob/living/carbon/alien/humanoid/hunter/ClickOn(var/atom/A, var/params) +/mob/living/carbon/alien/humanoid/hunter/ClickOn(atom/A, params) face_atom(A) if(leap_on_click) leap_at(A) @@ -64,7 +64,7 @@ #define MAX_ALIEN_LEAP_DIST 7 -/mob/living/carbon/alien/humanoid/hunter/proc/leap_at(var/atom/A) +/mob/living/carbon/alien/humanoid/hunter/proc/leap_at(atom/A) if(pounce_cooldown) src << "You are too fatigued to pounce right now!" return diff --git a/code/modules/mob/living/carbon/alien/humanoid/emote.dm b/code/modules/mob/living/carbon/alien/humanoid/emote.dm index 73157d41c63..fd46ca92087 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/emote.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/emote.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/alien/humanoid/emote(var/act) +/mob/living/carbon/alien/humanoid/emote(act) var/param = null if (findtext(act, "-", 1, null)) diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index cc695822032..4c27150e481 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -46,7 +46,7 @@ step_away(src,user,15) return 1 -/mob/living/carbon/alien/humanoid/attack_hand(mob/living/carbon/human/M as mob) +/mob/living/carbon/alien/humanoid/attack_hand(mob/living/carbon/human/M) if(..()) switch(M.a_intent) if ("harm") diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm index 1b58d61fb27..90e2fd474c8 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm @@ -65,7 +65,7 @@ action_icon_state = "alien_egg" -/obj/effect/proc_holder/alien/lay_egg/fire(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/lay_egg/fire(mob/living/carbon/alien/user) if(locate(/obj/structure/alien/egg) in get_turf(user)) user << "There's already an egg here." return 0 diff --git a/code/modules/mob/living/carbon/alien/larva/inventory.dm b/code/modules/mob/living/carbon/alien/larva/inventory.dm index 99298e50bbe..3cb46a54b2e 100644 --- a/code/modules/mob/living/carbon/alien/larva/inventory.dm +++ b/code/modules/mob/living/carbon/alien/larva/inventory.dm @@ -1,3 +1,3 @@ //can't unequip since it can't equip anything -/mob/living/carbon/alien/larva/unEquip(obj/item/W as obj) +/mob/living/carbon/alien/larva/unEquip(obj/item/W) return \ No newline at end of file diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm index 74c786143a7..d1b46a70481 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva.dm @@ -52,7 +52,7 @@ step_away(src,user,15) return 1 -/mob/living/carbon/alien/larva/attack_hand(mob/living/carbon/human/M as mob) +/mob/living/carbon/alien/larva/attack_hand(mob/living/carbon/human/M) if(..()) var/damage = rand(1, 9) if (prob(90)) diff --git a/code/modules/mob/living/carbon/alien/larva/powers.dm b/code/modules/mob/living/carbon/alien/larva/powers.dm index 093c727edc5..3bc9e44a910 100644 --- a/code/modules/mob/living/carbon/alien/larva/powers.dm +++ b/code/modules/mob/living/carbon/alien/larva/powers.dm @@ -5,7 +5,7 @@ action_icon_state = "alien_hide" -/obj/effect/proc_holder/alien/hide/fire(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/hide/fire(mob/living/carbon/alien/user) if(user.stat != CONSCIOUS) return @@ -27,7 +27,7 @@ action_icon_state = "alien_evolve_larva" -/obj/effect/proc_holder/alien/larva_evolve/fire(var/mob/living/carbon/alien/user) +/obj/effect/proc_holder/alien/larva_evolve/fire(mob/living/carbon/alien/user) if(!islarva(user)) return var/mob/living/carbon/alien/larva/L = user diff --git a/code/modules/mob/living/carbon/alien/say.dm b/code/modules/mob/living/carbon/alien/say.dm index 3bf5ead3260..03aea6db380 100644 --- a/code/modules/mob/living/carbon/alien/say.dm +++ b/code/modules/mob/living/carbon/alien/say.dm @@ -1,9 +1,9 @@ -/mob/living/carbon/alien/say(var/message) +/mob/living/carbon/alien/say(message) . = ..(message, "A") if(.) playsound(loc, "hiss", 25, 1, 1) //erp just isn't the same without sound feedback -/mob/living/proc/alien_talk(var/message) +/mob/living/proc/alien_talk(message) log_say("[key_name(src)] : [message]") message = trim(message) diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm index d7c223124b6..57db5c8890b 100644 --- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm +++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm @@ -50,7 +50,7 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds -/obj/item/body_egg/alien_embryo/proc/AttemptGrow(var/gib_on_success = 1) +/obj/item/body_egg/alien_embryo/proc/AttemptGrow(gib_on_success = 1) var/list/candidates = get_candidates(BE_ALIEN, ALIEN_AFK_BRACKET) var/client/C = null diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index c053d20c090..04dfc223b1a 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -28,17 +28,17 @@ var/const/MAX_ACTIVE_TIME = 400 var/attached = 0 -/obj/item/clothing/mask/facehugger/attack_alien(user as mob) //can be picked up by aliens +/obj/item/clothing/mask/facehugger/attack_alien(mob/user) //can be picked up by aliens attack_hand(user) return -/obj/item/clothing/mask/facehugger/attack_hand(user as mob) +/obj/item/clothing/mask/facehugger/attack_hand(mob/user) if((stat == CONSCIOUS && !sterile) && !isalien(user)) if(Attach(user)) return ..() -/obj/item/clothing/mask/facehugger/attack(mob/living/M as mob, mob/user as mob) +/obj/item/clothing/mask/facehugger/attack(mob/living/M, mob/user) ..() user.unEquip(src) Attach(M) @@ -55,12 +55,12 @@ var/const/MAX_ACTIVE_TIME = 400 if (sterile) user << "It looks like the proboscis has been removed." -/obj/item/clothing/mask/facehugger/attackby(var/obj/item/O,var/mob/m, params) +/obj/item/clothing/mask/facehugger/attackby(obj/item/O,mob/m, params) if(O.force) Die() return -/obj/item/clothing/mask/facehugger/bullet_act(var/obj/item/projectile/P) +/obj/item/clothing/mask/facehugger/bullet_act(obj/item/projectile/P) if(P.damage) Die() return @@ -77,7 +77,7 @@ var/const/MAX_ACTIVE_TIME = 400 HasProximity(target) return -/obj/item/clothing/mask/facehugger/on_found(mob/finder as mob) +/obj/item/clothing/mask/facehugger/on_found(mob/finder) if(stat == CONSCIOUS) return HasProximity(finder) return 0 @@ -102,7 +102,7 @@ var/const/MAX_ACTIVE_TIME = 400 icon_state = "[initial(icon_state)]" Attach(hit_atom) -/obj/item/clothing/mask/facehugger/proc/Attach(M as mob) +/obj/item/clothing/mask/facehugger/proc/Attach(mob/M) if( (!iscorgi(M) && !iscarbon(M)) || isalien(M)) return 0 if(attached) @@ -158,7 +158,7 @@ var/const/MAX_ACTIVE_TIME = 400 return 1 -/obj/item/clothing/mask/facehugger/proc/Impregnate(mob/living/target as mob) +/obj/item/clothing/mask/facehugger/proc/Impregnate(mob/living/target) if(!target || target.stat == DEAD) //was taken off or something return @@ -229,7 +229,7 @@ var/const/MAX_ACTIVE_TIME = 400 return -/proc/CanHug(var/mob/M) +/proc/CanHug(mob/M) if(!istype(M)) return 0 if(M.stat == DEAD) diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index 4bca8132157..3655e7a183c 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -31,7 +31,7 @@ else icon_state = "mmi_empty" -/obj/item/device/mmi/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/item/device/mmi/attackby(obj/item/O, mob/user, params) user.changeNext_move(CLICK_CD_MELEE) if(istype(O,/obj/item/organ/brain)) //Time to stick a brain in it --NEO var/obj/item/organ/brain/newbrain = O @@ -85,7 +85,7 @@ return ..() -/obj/item/device/mmi/attack_self(mob/user as mob) +/obj/item/device/mmi/attack_self(mob/user) if(!brain) user << "You upend the MMI, but there's nothing in it!" else if(locked) @@ -105,7 +105,7 @@ update_icon() name = "Man-Machine Interface" -/obj/item/device/mmi/proc/transfer_identity(var/mob/living/carbon/human/H) //Same deal as the regular brain proc. Used for human-->robot people. +/obj/item/device/mmi/proc/transfer_identity(mob/living/carbon/human/H) //Same deal as the regular brain proc. Used for human-->robot people. brainmob = new(src) brainmob.name = H.real_name brainmob.real_name = H.real_name diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm index 2197876bc1c..3eec0aa657d 100644 --- a/code/modules/mob/living/carbon/brain/brain.dm +++ b/code/modules/mob/living/carbon/brain/brain.dm @@ -33,12 +33,12 @@ /mob/living/carbon/brain/blob_act() return -/mob/living/carbon/brain/on_forcemove(var/atom/newloc) +/mob/living/carbon/brain/on_forcemove(atom/newloc) if(container) container.loc = newloc else //something went very wrong. CRASH("Brainmob without container.") loc = container -/mob/living/carbon/brain/UnarmedAttack(var/atom/A)//Stops runtimes due to attack_animal being the default +/mob/living/carbon/brain/UnarmedAttack(atom/A)//Stops runtimes due to attack_animal being the default return diff --git a/code/modules/mob/living/carbon/brain/death.dm b/code/modules/mob/living/carbon/brain/death.dm index 5490d786297..f97ddb1a3db 100644 --- a/code/modules/mob/living/carbon/brain/death.dm +++ b/code/modules/mob/living/carbon/brain/death.dm @@ -19,7 +19,7 @@ return ..(gibbed) -/mob/living/carbon/brain/gib(var/animation = 0) +/mob/living/carbon/brain/gib(animation = 0) if(container && istype(container, /obj/item/device/mmi)) qdel(container)//Gets rid of the MMI if there is one if(loc) diff --git a/code/modules/mob/living/carbon/brain/emote.dm b/code/modules/mob/living/carbon/brain/emote.dm index 4a75b2765fe..c9feda102b4 100644 --- a/code/modules/mob/living/carbon/brain/emote.dm +++ b/code/modules/mob/living/carbon/brain/emote.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/brain/emote(var/act,var/m_type=1,var/message = null) +/mob/living/carbon/brain/emote(act,m_type=1,message = null) if(!(container && istype(container, /obj/item/device/mmi)))//No MMI, no emotes return diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm index 37a596ab08a..f2d90fdc84d 100644 --- a/code/modules/mob/living/carbon/brain/posibrain.dm +++ b/code/modules/mob/living/carbon/brain/posibrain.dm @@ -21,14 +21,14 @@ var/global/posibrain_notif_cooldown = 0 if(istype(ghost)) activate(ghost) -/obj/item/device/mmi/posibrain/proc/ping_ghosts(var/msg) +/obj/item/device/mmi/posibrain/proc/ping_ghosts(msg) if(!posibrain_notif_cooldown) notify_ghosts("Positronic Brain [msg] in [get_area(src)]. (Enter)") posibrain_notif_cooldown = 1 spawn(askDelay) //Global one minute cooldown to avoid spam. posibrain_notif_cooldown = 0 -/obj/item/device/mmi/posibrain/attack_self(mob/user as mob) +/obj/item/device/mmi/posibrain/attack_self(mob/user) if(brainmob && !brainmob.key && !notified) //Start the process of notified for a new user. user << "You carefully locate the manual activation switch and start the positronic brain's boot process." @@ -56,7 +56,7 @@ var/global/posibrain_notif_cooldown = 0 return transfer_personality(user) -/obj/item/device/mmi/posibrain/transfer_identity(var/mob/living/carbon/H) +/obj/item/device/mmi/posibrain/transfer_identity(mob/living/carbon/H) name = "positronic brain ([H])" brainmob.name = H.real_name brainmob.real_name = H.real_name @@ -77,7 +77,7 @@ var/global/posibrain_notif_cooldown = 0 update_icon() return -/obj/item/device/mmi/posibrain/proc/transfer_personality(var/mob/candidate) +/obj/item/device/mmi/posibrain/proc/transfer_personality(mob/candidate) if(brainmob && brainmob.key) //Prevents hostile takeover if two ghosts get the prompt or link for the same brain. candidate << "This brain has already been taken! Please try your possesion again later!" return @@ -135,7 +135,7 @@ var/global/posibrain_notif_cooldown = 0 ..() -/obj/item/device/mmi/posibrain/attackby(var/obj/item/O as obj, var/mob/user as mob) +/obj/item/device/mmi/posibrain/attackby(obj/item/O, mob/user) return diff --git a/code/modules/mob/living/carbon/brain/say.dm b/code/modules/mob/living/carbon/brain/say.dm index ac45baaf338..1086ba0ef1d 100644 --- a/code/modules/mob/living/carbon/brain/say.dm +++ b/code/modules/mob/living/carbon/brain/say.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/brain/say(var/message) +/mob/living/carbon/brain/say(message) if(!(container && istype(container, /obj/item/device/mmi))) return //No MMI, can't speak, bucko./N else diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index c3c789b3b9d..83f2425156a 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -35,7 +35,7 @@ if(legcuffed) . += legcuffed.slowdown -/mob/living/carbon/relaymove(var/mob/user, direction) +/mob/living/carbon/relaymove(mob/user, direction) if(user in src.stomach_contents) if(prob(40)) if(prob(25)) @@ -65,7 +65,7 @@ stomach_contents.Remove(A) src.gib() -/mob/living/carbon/gib(var/animation = 1) +/mob/living/carbon/gib(animation = 1) for(var/mob/M in src) if(M in stomach_contents) stomach_contents.Remove(M) @@ -74,7 +74,7 @@ . = ..() -/mob/living/carbon/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 1.0) +/mob/living/carbon/electrocute_act(shock_damage, obj/source, siemens_coeff = 1.0) shock_damage *= siemens_coeff if (shock_damage<1) return 0 @@ -119,7 +119,7 @@ src.hands.dir = SOUTH*/ return -/mob/living/carbon/activate_hand(var/selhand) //0 or "r" or "right" for right hand; 1 or "l" or "left" for left hand. +/mob/living/carbon/activate_hand(selhand) //0 or "r" or "right" for right hand; 1 or "l" or "left" for left hand. if(istext(selhand)) selhand = lowertext(selhand) @@ -360,10 +360,10 @@ var/const/NO_SLIP_WHEN_WALKING = 1 var/const/STEP = 2 var/const/SLIDE = 4 var/const/GALOSHES_DONT_HELP = 8 -/mob/living/carbon/slip(var/s_amount, var/w_amount, var/obj/O, var/lube) +/mob/living/carbon/slip(s_amount, w_amount, obj/O, lube) loc.handle_slip(src, s_amount, w_amount, O, lube) -/mob/living/carbon/fall(var/forced) +/mob/living/carbon/fall(forced) loc.handle_fall(src, forced)//it's loc so it doesn't call the mob's handle_fall which does nothing /mob/living/carbon/is_muzzled() @@ -435,7 +435,7 @@ var/const/GALOSHES_DONT_HELP = 8 cuff_resist(I) -/mob/living/carbon/proc/cuff_resist(obj/item/I, var/breakouttime = 600, cuff_break = 0) +/mob/living/carbon/proc/cuff_resist(obj/item/I, breakouttime = 600, cuff_break = 0) if(istype(I, /obj/item/weapon/restraints)) var/obj/item/weapon/restraints/R = I breakouttime = R.breakouttime @@ -526,7 +526,7 @@ var/const/GALOSHES_DONT_HELP = 8 if(head && (head.flags & HEADBANGPROTECT)) return 1 -/mob/living/carbon/proc/accident(var/obj/item/I) +/mob/living/carbon/proc/accident(obj/item/I) if(!I || (I.flags & NODROP)) return diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 65cdef581b1..7ef10003c95 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -43,7 +43,7 @@ return 0 -/mob/living/carbon/attack_paw(mob/living/carbon/monkey/M as mob) +/mob/living/carbon/attack_paw(mob/living/carbon/monkey/M) if(!istype(M, /mob/living/carbon)) return 0 diff --git a/code/modules/mob/living/carbon/emote.dm b/code/modules/mob/living/carbon/emote.dm index cdbb56ad240..320ae709bc3 100644 --- a/code/modules/mob/living/carbon/emote.dm +++ b/code/modules/mob/living/carbon/emote.dm @@ -2,7 +2,7 @@ //Things like airguitar can be done without arms, and the flap thing makes so little sense it's a keeper. //Intended to be called by a higher up emote proc if the requested emote isn't in the custom emotes. -/mob/living/carbon/emote(var/act,var/m_type=1,var/message = null) +/mob/living/carbon/emote(act,m_type=1,message = null) var/param = null if (findtext(act, "-", 1, null)) diff --git a/code/modules/mob/living/carbon/human/blood.dm b/code/modules/mob/living/carbon/human/blood.dm index 289fb8e5ee8..d03805d7d22 100644 --- a/code/modules/mob/living/carbon/human/blood.dm +++ b/code/modules/mob/living/carbon/human/blood.dm @@ -32,7 +32,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 if(B.id == "blood") B.data = list("donor"=src,"viruses"=null,"blood_DNA"=dna.unique_enzymes,"blood_type"=dna.blood_type,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"features"=null, "factions"=null) -/mob/living/carbon/human/proc/suppress_bloodloss(var/amount) +/mob/living/carbon/human/proc/suppress_bloodloss(amount) if(bleedsuppress) return else @@ -124,7 +124,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 drip(blood_max) //Makes a blood drop, leaking amt units of blood from the mob -/mob/living/carbon/human/proc/drip(var/amt as num) +/mob/living/carbon/human/proc/drip(amt as num) if(!amt) return @@ -138,7 +138,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 ****************************************************/ //Gets blood from mob to the container, preserving all data in it. -/mob/living/carbon/proc/take_blood(obj/item/weapon/reagent_containers/container, var/amount) +/mob/living/carbon/proc/take_blood(obj/item/weapon/reagent_containers/container, amount) var/datum/reagent/B = get_blood(container.reagents) if(!B) B = new /datum/reagent/blood @@ -177,7 +177,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 return B //For humans, blood does not appear from blue, it comes from vessels. -/mob/living/carbon/human/take_blood(obj/item/weapon/reagent_containers/container, var/amount) +/mob/living/carbon/human/take_blood(obj/item/weapon/reagent_containers/container, amount) if(NOBLOOD in dna.species.specflags) return null @@ -189,7 +189,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 vessel.remove_reagent("blood",amount) // Removes blood if human //Transfers blood from container to vessels -/mob/living/carbon/proc/inject_blood(obj/item/weapon/reagent_containers/container, var/amount) +/mob/living/carbon/proc/inject_blood(obj/item/weapon/reagent_containers/container, amount) var/datum/reagent/blood/injected = get_blood(container.reagents) @@ -205,7 +205,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 container.reagents.remove_reagent("blood", amount) //Transfers blood from container to vessels, respecting blood types compatibility. -/mob/living/carbon/human/inject_blood(obj/item/weapon/reagent_containers/container, var/amount) +/mob/living/carbon/human/inject_blood(obj/item/weapon/reagent_containers/container, amount) var/datum/reagent/blood/injected = get_blood(container.reagents) @@ -261,7 +261,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 //AB is a universal receiver. return 0 -/proc/blood_splatter(var/target,var/datum/reagent/blood/source,var/large) +/proc/blood_splatter(target,datum/reagent/blood/source,large) var/obj/effect/decal/cleanable/blood/B var/decal_type = /obj/effect/decal/cleanable/blood/splatter diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 2f84b03bd20..0e91f3f1d66 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -1,10 +1,10 @@ -/mob/living/carbon/human/gib_animation(var/animate) +/mob/living/carbon/human/gib_animation(animate) ..(animate, "gibbed-h") -/mob/living/carbon/human/dust_animation(var/animate) +/mob/living/carbon/human/dust_animation(animate) ..(animate, "dust-h") -/mob/living/carbon/human/dust(var/animation = 1) +/mob/living/carbon/human/dust(animation = 1) ..() /mob/living/carbon/human/spawn_gibs() diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 0c274d56ebf..5fc5e054f69 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/human/emote(var/act,var/m_type=1,var/message = null) +/mob/living/carbon/human/emote(act,m_type=1,message = null) var/param = null if (findtext(act, "-", 1, null)) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 1f5f0b11935..84cf8e339e1 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -259,7 +259,7 @@ // called when something steps onto a human // this could be made more general, but for now just handle mulebot -/mob/living/carbon/human/Crossed(var/atom/movable/AM) +/mob/living/carbon/human/Crossed(atom/movable/AM) var/obj/machinery/bot/mulebot/MB = AM if(istype(MB)) MB.RunOver(src) @@ -267,7 +267,7 @@ spreadFire(AM) //Added a safety check in case you want to shock a human mob directly through electrocute_act. -/mob/living/carbon/human/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 1.0, var/safety = 0) +/mob/living/carbon/human/electrocute_act(shock_damage, obj/source, siemens_coeff = 1.0, safety = 0) if(!safety) if(gloves) var/obj/item/clothing/gloves/G = gloves @@ -533,7 +533,7 @@ /mob/living/carbon/human/proc/canUseHUD() return !(src.stat || src.weakened || src.stunned || src.restrained()) -/mob/living/carbon/human/can_inject(var/mob/user, var/error_msg, var/target_zone) +/mob/living/carbon/human/can_inject(mob/user, error_msg, target_zone) . = 1 // Default to returning true. if(user && !target_zone) target_zone = user.zone_sel.selecting @@ -575,7 +575,7 @@ else return null -/mob/living/carbon/human/assess_threat(var/obj/machinery/bot/secbot/judgebot, var/lasercolor) +/mob/living/carbon/human/assess_threat(obj/machinery/bot/secbot/judgebot, lasercolor) if(judgebot.emagged == 2) return 10 //Everyone is a criminal! diff --git a/code/modules/mob/living/carbon/human/human_attackalien.dm b/code/modules/mob/living/carbon/human/human_attackalien.dm index 31c04c06b2f..30e03e615cb 100644 --- a/code/modules/mob/living/carbon/human/human_attackalien.dm +++ b/code/modules/mob/living/carbon/human/human_attackalien.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/human/attack_alien(mob/living/carbon/alien/humanoid/M as mob) +/mob/living/carbon/human/attack_alien(mob/living/carbon/alien/humanoid/M) if(check_shields(0, M.name)) visible_message("[M] attempted to touch [src]!") return 0 diff --git a/code/modules/mob/living/carbon/human/human_attackpaw.dm b/code/modules/mob/living/carbon/human/human_attackpaw.dm index c8372f814d6..54c47761514 100644 --- a/code/modules/mob/living/carbon/human/human_attackpaw.dm +++ b/code/modules/mob/living/carbon/human/human_attackpaw.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/human/attack_paw(mob/living/carbon/monkey/M as mob) +/mob/living/carbon/human/attack_paw(mob/living/carbon/monkey/M) var/dam_zone = pick("chest", "l_hand", "r_hand", "l_leg", "r_leg") var/obj/item/organ/limb/affecting = get_organ(ran_zone(dam_zone)) diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 48250417654..af0c7205b31 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -33,13 +33,13 @@ return amount -/mob/living/carbon/human/adjustBruteLoss(var/amount) +/mob/living/carbon/human/adjustBruteLoss(amount) if(amount > 0) take_overall_damage(amount, 0) else heal_overall_damage(-amount, 0) -/mob/living/carbon/human/adjustFireLoss(var/amount) +/mob/living/carbon/human/adjustFireLoss(amount) if(amount > 0) take_overall_damage(0, amount) else @@ -58,7 +58,7 @@ //////////////////////////////////////////// //Returns a list of damaged organs -/mob/living/carbon/human/proc/get_damaged_organs(var/brute, var/burn) +/mob/living/carbon/human/proc/get_damaged_organs(brute, burn) var/list/obj/item/organ/limb/parts = list() for(var/obj/item/organ/limb/O in organs) if((brute && O.brute_dam) || (burn && O.burn_dam)) @@ -76,7 +76,7 @@ //Heals ONE external organ, organ gets randomly selected from damaged ones. //It automatically updates damage overlays if necesary //It automatically updates health status -/mob/living/carbon/human/heal_organ_damage(var/brute, var/burn) +/mob/living/carbon/human/heal_organ_damage(brute, burn) var/list/obj/item/organ/limb/parts = get_damaged_organs(brute,burn) if(!parts.len) return var/obj/item/organ/limb/picked = pick(parts) @@ -87,7 +87,7 @@ //Damages ONE external organ, organ gets randomly selected from damagable ones. //It automatically updates damage overlays if necesary //It automatically updates health status -/mob/living/carbon/human/take_organ_damage(var/brute, var/burn) +/mob/living/carbon/human/take_organ_damage(brute, burn) var/list/obj/item/organ/limb/parts = get_damageable_organs() if(!parts.len) return var/obj/item/organ/limb/picked = pick(parts) @@ -98,7 +98,7 @@ //Heal MANY external organs, in random order -/mob/living/carbon/human/heal_overall_damage(var/brute, var/burn) +/mob/living/carbon/human/heal_overall_damage(brute, burn) var/list/obj/item/organ/limb/parts = get_damaged_organs(brute,burn) var/update = 0 @@ -118,7 +118,7 @@ if(update) update_damage_overlays(0) // damage MANY external organs, in random order -/mob/living/carbon/human/take_overall_damage(var/brute, var/burn) +/mob/living/carbon/human/take_overall_damage(brute, burn) if(status_flags & GODMODE) return //godmode var/list/obj/item/organ/limb/parts = get_damageable_organs() @@ -151,7 +151,7 @@ //////////////////////////////////////////// -/mob/living/carbon/human/proc/get_organ(var/zone) +/mob/living/carbon/human/proc/get_organ(zone) if(!zone) zone = "chest" for(var/obj/item/organ/limb/O in organs) if(O.name == zone) @@ -159,7 +159,7 @@ return null -/mob/living/carbon/human/apply_damage(var/damage = 0,var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0) +/mob/living/carbon/human/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = 0) if(dna) // if you have a species, it will run the apply_damage code there instead dna.species.apply_damage(damage, damagetype, def_zone, blocked, src) else diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 7e143f1baa0..72a5d682d0c 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -6,7 +6,7 @@ emp_act */ -/mob/living/carbon/human/getarmor(var/def_zone, var/type) +/mob/living/carbon/human/getarmor(def_zone, type) var/armorval = 0 var/organnum = 0 @@ -24,7 +24,7 @@ emp_act return (armorval/max(organnum, 1)) -/mob/living/carbon/human/proc/checkarmor(var/obj/item/organ/limb/def_zone, var/type) +/mob/living/carbon/human/proc/checkarmor(obj/item/organ/limb/def_zone, type) if(!type) return 0 var/protection = 0 var/list/body_parts = list(head, wear_mask, wear_suit, w_uniform) @@ -41,7 +41,7 @@ emp_act dna.species.on_hit(proj_type, src) return -/mob/living/carbon/human/bullet_act(var/obj/item/projectile/P, var/def_zone) +/mob/living/carbon/human/bullet_act(obj/item/projectile/P, def_zone) if(istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam)) if(check_reflect(def_zone)) // Checks if you've passed a reflection% check visible_message("The [P.name] gets reflected by [src]!", \ @@ -67,7 +67,7 @@ emp_act return 2 return (..(P , def_zone)) -/mob/living/carbon/human/proc/check_reflect(var/def_zone) //Reflection checks for anything in your l_hand, r_hand, or wear_suit based on the reflection chance of the object +/mob/living/carbon/human/proc/check_reflect(def_zone) //Reflection checks for anything in your l_hand, r_hand, or wear_suit based on the reflection chance of the object if(wear_suit && istype(wear_suit, /obj/item/)) var/obj/item/I = wear_suit if(I.IsReflect(def_zone) == 1) @@ -85,7 +85,7 @@ emp_act //End Here -/mob/living/carbon/human/proc/check_shields(var/damage = 0, var/attack_text = "the attack", var/obj/item/O) +/mob/living/carbon/human/proc/check_shields(damage = 0, attack_text = "the attack", obj/item/O) if(O) if(O.flags & NOSHIELD) //weapon ignores shields altogether return 0 @@ -122,7 +122,7 @@ emp_act return 0 -/mob/living/carbon/human/attacked_by(var/obj/item/I, var/mob/living/user, var/def_zone) +/mob/living/carbon/human/attacked_by(obj/item/I, mob/living/user, def_zone) if(!I || !user) return 0 var/obj/item/organ/limb/target_limb = get_organ(check_zone(user.zone_sel.selecting)) @@ -235,7 +235,7 @@ emp_act src.Stun(5) ..() -/mob/living/carbon/human/acid_act(var/acidpwr, var/toxpwr, var/acid_volume) +/mob/living/carbon/human/acid_act(acidpwr, toxpwr, acid_volume) var/list/damaged = list() var/list/inventory_items_to_kill = list() var/acidity = min(acidpwr*acid_volume/200, toxpwr) @@ -382,7 +382,7 @@ emp_act ..() -/mob/living/carbon/human/attack_animal(mob/living/simple_animal/M as mob) +/mob/living/carbon/human/attack_animal(mob/living/simple_animal/M) if(..()) var/damage = rand(M.melee_damage_lower, M.melee_damage_upper) if(check_shields(damage, "the [M.name]")) @@ -394,7 +394,7 @@ emp_act updatehealth() -/mob/living/carbon/human/attack_larva(mob/living/carbon/alien/larva/L as mob) +/mob/living/carbon/human/attack_larva(mob/living/carbon/alien/larva/L) if(..()) //successful larva bite. var/damage = rand(1, 3) @@ -408,7 +408,7 @@ emp_act updatehealth() -/mob/living/carbon/human/attack_slime(mob/living/simple_animal/slime/M as mob) +/mob/living/carbon/human/attack_slime(mob/living/simple_animal/slime/M) if(..()) //successful slime attack var/damage = rand(5, 25) if(M.is_adult) diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index e163fb158e0..3e512e7b825 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -11,7 +11,7 @@ //gets assignment from ID or ID inside PDA or PDA itself //Useful when player do something with computers -/mob/living/carbon/human/proc/get_assignment(var/if_no_id = "No id", var/if_no_job = "No job") +/mob/living/carbon/human/proc/get_assignment(if_no_id = "No id", if_no_job = "No job") var/obj/item/weapon/card/id/id = get_idcard() if(id) . = id.assignment @@ -26,7 +26,7 @@ //gets name from ID or ID inside PDA or PDA itself //Useful when player do something with computers -/mob/living/carbon/human/proc/get_authentification_name(var/if_no_id = "Unknown") +/mob/living/carbon/human/proc/get_authentification_name(if_no_id = "Unknown") var/obj/item/weapon/card/id/id = get_idcard() if(id) return id.registered_name @@ -62,7 +62,7 @@ //gets name from ID or PDA itself, ID inside PDA doesn't matter //Useful when player is being seen by other mobs -/mob/living/carbon/human/proc/get_id_name(var/if_no_id = "Unknown") +/mob/living/carbon/human/proc/get_id_name(if_no_id = "Unknown") var/obj/item/weapon/storage/wallet/wallet = wear_id var/obj/item/device/pda/pda = wear_id var/obj/item/weapon/card/id/id = wear_id @@ -115,7 +115,7 @@ tinted += MT.tint return tinted -/mob/living/carbon/human/abiotic(var/full_body = 0) +/mob/living/carbon/human/abiotic(full_body = 0) if(full_body && ((src.l_hand && !( src.l_hand.flags&ABSTRACT )) || (src.r_hand && !( src.r_hand.flags&ABSTRACT )) || (src.back || src.wear_mask || src.head || src.shoes || src.w_uniform || src.wear_suit || src.glasses || src.ears || src.gloves))) return 1 diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 5dc30d5535a..b0078a13719 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -5,7 +5,7 @@ . += ..() . += config.human_delay -/mob/living/carbon/human/Process_Spacemove(var/movement_dir = 0) +/mob/living/carbon/human/Process_Spacemove(movement_dir = 0) if(..()) return 1 @@ -24,7 +24,7 @@ return 0 -/mob/living/carbon/human/slip(var/s_amount, var/w_amount, var/obj/O, var/lube) +/mob/living/carbon/human/slip(s_amount, w_amount, obj/O, lube) if(isobj(shoes) && (shoes.flags&NOSLIP) && !(lube&GALOSHES_DONT_HELP)) return 0 .=..() diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 46a203afc1b..a86275539aa 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -391,7 +391,7 @@ return //Cycles through all clothing slots and tests them for destruction -/mob/living/carbon/human/proc/shred_clothing(var/bomb,var/shock) +/mob/living/carbon/human/proc/shred_clothing(bomb,shock) var/covered_parts = 0 //The body parts that are protected by exterior clothing/armor var/head_absorbed = 0 //How much of the shock the headgear absorbs when it is shredded. -1=it survives var/suit_absorbed = 0 //How much of the shock the exosuit absorbs when it is shredded. -1=it survives @@ -439,7 +439,7 @@ if(absorbed >= 0) w_uniform.shred(bomb,shock-20-absorbed,src) //Uniforms are also annoying to get shredded -/obj/item/proc/shred(var/bomb,var/shock,var/mob/living/carbon/human/Human) +/obj/item/proc/shred(bomb,shock,mob/living/carbon/human/Human) if(flags & ABSTRACT) return -1 diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index bfa438e032f..7da4365cf22 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -54,7 +54,7 @@ dna.species.spec_life(src) // for mutantraces -/mob/living/carbon/human/calculate_affecting_pressure(var/pressure) +/mob/living/carbon/human/calculate_affecting_pressure(pressure) if((wear_suit && (wear_suit.flags & STOPSPRESSUREDMAGE)) && (head && (head.flags & STOPSPRESSUREDMAGE))) return ONE_ATMOSPHERE else diff --git a/code/modules/mob/living/carbon/human/mutantrace.dm b/code/modules/mob/living/carbon/human/mutantrace.dm index 30615bb624c..32ad63444b5 100644 --- a/code/modules/mob/living/carbon/human/mutantrace.dm +++ b/code/modules/mob/living/carbon/human/mutantrace.dm @@ -14,7 +14,7 @@ var/global/list/mutants_with_eyes = list( // these mutantraces have eyes "jelly", ) -/mob/living/carbon/human/proc/check_mutrace(var/mutneeded = "mut1", var/mutneededalt = "mut2") +/mob/living/carbon/human/proc/check_mutrace(mutneeded = "mut1", mutneededalt = "mut2") if(dna) if(dna.mutantrace == mutneeded || dna.mutantrace == mutneededalt) return 1 diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 491f878b2ec..8b0fdbe16d5 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -54,7 +54,7 @@ return !mind.miming return 1 -/mob/living/carbon/human/proc/SetSpecialVoice(var/new_voice) +/mob/living/carbon/human/proc/SetSpecialVoice(new_voice) if(new_voice) special_voice = new_voice return diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index e5e7060002d..f0bb401c317 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -103,10 +103,10 @@ //Please override this locally if you want to define when what species qualifies for what rank if human authority is enforced. -/datum/species/proc/qualifies_for_rank(var/rank, var/list/features) +/datum/species/proc/qualifies_for_rank(rank, list/features) return 1 -/datum/species/proc/update_base_icon_state(var/mob/living/carbon/human/H) +/datum/species/proc/update_base_icon_state(mob/living/carbon/human/H) if(H.disabilities & HUSK) H.remove_overlay(SPECIES_LAYER) // races lose their color return "husk" @@ -118,7 +118,7 @@ else return "[id]" -/datum/species/proc/update_color(var/mob/living/carbon/human/H) +/datum/species/proc/update_color(mob/living/carbon/human/H) H.remove_overlay(SPECIES_LAYER) var/image/standing @@ -143,7 +143,7 @@ H.apply_overlay(SPECIES_LAYER) -/datum/species/proc/handle_hair(var/mob/living/carbon/human/H) +/datum/species/proc/handle_hair(mob/living/carbon/human/H) H.remove_overlay(HAIR_LAYER) var/datum/sprite_accessory/S @@ -201,7 +201,7 @@ H.apply_overlay(HAIR_LAYER) return -/datum/species/proc/handle_body(var/mob/living/carbon/human/H) +/datum/species/proc/handle_body(mob/living/carbon/human/H) H.remove_overlay(BODY_LAYER) var/list/standing = list() @@ -246,7 +246,7 @@ return -/datum/species/proc/handle_mutant_bodyparts(var/mob/living/carbon/human/H) +/datum/species/proc/handle_mutant_bodyparts(mob/living/carbon/human/H) var/list/bodyparts_to_add = mutant_bodyparts.Copy() var/list/relevent_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER, BODY_FRONT_LAYER) var/list/standing = list() @@ -390,17 +390,17 @@ H.apply_overlay(BODY_ADJ_LAYER) H.apply_overlay(BODY_FRONT_LAYER) -/datum/species/proc/spec_life(var/mob/living/carbon/human/H) +/datum/species/proc/spec_life(mob/living/carbon/human/H) return -/datum/species/proc/spec_death(var/gibbed, var/mob/living/carbon/human/H) +/datum/species/proc/spec_death(gibbed, mob/living/carbon/human/H) return -/datum/species/proc/auto_equip(var/mob/living/carbon/human/H) +/datum/species/proc/auto_equip(mob/living/carbon/human/H) // handles the equipping of species-specific gear return -/datum/species/proc/can_equip(var/obj/item/I, var/slot, var/disable_warning, var/mob/living/carbon/human/H) +/datum/species/proc/can_equip(obj/item/I, slot, disable_warning, mob/living/carbon/human/H) if(slot in no_equip) if(!(type in I.species_exception)) return 0 @@ -555,23 +555,23 @@ return 0 return 0 //Unsupported slot -/datum/species/proc/before_equip_job(var/datum/job/J, var/mob/living/carbon/human/H) +/datum/species/proc/before_equip_job(datum/job/J, mob/living/carbon/human/H) return -/datum/species/proc/after_equip_job(var/datum/job/J, var/mob/living/carbon/human/H) +/datum/species/proc/after_equip_job(datum/job/J, mob/living/carbon/human/H) return -/datum/species/proc/handle_chemicals(var/datum/reagent/chem, var/mob/living/carbon/human/H) +/datum/species/proc/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H) return 0 -/datum/species/proc/handle_speech(var/message, var/mob/living/carbon/human/H) +/datum/species/proc/handle_speech(message, mob/living/carbon/human/H) return message //////// //LIFE// //////// -/datum/species/proc/handle_chemicals_in_body(var/mob/living/carbon/human/H) +/datum/species/proc/handle_chemicals_in_body(mob/living/carbon/human/H) //The fucking FAT mutation is the dumbest shit ever. It makes the code so difficult to work with if(H.disabilities & FAT) @@ -627,7 +627,7 @@ return -/datum/species/proc/handle_vision(var/mob/living/carbon/human/H) +/datum/species/proc/handle_vision(mob/living/carbon/human/H) if( H.stat == DEAD ) H.sight |= (SEE_TURFS|SEE_MOBS|SEE_OBJS) H.see_in_dark = 8 @@ -699,7 +699,7 @@ return 1 -/datum/species/proc/handle_hud_icons(var/mob/living/carbon/human/H) +/datum/species/proc/handle_hud_icons(mob/living/carbon/human/H) if(H.healths) if(H.stat == DEAD) H.healths.icon_state = "health7" @@ -752,7 +752,7 @@ return 1 -/datum/species/proc/handle_mutations_and_radiation(var/mob/living/carbon/human/H) +/datum/species/proc/handle_mutations_and_radiation(mob/living/carbon/human/H) if(!(RADIMMUNE in specflags)) if(H.radiation) @@ -789,7 +789,7 @@ // MOVE SPEED // //////////////// -/datum/species/proc/movement_delay(var/mob/living/carbon/human/H) +/datum/species/proc/movement_delay(mob/living/carbon/human/H) var/mspeed = 0 if(!(H.status_flags & IGNORESLOWDOWN)) @@ -850,7 +850,7 @@ // ATTACK PROCS // ////////////////// -/datum/species/proc/spec_attack_hand(var/mob/living/carbon/human/M, var/mob/living/carbon/human/H) +/datum/species/proc/spec_attack_hand(mob/living/carbon/human/M, mob/living/carbon/human/H) if(!istype(M)) //sanity check for drones. return if((M != H) && H.check_shields(0, M.name)) @@ -982,7 +982,7 @@ "[M] attemped to disarm [H]!") return -/datum/species/proc/spec_attacked_by(var/obj/item/I, var/mob/living/user, var/def_zone, var/obj/item/organ/limb/affecting, var/hit_area, var/intent, var/obj/item/organ/limb/target_limb, target_area, var/mob/living/carbon/human/H) +/datum/species/proc/spec_attacked_by(obj/item/I, mob/living/user, def_zone, obj/item/organ/limb/affecting, hit_area, intent, obj/item/organ/limb/target_limb, target_area, mob/living/carbon/human/H) // Allows you to put in item-specific reactions based on species if(user != src) user.do_attack_animation(H) @@ -1068,7 +1068,7 @@ H.forcesay(hit_appends) //forcesay checks stat already. return -/datum/species/proc/attacked_by(var/obj/item/I, var/mob/living/user, var/def_zone, var/mob/living/carbon/human/H) +/datum/species/proc/attacked_by(obj/item/I, mob/living/user, def_zone, mob/living/carbon/human/H) H.apply_damage(I.force, I.damtype) if(I.damtype == "brute") if(prob(33) && I.force && !(NOBLOOD in specflags)) @@ -1093,7 +1093,7 @@ return -/datum/species/proc/apply_damage(var/damage, var/damagetype = BRUTE, var/def_zone = null, var/blocked, var/mob/living/carbon/human/H) +/datum/species/proc/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked, mob/living/carbon/human/H) blocked = (100-(blocked+armor))/100 if(blocked <= 0) return 0 @@ -1125,7 +1125,7 @@ if(STAMINA) H.adjustStaminaLoss(damage * blocked) -/datum/species/proc/on_hit(var/obj/item/projectile/proj_type, var/mob/living/carbon/human/H) +/datum/species/proc/on_hit(obj/item/projectile/proj_type, mob/living/carbon/human/H) // called when hit by a projectile switch(proj_type) if(/obj/item/projectile/energy/floramut) // overwritten by plants/pods @@ -1138,7 +1138,7 @@ //BREATHING// ///////////// -/datum/species/proc/breathe(var/mob/living/carbon/human/H) +/datum/species/proc/breathe(mob/living/carbon/human/H) return /datum/species/proc/check_breath(datum/gas_mixture/breath, var/mob/living/carbon/human/H) @@ -1276,7 +1276,7 @@ //Returns the amount of true_pp we breathed -/datum/species/proc/handle_too_little_breath(var/mob/living/carbon/human/H = null,var/breath_pp = 0, var/safe_breath_min = 0, var/true_pp = 0) +/datum/species/proc/handle_too_little_breath(mob/living/carbon/human/H = null,breath_pp = 0, safe_breath_min = 0, true_pp = 0) . = 0 if(!H || !safe_breath_min) //the other args are either: Ok being 0 or Specifically handled. return 0 @@ -1295,7 +1295,7 @@ H.failed_last_breath = 1 -/datum/species/proc/handle_breath_temperature(datum/gas_mixture/breath, var/mob/living/carbon/human/H) // called by human/life, handles temperatures +/datum/species/proc/handle_breath_temperature(datum/gas_mixture/breath, mob/living/carbon/human/H) // called by human/life, handles temperatures if(abs(310.15 - breath.temperature) > 50) if(!(mutations_list[COLDRES] in H.dna.mutations)) // COLD DAMAGE @@ -1316,7 +1316,7 @@ if(1000 to INFINITY) H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_3, BURN, "head") -/datum/species/proc/handle_environment(datum/gas_mixture/environment, var/mob/living/carbon/human/H) +/datum/species/proc/handle_environment(datum/gas_mixture/environment, mob/living/carbon/human/H) if(!environment) return @@ -1403,15 +1403,15 @@ // FIRE // ////////// -/datum/species/proc/handle_fire(var/mob/living/carbon/human/H) +/datum/species/proc/handle_fire(mob/living/carbon/human/H) if((HEATRES in specflags) || (NOFIRE in specflags)) return 1 -/datum/species/proc/IgniteMob(var/mob/living/carbon/human/H) +/datum/species/proc/IgniteMob(mob/living/carbon/human/H) if((HEATRES in specflags) || (NOFIRE in specflags)) return 1 -/datum/species/proc/ExtinguishMob(var/mob/living/carbon/human/H) +/datum/species/proc/ExtinguishMob(mob/living/carbon/human/H) return #undef HUMAN_MAX_OXYLOSS diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm index c8fa08fab3c..2549b1635bf 100644 --- a/code/modules/mob/living/carbon/human/species_types.dm +++ b/code/modules/mob/living/carbon/human/species_types.dm @@ -12,7 +12,7 @@ default_features = list("mcolor" = "FFF", "tail_human" = "None", "ears" = "None") use_skintones = 1 -/datum/species/human/qualifies_for_rank(var/rank, var/list/features) +/datum/species/human/qualifies_for_rank(rank, list/features) if(!config.mutant_humans) //No mutie scum here return 1 @@ -45,7 +45,7 @@ return 1 //Curiosity killed the cat's wagging tail. -datum/species/human/spec_death(var/gibbed, var/mob/living/carbon/human/H) +datum/species/human/spec_death(gibbed, mob/living/carbon/human/H) if(H) H.endTailWag() @@ -79,7 +79,7 @@ datum/species/human/spec_death(var/gibbed, var/mob/living/carbon/human/H) return randname -/datum/species/lizard/qualifies_for_rank(var/rank, var/list/features) +/datum/species/lizard/qualifies_for_rank(rank, list/features) if(rank in command_positions) return 0 return 1 @@ -92,7 +92,7 @@ datum/species/human/spec_death(var/gibbed, var/mob/living/carbon/human/H) return message //I wag in death -/datum/species/lizard/spec_death(var/gibbed, var/mob/living/carbon/human/H) +/datum/species/lizard/spec_death(gibbed, mob/living/carbon/human/H) if(H) H.endTailWag() @@ -419,13 +419,13 @@ var/global/image/plasmaman_on_fire = image("icon"='icons/mob/OnFire.dmi', "icon_ name = "Skinbone" skin = 1 -/datum/species/plasmaman/update_base_icon_state(var/mob/living/carbon/human/H) +/datum/species/plasmaman/update_base_icon_state(mob/living/carbon/human/H) var/base = ..() if(base == id) base = "[base][skin]" return base -/datum/species/plasmaman/spec_life(var/mob/living/carbon/human/H) +/datum/species/plasmaman/spec_life(mob/living/carbon/human/H) var/datum/gas_mixture/environment = H.loc.return_air() if(!istype(H.wear_suit, /obj/item/clothing/suit/space/eva/plasmaman) || !istype(H.head, /obj/item/clothing/head/helmet/space/hardsuit/plasmaman)) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index c33e23bbf8e..aa276babfbd 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -631,7 +631,7 @@ Please contact me on #coderbus IRC. ~Carnie x var/standing = image("icon"=female_clothing_icons["[t_color]_s"], "layer"=-layer) return(standing) -/mob/living/carbon/human/proc/get_overlays_copy(var/list/unwantedLayers) +/mob/living/carbon/human/proc/get_overlays_copy(list/unwantedLayers) var/list/out = new for(var/i=1;i<=TOTAL_LAYERS;i++) if(overlays_standing[i]) diff --git a/code/modules/mob/living/carbon/monkey/death.dm b/code/modules/mob/living/carbon/monkey/death.dm index cecda79cfc9..7e90fb4d386 100644 --- a/code/modules/mob/living/carbon/monkey/death.dm +++ b/code/modules/mob/living/carbon/monkey/death.dm @@ -1,7 +1,7 @@ -/mob/living/carbon/monkey/gib_animation(var/animate) +/mob/living/carbon/monkey/gib_animation(animate) ..(animate, "gibbed-m") -/mob/living/carbon/monkey/dust_animation(var/animate) +/mob/living/carbon/monkey/dust_animation(animate) ..(animate, "dust-m") /mob/living/carbon/monkey/dust(var/animation = 1) diff --git a/code/modules/mob/living/carbon/monkey/emote.dm b/code/modules/mob/living/carbon/monkey/emote.dm index eef8f22fcd1..e21d3a48bb7 100644 --- a/code/modules/mob/living/carbon/monkey/emote.dm +++ b/code/modules/mob/living/carbon/monkey/emote.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/monkey/emote(var/act) +/mob/living/carbon/monkey/emote(act) var/param = null if (findtext(act, "-", 1, null)) diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index da95fd25fdf..1d1bbcc64d5 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -48,7 +48,7 @@ tally += (283.222 - bodytemperature) / 10 * 1.75 return tally+config.monkey_delay -/mob/living/carbon/monkey/attack_paw(mob/living/M as mob) +/mob/living/carbon/monkey/attack_paw(mob/living/M) if(..()) //successful monkey bite. var/damage = rand(1, 5) if (stat != DEAD) @@ -56,7 +56,7 @@ updatehealth() return -/mob/living/carbon/monkey/attack_larva(mob/living/carbon/alien/larva/L as mob) +/mob/living/carbon/monkey/attack_larva(mob/living/carbon/alien/larva/L) if(..()) //successful larva bite. var/damage = rand(1, 3) if(stat != DEAD) @@ -64,7 +64,7 @@ adjustBruteLoss(damage) updatehealth() -/mob/living/carbon/monkey/attack_hand(mob/living/carbon/human/M as mob) +/mob/living/carbon/monkey/attack_hand(mob/living/carbon/human/M) if(..()) //To allow surgery to return properly. return @@ -113,7 +113,7 @@ "[M] has disarmed [src]!") return -/mob/living/carbon/monkey/attack_alien(mob/living/carbon/alien/humanoid/M as mob) +/mob/living/carbon/monkey/attack_alien(mob/living/carbon/alien/humanoid/M) if(..()) //if harm or disarm intent. if (M.a_intent == "harm") if ((prob(95) && health > 0)) @@ -152,14 +152,14 @@ updatehealth() return -/mob/living/carbon/monkey/attack_animal(mob/living/simple_animal/M as mob) +/mob/living/carbon/monkey/attack_animal(mob/living/simple_animal/M) if(..()) var/damage = rand(M.melee_damage_lower, M.melee_damage_upper) adjustBruteLoss(damage) updatehealth() -/mob/living/carbon/monkey/attack_slime(mob/living/simple_animal/slime/M as mob) +/mob/living/carbon/monkey/attack_slime(mob/living/simple_animal/slime/M) if(..()) //successful slime attack var/damage = rand(5, 35) if(M.is_adult) @@ -207,13 +207,13 @@ /mob/living/carbon/monkey/IsAdvancedToolUser()//Unless its monkey mode monkeys cant use advanced tools return 0 -/mob/living/carbon/monkey/reagent_check(var/datum/reagent/R) //can metabolize all reagents +/mob/living/carbon/monkey/reagent_check(datum/reagent/R) //can metabolize all reagents return 0 /mob/living/carbon/monkey/canBeHandcuffed() return 1 -/mob/living/carbon/monkey/assess_threat(var/obj/machinery/bot/secbot/judgebot, var/lasercolor) +/mob/living/carbon/monkey/assess_threat(obj/machinery/bot/secbot/judgebot, lasercolor) if(judgebot.emagged == 2) return 10 //Everyone is a criminal! var/threatcount = 0 @@ -247,7 +247,7 @@ return threatcount -/mob/living/carbon/monkey/acid_act(var/acidpwr, var/toxpwr, var/acid_volume) +/mob/living/carbon/monkey/acid_act(acidpwr, toxpwr, acid_volume) if(wear_mask) if(!wear_mask.unacidable) wear_mask.acid_act(acidpwr) diff --git a/code/modules/mob/living/carbon/monkey/update_icons.dm b/code/modules/mob/living/carbon/monkey/update_icons.dm index 5be5fbc43b8..3e47c990d9d 100644 --- a/code/modules/mob/living/carbon/monkey/update_icons.dm +++ b/code/modules/mob/living/carbon/monkey/update_icons.dm @@ -35,7 +35,7 @@ overlays += I //////// -/mob/living/carbon/monkey/update_inv_wear_mask(var/update_icons=1) +/mob/living/carbon/monkey/update_inv_wear_mask(update_icons=1) if(wear_mask && istype(wear_mask, /obj/item/clothing/mask) ) wear_mask.screen_loc = ui_monkey_mask if(client && hud_used) @@ -52,7 +52,7 @@ if(update_icons) update_icons() -/mob/living/carbon/monkey/update_inv_head(var/update_icons=1) +/mob/living/carbon/monkey/update_inv_head(update_icons=1) if(head) head.screen_loc = ui_monkey_head if(client && hud_used) @@ -67,7 +67,7 @@ if(update_icons) update_icons() -/mob/living/carbon/monkey/update_inv_r_hand(var/update_icons=1) +/mob/living/carbon/monkey/update_inv_r_hand(update_icons=1) if (handcuffed) drop_r_hand() return @@ -88,7 +88,7 @@ if(update_icons) update_icons() -/mob/living/carbon/monkey/update_inv_l_hand(var/update_icons=1) +/mob/living/carbon/monkey/update_inv_l_hand(update_icons=1) if (handcuffed) drop_l_hand() return @@ -109,7 +109,7 @@ if(update_icons) update_icons() -/mob/living/carbon/monkey/update_inv_back(var/update_icons=1) +/mob/living/carbon/monkey/update_inv_back(update_icons=1) if(back) back.screen_loc = ui_monkey_back if(client && hud_used) @@ -123,7 +123,7 @@ if(update_icons) update_icons() -/mob/living/carbon/monkey/update_inv_handcuffed(var/update_icons=1) +/mob/living/carbon/monkey/update_inv_handcuffed(update_icons=1) if(handcuffed) drop_r_hand() drop_l_hand() diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index 89a35a4e605..2afbf5c033b 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -8,7 +8,7 @@ Returns standard 0 if fail */ -/mob/living/proc/apply_damage(var/damage = 0,var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0) +/mob/living/proc/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = 0) blocked = (100-blocked)/100 if(!damage || (blocked <= 0)) return 0 switch(damagetype) @@ -28,7 +28,7 @@ return 1 -/mob/living/proc/apply_damages(var/brute = 0, var/burn = 0, var/tox = 0, var/oxy = 0, var/clone = 0, var/def_zone = null, var/blocked = 0, var/stamina = 0) +/mob/living/proc/apply_damages(brute = 0, burn = 0, tox = 0, oxy = 0, clone = 0, def_zone = null, blocked = 0, stamina = 0) if(blocked >= 100) return 0 if(brute) apply_damage(brute, BRUTE, def_zone, blocked) if(burn) apply_damage(burn, BURN, def_zone, blocked) @@ -40,7 +40,7 @@ -/mob/living/proc/apply_effect(var/effect = 0,var/effecttype = STUN, var/blocked = 0) +/mob/living/proc/apply_effect(effect = 0,effecttype = STUN, blocked = 0) blocked = (100-blocked)/100 if(!effect || (blocked <= 0)) return 0 switch(effecttype) @@ -68,7 +68,7 @@ return 1 -/mob/living/proc/apply_effects(var/stun = 0, var/weaken = 0, var/paralyze = 0, var/irradiate = 0, var/slur = 0, var/stutter = 0, var/eyeblur = 0, var/drowsy = 0, var/blocked = 0, var/stamina = 0, var/jitter = 0) +/mob/living/proc/apply_effects(stun = 0, weaken = 0, paralyze = 0, irradiate = 0, slur = 0, stutter = 0, eyeblur = 0, drowsy = 0, blocked = 0, stamina = 0, jitter = 0) if(blocked >= 100) return 0 if(stun) apply_effect(stun, STUN, blocked) if(weaken) apply_effect(weaken, WEAKEN, blocked) diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm index a0c1a8a3762..3d34f72f240 100644 --- a/code/modules/mob/living/death.dm +++ b/code/modules/mob/living/death.dm @@ -1,4 +1,4 @@ -/mob/living/gib(var/animation = 1) +/mob/living/gib(animation = 1) var/prev_lying = lying death(1) @@ -16,10 +16,10 @@ /mob/living/proc/spawn_gibs() gibs(loc, viruses) -/mob/living/proc/gib_animation(var/animate, var/flick_name = "gibbed") +/mob/living/proc/gib_animation(animate, flick_name = "gibbed") flick(flick_name, animate) -/mob/living/dust(var/animation = 0) +/mob/living/dust(animation = 0) death(1) var/atom/movable/overlay/animate = setup_animation(animation, 0) if(animate) @@ -31,7 +31,7 @@ /mob/living/proc/spawn_dust() new /obj/effect/decal/cleanable/ash(loc) -/mob/living/proc/dust_animation(var/animate, var/flick_name = "") +/mob/living/proc/dust_animation(animate, flick_name = "") flick(flick_name, animate) /mob/living/death(gibbed) @@ -45,7 +45,7 @@ buckled.unbuckle_mob() -/mob/living/proc/setup_animation(var/animation, var/prev_lying) +/mob/living/proc/setup_animation(animation, prev_lying) var/atom/movable/overlay/animate = null notransform = 1 canmove = 0 @@ -60,7 +60,7 @@ animate.master = src return animate -/mob/living/proc/end_animation(var/animate) +/mob/living/proc/end_animation(animate) if(!animate) qdel(src) else diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 08ffb07c7d9..ef8a6b82680 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -2,7 +2,7 @@ //Things like airguitar can be done without arms, and the flap thing makes so little sense it's a keeper. //Intended to be called by a higher up emote proc if the requested emote isn't in the custom emotes. -/mob/living/emote(var/act, var/m_type=1, var/message = null) +/mob/living/emote(act, m_type=1, message = null) if(stat) return diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index bdd6bd4119a..43198f5700c 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -74,7 +74,7 @@ /mob/living/proc/handle_random_events() return -/mob/living/proc/handle_environment(var/datum/gas_mixture/environment) +/mob/living/proc/handle_environment(datum/gas_mixture/environment) return /mob/living/proc/handle_stomach() diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index dceb94a9f96..46fb3469ab3 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -166,7 +166,7 @@ Sorry Giacom. Please don't be mad :( visible_message("[src] points to [A]") return 1 -/mob/living/verb/succumb(var/whispered as null) +/mob/living/verb/succumb(whispered as null) set hidden = 1 if (InCritical()) src.attack_log += "[src] has [whispered ? "whispered his final words" : "succumbed to death"] with [round(health, 0.1)] points of health!" @@ -194,7 +194,7 @@ Sorry Giacom. Please don't be mad :( //This proc is used for mobs which are affected by pressure to calculate the amount of pressure that actually //affects them once clothing is factored in. ~Errorage -/mob/living/proc/calculate_affecting_pressure(var/pressure) +/mob/living/proc/calculate_affecting_pressure(pressure) return pressure @@ -244,7 +244,7 @@ Sorry Giacom. Please don't be mad :( /mob/living/proc/getBruteLoss() return bruteloss -/mob/living/proc/adjustBruteLoss(var/amount) +/mob/living/proc/adjustBruteLoss(amount) if(status_flags & GODMODE) return 0 bruteloss = min(max(bruteloss + amount, 0),(maxHealth*2)) handle_regular_status_updates() //we update our health right away. @@ -252,12 +252,12 @@ Sorry Giacom. Please don't be mad :( /mob/living/proc/getOxyLoss() return oxyloss -/mob/living/proc/adjustOxyLoss(var/amount) +/mob/living/proc/adjustOxyLoss(amount) if(status_flags & GODMODE) return 0 oxyloss = min(max(oxyloss + amount, 0),(maxHealth*2)) handle_regular_status_updates() -/mob/living/proc/setOxyLoss(var/amount) +/mob/living/proc/setOxyLoss(amount) if(status_flags & GODMODE) return 0 oxyloss = amount handle_regular_status_updates() @@ -265,12 +265,12 @@ Sorry Giacom. Please don't be mad :( /mob/living/proc/getToxLoss() return toxloss -/mob/living/proc/adjustToxLoss(var/amount) +/mob/living/proc/adjustToxLoss(amount) if(status_flags & GODMODE) return 0 toxloss = min(max(toxloss + amount, 0),(maxHealth*2)) handle_regular_status_updates() -/mob/living/proc/setToxLoss(var/amount) +/mob/living/proc/setToxLoss(amount) if(status_flags & GODMODE) return 0 toxloss = amount handle_regular_status_updates() @@ -278,7 +278,7 @@ Sorry Giacom. Please don't be mad :( /mob/living/proc/getFireLoss() return fireloss -/mob/living/proc/adjustFireLoss(var/amount) +/mob/living/proc/adjustFireLoss(amount) if(status_flags & GODMODE) return 0 fireloss = min(max(fireloss + amount, 0),(maxHealth*2)) handle_regular_status_updates() //we update our health right away. @@ -286,12 +286,12 @@ Sorry Giacom. Please don't be mad :( /mob/living/proc/getCloneLoss() return cloneloss -/mob/living/proc/adjustCloneLoss(var/amount) +/mob/living/proc/adjustCloneLoss(amount) if(status_flags & GODMODE) return 0 cloneloss = min(max(cloneloss + amount, 0),(maxHealth*2)) handle_regular_status_updates() -/mob/living/proc/setCloneLoss(var/amount) +/mob/living/proc/setCloneLoss(amount) if(status_flags & GODMODE) return 0 cloneloss = amount handle_regular_status_updates() @@ -299,12 +299,12 @@ Sorry Giacom. Please don't be mad :( /mob/living/proc/getBrainLoss() return brainloss -/mob/living/proc/adjustBrainLoss(var/amount) +/mob/living/proc/adjustBrainLoss(amount) if(status_flags & GODMODE) return 0 brainloss = min(max(brainloss + amount, 0),(maxHealth*2)) handle_regular_status_updates() -/mob/living/proc/setBrainLoss(var/amount) +/mob/living/proc/setBrainLoss(amount) if(status_flags & GODMODE) return 0 brainloss = amount handle_regular_status_updates() //we update our health right away. @@ -312,18 +312,18 @@ Sorry Giacom. Please don't be mad :( /mob/living/proc/getStaminaLoss() return staminaloss -/mob/living/proc/adjustStaminaLoss(var/amount) +/mob/living/proc/adjustStaminaLoss(amount) if(status_flags & GODMODE) return 0 staminaloss = min(max(staminaloss + amount, 0),(maxHealth*2)) -/mob/living/proc/setStaminaLoss(var/amount) +/mob/living/proc/setStaminaLoss(amount) if(status_flags & GODMODE) return 0 staminaloss = amount /mob/living/proc/getMaxHealth() return maxHealth -/mob/living/proc/setMaxHealth(var/newMaxHealth) +/mob/living/proc/setMaxHealth(newMaxHealth) maxHealth = newMaxHealth // MOB PROCS //END @@ -351,7 +351,7 @@ Sorry Giacom. Please don't be mad :( update_canmove() //Recursive function to find everything a mob is holding. -/mob/living/get_contents(var/obj/item/weapon/storage/Storage = null) +/mob/living/get_contents(obj/item/weapon/storage/Storage = null) var/list/L = list() if(Storage) //If it called itself @@ -376,7 +376,7 @@ Sorry Giacom. Please don't be mad :( return 0 -/mob/living/proc/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 1.0) +/mob/living/proc/electrocute_act(shock_damage, obj/source, siemens_coeff = 1.0) return 0 //only carbon liveforms have this proc /mob/living/emp_act(severity) @@ -397,37 +397,37 @@ Sorry Giacom. Please don't be mad :( return def_zone //damage/heal the mob ears and adjust the deaf amount -/mob/living/adjustEarDamage(var/damage, var/deaf) +/mob/living/adjustEarDamage(damage, deaf) ear_damage = max(0, ear_damage + damage) ear_deaf = max(0, ear_deaf + deaf) //pass a negative argument to skip one of the variable -/mob/living/setEarDamage(var/damage, var/deaf) +/mob/living/setEarDamage(damage, deaf) if(damage >= 0) ear_damage = damage if(deaf >= 0) ear_deaf = deaf // heal ONE external organ, organ gets randomly selected from damaged ones. -/mob/living/proc/heal_organ_damage(var/brute, var/burn) +/mob/living/proc/heal_organ_damage(brute, burn) adjustBruteLoss(-brute) adjustFireLoss(-burn) src.updatehealth() // damage ONE external organ, organ gets randomly selected from damaged ones. -/mob/living/proc/take_organ_damage(var/brute, var/burn) +/mob/living/proc/take_organ_damage(brute, burn) adjustBruteLoss(brute) adjustFireLoss(burn) src.updatehealth() // heal MANY external organs, in random order -/mob/living/proc/heal_overall_damage(var/brute, var/burn) +/mob/living/proc/heal_overall_damage(brute, burn) adjustBruteLoss(-brute) adjustFireLoss(-burn) src.updatehealth() // damage MANY external organs, in random order -/mob/living/proc/take_overall_damage(var/brute, var/burn) +/mob/living/proc/take_overall_damage(brute, burn) adjustBruteLoss(brute) adjustFireLoss(burn) src.updatehealth() @@ -570,7 +570,7 @@ Sorry Giacom. Please don't be mad :( for(var/mob/living/simple_animal/slime/M in oview(1,src)) M.UpdateFeed(src) -/mob/living/proc/makeTrail(var/turf/T, var/mob/living/M) +/mob/living/proc/makeTrail(turf/T, mob/living/M) if(ishuman(M)) var/mob/living/carbon/human/H = M if((NOBLOOD in H.dna.species.specflags) || (!H.blood_max) || (H.bleedsuppress)) @@ -814,7 +814,7 @@ Sorry Giacom. Please don't be mad :( animate(pixel_x = final_pixel_x , pixel_y = final_pixel_y , time = 2) floating = 0 // If we were without gravity, the bouncing animation got stopped, so we make sure to restart it in next life(). -/mob/living/proc/get_temperature(var/datum/gas_mixture/environment) +/mob/living/proc/get_temperature(datum/gas_mixture/environment) var/loc_temp = T0C if(istype(loc, /obj/mecha)) var/obj/mecha/M = loc diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 978df4d981d..c620bda6767 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -1,4 +1,4 @@ -/mob/living/proc/run_armor_check(def_zone = null, attack_flag = "melee", absorb_text = null, soften_text = null, var/armour_penetration, var/penetrated_text) +/mob/living/proc/run_armor_check(def_zone = null, attack_flag = "melee", absorb_text = null, soften_text = null, armour_penetration, penetrated_text) var/armor = getarmor(def_zone, attack_flag) //the if "armor" check is because this is used for everything on /living, including humans @@ -22,10 +22,10 @@ return armor -/mob/living/proc/getarmor(var/def_zone, var/type) +/mob/living/proc/getarmor(def_zone, type) return 0 -/mob/living/proc/on_hit(var/obj/item/projectile/proj_type) +/mob/living/proc/on_hit(obj/item/projectile/proj_type) return /mob/living/bullet_act(obj/item/projectile/P, def_zone) @@ -34,7 +34,7 @@ apply_damage(P.damage, P.damage_type, def_zone, armor) return P.on_hit(src, armor, def_zone) -/proc/vol_by_throwforce_and_or_w_class(var/obj/item/I) +/proc/vol_by_throwforce_and_or_w_class(obj/item/I) if(!I) return 0 if(I.throwforce && I.w_class) @@ -149,7 +149,7 @@ //Share fire evenly between the two mobs //Called in MobBump() and Crossed() -/mob/living/proc/spreadFire(var/mob/living/L) +/mob/living/proc/spreadFire(mob/living/L) if(!istype(L)) return var/L_old_on_fire = L.on_fire @@ -167,10 +167,10 @@ //Mobs on Fire end -/mob/living/acid_act(var/acidpwr, var/toxpwr, var/acid_volume) +/mob/living/acid_act(acidpwr, toxpwr, acid_volume) take_organ_damage(min(10*toxpwr, acid_volume * toxpwr)) -/mob/living/proc/grabbedby(mob/living/carbon/user,var/supress_message = 0) +/mob/living/proc/grabbedby(mob/living/carbon/user,supress_message = 0) if(user == src || anchored) return 0 if(!(status_flags & CANPUSH)) @@ -192,7 +192,7 @@ visible_message("[user] has grabbed [src] passively!") -/mob/living/attack_slime(mob/living/simple_animal/slime/M as mob) +/mob/living/attack_slime(mob/living/simple_animal/slime/M) if (!ticker) M << "You cannot attack people before the game has started." return @@ -207,7 +207,7 @@ "The [M.name] glomps [src]!") return 1 -/mob/living/attack_animal(mob/living/simple_animal/M as mob) +/mob/living/attack_animal(mob/living/simple_animal/M) if(M.melee_damage_upper == 0) M.visible_message("\The [M] [M.friendly] [src]!") return 0 @@ -221,7 +221,7 @@ return 1 -/mob/living/attack_paw(mob/living/carbon/monkey/M as mob) +/mob/living/attack_paw(mob/living/carbon/monkey/M) if (!ticker) M << "You cannot attack people before the game has started." return 0 @@ -246,7 +246,7 @@ "[M.name] has attempted to bite [src]!") return 0 -/mob/living/attack_larva(mob/living/carbon/alien/larva/L as mob) +/mob/living/attack_larva(mob/living/carbon/alien/larva/L) switch(L.a_intent) if("help") @@ -266,7 +266,7 @@ "[L.name] has attempted to bite [src]!") return 0 -/mob/living/attack_alien(mob/living/carbon/alien/humanoid/M as mob) +/mob/living/attack_alien(mob/living/carbon/alien/humanoid/M) if (!ticker) M << "You cannot attack people before the game has started." return 0 diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 4f2c3b17000..cac929c3681 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -351,7 +351,7 @@ var/list/ai_list = list() SSshuttle.cancelEvac(src) return -/mob/living/silicon/ai/check_eye(var/mob/user as mob) +/mob/living/silicon/ai/check_eye(mob/user) if (!current) return null user.reset_view(current) @@ -463,13 +463,13 @@ var/list/ai_list = list() if(M) M.transfer_ai(AI_MECH_HACK,src, usr) //Called om the mech itself. -/mob/living/silicon/ai/bullet_act(var/obj/item/projectile/Proj) +/mob/living/silicon/ai/bullet_act(obj/item/projectile/Proj) ..(Proj) updatehealth() return 2 -/mob/living/silicon/ai/attack_alien(mob/living/carbon/alien/humanoid/M as mob) +/mob/living/silicon/ai/attack_alien(mob/living/carbon/alien/humanoid/M) if (!ticker) M << "You cannot attack people before the game has started." return @@ -485,7 +485,7 @@ var/list/ai_list = list() ..() -/mob/living/silicon/ai/proc/switchCamera(var/obj/machinery/camera/C) +/mob/living/silicon/ai/proc/switchCamera(obj/machinery/camera/C) if(!tracking) cameraFollow = null @@ -536,7 +536,7 @@ var/list/ai_list = list() popup.set_content(d) popup.open() -/mob/living/silicon/ai/proc/set_waypoint(var/atom/A) +/mob/living/silicon/ai/proc/set_waypoint(atom/A) var/turf/turf_check = get_turf(A) //The target must be in view of a camera or near the core. if(turf_check in range(get_turf(src))) @@ -546,7 +546,7 @@ var/list/ai_list = list() else src << "Selected location is not visible." -/mob/living/silicon/ai/proc/call_bot(var/turf/waypoint) +/mob/living/silicon/ai/proc/call_bot(turf/waypoint) if(!Bot) return @@ -557,7 +557,7 @@ var/list/ai_list = list() Bot.call_bot(src, waypoint) -/mob/living/silicon/ai/triggerAlarm(var/class, area/A, var/O, var/obj/alarmsource) +/mob/living/silicon/ai/triggerAlarm(class, area/A, O, obj/alarmsource) if(alarmsource.z != z) return if (stat == 2) @@ -596,7 +596,7 @@ var/list/ai_list = list() if (viewalerts) ai_alerts() return 1 -/mob/living/silicon/ai/cancelAlarm(var/class, area/A as area, obj/origin) +/mob/living/silicon/ai/cancelAlarm(class, area/A, obj/origin) var/list/L = alarms[class] var/cleared = 0 for (var/I in L) @@ -806,7 +806,7 @@ var/list/ai_list = list() /mob/living/silicon/ai/attack_slime(mob/living/simple_animal/slime/user) return -/mob/living/silicon/ai/transfer_ai(var/interaction, var/mob/user, var/mob/living/silicon/ai/AI, var/obj/item/device/aicard/card) +/mob/living/silicon/ai/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card) if(!..()) return if(interaction == AI_TRANS_TO_CARD)//The only possible interaction. Upload AI mob to a card. diff --git a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm index f9da2399c9a..dfa2e7bb970 100644 --- a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm +++ b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm @@ -59,7 +59,7 @@ var/datum/cameranet/cameranet = new() // Updates the chunks that the turf is located in. Use this when obstacles are destroyed or when doors open. -/datum/cameranet/proc/updateVisibility(atom/A, var/opacity_check = 1) +/datum/cameranet/proc/updateVisibility(atom/A, opacity_check = 1) if(!ticker || (opacity_check && !A.opacity)) return @@ -98,7 +98,7 @@ var/datum/cameranet/cameranet = new() // Setting the choice to 0 will remove the camera from the chunks. // If you want to update the chunks around an object, without adding/removing a camera, use choice 2. -/datum/cameranet/proc/majorChunkChange(atom/c, var/choice) +/datum/cameranet/proc/majorChunkChange(atom/c, choice) // 0xf = 15 if(!c) return @@ -126,14 +126,14 @@ var/datum/cameranet/cameranet = new() // Will check if a mob is on a viewable turf. Returns 1 if it is, otherwise returns 0. -/datum/cameranet/proc/checkCameraVis(mob/living/target as mob) +/datum/cameranet/proc/checkCameraVis(mob/living/target) // 0xf = 15 var/turf/position = get_turf(target) return checkTurfVis(position) -/datum/cameranet/proc/checkTurfVis(var/turf/position) +/datum/cameranet/proc/checkTurfVis(turf/position) var/datum/camerachunk/chunk = getCameraChunk(position.x, position.y, position.z) if(chunk) if(chunk.changed) diff --git a/code/modules/mob/living/silicon/ai/freelook/chunk.dm b/code/modules/mob/living/silicon/ai/freelook/chunk.dm index 62edcd7bd03..e36a3df9bd3 100644 --- a/code/modules/mob/living/silicon/ai/freelook/chunk.dm +++ b/code/modules/mob/living/silicon/ai/freelook/chunk.dm @@ -52,7 +52,7 @@ // Updates the chunk, makes sure that it doesn't update too much. If the chunk isn't being watched it will // instead be flagged to update the next time an AI Eye moves near it. -/datum/camerachunk/proc/hasChanged(var/update_now = 0) +/datum/camerachunk/proc/hasChanged(update_now = 0) if(visible || update_now) if(!updating) updating = 1 diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm index dd38dac92d1..30918bbcec3 100644 --- a/code/modules/mob/living/silicon/ai/freelook/eye.dm +++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm @@ -13,7 +13,7 @@ // Use this when setting the aiEye's location. // It will also stream the chunk that the new loc is in. -/mob/camera/aiEye/proc/setLoc(var/T) +/mob/camera/aiEye/proc/setLoc(T) if(ai) if(!isturf(ai.loc)) @@ -51,7 +51,7 @@ // This will move the AIEye. It will also cause lights near the eye to light up, if toggled. // This is handled in the proc below this one. -/client/proc/AIMove(n, direct, var/mob/living/silicon/ai/user) +/client/proc/AIMove(n, direct, mob/living/silicon/ai/user) var/initial = initial(user.sprint) var/max_sprint = 50 diff --git a/code/modules/mob/living/silicon/ai/freelook/update_triggers.dm b/code/modules/mob/living/silicon/ai/freelook/update_triggers.dm index f67578c5286..2b69c20cd65 100644 --- a/code/modules/mob/living/silicon/ai/freelook/update_triggers.dm +++ b/code/modules/mob/living/silicon/ai/freelook/update_triggers.dm @@ -78,7 +78,7 @@ // An addition to deactivate which removes/adds the camera from the chunk list based on if it works or not. -/obj/machinery/camera/deactivate(user as mob, var/choice = 1) +/obj/machinery/camera/deactivate(mob/user, choice = 1) ..(user, choice) if(src.can_use()) cameranet.addCamera(src) diff --git a/code/modules/mob/living/silicon/ai/laws.dm b/code/modules/mob/living/silicon/ai/laws.dm index 6959150a555..8371f6e3021 100644 --- a/code/modules/mob/living/silicon/ai/laws.dm +++ b/code/modules/mob/living/silicon/ai/laws.dm @@ -4,7 +4,7 @@ set name = "Show Laws" src.show_laws() -/mob/living/silicon/ai/show_laws(var/everyone = 0) +/mob/living/silicon/ai/show_laws(everyone = 0) var/who if (everyone) diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm index 826b823c0ff..86158b3c4f0 100644 --- a/code/modules/mob/living/silicon/ai/say.dm +++ b/code/modules/mob/living/silicon/ai/say.dm @@ -1,4 +1,4 @@ -/mob/living/silicon/ai/say(var/message) +/mob/living/silicon/ai/say(message) if(parent && istype(parent) && parent.stat != 2) //If there is a defined "parent" AI, it is actually an AI, and it is alive, anything the AI tries to say is said by the parent instead. parent.say(message) return @@ -39,7 +39,7 @@ return 1 //For holopads only. Usable by AI. -/mob/living/silicon/ai/proc/holopad_talk(var/message) +/mob/living/silicon/ai/proc/holopad_talk(message) log_say("[key_name(src)] : [message]") message = trim(message) @@ -141,7 +141,7 @@ var/const/VOX_DELAY = 600 */ -/proc/play_vox_word(var/word, var/z_level, var/mob/only_listener) +/proc/play_vox_word(word, z_level, mob/only_listener) word = lowertext(word) diff --git a/code/modules/mob/living/silicon/death.dm b/code/modules/mob/living/silicon/death.dm index bc3ed069bba..f9c7e78231d 100644 --- a/code/modules/mob/living/silicon/death.dm +++ b/code/modules/mob/living/silicon/death.dm @@ -1,7 +1,7 @@ /mob/living/silicon/spawn_gibs() robogibs(loc, viruses) -/mob/living/silicon/gib(var/animation = 0) // Please don't remove this thinking this proc does nothing, it is changing the default value for animation. +/mob/living/silicon/gib(animation = 0) // Please don't remove this thinking this proc does nothing, it is changing the default value for animation. ..() /mob/living/silicon/spawn_dust() diff --git a/code/modules/mob/living/silicon/laws.dm b/code/modules/mob/living/silicon/laws.dm index d78b2448e28..a588bd19e1c 100644 --- a/code/modules/mob/living/silicon/laws.dm +++ b/code/modules/mob/living/silicon/laws.dm @@ -5,12 +5,12 @@ if (!laws) make_laws() -/mob/living/silicon/proc/set_zeroth_law(var/law, var/law_borg) +/mob/living/silicon/proc/set_zeroth_law(law, law_borg) throw_alert("newlaw") src.laws_sanity_check() src.laws.set_zeroth_law(law, law_borg) -/mob/living/silicon/proc/add_inherent_law(var/law) +/mob/living/silicon/proc/add_inherent_law(law) throw_alert("newlaw") laws_sanity_check() laws.add_inherent_law(law) @@ -20,7 +20,7 @@ laws_sanity_check() laws.clear_inherent_laws() -/mob/living/silicon/proc/add_supplied_law(var/number, var/law) +/mob/living/silicon/proc/add_supplied_law(number, law) throw_alert("newlaw") laws_sanity_check() laws.add_supplied_law(number, law) @@ -30,7 +30,7 @@ laws_sanity_check() laws.clear_supplied_laws() -/mob/living/silicon/proc/add_ion_law(var/law) +/mob/living/silicon/proc/add_ion_law(law) throw_alert("newlaw") laws_sanity_check() laws.add_ion_law(law) @@ -49,6 +49,6 @@ laws = new lawtype() laws.associate(src) -/mob/living/silicon/proc/clear_zeroth_law(var/force) +/mob/living/silicon/proc/clear_zeroth_law(force) laws_sanity_check() laws.clear_zeroth_law(force) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 0e629e59283..858e4f42e97 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -88,7 +88,7 @@ else stat(null, text("Systems nonfunctional")) -/mob/living/silicon/pai/check_eye(var/mob/user as mob) +/mob/living/silicon/pai/check_eye(mob/user) if (!src.current) return null user.reset_view(src.current) @@ -153,7 +153,7 @@ ///mob/living/silicon/pai/attack_hand(mob/living/carbon/M as mob) -/mob/living/silicon/pai/proc/switchCamera(var/obj/machinery/camera/C) +/mob/living/silicon/pai/proc/switchCamera(obj/machinery/camera/C) usr:cameraFollow = null if (!C) src.unset_machine() @@ -176,10 +176,10 @@ src.unset_machine() src:cameraFollow = null -/mob/living/silicon/pai/UnarmedAttack(var/atom/A)//Stops runtimes due to attack_animal being the default +/mob/living/silicon/pai/UnarmedAttack(atom/A)//Stops runtimes due to attack_animal being the default return -/mob/living/silicon/pai/on_forcemove(var/atom/newloc) +/mob/living/silicon/pai/on_forcemove(atom/newloc) if(card) card.loc = newloc else //something went very wrong. diff --git a/code/modules/mob/living/silicon/pai/personality.dm b/code/modules/mob/living/silicon/pai/personality.dm index c4928878ce9..a3f4f7d8871 100644 --- a/code/modules/mob/living/silicon/pai/personality.dm +++ b/code/modules/mob/living/silicon/pai/personality.dm @@ -31,7 +31,7 @@ // returns 1 if loaded (or file was incompatible) // returns 0 if savefile did not exist -/datum/paiCandidate/proc/savefile_load(mob/user, var/silent = 1) +/datum/paiCandidate/proc/savefile_load(mob/user, silent = 1) if (IsGuestKey(user.key)) return 0 diff --git a/code/modules/mob/living/silicon/pai/say.dm b/code/modules/mob/living/silicon/pai/say.dm index 6e93366f713..9432ce52a55 100644 --- a/code/modules/mob/living/silicon/pai/say.dm +++ b/code/modules/mob/living/silicon/pai/say.dm @@ -1,4 +1,4 @@ -/mob/living/silicon/pai/say(var/msg) +/mob/living/silicon/pai/say(msg) if(silence_time) src << "Communication circuits remain unitialized." else diff --git a/code/modules/mob/living/silicon/robot/death.dm b/code/modules/mob/living/silicon/robot/death.dm index e12b5db835b..53e979b4031 100644 --- a/code/modules/mob/living/silicon/robot/death.dm +++ b/code/modules/mob/living/silicon/robot/death.dm @@ -1,13 +1,13 @@ -/mob/living/silicon/robot/gib(var/animation = 1) +/mob/living/silicon/robot/gib(animation = 1) ..() /mob/living/silicon/robot/spawn_gibs() robogibs(loc, viruses) -/mob/living/silicon/robot/gib_animation(var/animate) +/mob/living/silicon/robot/gib_animation(animate) ..(animate, "gibbed-r") -/mob/living/silicon/robot/dust(var/animation = 1) +/mob/living/silicon/robot/dust(animation = 1) if(mmi) qdel(mmi) ..() @@ -15,7 +15,7 @@ /mob/living/silicon/robot/spawn_dust() new /obj/effect/decal/remains/robot(loc) -/mob/living/silicon/robot/dust_animation(var/animate) +/mob/living/silicon/robot/dust_animation(animate) ..(animate, "dust-r") /mob/living/silicon/robot/death(gibbed) diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 3cdc1c7008b..d424af7bf41 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -1,4 +1,4 @@ -/mob/living/silicon/emote(var/act,var/m_type=1,var/message = null) +/mob/living/silicon/emote(act,m_type=1,message = null) var/param = null if (findtext(act, "-", 1, null)) var/t1 = findtext(act, "-", 1, null) diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm index 496d44d7e04..70a5daa21ee 100644 --- a/code/modules/mob/living/silicon/robot/inventory.dm +++ b/code/modules/mob/living/silicon/robot/inventory.dm @@ -43,7 +43,7 @@ hud_used.update_robot_modules_display() return 1 -/mob/living/silicon/robot/proc/activate_module(var/obj/item/O) +/mob/living/silicon/robot/proc/activate_module(obj/item/O) if(!(locate(O) in src.module.modules) && O != src.module.emag) return if(activated(O)) @@ -95,11 +95,11 @@ //These are hackish but they help clean up code elsewhere. //module_selected(module) - Checks whether the module slot specified by "module" is currently selected. -/mob/living/silicon/robot/proc/module_selected(var/module) //Module is 1-3 +/mob/living/silicon/robot/proc/module_selected(module) //Module is 1-3 return module == get_selected_module() //module_active(module) - Checks whether there is a module active in the slot specified by "module". -/mob/living/silicon/robot/proc/module_active(var/module) //Module is 1-3 +/mob/living/silicon/robot/proc/module_active(module) //Module is 1-3 if(module < 1 || module > 3) return 0 switch(module) @@ -126,7 +126,7 @@ return 0 //select_module(module) - Selects the module slot specified by "module" -/mob/living/silicon/robot/proc/select_module(var/module) //Module is 1-3 +/mob/living/silicon/robot/proc/select_module(module) //Module is 1-3 if(module < 1 || module > 3) return if(!module_active(module)) return @@ -156,7 +156,7 @@ return //deselect_module(module) - Deselects the module slot specified by "module" -/mob/living/silicon/robot/proc/deselect_module(var/module) //Module is 1-3 +/mob/living/silicon/robot/proc/deselect_module(module) //Module is 1-3 if(module < 1 || module > 3) return switch(module) @@ -178,7 +178,7 @@ return //toggle_module(module) - Toggles the selection of the module slot specified by "module". -/mob/living/silicon/robot/proc/toggle_module(var/module) //Module is 1-3 +/mob/living/silicon/robot/proc/toggle_module(module) //Module is 1-3 if(module < 1 || module > 3) return if(module_selected(module)) diff --git a/code/modules/mob/living/silicon/robot/laws.dm b/code/modules/mob/living/silicon/robot/laws.dm index 30ba3143730..337ca2118f0 100644 --- a/code/modules/mob/living/silicon/robot/laws.dm +++ b/code/modules/mob/living/silicon/robot/laws.dm @@ -3,7 +3,7 @@ set name = "Show Laws" show_laws() -/mob/living/silicon/robot/show_laws(var/everyone = 0) +/mob/living/silicon/robot/show_laws(everyone = 0) laws_sanity_check() var/who diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 41ebf4b0440..11ebe6edb27 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -351,7 +351,7 @@ if(prob(75) && Proj.damage > 0) spark_system.start() return 2 -/mob/living/silicon/robot/triggerAlarm(var/class, area/A, var/O, var/obj/alarmsource) +/mob/living/silicon/robot/triggerAlarm(class, area/A, O, obj/alarmsource) if(alarmsource.z != z) return if (stat == 2) @@ -378,7 +378,7 @@ return 1 -/mob/living/silicon/robot/cancelAlarm(var/class, area/A as area, obj/origin) +/mob/living/silicon/robot/cancelAlarm(class, area/A, obj/origin) var/list/L = alarms[class] var/cleared = 0 for (var/I in L) @@ -396,7 +396,7 @@ return !cleared -/mob/living/silicon/robot/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/mob/living/silicon/robot/attackby(obj/item/weapon/W, mob/user, params) if (istype(W, /obj/item/weapon/restraints/handcuffs)) // fuck i don't even know why isrobot() in handcuff code isn't working so this will have to do return @@ -555,7 +555,7 @@ spark_system.start() return ..() -/mob/living/silicon/robot/emag_act(mob/user as mob) +/mob/living/silicon/robot/emag_act(mob/user) if(user != src)//To prevent syndieborgs from emagging themselves if(!opened)//Cover is closed if(locked) @@ -615,7 +615,7 @@ update_icons() usr << "You unlock your cover." -/mob/living/silicon/robot/attack_alien(mob/living/carbon/alien/humanoid/M as mob) +/mob/living/silicon/robot/attack_alien(mob/living/carbon/alien/humanoid/M) if (M.a_intent =="disarm") if(!(lying)) M.do_attack_animation(src) @@ -638,7 +638,7 @@ -/mob/living/silicon/robot/attack_slime(mob/living/simple_animal/slime/M as mob) +/mob/living/silicon/robot/attack_slime(mob/living/simple_animal/slime/M) if(..()) //successful slime shock flick("noise", flash) var/stunprob = M.powerlevel * 7 + 10 @@ -939,7 +939,7 @@ return -/mob/living/silicon/robot/proc/SetLockdown(var/state = 1) +/mob/living/silicon/robot/proc/SetLockdown(state = 1) // They stay locked down if their wire is cut. if(wires.LockedCut()) state = 1 @@ -950,7 +950,7 @@ lockcharge = state update_canmove() -/mob/living/silicon/robot/proc/SetEmagged(var/new_state) +/mob/living/silicon/robot/proc/SetEmagged(new_state) emagged = new_state if(new_state) if(src.module) @@ -1038,7 +1038,7 @@ module = new /obj/item/weapon/robot_module/syndicate(src) laws = new /datum/ai_laws/syndicate_override() -/mob/living/silicon/robot/proc/notify_ai(var/notifytype, var/oldname, var/newname) +/mob/living/silicon/robot/proc/notify_ai(notifytype, oldname, newname) if(!connected_ai) return switch(notifytype) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 59e6475286e..7bbcd4ad3b2 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -40,7 +40,7 @@ return -/obj/item/weapon/robot_module/proc/respawn_consumable(var/mob/living/silicon/robot/R) +/obj/item/weapon/robot_module/proc/respawn_consumable(mob/living/silicon/robot/R) return /obj/item/weapon/robot_module/proc/rebuild()//Rebuilds the list so it's possible to add/remove items from the module @@ -272,7 +272,7 @@ energy = max_energy return -/datum/robot_energy_storage/proc/use_charge(var/amount) +/datum/robot_energy_storage/proc/use_charge(amount) if (energy >= amount) energy -= amount if (energy == 0) @@ -281,7 +281,7 @@ else return 0 -/datum/robot_energy_storage/proc/add_charge(var/amount) +/datum/robot_energy_storage/proc/add_charge(amount) energy = min(energy + amount, max_energy) /datum/robot_energy_storage/metal diff --git a/code/modules/mob/living/silicon/robot/robot_movement.dm b/code/modules/mob/living/silicon/robot/robot_movement.dm index fe89288765e..d459886311c 100644 --- a/code/modules/mob/living/silicon/robot/robot_movement.dm +++ b/code/modules/mob/living/silicon/robot/robot_movement.dm @@ -1,4 +1,4 @@ -/mob/living/silicon/robot/Process_Spacemove(var/movement_dir = 0) +/mob/living/silicon/robot/Process_Spacemove(movement_dir = 0) if(module) for(var/obj/item/weapon/tank/jetpack/J in module.modules) if(J && istype(J, /obj/item/weapon/tank/jetpack)) diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm index ef2e3041aa1..e022b8991a4 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -1,10 +1,10 @@ -/mob/living/silicon/say(var/message) +/mob/living/silicon/say(message) return ..(message, "R") /mob/living/silicon/get_spans() return ..() | SPAN_ROBOT -/mob/living/proc/robot_talk(var/message) +/mob/living/proc/robot_talk(message) log_say("[key_name(src)] : [message]") var/desig = "Default Cyborg" //ezmode for taters if(istype(src, /mob/living/silicon)) diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index dc549c835d1..c3ec3215993 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -37,7 +37,7 @@ /mob/living/silicon/proc/triggerAlarm() return -/mob/living/silicon/proc/queueAlarm(var/message, var/type, var/incoming = 1) +/mob/living/silicon/proc/queueAlarm(message, type, incoming = 1) var/in_cooldown = (alarms_to_show.len > 0 || alarms_to_clear.len > 0) if(incoming) alarms_to_show += message @@ -126,7 +126,7 @@ src << "Warning: Electromagnetic pulse detected." ..() -/mob/living/silicon/apply_damage(var/damage = 0,var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0) +/mob/living/silicon/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = 0) blocked = (100-blocked)/100 if(!damage || (blocked <= 0)) return 0 switch(damagetype) @@ -139,10 +139,10 @@ updatehealth() return 1 -/mob/living/silicon/proc/damage_mob(var/brute = 0, var/fire = 0, var/tox = 0) +/mob/living/silicon/proc/damage_mob(brute = 0, fire = 0, tox = 0) return -/mob/living/silicon/can_inject(var/mob/user, var/error_msg) +/mob/living/silicon/can_inject(mob/user, error_msg) if(error_msg) user << "Their outer shell is too tough." return 0 @@ -150,13 +150,13 @@ /mob/living/silicon/IsAdvancedToolUser() return 1 -/mob/living/silicon/bullet_act(var/obj/item/projectile/Proj) +/mob/living/silicon/bullet_act(obj/item/projectile/Proj) if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) adjustBruteLoss(Proj.damage) Proj.on_hit(src,2) return 2 -/mob/living/silicon/apply_effect(var/effect = 0,var/effecttype = STUN, var/blocked = 0) +/mob/living/silicon/apply_effect(effect = 0,effecttype = STUN, blocked = 0) return 0//The only effect that can hit them atm is flashes and they still directly edit so this works for now /* if(!effect || (blocked >= 2)) return 0 @@ -178,7 +178,7 @@ updatehealth() return 1*/ -/proc/islinked(var/mob/living/silicon/robot/bot, var/mob/living/silicon/ai/ai) +/proc/islinked(mob/living/silicon/robot/bot, mob/living/silicon/ai/ai) if(!istype(bot) || !istype(ai)) return 0 if (bot.connected_ai == ai) @@ -359,7 +359,7 @@ src << "Sensor augmentations disabled." -/mob/living/silicon/attack_alien(mob/living/carbon/alien/humanoid/M as mob) +/mob/living/silicon/attack_alien(mob/living/carbon/alien/humanoid/M) if(..()) //if harm or disarm intent var/damage = rand(10, 20) if (prob(90)) @@ -378,7 +378,7 @@ "[M] took a swipe at [src]!") return -/mob/living/silicon/attack_animal(mob/living/simple_animal/M as mob) +/mob/living/silicon/attack_animal(mob/living/simple_animal/M) if(..()) var/damage = rand(M.melee_damage_lower, M.melee_damage_upper) adjustBruteLoss(damage) diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index 2e7eb872262..261dad9eaa9 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -49,14 +49,14 @@ user << msg -/mob/living/simple_animal/construct/attack_animal(mob/living/simple_animal/M as mob) +/mob/living/simple_animal/construct/attack_animal(mob/living/simple_animal/M) if(istype(M, /mob/living/simple_animal/construct/builder)) adjustBruteLoss(-5) M.emote("me", 1, "mends some of \the [src]'s wounds.") else if(src != M) ..() -/mob/living/simple_animal/construct/bullet_act(var/obj/item/projectile/Proj) +/mob/living/simple_animal/construct/bullet_act(obj/item/projectile/Proj) if(!Proj) return if(Proj.damage_type == BURN || Proj.damage_type == BRUTE) @@ -94,7 +94,7 @@ playstyle_string = "You are a Juggernaut. Though slow, your shell can withstand extreme punishment, \ create shield walls and even deflect energy weapons, and rip apart enemies and walls alike." -/mob/living/simple_animal/construct/armored/bullet_act(var/obj/item/projectile/P) +/mob/living/simple_animal/construct/armored/bullet_act(obj/item/projectile/P) if(istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam)) var/reflectchance = 80 - round(P.damage/3) if(prob(reflectchance)) @@ -195,5 +195,5 @@ playstyle_string = "You are a Harvester. You are not strong, but your powers of domination will assist you in your role: \ Bring those who still cling to this world of illusion back to the Geometer so they may know Truth." -/mob/living/simple_animal/construct/harvester/Process_Spacemove(var/movement_dir = 0) +/mob/living/simple_animal/construct/harvester/Process_Spacemove(movement_dir = 0) return 1 \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm index 1462e2b52ed..cffe86460e0 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm @@ -38,13 +38,13 @@ ..() regenerate_icons() -/mob/living/simple_animal/pet/corgi/sac_act(var/obj/effect/rune/R, victim) //Still the best thing in this game +/mob/living/simple_animal/pet/corgi/sac_act(obj/effect/rune/R, victim) //Still the best thing in this game usr << "Even dark gods from another plane have standards, sicko." usr.reagents.add_reagent("hell_water", 2) R.stone_or_gib(victim) -/mob/living/simple_animal/pet/corgi/show_inv(mob/user as mob) +/mob/living/simple_animal/pet/corgi/show_inv(mob/user) user.set_machine(src) if(user.stat) return @@ -62,7 +62,7 @@ onclose(user, "mob[real_name]") return -/mob/living/simple_animal/pet/corgi/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/mob/living/simple_animal/pet/corgi/attackby(obj/item/O, mob/user, params) if(inventory_head && inventory_back) //helmet and armor = 100% protection if( istype(inventory_head,/obj/item/clothing/head/helmet) && istype(inventory_back,/obj/item/clothing/suit/armor) ) @@ -193,7 +193,7 @@ //Corgis are supposed to be simpler, so only a select few objects can actually be put //to be compatible with them. The objects are below. //Many hats added, Some will probably be removed, just want to see which ones are popular. -/mob/living/simple_animal/pet/corgi/proc/place_on_head(obj/item/item_to_add, var/mob/user as mob) +/mob/living/simple_animal/pet/corgi/proc/place_on_head(obj/item/item_to_add, mob/user) if(istype(item_to_add,/obj/item/weapon/c4)) // last thing he ever wears, I guess item_to_add.afterattack(src,user,1) diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm index 67b2369d341..af1520d2d42 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm @@ -141,7 +141,7 @@ src << "HeAV% DA%^MMA+G TO I/O CIR!%UUT!" -/mob/living/simple_animal/drone/proc/triggerAlarm(var/class, area/A, var/O, var/obj/alarmsource) +/mob/living/simple_animal/drone/proc/triggerAlarm(class, area/A, O, obj/alarmsource) if(alarmsource.z != z) return if(stat != DEAD) @@ -157,7 +157,7 @@ src << "--- [class] alarm detected in [A.name]!" -/mob/living/simple_animal/drone/proc/cancelAlarm(var/class, area/A as area, obj/origin) +/mob/living/simple_animal/drone/proc/cancelAlarm(class, area/A, obj/origin) if(stat != DEAD) var/list/L = alarms[class] var/cleared = 0 diff --git a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm index d4b664f4536..fe4cbaf4122 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm @@ -62,7 +62,7 @@ uncurl() -/obj/item/clothing/head/drone_holder/proc/updateVisualAppearence(var/mob/living/simple_animal/drone/D) +/obj/item/clothing/head/drone_holder/proc/updateVisualAppearence(mob/living/simple_animal/drone/D) if(!D) return icon_state = "[D.visualAppearence]_hat" diff --git a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm index c835c1c4e79..faf63c739c4 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm @@ -8,7 +8,7 @@ -/mob/living/simple_animal/drone/activate_hand(var/selhand) +/mob/living/simple_animal/drone/activate_hand(selhand) if(istext(selhand)) selhand = lowertext(selhand) diff --git a/code/modules/mob/living/simple_animal/friendly/drone/say.dm b/code/modules/mob/living/simple_animal/friendly/drone/say.dm index 15dc76f9e16..def3ad69d53 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/say.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/say.dm @@ -6,7 +6,7 @@ //Drone hearing -/mob/living/simple_animal/drone/say(var/message) +/mob/living/simple_animal/drone/say(message) return ..(message, "R") diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index 1cc8c6acc9b..96b24a86fe7 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -71,7 +71,7 @@ SV.eat(src) -/mob/living/simple_animal/hostile/retaliate/goat/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/mob/living/simple_animal/hostile/retaliate/goat/attackby(obj/item/O, mob/user, params) if(stat == CONSCIOUS && istype(O, /obj/item/weapon/reagent_containers/glass)) user.visible_message("[user] milks [src] using \the [O].", "You milk [src] using \the [O].") var/obj/item/weapon/reagent_containers/glass/G = O @@ -111,7 +111,7 @@ udder.my_atom = src ..() -/mob/living/simple_animal/cow/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/mob/living/simple_animal/cow/attackby(obj/item/O, mob/user, params) if(stat == CONSCIOUS && istype(O, /obj/item/weapon/reagent_containers/glass)) user.visible_message("[user] milks [src] using \the [O].", "You milk [src] using \the [O].") var/obj/item/weapon/reagent_containers/glass/G = O @@ -129,7 +129,7 @@ if(udder && prob(5)) udder.add_reagent("milk", rand(5, 10)) -/mob/living/simple_animal/cow/attack_hand(mob/living/carbon/M as mob) +/mob/living/simple_animal/cow/attack_hand(mob/living/carbon/M) if(!stat && M.a_intent == "disarm" && icon_state != icon_dead) M.visible_message("[M] tips over [src].","You tip over [src].") Weaken(30) @@ -235,7 +235,7 @@ var/global/chicken_count = 0 ..(gibbed) chicken_count -= 1 -/mob/living/simple_animal/chicken/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/mob/living/simple_animal/chicken/attackby(obj/item/O, mob/user, params) if(istype(O, food_type)) //feedin' dem chickens if(!stat && eggsleft < 8) var/feedmsg = "[user] feeds [O] to [name]! [pick(feedMessages)]" diff --git a/code/modules/mob/living/simple_animal/friendly/pet.dm b/code/modules/mob/living/simple_animal/friendly/pet.dm index 79ddffe3912..47680e97a7b 100644 --- a/code/modules/mob/living/simple_animal/friendly/pet.dm +++ b/code/modules/mob/living/simple_animal/friendly/pet.dm @@ -5,7 +5,7 @@ var/image/collar = null var/image/pettag = null -/mob/living/simple_animal/pet/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/mob/living/simple_animal/pet/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/clothing/tie/petcollar) && !pcollar) var/obj/item/clothing/tie/petcollar/P = O pcollar = P diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm index 9526c66c68b..651d97dcb56 100644 --- a/code/modules/mob/living/simple_animal/hostile/bear.dm +++ b/code/modules/mob/living/simple_animal/hostile/bear.dm @@ -47,7 +47,7 @@ else icon_state = "bearfloor" -/mob/living/simple_animal/hostile/bear/Process_Spacemove(var/movement_dir = 0) +/mob/living/simple_animal/hostile/bear/Process_Spacemove(movement_dir = 0) return 1 //No drifting in space for space bears! diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm index a1a0cd68c9f..5c9265578f8 100644 --- a/code/modules/mob/living/simple_animal/hostile/bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -26,7 +26,7 @@ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 -/mob/living/simple_animal/hostile/poison/bees/Process_Spacemove(var/movement_dir = 0) +/mob/living/simple_animal/hostile/poison/bees/Process_Spacemove(movement_dir = 0) return 1 /mob/living/simple_animal/hostile/poison/bees/New() diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index b98c42e2d7b..dd872f00853 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -32,7 +32,7 @@ faction = list("carp") flying = 1 -/mob/living/simple_animal/hostile/carp/Process_Spacemove(var/movement_dir = 0) +/mob/living/simple_animal/hostile/carp/Process_Spacemove(movement_dir = 0) return 1 //No drifting in space for space carp! //original comments do not steal /mob/living/simple_animal/hostile/carp/AttackingTarget() diff --git a/code/modules/mob/living/simple_animal/hostile/faithless.dm b/code/modules/mob/living/simple_animal/hostile/faithless.dm index ec9e38e6190..c74afd3be1b 100644 --- a/code/modules/mob/living/simple_animal/hostile/faithless.dm +++ b/code/modules/mob/living/simple_animal/hostile/faithless.dm @@ -27,7 +27,7 @@ faction = list("faithless") -/mob/living/simple_animal/hostile/faithless/Process_Spacemove(var/movement_dir = 0) +/mob/living/simple_animal/hostile/faithless/Process_Spacemove(movement_dir = 0) return 1 /mob/living/simple_animal/hostile/faithless/AttackingTarget() diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index 1d3e90fb8e5..e28524867f2 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -92,7 +92,7 @@ stop_automated_movement = 0 walk(src,0) -/mob/living/simple_animal/hostile/poison/giant_spider/nurse/proc/GiveUp(var/C) +/mob/living/simple_animal/hostile/poison/giant_spider/nurse/proc/GiveUp(C) spawn(100) if(busy == MOVING_TO_TARGET) if(cocoon_target == C && get_dist(src,cocoon_target) > 1) diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm index c8a84bd520e..1d46890166d 100644 --- a/code/modules/mob/living/simple_animal/hostile/headcrab.dm +++ b/code/modules/mob/living/simple_animal/hostile/headcrab.dm @@ -21,7 +21,7 @@ var/datum/mind/origin var/egg_lain = 0 -/mob/living/simple_animal/hostile/headcrab/proc/Infect(var/mob/living/carbon/human/victim) +/mob/living/simple_animal/hostile/headcrab/proc/Infect(mob/living/carbon/human/victim) var/obj/item/body_egg/changeling_egg/egg = new(victim) if(origin) egg.owner = origin diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 26fe0a596c2..b70b4418d89 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -97,10 +97,10 @@ GiveTarget(Target) return Target //We now have a target -/mob/living/simple_animal/hostile/proc/Found(var/atom/A)//This is here as a potential override to pick a specific target if available +/mob/living/simple_animal/hostile/proc/Found(atom/A)//This is here as a potential override to pick a specific target if available return -/mob/living/simple_animal/hostile/proc/PickTarget(var/list/Targets)//Step 3, pick amongst the possible, attackable targets +/mob/living/simple_animal/hostile/proc/PickTarget(list/Targets)//Step 3, pick amongst the possible, attackable targets if(target != null)//If we already have a target, but are told to pick again, calculate the lowest distance between all possible, and pick from the lowest distance targets for(var/atom/A in Targets) var/target_dist = get_dist(src, target) @@ -112,7 +112,7 @@ var/chosen_target = pick(Targets)//Pick the remaining targets (if any) at random return chosen_target -/mob/living/simple_animal/hostile/CanAttack(var/atom/the_target)//Can we actually attack a possible target? +/mob/living/simple_animal/hostile/CanAttack(atom/the_target)//Can we actually attack a possible target? if(see_invisible < the_target.invisibility)//Target's invisible to us, forget it return 0 if(search_objects < 2) @@ -146,7 +146,7 @@ return 1 return 0 -/mob/living/simple_animal/hostile/proc/GiveTarget(var/new_target)//Step 4, give us our selected target +/mob/living/simple_animal/hostile/proc/GiveTarget(new_target)//Step 4, give us our selected target target = new_target if(target != null) Aggro() @@ -184,10 +184,10 @@ return LoseTarget() -/mob/living/simple_animal/hostile/proc/Goto(var/target, var/delay, var/minimum_distance) +/mob/living/simple_animal/hostile/proc/Goto(target, delay, minimum_distance) walk_to(src, target, minimum_distance, delay) -/mob/living/simple_animal/hostile/adjustBruteLoss(var/damage) +/mob/living/simple_animal/hostile/adjustBruteLoss(damage) ..(damage) if(!client && !stat && search_objects < 3)//Not unconscious, and we don't ignore mobs if(search_objects)//Turn off item searching and ignore whatever item we were looking at, we're more concerned with fight or flight @@ -241,7 +241,7 @@ ..(gibbed) walk(src, 0) -/mob/living/simple_animal/hostile/proc/OpenFire(var/the_target) +/mob/living/simple_animal/hostile/proc/OpenFire(the_target) var/target = the_target visible_message("[src] [ranged_message] at [target]!") @@ -267,7 +267,7 @@ ranged_cooldown = ranged_cooldown_cap return -/mob/living/simple_animal/hostile/proc/Shoot(var/target, var/start, var/user, var/bullet = 0) +/mob/living/simple_animal/hostile/proc/Shoot(target, start, user, bullet = 0) if(target == start) return @@ -316,7 +316,7 @@ A.attack_animal(src) return 1 -/mob/living/simple_animal/hostile/RangedAttack(var/atom/A, var/params) //Player firing +/mob/living/simple_animal/hostile/RangedAttack(atom/A, params) //Player firing if(ranged && ranged_cooldown <= 0) target = A OpenFire(A) diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm index aacc4469640..4c99fd62ca2 100644 --- a/code/modules/mob/living/simple_animal/hostile/mimic.dm +++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm @@ -87,7 +87,7 @@ visible_message("[src] starts to move!") attempt_open = 1 -/mob/living/simple_animal/hostile/mimic/crate/adjustBruteLoss(var/damage) +/mob/living/simple_animal/hostile/mimic/crate/adjustBruteLoss(damage) trigger() ..(damage) @@ -147,18 +147,18 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca . = ..() return . - creator -/mob/living/simple_animal/hostile/mimic/copy/proc/ChangeOwner(var/mob/owner) +/mob/living/simple_animal/hostile/mimic/copy/proc/ChangeOwner(mob/owner) if(owner != creator) LoseTarget() creator = owner faction |= "\ref[owner]" -/mob/living/simple_animal/hostile/mimic/copy/proc/CheckObject(var/obj/O) +/mob/living/simple_animal/hostile/mimic/copy/proc/CheckObject(obj/O) if((istype(O, /obj/item) || istype(O, /obj/structure)) && !is_type_in_list(O, protected_objects)) return 1 return 0 -/mob/living/simple_animal/hostile/mimic/copy/proc/CopyObject(var/obj/O, var/mob/living/creator, var/destroy_original = 0) +/mob/living/simple_animal/hostile/mimic/copy/proc/CopyObject(obj/O, mob/living/creator, destroy_original = 0) if(destroy_original || CheckObject(O)) @@ -216,7 +216,7 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca "My logic is undeniable.", "One of us.", "FLESH IS WEAK", "THIS ISN'T WAR, THIS IS EXTERMINATION!") speak_chance = 15 -/mob/living/simple_animal/hostile/mimic/copy/machine/CanAttack(var/atom/the_target) +/mob/living/simple_animal/hostile/mimic/copy/machine/CanAttack(atom/the_target) if(the_target == creator) // Don't attack our creator AI. return 0 if(isrobot(the_target)) @@ -249,7 +249,7 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca ..() -/mob/living/simple_animal/hostile/mimic/copy/ranged/CopyObject(var/obj/O, var/mob/living/creator, var/destroy_original = 0) +/mob/living/simple_animal/hostile/mimic/copy/ranged/CopyObject(obj/O, mob/living/creator, destroy_original = 0) if(destroy_original || CheckObject(O)) O.loc = src @@ -298,7 +298,7 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca return 1 return -/mob/living/simple_animal/hostile/mimic/copy/ranged/OpenFire(var/the_target) +/mob/living/simple_animal/hostile/mimic/copy/ranged/OpenFire(the_target) if(Zapgun) if(Zapgun.power_supply) //sanity var/obj/item/ammo_casing/energy/shot = Zapgun.ammo_type[Zapgun.select] diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm index 850f307f63b..fffffa30f30 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm @@ -23,7 +23,7 @@ ..() icon_state = icon_living -/mob/living/simple_animal/hostile/asteroid/bullet_act(var/obj/item/projectile/P)//Reduces damage from most projectiles to curb off-screen kills +/mob/living/simple_animal/hostile/asteroid/bullet_act(obj/item/projectile/P)//Reduces damage from most projectiles to curb off-screen kills if(!stat) Aggro() if(P.damage < 30 && P.damage_type != BRUTE) @@ -86,7 +86,7 @@ flag = "energy" temperature = 50 -/mob/living/simple_animal/hostile/asteroid/basilisk/GiveTarget(var/new_target) +/mob/living/simple_animal/hostile/asteroid/basilisk/GiveTarget(new_target) target = new_target if(target != null) Aggro() @@ -149,7 +149,7 @@ var/ore_eaten = 1 var/chase_time = 100 -/mob/living/simple_animal/hostile/asteroid/goldgrub/GiveTarget(var/new_target) +/mob/living/simple_animal/hostile/asteroid/goldgrub/GiveTarget(new_target) target = new_target if(target != null) if(istype(target, /obj/item/weapon/ore)) @@ -172,7 +172,7 @@ return ..() -/mob/living/simple_animal/hostile/asteroid/goldgrub/proc/EatOre(var/atom/targeted_ore) +/mob/living/simple_animal/hostile/asteroid/goldgrub/proc/EatOre(atom/targeted_ore) for(var/obj/item/weapon/ore/O in targeted_ore.loc) ore_eaten++ if(!(O.type in ore_types_eaten)) @@ -202,7 +202,7 @@ ore_eaten = 0 -/mob/living/simple_animal/hostile/asteroid/goldgrub/bullet_act(var/obj/item/projectile/P) +/mob/living/simple_animal/hostile/asteroid/goldgrub/bullet_act(obj/item/projectile/P) visible_message("The [P.name] was repelled by [src.name]'s girth!") return @@ -211,7 +211,7 @@ Reward() ..(gibbed) -/mob/living/simple_animal/hostile/asteroid/goldgrub/adjustBruteLoss(var/damage) +/mob/living/simple_animal/hostile/asteroid/goldgrub/adjustBruteLoss(damage) idle_vision_range = 9 ..() @@ -247,7 +247,7 @@ minimum_distance = 3 pass_flags = PASSTABLE -/mob/living/simple_animal/hostile/asteroid/hivelord/OpenFire(var/the_target) +/mob/living/simple_animal/hostile/asteroid/hivelord/OpenFire(the_target) var/mob/living/simple_animal/hostile/asteroid/hivelordbrood/A = new /mob/living/simple_animal/hostile/asteroid/hivelordbrood(src.loc) A.GiveTarget(target) A.friends = friends @@ -274,7 +274,7 @@ inert = 1 desc = "The remains of a hivelord that have become useless, having been left alone too long after being harvested." -/obj/item/asteroid/hivelord_core/attack(mob/living/M as mob, mob/living/user as mob) +/obj/item/asteroid/hivelord_core/attack(mob/living/M, mob/living/user) if(ishuman(M)) var/mob/living/carbon/human/H = M if(inert) @@ -388,7 +388,7 @@ pre_attack = 0 return -/mob/living/simple_animal/hostile/asteroid/goliath/adjustBruteLoss(var/damage) +/mob/living/simple_animal/hostile/asteroid/goliath/adjustBruteLoss(damage) ranged_cooldown-- handle_preattack() ..() diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm index 8b9eaecaecc..8f082395c4c 100644 --- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm +++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm @@ -59,14 +59,14 @@ health = maxHealth ..() -/mob/living/simple_animal/hostile/mushroom/adjustBruteLoss(var/damage)//Possibility to flee from a fight just to make it more visually interesting +/mob/living/simple_animal/hostile/mushroom/adjustBruteLoss(damage)//Possibility to flee from a fight just to make it more visually interesting if(!retreat_distance && prob(33)) retreat_distance = 5 spawn(30) retreat_distance = null ..() -/mob/living/simple_animal/hostile/mushroom/attack_animal(var/mob/living/L) +/mob/living/simple_animal/hostile/mushroom/attack_animal(mob/living/L) if(istype(L, /mob/living/simple_animal/hostile/mushroom) && stat == DEAD) var/mob/living/simple_animal/hostile/mushroom/M = L if(faint_ticker < 2) @@ -110,7 +110,7 @@ spawn(300) recovery_cooldown = 0 -/mob/living/simple_animal/hostile/mushroom/proc/LevelUp(var/level_gain) +/mob/living/simple_animal/hostile/mushroom/proc/LevelUp(level_gain) if(powerlevel <= 9) powerlevel += level_gain if(prob(25)) @@ -125,7 +125,7 @@ src.visible_message("The [src.name] was bruised!") bruised = 1 -/mob/living/simple_animal/hostile/mushroom/attackby(obj/item/I as obj, mob/user as mob, params) +/mob/living/simple_animal/hostile/mushroom/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom)) if(stat == DEAD && !recovery_cooldown) Recover() @@ -137,7 +137,7 @@ Bruise() ..() -/mob/living/simple_animal/hostile/mushroom/attack_hand(mob/living/carbon/human/M as mob) +/mob/living/simple_animal/hostile/mushroom/attack_hand(mob/living/carbon/human/M) ..() if(M.a_intent == "harm") Bruise() diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm index 6c76a1520cd..5c4a4621da0 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/retaliate var/list/enemies = list() -/mob/living/simple_animal/hostile/retaliate/Found(var/atom/A) +/mob/living/simple_animal/hostile/retaliate/Found(atom/A) if(isliving(A)) var/mob/living/L = A if(!L.stat) @@ -51,7 +51,7 @@ H.enemies |= enemies return 0 -/mob/living/simple_animal/hostile/retaliate/adjustBruteLoss(var/damage) +/mob/living/simple_animal/hostile/retaliate/adjustBruteLoss(damage) ..(damage) if(stat == CONSCIOUS) Retaliate() diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm index d61fbfa6706..9d5fc402615 100644 --- a/code/modules/mob/living/simple_animal/hostile/statue.dm +++ b/code/modules/mob/living/simple_animal/hostile/statue.dm @@ -62,7 +62,7 @@ if(creator) src.creator = creator -/mob/living/simple_animal/hostile/statue/Move(var/turf/NewLoc) +/mob/living/simple_animal/hostile/statue/Move(turf/NewLoc) if(can_be_seen(NewLoc)) if(client) src << "You cannot move, there are eyes on you!" @@ -96,7 +96,7 @@ if(!can_be_seen(get_turf(loc))) ..() -/mob/living/simple_animal/hostile/statue/proc/can_be_seen(var/turf/destination) +/mob/living/simple_animal/hostile/statue/proc/can_be_seen(turf/destination) if(!cannot_be_seen) return null // Check for darkness @@ -131,13 +131,13 @@ // Turn to dust when gibbed -/mob/living/simple_animal/hostile/statue/gib(var/animation = 0) +/mob/living/simple_animal/hostile/statue/gib(animation = 0) dust(animation) // Stop attacking clientless mobs -/mob/living/simple_animal/hostile/statue/CanAttack(var/atom/the_target) +/mob/living/simple_animal/hostile/statue/CanAttack(atom/the_target) if(isliving(the_target)) var/mob/living/L = the_target if(!L.client && !L.ckey) diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index d01462502f6..38987cf6d27 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -51,7 +51,7 @@ attack_sound = 'sound/weapons/bladeslice.ogg' status_flags = 0 -/mob/living/simple_animal/hostile/syndicate/melee/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/mob/living/simple_animal/hostile/syndicate/melee/attackby(obj/item/O, mob/user, params) if(O.force) if(prob(80)) var/damage = O.force @@ -67,7 +67,7 @@ visible_message("[user] gently taps [src] with [O].") -/mob/living/simple_animal/hostile/syndicate/melee/bullet_act(var/obj/item/projectile/Proj) +/mob/living/simple_animal/hostile/syndicate/melee/bullet_act(obj/item/projectile/Proj) if(!Proj) return if(prob(65)) if((Proj.damage_type == BRUTE || Proj.damage_type == BURN)) @@ -86,7 +86,7 @@ corpse = /obj/effect/landmark/mobcorpse/syndicatecommando speed = 1 -/mob/living/simple_animal/hostile/syndicate/melee/space/Process_Spacemove(var/movement_dir = 0) +/mob/living/simple_animal/hostile/syndicate/melee/space/Process_Spacemove(movement_dir = 0) return /mob/living/simple_animal/hostile/syndicate/ranged @@ -111,7 +111,7 @@ corpse = /obj/effect/landmark/mobcorpse/syndicatecommando speed = 1 -/mob/living/simple_animal/hostile/syndicate/ranged/space/Process_Spacemove(var/movement_dir = 0) +/mob/living/simple_animal/hostile/syndicate/ranged/space/Process_Spacemove(movement_dir = 0) return diff --git a/code/modules/mob/living/simple_animal/morph/morph.dm b/code/modules/mob/living/simple_animal/morph/morph.dm index fb17c943adf..af42538d056 100644 --- a/code/modules/mob/living/simple_animal/morph/morph.dm +++ b/code/modules/mob/living/simple_animal/morph/morph.dm @@ -35,20 +35,20 @@ /mob/living/simple_animal/hostile/morph/examine(mob/user) if(morphed) form.examine(user) // Refactor examine to return desc so it's static? Not sure if worth it - if(get_dist(user,src)<=3) + if(get_dist(user,src)<=3) user << "Looks odd!" else ..() return -/mob/living/simple_animal/hostile/morph/proc/allowed(var/atom/movable/A) // make it into property/proc ? not sure if worth it +/mob/living/simple_animal/hostile/morph/proc/allowed(atom/movable/A) // make it into property/proc ? not sure if worth it if(istype(A,/obj/screen)) return 0 if(istype(A,/obj/singularity)) return 0 return 1 -/mob/living/simple_animal/hostile/morph/ShiftClickOn(var/atom/movable/A) +/mob/living/simple_animal/hostile/morph/ShiftClickOn(atom/movable/A) if(morph_time <= world.time) if(A == src) restore() @@ -58,10 +58,10 @@ else ..() -/mob/living/simple_animal/hostile/morph/proc/assume(var/atom/movable/target) +/mob/living/simple_animal/hostile/morph/proc/assume(atom/movable/target) morphed = 1 form = target - + //anim(loc,src,'icons/mob/mob.dmi',,"morph",,src.dir) No effect better than shit effect //Todo : update to .appearance once 508 hits @@ -89,9 +89,9 @@ return morphed = 0 form = null - - //anim(loc,src,'icons/mob/mob.dmi',,"morph",,src.dir) - + + //anim(loc,src,'icons/mob/mob.dmi',,"morph",,src.dir) + name = initial(name) icon = initial(icon) icon_state = initial(icon_state) @@ -171,7 +171,7 @@ /datum/round_event/morph var/key_of_morph -/datum/round_event/morph/proc/get_morph(var/end_if_fail = 0) +/datum/round_event/morph/proc/get_morph(end_if_fail = 0) key_of_morph = null if(!key_of_morph) var/list/candidates = get_candidates(BE_ALIEN) diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 1f6e0713900..41c36669023 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -261,7 +261,7 @@ * Attack responces */ //Humans, monkeys, aliens -/mob/living/simple_animal/parrot/attack_hand(mob/living/carbon/M as mob) +/mob/living/simple_animal/parrot/attack_hand(mob/living/carbon/M) ..() if(client) return @@ -282,14 +282,14 @@ drop_held_item(0) return -/mob/living/simple_animal/parrot/attack_paw(mob/living/carbon/monkey/M as mob) +/mob/living/simple_animal/parrot/attack_paw(mob/living/carbon/monkey/M) attack_hand(M) -/mob/living/simple_animal/parrot/attack_alien(mob/living/carbon/alien/M as mob) +/mob/living/simple_animal/parrot/attack_alien(mob/living/carbon/alien/M) attack_hand(M) //Simple animals -/mob/living/simple_animal/parrot/attack_animal(mob/living/simple_animal/M as mob) +/mob/living/simple_animal/parrot/attack_animal(mob/living/simple_animal/M) ..() //goodbye immortal parrots if(client) @@ -304,7 +304,7 @@ icon_state = "parrot_fly" //Mobs with objects -/mob/living/simple_animal/parrot/attackby(var/obj/item/O as obj, var/mob/living/user as mob, params) +/mob/living/simple_animal/parrot/attackby(obj/item/O, mob/living/user, params) if(!stat && !client && !istype(O, /obj/item/stack/medical) && !istype(O,/obj/item/weapon/reagent_containers/food/snacks/cracker)) if(O.force) if(parrot_state == PARROT_PERCH) @@ -328,7 +328,7 @@ return //Bullets -/mob/living/simple_animal/parrot/bullet_act(var/obj/item/projectile/Proj) +/mob/living/simple_animal/parrot/bullet_act(obj/item/projectile/Proj) ..() if(!stat && !client) if(parrot_state == PARROT_PERCH) @@ -729,7 +729,7 @@ return -/mob/living/simple_animal/parrot/proc/drop_held_item(var/drop_gently = 1) +/mob/living/simple_animal/parrot/proc/drop_held_item(drop_gently = 1) set name = "Drop held item" set category = "Parrot" set desc = "Drop the item you're holding." diff --git a/code/modules/mob/living/simple_animal/revenant/revenant.dm b/code/modules/mob/living/simple_animal/revenant/revenant.dm index dc1137e62d5..cb99c234248 100644 --- a/code/modules/mob/living/simple_animal/revenant/revenant.dm +++ b/code/modules/mob/living/simple_animal/revenant/revenant.dm @@ -54,7 +54,7 @@ /mob/living/simple_animal/revenant/ex_act(severity, target) return 1 //Immune to the effects of explosions. -/mob/living/simple_animal/revenant/ClickOn(var/atom/A, var/params) //Copypaste from ghost code - revenants can't interact with the world directly. +/mob/living/simple_animal/revenant/ClickOn(atom/A, params) //Copypaste from ghost code - revenants can't interact with the world directly. if(client.buildmode) build_click(src, client.buildmode, params, A) return @@ -158,7 +158,7 @@ -/mob/living/simple_animal/revenant/proc/castcheck(var/essence_cost) +/mob/living/simple_animal/revenant/proc/castcheck(essence_cost) var/mob/living/simple_animal/revenant/user = usr if(!istype(user) || !user) return @@ -176,7 +176,7 @@ -/mob/living/simple_animal/revenant/proc/change_essence_amount(var/essence_amt, var/silent = 0, var/source = null) +/mob/living/simple_animal/revenant/proc/change_essence_amount(essence_amt, silent = 0, source = null) var/mob/living/simple_animal/revenant/user = usr if(!istype(usr) || !usr) return @@ -193,7 +193,7 @@ -/mob/living/simple_animal/revenant/proc/reveal(var/time, var/stun) +/mob/living/simple_animal/revenant/proc/reveal(time, stun) var/mob/living/simple_animal/revenant/R = usr if(!istype(usr) || !usr) return diff --git a/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm b/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm index 01f527f2e07..b4f47647871 100644 --- a/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm +++ b/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm @@ -10,7 +10,7 @@ var/draining var/list/drained_mobs = list() //Cannot harvest the same mob twice -/obj/effect/proc_holder/spell/targeted/revenant_harvest/cast(list/targets, var/mob/living/simple_animal/revenant/user = usr) +/obj/effect/proc_holder/spell/targeted/revenant_harvest/cast(list/targets, mob/living/simple_animal/revenant/user = usr) if(!user.castcheck(0)) charge_counter = charge_max return @@ -82,7 +82,7 @@ include_user = 1 var/locked = 1 -/obj/effect/proc_holder/spell/targeted/revenant_transmit/cast(list/targets, var/mob/living/simple_animal/revenant/user = usr) +/obj/effect/proc_holder/spell/targeted/revenant_transmit/cast(list/targets, mob/living/simple_animal/revenant/user = usr) if(!user.castcheck(-5)) charge_counter = charge_max return @@ -114,7 +114,7 @@ range = 1 var/locked = 1 -/obj/effect/proc_holder/spell/aoe_turf/revenant_light/cast(list/targets, var/mob/living/simple_animal/revenant/user = usr) +/obj/effect/proc_holder/spell/aoe_turf/revenant_light/cast(list/targets, mob/living/simple_animal/revenant/user = usr) if(!user.castcheck(-25)) charge_counter = charge_max return @@ -152,7 +152,7 @@ range = 1 var/locked = 1 -/obj/effect/proc_holder/spell/aoe_turf/revenantDefile/cast(list/targets, var/mob/living/simple_animal/revenant/user = usr) +/obj/effect/proc_holder/spell/aoe_turf/revenantDefile/cast(list/targets, mob/living/simple_animal/revenant/user = usr) if(!user.castcheck(-30)) charge_counter = charge_max return diff --git a/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm b/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm index 3d3e7910656..25516b51619 100644 --- a/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm +++ b/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm @@ -12,7 +12,7 @@ var/key_of_revenant -/datum/round_event/revenant/proc/get_revenant(var/end_if_fail = 0) +/datum/round_event/revenant/proc/get_revenant(end_if_fail = 0) var/deadMobs = 0 for(var/mob/M in dead_mob_list) deadMobs++ diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm index 2589c79d5c9..cb43847c32c 100644 --- a/code/modules/mob/living/simple_animal/shade.dm +++ b/code/modules/mob/living/simple_animal/shade.dm @@ -36,7 +36,7 @@ return -/mob/living/simple_animal/shade/attackby(var/obj/item/O as obj, var/mob/user as mob, params) //Marker -Agouri +/mob/living/simple_animal/shade/attackby(obj/item/O, mob/user, params) //Marker -Agouri if(istype(O, /obj/item/device/soulstone)) var/obj/item/device/soulstone/SS = O SS.transfer_soul("SHADE", src, user) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index f20d4c04b8b..dedb7bb3f99 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -214,7 +214,7 @@ else if(bodytemperature > maxbodytemp) adjustBruteLoss(3) -/mob/living/simple_animal/gib(var/animation = 0) +/mob/living/simple_animal/gib(animation = 0) if(icon_gib) flick(icon_gib, src) if(butcher_results) @@ -236,7 +236,7 @@ return "[emote], \"[input]\"" return ..() -/mob/living/simple_animal/emote(var/act, var/m_type=1, var/message = null) +/mob/living/simple_animal/emote(act, m_type=1, message = null) if(stat) return if(act == "scream") @@ -244,26 +244,26 @@ act = "me" ..(act, m_type, message) -/mob/living/simple_animal/attack_animal(mob/living/simple_animal/M as mob) +/mob/living/simple_animal/attack_animal(mob/living/simple_animal/M) if(..()) var/damage = rand(M.melee_damage_lower, M.melee_damage_upper) attack_threshold_check(damage) return 1 -/mob/living/simple_animal/bullet_act(var/obj/item/projectile/Proj) +/mob/living/simple_animal/bullet_act(obj/item/projectile/Proj) if(!Proj) return apply_damage(Proj.damage, Proj.damage_type) Proj.on_hit(src, 0) return 0 -/mob/living/simple_animal/adjustFireLoss(var/amount) +/mob/living/simple_animal/adjustFireLoss(amount) adjustBruteLoss(amount) -/mob/living/simple_animal/adjustStaminaLoss(var/amount) +/mob/living/simple_animal/adjustStaminaLoss(amount) return -/mob/living/simple_animal/attack_hand(mob/living/carbon/human/M as mob) +/mob/living/simple_animal/attack_hand(mob/living/carbon/human/M) switch(M.a_intent) if("help") @@ -283,7 +283,7 @@ updatehealth() return 1 -/mob/living/simple_animal/attack_paw(mob/living/carbon/monkey/M as mob) +/mob/living/simple_animal/attack_paw(mob/living/carbon/monkey/M) if(..()) //successful monkey bite. if(stat != DEAD) var/damage = rand(1, 3) @@ -296,7 +296,7 @@ return -/mob/living/simple_animal/attack_alien(mob/living/carbon/alien/humanoid/M as mob) +/mob/living/simple_animal/attack_alien(mob/living/carbon/alien/humanoid/M) if(..()) //if harm or disarm intent. if(M.a_intent == "disarm") playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1) @@ -312,7 +312,7 @@ add_logs(M, src, "attacked") return 1 -/mob/living/simple_animal/attack_larva(mob/living/carbon/alien/larva/L as mob) +/mob/living/simple_animal/attack_larva(mob/living/carbon/alien/larva/L) if(..()) //successful larva bite var/damage = rand(5, 10) if(stat != DEAD) @@ -320,7 +320,7 @@ attack_threshold_check(damage) return 1 -/mob/living/simple_animal/attack_slime(mob/living/simple_animal/slime/M as mob) +/mob/living/simple_animal/attack_slime(mob/living/simple_animal/slime/M) if(..()) //successful slime attack var/damage = rand(15, 25) if(M.is_adult) @@ -328,7 +328,7 @@ attack_threshold_check(damage) return 1 -/mob/living/simple_animal/proc/attack_threshold_check(var/damage) +/mob/living/simple_animal/proc/attack_threshold_check(damage) if(damage <= force_threshold) visible_message("[src] looks unharmed.") else @@ -336,7 +336,7 @@ updatehealth() -/mob/living/simple_animal/attackby(var/obj/item/O as obj, var/mob/living/user as mob, params) //Marker -Agouri +/mob/living/simple_animal/attackby(obj/item/O, mob/living/user, params) //Marker -Agouri if(O.flags & NOBLUDGEON) return @@ -412,7 +412,7 @@ adjustBruteLoss(30) updatehealth() -/mob/living/simple_animal/proc/CanAttack(var/atom/the_target) +/mob/living/simple_animal/proc/CanAttack(atom/the_target) if(see_invisible < the_target.invisibility) return 0 if (isliving(the_target)) diff --git a/code/modules/mob/living/simple_animal/slaughter/slaughter.dm b/code/modules/mob/living/simple_animal/slaughter/slaughter.dm index 61f19d51552..cff95221196 100644 --- a/code/modules/mob/living/simple_animal/slaughter/slaughter.dm +++ b/code/modules/mob/living/simple_animal/slaughter/slaughter.dm @@ -51,7 +51,7 @@ ////////////////////The Powers -/mob/living/simple_animal/slaughter/proc/phaseout(var/obj/effect/decal/cleanable/B) +/mob/living/simple_animal/slaughter/proc/phaseout(obj/effect/decal/cleanable/B) var/turf/mobloc = get_turf(src.loc) var/turf/bloodloc = get_turf(B.loc) if(Adjacent(bloodloc)) @@ -93,7 +93,7 @@ src.eating = FALSE src.notransform = 0 -/mob/living/simple_animal/slaughter/proc/phasein(var/obj/effect/decal/cleanable/B) +/mob/living/simple_animal/slaughter/proc/phasein(obj/effect/decal/cleanable/B) if(src.eating) src << "Finish eating first!" else @@ -104,7 +104,7 @@ playsound(get_turf(src), 'sound/magic/exit_blood.ogg', 100, 1, -1) qdel(src.holder) -/obj/effect/decal/cleanable/blood/CtrlClick(var/mob/user) +/obj/effect/decal/cleanable/blood/CtrlClick(mob/user) ..() if(istype(user, /mob/living/simple_animal/slaughter)) var/mob/living/simple_animal/slaughter/S = user @@ -114,7 +114,7 @@ S.phaseout(src) -/obj/effect/decal/cleanable/trail_holder/CtrlClick(var/mob/user) +/obj/effect/decal/cleanable/trail_holder/CtrlClick(mob/user) ..() if(istype(user, /mob/living/simple_animal/slaughter)) var/mob/living/simple_animal/slaughter/S = user @@ -147,7 +147,7 @@ anchored = 1 invisibility = 60 -obj/effect/dummy/slaughter/relaymove(var/mob/user, direction) +obj/effect/dummy/slaughter/relaymove(mob/user, direction) if (!src.canmove || !direction) return var/turf/newLoc = get_step(src,direction) loc = newLoc diff --git a/code/modules/mob/living/simple_animal/slaughter/slaughterevent.dm b/code/modules/mob/living/simple_animal/slaughter/slaughterevent.dm index 3db4b52bcfd..8e836a74250 100644 --- a/code/modules/mob/living/simple_animal/slaughter/slaughterevent.dm +++ b/code/modules/mob/living/simple_animal/slaughter/slaughterevent.dm @@ -12,7 +12,7 @@ var/key_of_slaughter -/datum/round_event/slaughter/proc/get_slaughter(var/end_if_fail = 0) +/datum/round_event/slaughter/proc/get_slaughter(end_if_fail = 0) key_of_slaughter = null if(!key_of_slaughter) var/list/candidates = get_candidates(BE_ALIEN) diff --git a/code/modules/mob/living/simple_animal/slime/emote.dm b/code/modules/mob/living/simple_animal/slime/emote.dm index 7f8127d3bcf..85a298336a0 100644 --- a/code/modules/mob/living/simple_animal/slime/emote.dm +++ b/code/modules/mob/living/simple_animal/slime/emote.dm @@ -1,4 +1,4 @@ -/mob/living/simple_animal/slime/emote(var/act) +/mob/living/simple_animal/slime/emote(act) if (findtext(act, "-", 1, null)) diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm index 88b876e102e..5531fcd6a85 100644 --- a/code/modules/mob/living/simple_animal/slime/life.dm +++ b/code/modules/mob/living/simple_animal/slime/life.dm @@ -177,7 +177,7 @@ else Evolve() -/mob/living/simple_animal/slime/proc/add_nutrition(var/nutrition_to_add = 0, var/lastnut = 0) +/mob/living/simple_animal/slime/proc/add_nutrition(nutrition_to_add = 0, lastnut = 0) nutrition = min((nutrition + nutrition_to_add), get_max_nutrition()) if(nutrition >= (lastnut + 50)) if(prob(80)) @@ -492,7 +492,7 @@ if(is_adult) return 300 else return 200 -/mob/living/simple_animal/slime/proc/will_hunt(var/hunger = -1) // Check for being stopped from feeding and chasing +/mob/living/simple_animal/slime/proc/will_hunt(hunger = -1) // Check for being stopped from feeding and chasing if (docile) return 0 if (hunger == 2 || rabid || attacked) return 1 if (Leader) return 0 diff --git a/code/modules/mob/living/simple_animal/slime/powers.dm b/code/modules/mob/living/simple_animal/slime/powers.dm index a2da3fb63d6..d41d71cbbea 100644 --- a/code/modules/mob/living/simple_animal/slime/powers.dm +++ b/code/modules/mob/living/simple_animal/slime/powers.dm @@ -16,7 +16,7 @@ Feedon(M) return 1 -/mob/living/simple_animal/slime/proc/CanFeedon(var/mob/living/M) +/mob/living/simple_animal/slime/proc/CanFeedon(mob/living/M) if(!Adjacent(M)) return 0 @@ -46,7 +46,7 @@ return 0 return 1 -/mob/living/simple_animal/slime/proc/Feedon(var/mob/living/M) +/mob/living/simple_animal/slime/proc/Feedon(mob/living/M) src << "I have latched onto the subject and begun feeding..." M << "The [name] has latched onto [M.name]!" @@ -138,7 +138,7 @@ Victim << "[src] has let go of your head!" Victim = null -/mob/living/simple_animal/slime/proc/UpdateFeed(var/mob/M) +/mob/living/simple_animal/slime/proc/UpdateFeed(mob/M) if(Victim) if(Victim == M) loc = M.loc // simple "attach to head" effect! diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm index d638788ed1d..75da09b542c 100644 --- a/code/modules/mob/living/simple_animal/slime/slime.dm +++ b/code/modules/mob/living/simple_animal/slime/slime.dm @@ -141,7 +141,7 @@ spawn(45) Atkcool = 0 -/mob/living/simple_animal/slime/Process_Spacemove(var/movement_dir = 0) +/mob/living/simple_animal/slime/Process_Spacemove(movement_dir = 0) return 2 /mob/living/simple_animal/slime/Stat() @@ -161,7 +161,7 @@ ..(-abs(amount)) // Heals them return -/mob/living/simple_animal/slime/bullet_act(var/obj/item/projectile/Proj) +/mob/living/simple_animal/slime/bullet_act(obj/item/projectile/Proj) if(!Proj) return attacked += 10 @@ -176,23 +176,23 @@ powerlevel = 0 // oh no, the power! ..() -/mob/living/simple_animal/slime/MouseDrop(var/atom/movable/A as mob|obj) +/mob/living/simple_animal/slime/MouseDrop(atom/movable/A as mob|obj) if(isliving(A) && A != src) var/mob/living/Food = A if(CanFeedon(Food)) Feedon(Food) ..() -/mob/living/simple_animal/slime/unEquip(obj/item/W as obj) +/mob/living/simple_animal/slime/unEquip(obj/item/W) return -/mob/living/simple_animal/slime/start_pulling(var/atom/movable/AM) +/mob/living/simple_animal/slime/start_pulling(atom/movable/AM) return /mob/living/simple_animal/slime/attack_ui(slot) return -/mob/living/simple_animal/slime/attack_slime(mob/living/simple_animal/slime/M as mob) +/mob/living/simple_animal/slime/attack_slime(mob/living/simple_animal/slime/M) if(..()) //successful slime attack if(M == src) return @@ -208,16 +208,16 @@ M.adjustBruteLoss(-10 + (-10 * M.is_adult)) M.updatehealth() -/mob/living/simple_animal/slime/attack_animal(mob/living/simple_animal/M as mob) +/mob/living/simple_animal/slime/attack_animal(mob/living/simple_animal/M) if(..()) attacked += 10 -/mob/living/simple_animal/slime/attack_paw(mob/living/carbon/monkey/M as mob) +/mob/living/simple_animal/slime/attack_paw(mob/living/carbon/monkey/M) if(..()) //successful monkey bite. attacked += 10 -/mob/living/simple_animal/slime/attack_larva(mob/living/carbon/alien/larva/L as mob) +/mob/living/simple_animal/slime/attack_larva(mob/living/carbon/alien/larva/L) if(..()) //successful larva bite. attacked += 10 @@ -227,7 +227,7 @@ discipline_slime(user) -/mob/living/simple_animal/slime/attack_hand(mob/living/carbon/human/M as mob) +/mob/living/simple_animal/slime/attack_hand(mob/living/carbon/human/M) if(Victim) if(Victim == M) if(prob(60)) @@ -260,7 +260,7 @@ if(..()) //successful attack attacked += 10 -/mob/living/simple_animal/slime/attack_alien(mob/living/carbon/alien/humanoid/M as mob) +/mob/living/simple_animal/slime/attack_alien(mob/living/carbon/alien/humanoid/M) if(..()) //if harm or disarm intent. attacked += 10 discipline_slime(M) diff --git a/code/modules/mob/living/simple_animal/slime/subtypes.dm b/code/modules/mob/living/simple_animal/slime/subtypes.dm index 55a6eee734d..a2df855d0b7 100644 --- a/code/modules/mob/living/simple_animal/slime/subtypes.dm +++ b/code/modules/mob/living/simple_animal/slime/subtypes.dm @@ -1,4 +1,4 @@ -/mob/living/simple_animal/slime/proc/mutation_table(var/colour) +/mob/living/simple_animal/slime/proc/mutation_table(colour) var/list/slime_mutation[4] switch(colour) //Tier 1 diff --git a/code/modules/mob/living/simple_animal/worm.dm b/code/modules/mob/living/simple_animal/worm.dm index 333deb7eb59..273d14d2c90 100644 --- a/code/modules/mob/living/simple_animal/worm.dm +++ b/code/modules/mob/living/simple_animal/worm.dm @@ -133,7 +133,7 @@ return - proc/AttemptToEat(var/atom/target) + proc/AttemptToEat(atom/target) if(istype(target,/turf/simulated/wall)) if((!istype(target,/turf/simulated/wall/r_wall) && eatingDuration >= 100) || eatingDuration >= 200) //need 20 ticks to eat an rwall, 10 for a regular one var/turf/simulated/wall/wall = target @@ -148,7 +148,7 @@ return 0 - proc/Attach(var/mob/living/simple_animal/space_worm/attachement) + proc/Attach(mob/living/simple_animal/space_worm/attachement) if(!attachement) return diff --git a/code/modules/mob/living/ventcrawling.dm b/code/modules/mob/living/ventcrawling.dm index 5df785e016c..2623c66ff2a 100644 --- a/code/modules/mob/living/ventcrawling.dm +++ b/code/modules/mob/living/ventcrawling.dm @@ -3,7 +3,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump, //VENTCRAWLING -/mob/living/proc/handle_ventcrawl(var/atom/A) +/mob/living/proc/handle_ventcrawl(atom/A) if(!ventcrawler || !Adjacent(A)) return if(stat) @@ -89,10 +89,10 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump, //OOP -/atom/proc/update_pipe_vision(var/atom/new_loc = null) +/atom/proc/update_pipe_vision(atom/new_loc = null) return -/mob/living/update_pipe_vision(var/atom/new_loc = null) +/mob/living/update_pipe_vision(atom/new_loc = null) . = loc if(new_loc) . = new_loc diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 7e1b151a408..6e9e8ccd996 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -10,7 +10,7 @@ ghostize() ..() -/mob/proc/sac_act(var/obj/effect/rune/R, var/mob/victim as mob) +/mob/proc/sac_act(obj/effect/rune/R, mob/victim) return var/next_mob_id = 0 @@ -81,7 +81,7 @@ var/next_mob_id = 0 // self_message (optional) is what the src mob sees e.g. "You do something!" // blind_message (optional) is what blind people will hear e.g. "You hear something!" -/mob/visible_message(var/message, var/self_message, var/blind_message) +/mob/visible_message(message, self_message, blind_message) var/list/mob_viewers = list() var/list/possible_viewers = list() mob_viewers |= src @@ -120,7 +120,7 @@ var/next_mob_id = 0 // message is output to anyone who can see, e.g. "The [src] does something!" // blind_message (optional) is what blind people will hear e.g. "You hear something!" -/atom/proc/visible_message(var/message, var/blind_message) +/atom/proc/visible_message(message, blind_message) var/list/mob_viewers = list() var/list/possible_viewers = list() mob_viewers |= viewers(src) @@ -155,7 +155,7 @@ var/next_mob_id = 0 // deaf_message (optional) is what deaf people will see. // hearing_distance (optional) is the range, how many tiles away the message can be heard. -/mob/audible_message(var/message, var/deaf_message, var/hearing_distance, var/self_message) +/mob/audible_message(message, deaf_message, hearing_distance, self_message) var/range = 7 if(hearing_distance) range = hearing_distance @@ -171,7 +171,7 @@ var/next_mob_id = 0 // deaf_message (optional) is what deaf people will see. // hearing_distance (optional) is the range, how many tiles away the message can be heard. -/atom/proc/audible_message(var/message, var/deaf_message, var/hearing_distance) +/atom/proc/audible_message(message, deaf_message, hearing_distance) var/range = 7 if(hearing_distance) range = hearing_distance @@ -192,7 +192,7 @@ var/next_mob_id = 0 return r_hand return null -/mob/proc/ret_grab(obj/effect/list_container/mobl/L as obj, flag) +/mob/proc/ret_grab(obj/effect/list_container/mobl/L, flag) if ((!( istype(l_hand, /obj/item/weapon/grab) ) && !( istype(r_hand, /obj/item/weapon/grab) ))) if (!( L )) return null @@ -248,7 +248,7 @@ var/next_mob_id = 0 return 0 -/mob/proc/put_in_any_hand_if_possible(obj/item/W as obj, qdel_on_fail = 0, disable_warning = 1, redraw_mob = 1) +/mob/proc/put_in_any_hand_if_possible(obj/item/W, qdel_on_fail = 0, disable_warning = 1, redraw_mob = 1) if(equip_to_slot_if_possible(W, slot_l_hand, qdel_on_fail, disable_warning, redraw_mob)) return 1 else if(equip_to_slot_if_possible(W, slot_r_hand, qdel_on_fail, disable_warning, redraw_mob)) @@ -259,7 +259,7 @@ var/next_mob_id = 0 //set qdel_on_fail to have it delete W if it fails to equip //set disable_warning to disable the 'you are unable to equip that' warning. //unset redraw_mob to prevent the mob from being redrawn at the end. -/mob/proc/equip_to_slot_if_possible(obj/item/W as obj, slot, qdel_on_fail = 0, disable_warning = 0, redraw_mob = 1) +/mob/proc/equip_to_slot_if_possible(obj/item/W, slot, qdel_on_fail = 0, disable_warning = 0, redraw_mob = 1) if(!istype(W)) return 0 if(!W.mob_can_equip(src, slot, disable_warning)) if(qdel_on_fail) @@ -273,11 +273,11 @@ var/next_mob_id = 0 //This is an UNSAFE proc. It merely handles the actual job of equipping. All the checks on whether you can or can't eqip need to be done before! Use mob_can_equip() for that task. //In most cases you will want to use equip_to_slot_if_possible() -/mob/proc/equip_to_slot(obj/item/W as obj, slot) +/mob/proc/equip_to_slot(obj/item/W, slot) return //This is just a commonly used configuration for the equip_to_slot_if_possible() proc, used to equip people when the rounds tarts and when events happen and such. -/mob/proc/equip_to_slot_or_del(obj/item/W as obj, slot) +/mob/proc/equip_to_slot_or_del(obj/item/W, slot) equip_to_slot_if_possible(W, slot, 1, 1, 0) //The list of slots by priority. equip_to_appropriate_slot() uses this list. Doesn't matter if a mob type doesn't have a slot. @@ -375,7 +375,7 @@ var/list/slot_equipment_priority = list( \ return 1 //this and stop_pulling really ought to be /mob/living procs -/mob/proc/start_pulling(var/atom/movable/AM) +/mob/proc/start_pulling(atom/movable/AM) if ( !AM || !src || src==AM || !isturf(src.loc) ) //if there's no person pulling OR the person is pulling themself OR the object being pulled is inside something: abort! return if (!( AM.anchored )) @@ -743,7 +743,7 @@ var/list/slot_equipment_priority = list( \ add_stings_to_statpanel(mind.changeling.purchasedpowers) add_spells_to_statpanel(mob_spell_list) -/mob/proc/add_spells_to_statpanel(var/list/spells) +/mob/proc/add_spells_to_statpanel(list/spells) for(var/obj/effect/proc_holder/spell/S in spells) if(S.can_be_cast_by(src)) switch(S.charge_type) @@ -754,7 +754,7 @@ var/list/slot_equipment_priority = list( \ if("holdervar") statpanel("[S.panel]","[S.holder_var_type] [S.holder_var_amount]",S) -/mob/proc/add_stings_to_statpanel(var/list/stings) +/mob/proc/add_stings_to_statpanel(list/stings) for(var/obj/effect/proc_holder/changeling/S in stings) if(S.chemical_cost >=0 && S.can_be_used_by(src)) statpanel("[S.panel]",((S.chemical_cost > 0) ? "[S.chemical_cost]" : ""),S) @@ -800,7 +800,7 @@ var/list/slot_equipment_priority = list( \ return canmove -/mob/proc/fall(var/forced) +/mob/proc/fall(forced) drop_l_hand() drop_r_hand() @@ -842,7 +842,7 @@ var/list/slot_equipment_priority = list( \ /mob/proc/swap_hand() return -/mob/proc/activate_hand(var/selhand) +/mob/proc/activate_hand(selhand) return /mob/proc/Jitter(amount) @@ -869,7 +869,7 @@ var/list/slot_equipment_priority = list( \ update_canmove() return -/mob/proc/Weaken(amount, var/ignore_canweaken = 0) +/mob/proc/Weaken(amount, ignore_canweaken = 0) if(status_flags & CANWEAKEN || ignore_canweaken) weakened = max(max(weakened,amount),0) update_canmove() //updates lying, canmove and icons @@ -952,7 +952,7 @@ var/list/slot_equipment_priority = list( \ /mob/proc/setEarDamage() return -/mob/proc/AddSpell(var/obj/effect/proc_holder/spell/spell) +/mob/proc/AddSpell(obj/effect/proc_holder/spell/spell) mob_spell_list += spell if(!spell.action) spell.action = new/datum/action/spell_action diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 3c1906ee7dc..62fb5c75178 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -448,14 +448,14 @@ It's fairly easy to fix if dealing with single letters but not so much with comp return 1 return 0 -/mob/proc/has_mutation(var/mutation) +/mob/proc/has_mutation(mutation) return mutation in src.mutations ? 1 : 0 /proc/get_both_hands(mob/living/carbon/M) var/list/hands = list(M.l_hand, M.r_hand) return hands -/mob/proc/reagent_check(var/datum/reagent/R) // utilized in the species code +/mob/proc/reagent_check(datum/reagent/R) // utilized in the species code return 1 /proc/notify_ghosts(var/message, var/ghost_sound = null) //Easy notification of ghosts. @@ -465,7 +465,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp if(ghost_sound) O << sound(ghost_sound) -/proc/item_heal_robotic(var/mob/living/carbon/human/H, var/mob/user, var/brute, var/burn) +/proc/item_heal_robotic(mob/living/carbon/human/H, mob/user, brute, burn) var/obj/item/organ/limb/affecting = H.get_organ(check_zone(user.zone_sel.selecting)) var/dam //changes repair text based on how much brute/burn was supplied diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index f80afc9d4f8..c5f8a272d8b 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -318,7 +318,7 @@ ///Called by /client/Move() ///For moving in space ///Return 1 for movement 0 for none -/mob/Process_Spacemove(var/movement_dir = 0) +/mob/Process_Spacemove(movement_dir = 0) if(..()) return 1 @@ -363,7 +363,7 @@ /mob/proc/mob_negates_gravity() return 0 -/mob/proc/Move_Pulled(var/atom/A) +/mob/proc/Move_Pulled(atom/A) if (!canmove || restrained() || !pulling) return if (pulling.anchored) @@ -385,7 +385,7 @@ step(pulling, get_dir(pulling.loc, A)) return -/mob/proc/slip(var/s_amount, var/w_amount, var/obj/O, var/lube) +/mob/proc/slip(s_amount, w_amount, obj/O, lube) return /mob/proc/update_gravity() diff --git a/code/modules/mob/mob_transformation_simple.dm b/code/modules/mob/mob_transformation_simple.dm index e0b8ca39e86..3b9b6021b15 100644 --- a/code/modules/mob/mob_transformation_simple.dm +++ b/code/modules/mob/mob_transformation_simple.dm @@ -2,7 +2,7 @@ //This proc is the most basic of the procs. All it does is make a new mob on the same tile and transfer over a few variables. //Returns the new mob //Note that this proc does NOT do MMI related stuff! -/mob/proc/change_mob_type(var/new_type = null, var/turf/location = null, var/new_name = null as text, var/delete_old_mob = 0 as num) +/mob/proc/change_mob_type(new_type = null, turf/location = null, new_name = null as text, delete_old_mob = 0 as num) if(istype(src,/mob/new_player)) usr << "cannot convert players who have not entered yet." diff --git a/code/modules/mob/new_player/poll.dm b/code/modules/mob/new_player/poll.dm index 77477bf3e52..f58f6af7f31 100644 --- a/code/modules/mob/new_player/poll.dm +++ b/code/modules/mob/new_player/poll.dm @@ -35,7 +35,7 @@ -/mob/new_player/proc/poll_player(var/pollid = -1) +/mob/new_player/proc/poll_player(pollid = -1) if(pollid == -1) return establish_db_connection() if(dbcon.IsConnected()) @@ -292,7 +292,7 @@ src << browse(output,"window=playerpoll;size=500x250") return -/mob/new_player/proc/vote_on_poll(var/pollid = -1, var/optionid = -1, var/multichoice = 0) +/mob/new_player/proc/vote_on_poll(pollid = -1, optionid = -1, multichoice = 0) if(pollid == -1 || optionid == -1) return @@ -362,7 +362,7 @@ usr << browse(null,"window=playerpoll") -/mob/new_player/proc/log_text_poll_reply(var/pollid = -1, var/replytext = "") +/mob/new_player/proc/log_text_poll_reply(pollid = -1, replytext = "") if(pollid == -1 || replytext == "") return @@ -420,7 +420,7 @@ usr << browse(null,"window=playerpoll") -/mob/new_player/proc/vote_on_numval_poll(var/pollid = -1, var/optionid = -1, var/rating = null) +/mob/new_player/proc/vote_on_numval_poll(pollid = -1, optionid = -1, rating = null) if(pollid == -1 || optionid == -1) return diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 96f631e6d71..45fe320ce0c 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -290,7 +290,7 @@ //human -> robot -/mob/living/carbon/human/proc/Robotize(var/delete_items = 0) +/mob/living/carbon/human/proc/Robotize(delete_items = 0) if (notransform) return for(var/obj/item/W in src) @@ -497,7 +497,7 @@ * This proc is here to force coders to manually place their mob in this list, hopefully tested. * This also gives a place to explain -why- players shouldnt be turn into certain mobs and hopefully someone can fix them. */ -/mob/proc/safe_animal(var/MP) +/mob/proc/safe_animal(MP) //Bad mobs! - Remember to add a comment explaining what's wrong with the mob if(!MP) diff --git a/code/modules/nano/nanoexternal.dm b/code/modules/nano/nanoexternal.dm index 265629ec4df..52a2fb9d3e3 100644 --- a/code/modules/nano/nanoexternal.dm +++ b/code/modules/nano/nanoexternal.dm @@ -36,7 +36,7 @@ * * @return nothing */ -/atom/movable/proc/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/atom/movable/proc/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) return /atom/movable/proc/get_ui_data(mob/user) diff --git a/code/modules/nano/nanomanager.dm b/code/modules/nano/nanomanager.dm index 5f47c8da5ca..dbe242e8c08 100644 --- a/code/modules/nano/nanomanager.dm +++ b/code/modules/nano/nanomanager.dm @@ -9,7 +9,7 @@ * * @return /nanoui Returns the new or found ui */ -/datum/subsystem/nano/proc/push_open_or_new_ui(var/mob/user, var/atom/movable/src_object, ui_key, var/datum/nanoui/ui, template, title, width, height, auto_update) +/datum/subsystem/nano/proc/push_open_or_new_ui(mob/user, atom/movable/src_object, ui_key, datum/nanoui/ui, template, title, width, height, auto_update) var/list/data = src_object.get_ui_data(user) if (!data) data = list() @@ -33,7 +33,7 @@ * * @return /nanoui Returns the found ui, for null if none exists */ -/datum/subsystem/nano/proc/try_update_ui(var/mob/user, src_object, ui_key, var/datum/nanoui/ui, data) +/datum/subsystem/nano/proc/try_update_ui(mob/user, src_object, ui_key, datum/nanoui/ui, data) if (isnull(ui)) // no ui has been passed, so we'll search for one ui = get_open_ui(user, src_object, ui_key) @@ -53,7 +53,7 @@ * * @return /nanoui Returns the found ui, or null if none exists */ -/datum/subsystem/nano/proc/get_open_ui(var/mob/user, src_object, ui_key) +/datum/subsystem/nano/proc/get_open_ui(mob/user, src_object, ui_key) var/src_object_key = "\ref[src_object]" if (isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list)) return null @@ -95,7 +95,7 @@ * * @return int The number of uis updated */ -/datum/subsystem/nano/proc/update_user_uis(var/mob/user, src_object = null, ui_key = null) +/datum/subsystem/nano/proc/update_user_uis(mob/user, src_object = null, ui_key = null) if (isnull(user.open_uis) || !istype(user.open_uis, /list) || open_uis.len == 0) return 0 // has no open uis @@ -116,7 +116,7 @@ * * @return int The number of uis closed */ -/datum/subsystem/nano/proc/close_user_uis(var/mob/user, src_object = null, ui_key = null) +/datum/subsystem/nano/proc/close_user_uis(mob/user, src_object = null, ui_key = null) if (isnull(user.open_uis) || !istype(user.open_uis, /list) || open_uis.len == 0) return 0 // has no open uis @@ -136,7 +136,7 @@ * * @return nothing */ -/datum/subsystem/nano/proc/ui_opened(var/datum/nanoui/ui) +/datum/subsystem/nano/proc/ui_opened(datum/nanoui/ui) var/src_object_key = "\ref[ui.src_object]" if (isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list)) open_uis[src_object_key] = list(ui.ui_key = list()) @@ -156,7 +156,7 @@ * * @return int 0 if no ui was removed, 1 if removed successfully */ -/datum/subsystem/nano/proc/ui_closed(var/datum/nanoui/ui) +/datum/subsystem/nano/proc/ui_closed(datum/nanoui/ui) var/src_object_key = "\ref[ui.src_object]" if (isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list)) return 0 // wasn't open @@ -179,7 +179,7 @@ */ // -/datum/subsystem/nano/proc/user_logout(var/mob/user) +/datum/subsystem/nano/proc/user_logout(mob/user) return close_user_uis(user) /** @@ -191,7 +191,7 @@ * * @return nothing */ -/datum/subsystem/nano/proc/user_transferred(var/mob/oldMob, var/mob/newMob) +/datum/subsystem/nano/proc/user_transferred(mob/oldMob, mob/newMob) if (isnull(oldMob.open_uis) || !istype(oldMob.open_uis, /list) || open_uis.len == 0) return 0 // has no open uis diff --git a/code/modules/ninja/admin_ninja_verbs.dm b/code/modules/ninja/admin_ninja_verbs.dm index 59baa2c48e9..ddbbca1379e 100644 --- a/code/modules/ninja/admin_ninja_verbs.dm +++ b/code/modules/ninja/admin_ninja_verbs.dm @@ -8,7 +8,7 @@ Contents: //ADMIN CREATE NINJA (From Player) -/client/proc/cmd_admin_ninjafy(var/mob/living/carbon/human/H in player_list) +/client/proc/cmd_admin_ninjafy(mob/living/carbon/human/H in player_list) set category = null set name = "Make Space Ninja" diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm index 14a871ddf22..62609ee1bc9 100644 --- a/code/modules/ninja/energy_katana.dm +++ b/code/modules/ninja/energy_katana.dm @@ -35,7 +35,7 @@ ..() -/obj/item/weapon/katana/energy/proc/returnToOwner(var/mob/living/carbon/human/user, var/doSpark = 1, var/caught = 0) +/obj/item/weapon/katana/energy/proc/returnToOwner(mob/living/carbon/human/user, doSpark = 1, caught = 0) if(!istype(user)) return loc = get_turf(src) diff --git a/code/modules/ninja/suit/gloves.dm b/code/modules/ninja/suit/gloves.dm index 13d52efec9a..51b18f4c43a 100644 --- a/code/modules/ninja/suit/gloves.dm +++ b/code/modules/ninja/suit/gloves.dm @@ -37,7 +37,7 @@ var/maxdrain = 400 -/obj/item/clothing/gloves/space_ninja/Touch(var/atom/A,var/proximity) +/obj/item/clothing/gloves/space_ninja/Touch(atom/A,proximity) if(!candrain || draining) return 0 if(!istype(loc, /mob/living/carbon/human)) diff --git a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm index 9b2fb90596d..053931b171e 100644 --- a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm +++ b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm @@ -35,7 +35,7 @@ It is possible to destroy the net by the occupant or someone else. -/obj/effect/energy_net/process(var/mob/living/carbon/M as mob) +/obj/effect/energy_net/process(mob/living/carbon/M) var/check = 30//30 seconds before teleportation. Could be extended I guess. var/mob_name = affecting.name//Since they will report as null if terminated before teleport. //The person can still try and attack the net when inside. @@ -95,7 +95,7 @@ It is possible to destroy the net by the occupant or someone else. -/obj/effect/energy_net/bullet_act(var/obj/item/projectile/Proj) +/obj/effect/energy_net/bullet_act(obj/item/projectile/Proj) health -= Proj.damage healthcheck() ..() @@ -151,7 +151,7 @@ It is possible to destroy the net by the occupant or someone else. -/obj/effect/energy_net/attack_alien(mob/living/user as mob) +/obj/effect/energy_net/attack_alien(mob/living/user) user.do_attack_animation(src) if (islarva(user)) return @@ -168,7 +168,7 @@ It is possible to destroy the net by the occupant or someone else. -/obj/effect/energy_net/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/effect/energy_net/attackby(obj/item/weapon/W, mob/user, params) var/aforce = W.force health = max(0, health - aforce) healthcheck() diff --git a/code/modules/ninja/suit/ninjaDrainAct.dm b/code/modules/ninja/suit/ninjaDrainAct.dm index bea7284744c..11d97b7a7c4 100644 --- a/code/modules/ninja/suit/ninjaDrainAct.dm +++ b/code/modules/ninja/suit/ninjaDrainAct.dm @@ -18,7 +18,7 @@ They *could* go in their appropriate files, but this is supposed to be modular //APC// -/obj/machinery/power/apc/ninjadrain_act(var/obj/item/clothing/suit/space/space_ninja/S, var/mob/living/carbon/human/H, var/obj/item/clothing/gloves/space_ninja/G) +/obj/machinery/power/apc/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/S, mob/living/carbon/human/H, obj/item/clothing/gloves/space_ninja/G) if(!S || !H || !G) return INVALID_DRAIN @@ -61,7 +61,7 @@ They *could* go in their appropriate files, but this is supposed to be modular //SMES// -/obj/machinery/power/smes/ninjadrain_act(var/obj/item/clothing/suit/space/space_ninja/S, var/mob/living/carbon/human/H, var/obj/item/clothing/gloves/space_ninja/G) +/obj/machinery/power/smes/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/S, mob/living/carbon/human/H, obj/item/clothing/gloves/space_ninja/G) if(!S || !H || !G) return INVALID_DRAIN @@ -96,7 +96,7 @@ They *could* go in their appropriate files, but this is supposed to be modular //CELL// -/obj/item/weapon/stock_parts/cell/ninjadrain_act(var/obj/item/clothing/suit/space/space_ninja/S, var/mob/living/carbon/human/H, var/obj/item/clothing/gloves/space_ninja/G) +/obj/item/weapon/stock_parts/cell/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/S, mob/living/carbon/human/H, obj/item/clothing/gloves/space_ninja/G) if(!S || !H || !G) return INVALID_DRAIN @@ -115,7 +115,7 @@ They *could* go in their appropriate files, but this is supposed to be modular //RDCONSOLE// -/obj/machinery/computer/rdconsole/ninjadrain_act(var/obj/item/clothing/suit/space/space_ninja/S, var/mob/living/carbon/human/H, var/obj/item/clothing/gloves/space_ninja/G) +/obj/machinery/computer/rdconsole/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/S, mob/living/carbon/human/H, obj/item/clothing/gloves/space_ninja/G) if(!S || !H || !G) return INVALID_DRAIN @@ -146,7 +146,7 @@ They *could* go in their appropriate files, but this is supposed to be modular //RD SERVER// //Shamelessly copypasted from above, since these two used to be the same proc, but with MANY colon operators -/obj/machinery/r_n_d/server/ninjadrain_act(var/obj/item/clothing/suit/space/space_ninja/S, var/mob/living/carbon/human/H, var/obj/item/clothing/gloves/space_ninja/G) +/obj/machinery/r_n_d/server/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/S, mob/living/carbon/human/H, obj/item/clothing/gloves/space_ninja/G) if(!S || !H || !G) return INVALID_DRAIN @@ -176,7 +176,7 @@ They *could* go in their appropriate files, but this is supposed to be modular //WIRE// -/obj/structure/cable/ninjadrain_act(var/obj/item/clothing/suit/space/space_ninja/S, var/mob/living/carbon/human/H, var/obj/item/clothing/gloves/space_ninja/G) +/obj/structure/cable/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/S, mob/living/carbon/human/H, obj/item/clothing/gloves/space_ninja/G) if(!S || !H || !G) return INVALID_DRAIN @@ -212,7 +212,7 @@ They *could* go in their appropriate files, but this is supposed to be modular S.spark_system.start() //MECH// -/obj/mecha/ninjadrain_act(var/obj/item/clothing/suit/space/space_ninja/S, var/mob/living/carbon/human/H, var/obj/item/clothing/gloves/space_ninja/G) +/obj/mecha/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/S, mob/living/carbon/human/H, obj/item/clothing/gloves/space_ninja/G) if(!S || !H || !G) return INVALID_DRAIN @@ -239,7 +239,7 @@ They *could* go in their appropriate files, but this is supposed to be modular break //BORG// -/mob/living/silicon/robot/ninjadrain_act(var/obj/item/clothing/suit/space/space_ninja/S, var/mob/living/carbon/human/H, var/obj/item/clothing/gloves/space_ninja/G) +/mob/living/silicon/robot/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/S, mob/living/carbon/human/H, obj/item/clothing/gloves/space_ninja/G) if(!S || !H || !G) return INVALID_DRAIN @@ -268,7 +268,7 @@ They *could* go in their appropriate files, but this is supposed to be modular //CARBON MOBS// -/mob/living/carbon/ninjadrain_act(var/obj/item/clothing/suit/space/space_ninja/S, var/mob/living/carbon/human/H, var/obj/item/clothing/gloves/space_ninja/G) +/mob/living/carbon/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/S, mob/living/carbon/human/H, obj/item/clothing/gloves/space_ninja/G) if(!S || !H || !G) return INVALID_DRAIN diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm index a1273f10498..810e9058165 100644 --- a/code/modules/ninja/suit/suit.dm +++ b/code/modules/ninja/suit/suit.dm @@ -108,7 +108,7 @@ Contents: //This proc prevents the suit from being taken off. -/obj/item/clothing/suit/space/space_ninja/proc/lock_suit(mob/living/carbon/human/H, var/checkIcons = 0) +/obj/item/clothing/suit/space/space_ninja/proc/lock_suit(mob/living/carbon/human/H, checkIcons = 0) if(!istype(H)) return 0 if(checkIcons) diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm index bd947c4b7a3..09a345c0b3c 100644 --- a/code/modules/paperwork/handlabeler.dm +++ b/code/modules/paperwork/handlabeler.dm @@ -52,7 +52,7 @@ else user << "You turn off [src]." -/obj/item/weapon/hand_labeler/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/item/weapon/hand_labeler/attackby(obj/item/I, mob/user, params) ..() if(istype(I, /obj/item/hand_labeler_refill)) if(!user.unEquip(I)) diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index dc20fd83997..6e0f9b5e979 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -44,7 +44,7 @@ colour = "white" -/obj/item/weapon/pen/attack(mob/living/M, mob/user,var/stealth) +/obj/item/weapon/pen/attack(mob/living/M, mob/user,stealth) if(!istype(M)) return diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 8e9e3135496..770673d47bb 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -79,7 +79,7 @@ name = "photo[(n_name ? text("- '[n_name]'") : null)]" add_fingerprint(usr) -/obj/item/weapon/photo/proc/photocreate(var/inicon, var/inimg, var/indesc, var/inblueprints) +/obj/item/weapon/photo/proc/photocreate(inicon, inimg, indesc, inblueprints) icon = inicon img = inimg desc = indesc @@ -299,7 +299,7 @@ var/list/fields = list() -/obj/item/device/camera/proc/injectaialbum(var/icon, var/img, var/desc, var/pixel_x, var/pixel_y, var/blueprintsinject) //stores image information to a list similar to that of the datacore +/obj/item/device/camera/proc/injectaialbum(icon, img, desc, pixel_x, pixel_y, blueprintsinject) //stores image information to a list similar to that of the datacore var/numberer = 1 for(var/datum/picture in src.aipictures) numberer++ @@ -315,7 +315,7 @@ aipictures += P usr << "Image recorded" //feedback to the AI player that the picture was taken -/obj/item/device/camera/proc/injectmasteralbum(var/icon, var/img, var/desc, var/pixel_x, var/pixel_y, var/blueprintsinject) //stores image information to a list similar to that of the datacore +/obj/item/device/camera/proc/injectmasteralbum(icon, img, desc, pixel_x, pixel_y, blueprintsinject) //stores image information to a list similar to that of the datacore var/numberer = 1 var/mob/living/silicon/robot/C = src.loc if(C.connected_ai) @@ -335,7 +335,7 @@ else injectaialbum(icon, img, desc, pixel_x, pixel_y, blueprintsinject) -/obj/item/device/camera/siliconcam/proc/selectpicture(var/obj/item/device/camera/siliconcam/targetloc) +/obj/item/device/camera/siliconcam/proc/selectpicture(obj/item/device/camera/siliconcam/targetloc) var/list/nametemp = list() var/find if(targetloc.aipictures.len == 0) @@ -348,7 +348,7 @@ if(q.fields["name"] == find) return q -/obj/item/device/camera/siliconcam/proc/viewpichelper(var/obj/item/device/camera/siliconcam/targetloc) +/obj/item/device/camera/siliconcam/proc/viewpichelper(obj/item/device/camera/siliconcam/targetloc) var/obj/item/weapon/photo/P = new/obj/item/weapon/photo() var/datum/picture/selection = selectpicture(targetloc) if(selection) diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index 09b77e13dc5..3fb4af902ad 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -72,7 +72,7 @@ // Syndicate stamp to forge documents. -/obj/item/weapon/stamp/chameleon/attack_self(mob/user as mob) +/obj/item/weapon/stamp/chameleon/attack_self(mob/user) var/list/stamp_types = typesof(/obj/item/weapon/stamp) - src.type // Get all stamp types except our own var/list/stamps = list() diff --git a/code/modules/power/antimatter/containment_jar.dm b/code/modules/power/antimatter/containment_jar.dm index 4dbb76755b4..ff2d0043c42 100644 --- a/code/modules/power/antimatter/containment_jar.dm +++ b/code/modules/power/antimatter/containment_jar.dm @@ -33,7 +33,7 @@ //check_stability() return -/obj/item/weapon/am_containment/proc/usefuel(var/wanted) +/obj/item/weapon/am_containment/proc/usefuel(wanted) if(fuel < wanted) wanted = fuel fuel -= wanted diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm index e8270dafd52..41be20dc92f 100644 --- a/code/modules/power/antimatter/control.dm +++ b/code/modules/power/antimatter/control.dm @@ -118,7 +118,7 @@ return -/obj/machinery/power/am_control_unit/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/power/am_control_unit/bullet_act(obj/item/projectile/Proj) if(Proj.flag != "bullet") stability -= Proj.force return 0 @@ -180,13 +180,13 @@ return -/obj/machinery/power/am_control_unit/attack_hand(mob/user as mob) +/obj/machinery/power/am_control_unit/attack_hand(mob/user) if(anchored) interact(user) return -/obj/machinery/power/am_control_unit/proc/add_shielding(var/obj/machinery/am_shielding/AMS, var/AMS_linking = 0) +/obj/machinery/power/am_control_unit/proc/add_shielding(obj/machinery/am_shielding/AMS, AMS_linking = 0) if(!istype(AMS)) return 0 if(!anchored) return 0 if(!AMS_linking && !AMS.link_control(src)) return 0 @@ -195,7 +195,7 @@ return 1 -/obj/machinery/power/am_control_unit/proc/remove_shielding(var/obj/machinery/am_shielding/AMS) +/obj/machinery/power/am_control_unit/proc/remove_shielding(obj/machinery/am_shielding/AMS) if(!istype(AMS)) return 0 linked_shielding.Remove(AMS) update_shield_icons = 2 diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm index bcd24faebe1..1631f501fa7 100644 --- a/code/modules/power/antimatter/shielding.dm +++ b/code/modules/power/antimatter/shielding.dm @@ -33,7 +33,7 @@ return -/obj/machinery/am_shielding/proc/controllerscan(var/priorscan = 0) +/obj/machinery/am_shielding/proc/controllerscan(priorscan = 0) //Make sure we are the only one here if(!istype(src.loc, /turf)) qdel(src) @@ -106,7 +106,7 @@ return -/obj/machinery/am_shielding/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/am_shielding/bullet_act(obj/item/projectile/Proj) if(Proj.flag != "bullet") stability -= Proj.force/2 return 0 @@ -136,7 +136,7 @@ //Call this to link a detected shilding unit to the controller -/obj/machinery/am_shielding/proc/link_control(var/obj/machinery/power/am_control_unit/AMC) +/obj/machinery/am_shielding/proc/link_control(obj/machinery/power/am_control_unit/AMC) if(!istype(AMC)) return 0 if(control_unit && control_unit != AMC) return 0//Already have one control_unit = AMC @@ -171,7 +171,7 @@ return -/obj/machinery/am_shielding/proc/check_stability(var/injecting_fuel = 0) +/obj/machinery/am_shielding/proc/check_stability(injecting_fuel = 0) if(stability > 0) return if(injecting_fuel && control_unit) control_unit.exploding = 1 @@ -180,7 +180,7 @@ return -/obj/machinery/am_shielding/proc/recalc_efficiency(var/new_efficiency)//tbh still not 100% sure how I want to deal with efficiency so this is likely temp +/obj/machinery/am_shielding/proc/recalc_efficiency(new_efficiency)//tbh still not 100% sure how I want to deal with efficiency so this is likely temp if(!control_unit || !processing) return if(stability < 50) new_efficiency /= 2 @@ -203,7 +203,7 @@ throw_range = 2 materials = list(MAT_METAL=100) -/obj/item/device/am_shielding_container/attackby(var/obj/item/I, var/mob/user, params) +/obj/item/device/am_shielding_container/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/device/multitool) && istype(src.loc,/turf)) new/obj/machinery/am_shielding(src.loc) qdel(src) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 329346fa41b..cc411f25092 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -575,7 +575,7 @@ return src.attack_hand(user) ..() -/obj/machinery/power/apc/emag_act(mob/user as mob) +/obj/machinery/power/apc/emag_act(mob/user) if(!emagged && !malfhack) if(opened) user << "You must close the cover to swipe an ID card!" @@ -664,7 +664,7 @@ return 0 // 0 = User is not a Malf AI -/obj/machinery/power/apc/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/power/apc/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if(!user) return @@ -737,11 +737,11 @@ // world << "[area.power_equip]" area.power_change() -/obj/machinery/power/apc/proc/isWireCut(var/wireIndex) +/obj/machinery/power/apc/proc/isWireCut(wireIndex) return wires.IsIndexCut(wireIndex) -/obj/machinery/power/apc/proc/can_use(mob/user as mob, var/loud = 0) //used by attack_hand() and Topic() +/obj/machinery/power/apc/proc/can_use(mob/user, loud = 0) //used by attack_hand() and Topic() if (user.stat) user << "You must be conscious to use [src]!" return 0 @@ -874,7 +874,7 @@ src.update() update_icon() -/obj/machinery/power/apc/proc/malfoccupy(var/mob/living/silicon/ai/malf) +/obj/machinery/power/apc/proc/malfoccupy(mob/living/silicon/ai/malf) if(!istype(malf)) return if(istype(malf.loc, /obj/machinery/power/apc)) // Already in an APC @@ -905,7 +905,7 @@ point.the_disk = src //the pinpointer will detect the shunted AI -/obj/machinery/power/apc/proc/malfvacate(var/forced) +/obj/machinery/power/apc/proc/malfvacate(forced) if(!src.occupier) return if(src.occupier.parent && src.occupier.parent.stat != 2) @@ -958,7 +958,7 @@ else return 0 -/obj/machinery/power/apc/add_load(var/amount) +/obj/machinery/power/apc/add_load(amount) if(terminal && terminal.powernet) terminal.powernet.load += amount @@ -1128,7 +1128,7 @@ // val 0=off, 1=off(auto) 2=on 3=on(auto) // on 0=off, 1=on, 2=autooff -/obj/machinery/power/apc/proc/autoset(var/val, var/on) +/obj/machinery/power/apc/proc/autoset(val, on) if(on==0) if(val==2) // if on, return off return 0 diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 8b2e9f5ae2e..4e380448a3f 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -102,7 +102,7 @@ By design, d1 is the smallest direction and d2 is the highest /////////////////////////////////// //If underfloor, hide the cable -/obj/structure/cable/hide(var/i) +/obj/structure/cable/hide(i) if(level == 1 && istype(loc, /turf)) invisibility = i ? 101 : 0 @@ -162,7 +162,7 @@ By design, d1 is the smallest direction and d2 is the highest src.add_fingerprint(user) // shock the user with probability prb -/obj/structure/cable/proc/shock(mob/user, prb, var/siemens_coeff = 1.0) +/obj/structure/cable/proc/shock(mob/user, prb, siemens_coeff = 1.0) if(!prob(prb)) return 0 if (electrocute_mob(user, powernet, src, siemens_coeff)) @@ -189,7 +189,7 @@ By design, d1 is the smallest direction and d2 is the highest if(current_size >= STAGE_FIVE) Deconstruct() -/obj/structure/cable/proc/cableColor(var/colorC = "red") +/obj/structure/cable/proc/cableColor(colorC = "red") cable_color = colorC switch(colorC) if("red") @@ -218,11 +218,11 @@ By design, d1 is the smallest direction and d2 is the highest // Power related /////////////////////////////////////////// -/obj/structure/cable/proc/add_avail(var/amount) +/obj/structure/cable/proc/add_avail(amount) if(powernet) powernet.newavail += amount -/obj/structure/cable/proc/add_load(var/amount) +/obj/structure/cable/proc/add_load(amount) if(powernet) powernet.load += amount @@ -244,7 +244,7 @@ By design, d1 is the smallest direction and d2 is the highest //handles merging diagonally matching cables //for info : direction^3 is flipping horizontally, direction^12 is flipping vertically -/obj/structure/cable/proc/mergeDiagonalsNetworks(var/direction) +/obj/structure/cable/proc/mergeDiagonalsNetworks(direction) //search for and merge diagonally matching cables from the first direction component (north/south) var/turf/T = get_step(src, direction&3)//go north/south @@ -288,7 +288,7 @@ By design, d1 is the smallest direction and d2 is the highest C.powernet.add_cable(src) //else, we simply connect to the matching cable powernet // merge with the powernets of power objects in the given direction -/obj/structure/cable/proc/mergeConnectedNetworks(var/direction) +/obj/structure/cable/proc/mergeConnectedNetworks(direction) var/fdir = (!direction)? 0 : turn(direction, 180) //flip the direction, to match with the source position on its turf @@ -362,7 +362,7 @@ By design, d1 is the smallest direction and d2 is the highest ////////////////////////////////////////////// //if powernetless_only = 1, will only get connections without powernet -/obj/structure/cable/proc/get_connections(var/powernetless_only = 0) +/obj/structure/cable/proc/get_connections(powernetless_only = 0) . = list() // this will be a list of all connected power objects var/turf/T @@ -565,13 +565,13 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list ( \ src.use(amt) return -/obj/item/stack/cable_coil/use(var/used) +/obj/item/stack/cable_coil/use(used) . = ..() update_icon() return //add cables to the stack -/obj/item/stack/cable_coil/proc/give(var/extra) +/obj/item/stack/cable_coil/proc/give(extra) if(amount + extra > MAXCOIL) amount = MAXCOIL else @@ -584,7 +584,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list ( \ // Cable laying procedures ////////////////////////////////////////////// -/obj/item/stack/cable_coil/proc/get_new_cable(var/location) +/obj/item/stack/cable_coil/proc/get_new_cable(location) var/path = "/obj/structure/cable" + (item_color == "red" ? "" : "/" + item_color) return new path (location) diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 63ac0410ec1..b99735503ee 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -36,7 +36,7 @@ return 100.0*charge/maxcharge // use power from a cell -/obj/item/weapon/stock_parts/cell/proc/use(var/amount) +/obj/item/weapon/stock_parts/cell/proc/use(amount) if(rigged && amount > 0) explode() return 0 @@ -47,7 +47,7 @@ return 1 // recharge the cell -/obj/item/weapon/stock_parts/cell/proc/give(var/amount) +/obj/item/weapon/stock_parts/cell/proc/give(amount) if(rigged && amount > 0) explode() return 0 diff --git a/code/modules/power/engine.dm b/code/modules/power/engine.dm index b7ce6e6a6a0..fc5c68aa577 100644 --- a/code/modules/power/engine.dm +++ b/code/modules/power/engine.dm @@ -1,7 +1,7 @@ -/turf/simulated/floor/engine/attack_paw(var/mob/user as mob) +/turf/simulated/floor/engine/attack_paw(mob/user) return src.attack_hand(user) -/turf/simulated/floor/engine/attack_hand(var/mob/user as mob) +/turf/simulated/floor/engine/attack_hand(mob/user) user.Move_Pulled(src) /turf/simulated/floor/engine/ex_act(severity, target) diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index 6b73a53aa86..3dfc11b895b 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -126,7 +126,7 @@ return interact(user) -/obj/machinery/power/generator/proc/get_menu(var/include_link = 1) +/obj/machinery/power/generator/proc/get_menu(include_link = 1) var/t = "" if(!powernet) t += "Unable to connect to the power network!" diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index 7196abe57e8..5c63a5cc097 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -63,13 +63,13 @@ var/const/GRAV_NEEDS_WRENCH = 3 /obj/machinery/gravity_generator/part var/obj/machinery/gravity_generator/main/main_part = null -/obj/machinery/gravity_generator/part/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/machinery/gravity_generator/part/attackby(obj/item/I, mob/user, params) return main_part.attackby(I, user) /obj/machinery/gravity_generator/part/get_status() return main_part.get_status() -/obj/machinery/gravity_generator/part/attack_hand(mob/user as mob) +/obj/machinery/gravity_generator/part/attack_hand(mob/user) return main_part.attack_hand(user) /obj/machinery/gravity_generator/part/set_broken() @@ -171,7 +171,7 @@ var/const/GRAV_NEEDS_WRENCH = 3 // Interaction // Fixing the gravity generator. -/obj/machinery/gravity_generator/main/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/machinery/gravity_generator/main/attackby(obj/item/I, mob/user, params) var/old_broken_state = broken_state switch(broken_state) if(GRAV_NEEDS_SCREWDRIVER) @@ -208,11 +208,11 @@ var/const/GRAV_NEEDS_WRENCH = 3 if(old_broken_state != broken_state) update_icon() -/obj/machinery/gravity_generator/main/attack_hand(mob/user as mob) +/obj/machinery/gravity_generator/main/attack_hand(mob/user) if(!..()) return interact(user) -/obj/machinery/gravity_generator/main/interact(mob/user as mob) +/obj/machinery/gravity_generator/main/interact(mob/user) if(stat & BROKEN) return var/dat = "Gravity Generator Breaker: " @@ -277,7 +277,7 @@ var/const/GRAV_NEEDS_WRENCH = 3 update_icon() // Set the state of the gravity. -/obj/machinery/gravity_generator/main/proc/set_state(var/new_state) +/obj/machinery/gravity_generator/main/proc/set_state(new_state) charging_state = POWER_IDLE on = new_state use_power = on ? 2 : 1 diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index e891aceb82c..145f2b2ba84 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -21,7 +21,7 @@ var/obj/machinery/light/newlight = null var/sheets_refunded = 2 -/obj/item/light_fixture_frame/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/item/light_fixture_frame/attackby(obj/item/weapon/W, mob/user, params) if (istype(W, /obj/item/weapon/wrench)) new /obj/item/stack/sheet/metal( get_turf(src.loc), sheets_refunded ) qdel(src) @@ -94,7 +94,7 @@ if(3) user << "The casing is closed." -/obj/machinery/light_construct/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/light_construct/attackby(obj/item/weapon/W, mob/user, params) src.add_fingerprint(user) if (istype(W, /obj/item/weapon/wrench)) if (src.stage == 1) @@ -273,7 +273,7 @@ return // update the icon_state and luminosity of the light depending on its state -/obj/machinery/light/proc/update(var/trigger = 1) +/obj/machinery/light/proc/update(trigger = 1) update_icon() if(on) @@ -307,7 +307,7 @@ // attempt to set the light's on/off status // will not switch on if broken/burned/empty -/obj/machinery/light/proc/seton(var/s) +/obj/machinery/light/proc/seton(s) on = (s && status == LIGHT_OK) update() @@ -550,7 +550,7 @@ // break the light and make sparks if was on -/obj/machinery/light/proc/broken(var/skip_sound_and_sparks = 0) +/obj/machinery/light/proc/broken(skip_sound_and_sparks = 0) if(status == LIGHT_EMPTY) return @@ -677,7 +677,7 @@ // attack bulb/tube with object // if a syringe, can inject plasma to make it explode -/obj/item/weapon/light/attackby(var/obj/item/I, var/mob/user, params) +/obj/item/weapon/light/attackby(obj/item/I, mob/user, params) ..() if(istype(I, /obj/item/weapon/reagent_containers/syringe)) var/obj/item/weapon/reagent_containers/syringe/S = I diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 28a024aa07e..37a75156cc8 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -78,7 +78,7 @@ display round(lastgen) and plasmatank amount icon_state = initial(icon_state) handleInactive() -/obj/machinery/power/port_gen/attack_hand(mob/user as mob) +/obj/machinery/power/port_gen/attack_hand(mob/user) if(..()) return if(!anchored) @@ -194,7 +194,7 @@ display round(lastgen) and plasmatank amount /obj/machinery/power/port_gen/pacman/proc/overheat() explosion(src.loc, 2, 5, 2, -1) -/obj/machinery/power/port_gen/pacman/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/power/port_gen/pacman/attackby(obj/item/O, mob/user, params) if(istype(O, sheet_path)) var/obj/item/stack/addstack = O var/amount = min((max_sheets - sheets), addstack.amount) @@ -234,22 +234,22 @@ display round(lastgen) and plasmatank amount else if(istype(O, /obj/item/weapon/crowbar) && panel_open) default_deconstruction_crowbar(O) -/obj/machinery/power/port_gen/pacman/emag_act(mob/user as mob) +/obj/machinery/power/port_gen/pacman/emag_act(mob/user) if(!emagged) emagged = 1 emp_act(1) -/obj/machinery/power/port_gen/pacman/attack_hand(mob/user as mob) +/obj/machinery/power/port_gen/pacman/attack_hand(mob/user) ..() if (!anchored) return interact(user) -/obj/machinery/power/port_gen/pacman/attack_ai(mob/user as mob) +/obj/machinery/power/port_gen/pacman/attack_ai(mob/user) interact(user) -/obj/machinery/power/port_gen/pacman/attack_paw(mob/user as mob) +/obj/machinery/power/port_gen/pacman/attack_paw(mob/user) interact(user) /obj/machinery/power/port_gen/pacman/interact(mob/user) diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index d6f19601413..1fbca84583c 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -24,11 +24,11 @@ ////////////////////////////// // common helper procs for all power machines -/obj/machinery/power/proc/add_avail(var/amount) +/obj/machinery/power/proc/add_avail(amount) if(powernet) powernet.newavail += amount -/obj/machinery/power/proc/add_load(var/amount) +/obj/machinery/power/proc/add_load(amount) if(powernet) powernet.load += amount @@ -65,7 +65,7 @@ return A.master.powered(chan) // return power status of the area // increment the power usage stats for an area -/obj/machinery/proc/use_power(var/amount, var/chan = -1) // defaults to power_channel +/obj/machinery/proc/use_power(amount, chan = -1) // defaults to power_channel var/area/A = get_area(src) // make sure it's in an area if(!A || !isarea(A) || !A.master) return @@ -192,7 +192,7 @@ // returns a list of all power-related objects (nodes, cable, junctions) in turf, // excluding source, that match the direction d // if unmarked==1, only return those with no powernet -/proc/power_list(var/turf/T, var/source, var/d, var/unmarked=0, var/cable_only = 0) +/proc/power_list(turf/T, source, d, unmarked=0, cable_only = 0) . = list() //var/fdir = (!d)? 0 : turn(d, 180) // the opposite direction to d (or 0 if d==0) @@ -219,7 +219,7 @@ //remove the old powernet and replace it with a new one throughout the network. -/proc/propagate_network(var/obj/O, var/datum/powernet/PN) +/proc/propagate_network(obj/O, datum/powernet/PN) //world.log << "propagating new network" var/list/worklist = list() var/list/found_machines = list() @@ -252,7 +252,7 @@ //Merge two powernets, the bigger (in cable length term) absorbing the other -/proc/merge_powernets(var/datum/powernet/net1, var/datum/powernet/net2) +/proc/merge_powernets(datum/powernet/net1, datum/powernet/net2) if(!net1 || !net2) //if one of the powernet doesn't exist, return return @@ -280,7 +280,7 @@ //power_source is a source of electricity, can be powercell, area, apc, cable, powernet or null //source is an object caused electrocuting (airlock, grille, etc) //No animations will be performed by this proc. -/proc/electrocute_mob(mob/living/carbon/M as mob, var/power_source, var/obj/source, var/siemens_coeff = 1.0) +/proc/electrocute_mob(mob/living/carbon/M, power_source, obj/source, siemens_coeff = 1.0) if(istype(M.loc,/obj/mecha)) return 0 //feckin mechs are dumb if(istype(M,/mob/living/carbon/human)) var/mob/living/carbon/human/H = M diff --git a/code/modules/power/powernet.dm b/code/modules/power/powernet.dm index 3e8dfaf2309..0ad877f987d 100644 --- a/code/modules/power/powernet.dm +++ b/code/modules/power/powernet.dm @@ -33,7 +33,7 @@ //remove a cable from the current powernet //if the powernet is then empty, delete it //Warning : this proc DON'T check if the cable exists -/datum/powernet/proc/remove_cable(var/obj/structure/cable/C) +/datum/powernet/proc/remove_cable(obj/structure/cable/C) cables -= C C.powernet = null if(is_empty())//the powernet is now empty... @@ -41,7 +41,7 @@ //add a cable to the current powernet //Warning : this proc DON'T check if the cable exists -/datum/powernet/proc/add_cable(var/obj/structure/cable/C) +/datum/powernet/proc/add_cable(obj/structure/cable/C) if(C.powernet)// if C already has a powernet... if(C.powernet == src) return @@ -53,7 +53,7 @@ //remove a power machine from the current powernet //if the powernet is then empty, delete it //Warning : this proc DON'T check if the machine exists -/datum/powernet/proc/remove_machine(var/obj/machinery/power/M) +/datum/powernet/proc/remove_machine(obj/machinery/power/M) nodes -=M M.powernet = null if(is_empty())//the powernet is now empty... @@ -62,7 +62,7 @@ //add a power machine to the current powernet //Warning : this proc DON'T check if the machine exists -/datum/powernet/proc/add_machine(var/obj/machinery/power/M) +/datum/powernet/proc/add_machine(obj/machinery/power/M) if(M.powernet)// if M already has a powernet... if(M.powernet == src) return diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index 82c2955ad09..3687d237bd2 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -35,7 +35,7 @@ var/global/list/rad_collectors = list() return -/obj/machinery/power/rad_collector/attack_hand(mob/user as mob) +/obj/machinery/power/rad_collector/attack_hand(mob/user) if(..()) return if(anchored) @@ -127,7 +127,7 @@ var/global/list/rad_collectors = list() else update_icons() -/obj/machinery/power/rad_collector/proc/receive_pulse(var/pulse_strength) +/obj/machinery/power/rad_collector/proc/receive_pulse(pulse_strength) if(P && active) var/power_produced = 0 power_produced = P.air_contents.toxins*pulse_strength*20 diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm index ad420ffc5e6..fb0a69a9be2 100644 --- a/code/modules/power/singularity/containment_field.dm +++ b/code/modules/power/singularity/containment_field.dm @@ -21,7 +21,7 @@ FG2.cleanup() ..() -/obj/machinery/field/containment/attack_hand(mob/user as mob) +/obj/machinery/field/containment/attack_hand(mob/user) if(get_dist(src, user) > 1) return 0 else @@ -37,22 +37,22 @@ return 0 -/obj/machinery/field/containment/Crossed(mob/mover as mob) +/obj/machinery/field/containment/Crossed(mob/mover) if(isliving(mover)) shock(mover) -/obj/machinery/field/containment/Crossed(obj/mover as obj) +/obj/machinery/field/containment/Crossed(obj/mover) if(istype(mover, /obj/machinery) || istype(mover, /obj/structure) || istype(mover, /obj/mecha)) bump(mover) -/obj/machinery/field/containment/proc/set_master(var/master1,var/master2) +/obj/machinery/field/containment/proc/set_master(master1,master2) if(!master1 || !master2) return 0 FG1 = master1 FG2 = master2 return 1 -/obj/machinery/field/containment/shock(mob/living/user as mob) +/obj/machinery/field/containment/shock(mob/living/user) if(!FG1 || !FG2) qdel(src) return 0 @@ -67,13 +67,13 @@ /obj/machinery/field var/hasShocked = 0 //Used to add a delay between shocks. In some cases this used to crash servers by spawning hundreds of sparks every second. -/obj/machinery/field/CanPass(mob/mover as mob, turf/target, height=0) +/obj/machinery/field/CanPass(mob/mover, turf/target, height=0) if(isliving(mover)) // Don't let mobs through shock(mover) return 0 return ..() -/obj/machinery/field/CanPass(obj/mover as obj, turf/target, height=0) +/obj/machinery/field/CanPass(obj/mover, turf/target, height=0) if((istype(mover, /obj/machinery) && !istype(mover, /obj/singularity)) || \ istype(mover, /obj/structure) || \ istype(mover, /obj/mecha)) @@ -81,7 +81,7 @@ return 0 return ..() -/obj/machinery/field/proc/shock(mob/living/user as mob) +/obj/machinery/field/proc/shock(mob/living/user) if(hasShocked) return 0 if(isliving(user)) diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index cfffc52cdd7..23e6468096f 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -79,7 +79,7 @@ icon_state = "emitter" -/obj/machinery/power/emitter/attack_hand(mob/user as mob) +/obj/machinery/power/emitter/attack_hand(mob/user) src.add_fingerprint(user) if(state == 2) if(!powernet) @@ -106,7 +106,7 @@ return 1 -/obj/machinery/power/emitter/emp_act(var/severity)//Emitters are hardened but still might have issues +/obj/machinery/power/emitter/emp_act(severity)//Emitters are hardened but still might have issues // add_load(1000) /* if((severity == 1)&&prob(1)&&prob(1)) if(src.active) @@ -260,7 +260,7 @@ ..() return -/obj/machinery/power/emitter/emag_act(mob/user as mob) +/obj/machinery/power/emitter/emag_act(mob/user) if(!emagged) locked = 0 emagged = 1 diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 07943676729..9c9f3c0f948 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -75,7 +75,7 @@ field_generator power level display return -/obj/machinery/field/generator/attack_hand(mob/user as mob) +/obj/machinery/field/generator/attack_hand(mob/user) if(state == 2) if(get_dist(src, user) <= 1)//Need to actually touch the thing to turn it on if(src.active >= 1) @@ -162,7 +162,7 @@ field_generator power level display else ..() -/obj/machinery/field/generator/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/field/generator/bullet_act(obj/item/projectile/Proj) if(Proj.flag != "bullet") power += Proj.damage update_icon() @@ -218,7 +218,7 @@ field_generator power level display return 0 //This could likely be better, it tends to start loopin if you have a complex generator loop setup. Still works well enough to run the engine fields will likely recode the field gens and fields sometime -Mport -/obj/machinery/field/generator/proc/draw_power(var/draw = 0, var/failsafe = 0, var/obj/machinery/field/generator/G = null, var/obj/machinery/field/generator/last = null) +/obj/machinery/field/generator/proc/draw_power(draw = 0, failsafe = 0, obj/machinery/field/generator/G = null, obj/machinery/field/generator/last = null) if(Varpower) return 1 if((G && G == src) || (failsafe >= 8))//Loopin, set fail @@ -263,7 +263,7 @@ field_generator power level display src.active = 2 -/obj/machinery/field/generator/proc/setup_field(var/NSEW) +/obj/machinery/field/generator/proc/setup_field(NSEW) var/turf/T = src.loc var/obj/machinery/field/generator/G var/steps = 0 @@ -352,7 +352,7 @@ field_generator power level display investigate_log("has failed whilst a singulo exists.","singulo") O.last_warning = world.time -/obj/machinery/field/generator/shock(mob/living/user as mob) +/obj/machinery/field/generator/shock(mob/living/user) if(fields.len) ..() diff --git a/code/modules/power/singularity/investigate.dm b/code/modules/power/singularity/investigate.dm index e601e210680..8d375e06f90 100644 --- a/code/modules/power/singularity/investigate.dm +++ b/code/modules/power/singularity/investigate.dm @@ -1,4 +1,4 @@ -/area/engine/engineering/poweralert(var/state, var/source) +/area/engine/engineering/poweralert(state, source) if (state != poweralm) investigate_log("has a power alarm!","singulo") ..() \ No newline at end of file diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm index 607be1ba324..bbfa406ad58 100644 --- a/code/modules/power/singularity/narsie.dm +++ b/code/modules/power/singularity/narsie.dm @@ -62,7 +62,7 @@ godsmack(A) return -/obj/singularity/narsie/proc/godsmack(var/atom/A) +/obj/singularity/narsie/proc/godsmack(atom/A) if(istype(A,/obj/)) var/obj/O = A O.ex_act(1.0) @@ -81,7 +81,7 @@ M.apply_effect(3, STUN) -/obj/singularity/narsie/consume(var/atom/A) +/obj/singularity/narsie/consume(atom/A) A.narsie_act() @@ -123,7 +123,7 @@ return -/obj/singularity/narsie/proc/acquire(var/mob/food) +/obj/singularity/narsie/proc/acquire(mob/food) target << "NAR-SIE HAS LOST INTEREST IN YOU" target = food if(ishuman(target)) diff --git a/code/modules/power/singularity/particle_accelerator/particle.dm b/code/modules/power/singularity/particle_accelerator/particle.dm index e7e3632b93e..a9ff8952161 100644 --- a/code/modules/power/singularity/particle_accelerator/particle.dm +++ b/code/modules/power/singularity/particle_accelerator/particle.dm @@ -55,13 +55,13 @@ -/obj/effect/accelerated_particle/proc/toxmob(var/mob/living/M) +/obj/effect/accelerated_particle/proc/toxmob(mob/living/M) M.irradiate(energy*6) M.updatehealth() return -/obj/effect/accelerated_particle/proc/move(var/lag) +/obj/effect/accelerated_particle/proc/move(lag) if(loc == null) return if(!step(src,dir)) diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm index 9c21da66e97..18a04d16f32 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm @@ -168,7 +168,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin return 0 -/obj/structure/particle_accelerator/proc/report_ready(var/obj/O) +/obj/structure/particle_accelerator/proc/report_ready(obj/O) if(O && (O == master)) if(construction_state >= 3) return 1 @@ -181,7 +181,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin return 0 -/obj/structure/particle_accelerator/proc/connect_master(var/obj/O) +/obj/structure/particle_accelerator/proc/connect_master(obj/O) if(O && istype(O,/obj/machinery/particle_accelerator/control_box)) if(O.dir == src.dir) master = O @@ -189,7 +189,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin return 0 -/obj/structure/particle_accelerator/proc/process_tool_hit(var/obj/O, var/mob/user) +/obj/structure/particle_accelerator/proc/process_tool_hit(obj/O, mob/user) if(!(O) || !(user)) return 0 if(!ismob(user) || !isobj(O)) @@ -325,7 +325,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin return 0 -/obj/machinery/particle_accelerator/proc/process_tool_hit(var/obj/O, var/mob/user) +/obj/machinery/particle_accelerator/proc/process_tool_hit(obj/O, mob/user) if(!(O) || !(user)) return 0 if(!ismob(user) || !isobj(O)) diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index c5fe52da089..61fd8dbe424 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -31,7 +31,7 @@ toggle_power() ..() -/obj/machinery/particle_accelerator/control_box/attack_hand(mob/user as mob) +/obj/machinery/particle_accelerator/control_box/attack_hand(mob/user) if(construction_state >= 3) interact(user) else if(construction_state == 2) // Wires exposed @@ -113,7 +113,7 @@ part.strength = strength part.update_icon() -/obj/machinery/particle_accelerator/control_box/proc/add_strength(var/s) +/obj/machinery/particle_accelerator/control_box/proc/add_strength(s) if(assembled) strength++ if(strength > strength_upper_limit) @@ -124,7 +124,7 @@ investigate_log("increased to [strength] by [key_name(usr)]","singulo") strength_change() -/obj/machinery/particle_accelerator/control_box/proc/remove_strength(var/s) +/obj/machinery/particle_accelerator/control_box/proc/remove_strength(s) if(assembled) strength-- if(strength < 0) @@ -196,7 +196,7 @@ return 0 -/obj/machinery/particle_accelerator/control_box/proc/check_part(var/turf/T, var/type) +/obj/machinery/particle_accelerator/control_box/proc/check_part(turf/T, type) if(!(T)||!(type)) return 0 var/obj/structure/particle_accelerator/PA = locate(/obj/structure/particle_accelerator) in T diff --git a/code/modules/power/singularity/particle_accelerator/particle_emitter.dm b/code/modules/power/singularity/particle_accelerator/particle_emitter.dm index 8e260a1115d..caaae583787 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_emitter.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_emitter.dm @@ -24,14 +24,14 @@ ..() return -/obj/structure/particle_accelerator/particle_emitter/proc/set_delay(var/delay) +/obj/structure/particle_accelerator/particle_emitter/proc/set_delay(delay) if(delay && delay >= 0) src.fire_delay = delay return 1 return 0 -/obj/structure/particle_accelerator/particle_emitter/proc/emit_particle(var/strength = 0) +/obj/structure/particle_accelerator/particle_emitter/proc/emit_particle(strength = 0) if((src.last_shot + src.fire_delay) <= world.time) src.last_shot = world.time var/obj/effect/accelerated_particle/A = null diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 90c60fc5769..43eaa1a7235 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -53,7 +53,7 @@ return 0 -/obj/singularity/attack_hand(mob/user as mob) +/obj/singularity/attack_hand(mob/user) consume(user) return 1 @@ -126,7 +126,7 @@ dissipate_track++ -/obj/singularity/proc/expand(var/force_size = 0) +/obj/singularity/proc/expand(force_size = 0) var/temp_allowed_size = src.allowed_size if(force_size) temp_allowed_size = force_size @@ -243,7 +243,7 @@ return -/obj/singularity/proc/consume(var/atom/A) +/obj/singularity/proc/consume(atom/A) var/gain = A.singularity_act(current_size) src.energy += gain if(istype(A, /obj/machinery/power/supermatter_shard) && !consumedSupermatter) @@ -254,7 +254,7 @@ return -/obj/singularity/proc/move(var/force_move = 0) +/obj/singularity/proc/move(force_move = 0) if(!move_self) return 0 @@ -269,7 +269,7 @@ step(src, movement_dir) -/obj/singularity/proc/check_turfs_in(var/direction = 0, var/step = 0) +/obj/singularity/proc/check_turfs_in(direction = 0, step = 0) if(!direction) return 0 var/steps = 0 @@ -322,7 +322,7 @@ return 1 -/obj/singularity/proc/can_move(var/turf/T) +/obj/singularity/proc/can_move(turf/T) if(!T) return 0 if((locate(/obj/machinery/field/containment) in T)||(locate(/obj/machinery/shieldwall) in T)) diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 04f15cbdfec..3bc6dbcfc36 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -172,7 +172,7 @@ // create a terminal object pointing towards the SMES // wires will attach to this -/obj/machinery/power/smes/proc/make_terminal(var/turf/T) +/obj/machinery/power/smes/proc/make_terminal(turf/T) terminal = new/obj/machinery/power/terminal(T) terminal.dir = get_dir(T,src) terminal.master = src @@ -306,7 +306,7 @@ return -/obj/machinery/power/smes/add_load(var/amount) +/obj/machinery/power/smes/add_load(amount) if(terminal && terminal.powernet) terminal.powernet.load += amount @@ -322,7 +322,7 @@ ui_interact(user) -/obj/machinery/power/smes/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/power/smes/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if(!user) return @@ -412,7 +412,7 @@ output_level = Clamp(output_level, 0, output_level_max) log_smes(usr.ckey) -/obj/machinery/power/smes/proc/log_smes(var/user = "") +/obj/machinery/power/smes/proc/log_smes(user = "") investigate_log("input/output; [input_level>output_level?"":""][input_level]/[output_level] | Charge: [charge] | Output-mode: [output_attempt?"on":"off"] | Input-mode: [input_attempt?"auto":"off"] by [user]","singulo") diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index f85d5dcc655..480fb8380b2 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -30,7 +30,7 @@ ..() //set the control of the panel to a given computer if closer than SOLAR_MAX_DIST -/obj/machinery/power/solar/proc/set_control(var/obj/machinery/power/solar_control/SC) +/obj/machinery/power/solar/proc/set_control(obj/machinery/power/solar_control/SC) if(!SC || (get_dist(src, SC) > SOLAR_MAX_DIST)) return 0 control = SC @@ -43,7 +43,7 @@ control.connected_panels.Remove(src) control = null -/obj/machinery/power/solar/proc/Make(var/obj/item/solar_assembly/S) +/obj/machinery/power/solar/proc/Make(obj/item/solar_assembly/S) if(!S) S = new /obj/item/solar_assembly(src) S.glass_type = /obj/item/stack/sheet/glass @@ -209,7 +209,7 @@ var/tracker = 0 var/glass_type = null -/obj/item/solar_assembly/attack_hand(var/mob/user) +/obj/item/solar_assembly/attack_hand(mob/user) if(!anchored && isturf(loc)) // You can't pick it up ..() @@ -221,7 +221,7 @@ glass_type = null -/obj/item/solar_assembly/attackby(var/obj/item/weapon/W, var/mob/user, params) +/obj/item/solar_assembly/attackby(obj/item/weapon/W, mob/user, params) if(!anchored && isturf(loc)) if(istype(W, /obj/item/weapon/wrench)) @@ -370,7 +370,7 @@ if(!..()) ui_interact(user) -/obj/machinery/power/solar_control/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/power/solar_control/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) ui = SSnano.push_open_or_new_ui(user, src, ui_key, ui, "solar_control.tmpl", name, 490, 420, 1) /obj/machinery/power/solar_control/get_ui_data() @@ -388,7 +388,7 @@ data["connected_tracker"] = (connected_tracker ? 1 : 0) return data -/obj/machinery/power/solar_control/attackby(I as obj, user as mob, params) +/obj/machinery/power/solar_control/attackby(obj/I, mob/user, params) if(istype(I, /obj/item/weapon/screwdriver)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20, target = src)) @@ -469,7 +469,7 @@ set_panels(cdir) //rotates the panel to the passed angle -/obj/machinery/power/solar_control/proc/set_panels(var/cdir) +/obj/machinery/power/solar_control/proc/set_panels(cdir) for(var/obj/machinery/power/solar/S in connected_panels) S.adir = cdir //instantly rotates the panel diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 8520b330ec3..9fb8bfb9d52 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -189,7 +189,7 @@ /obj/machinery/power/supermatter_shard -/obj/machinery/power/supermatter_shard/bullet_act(var/obj/item/projectile/Proj) +/obj/machinery/power/supermatter_shard/bullet_act(obj/item/projectile/Proj) var/turf/L = loc if(!istype(L)) // We don't run process() when we are in space return 0 // This stops people from being able to really power up the supermatter @@ -217,21 +217,21 @@ qdel(src) return(gain) -/obj/machinery/power/supermatter_shard/attack_paw(mob/user as mob) +/obj/machinery/power/supermatter_shard/attack_paw(mob/user) return attack_hand(user) -/obj/machinery/power/supermatter_shard/attack_robot(mob/user as mob) +/obj/machinery/power/supermatter_shard/attack_robot(mob/user) if(Adjacent(user)) return attack_hand(user) else user << "You attempt to interface with the control circuits but find they are not connected to your network. Maybe in a future firmware update." return -/obj/machinery/power/supermatter_shard/attack_ai(mob/user as mob) +/obj/machinery/power/supermatter_shard/attack_ai(mob/user) user << "You attempt to interface with the control circuits but find they are not connected to your network. Maybe in a future firmware update." -/obj/machinery/power/supermatter_shard/attack_hand(mob/living/user as mob) +/obj/machinery/power/supermatter_shard/attack_hand(mob/living/user) if(!istype(user)) return user.visible_message("\The [user] reaches out and touches \the [src], inducing a resonance... \his body starts to glow and bursts into flames before flashing into ash.",\ @@ -248,7 +248,7 @@ R.receive_pulse(power/10) return -/obj/machinery/power/supermatter_shard/attackby(obj/item/W as obj, mob/living/user as mob, params) +/obj/machinery/power/supermatter_shard/attackby(obj/item/W, mob/living/user, params) if(!istype(W) || (W.flags & ABSTRACT) || !istype(user)) return if(user.drop_item(W)) diff --git a/code/modules/power/terminal.dm b/code/modules/power/terminal.dm index ded1f663392..37fded3198f 100644 --- a/code/modules/power/terminal.dm +++ b/code/modules/power/terminal.dm @@ -25,7 +25,7 @@ master.disconnect_terminal() return ..() -/obj/machinery/power/terminal/hide(var/i) +/obj/machinery/power/terminal/hide(i) if(i) invisibility = 101 icon_state = "term-f" @@ -48,7 +48,7 @@ . = 1 -/obj/machinery/power/terminal/proc/dismantle(var/mob/living/user) +/obj/machinery/power/terminal/proc/dismantle(mob/living/user) if(istype(loc, /turf/simulated)) var/turf/simulated/T = loc if(T.intact) diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm index d39921f2699..b2771ae6d4f 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/tracker.dm @@ -26,7 +26,7 @@ ..() //set the control of the tracker to a given computer if closer than SOLAR_MAX_DIST -/obj/machinery/power/tracker/proc/set_control(var/obj/machinery/power/solar_control/SC) +/obj/machinery/power/tracker/proc/set_control(obj/machinery/power/solar_control/SC) if(!SC || (get_dist(src, SC) > SOLAR_MAX_DIST)) return 0 control = SC @@ -39,7 +39,7 @@ control.connected_tracker = null control = null -/obj/machinery/power/tracker/proc/Make(var/obj/item/solar_assembly/S) +/obj/machinery/power/tracker/proc/Make(obj/item/solar_assembly/S) if(!S) S = new /obj/item/solar_assembly(src) S.glass_type = /obj/item/stack/sheet/glass @@ -49,7 +49,7 @@ update_icon() //updates the tracker icon and the facing angle for the control computer -/obj/machinery/power/tracker/proc/set_angle(var/angle) +/obj/machinery/power/tracker/proc/set_angle(angle) sun_angle = angle //set icon dir to show sun illumination @@ -58,7 +58,7 @@ if(powernet && (powernet == control.powernet)) //update if we're still in the same powernet control.cdir = angle -/obj/machinery/power/tracker/attackby(var/obj/item/weapon/W, var/mob/user, params) +/obj/machinery/power/tracker/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/crowbar)) playsound(src.loc, 'sound/machines/click.ogg', 50, 1) diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index 6e72debce5f..c7bf249a611 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -130,7 +130,7 @@ default_deconstruction_crowbar(I) -/obj/machinery/power/compressor/CanAtmosPass(var/turf/T) +/obj/machinery/power/compressor/CanAtmosPass(turf/T) return !density /obj/machinery/power/compressor/process() @@ -230,7 +230,7 @@ if(compressor) compressor.locate_machinery() -/obj/machinery/power/turbine/CanAtmosPass(var/turf/T) +/obj/machinery/power/turbine/CanAtmosPass(turf/T) return !density /obj/machinery/power/turbine/process() diff --git a/code/modules/procedural mapping/mapGenerator.dm b/code/modules/procedural mapping/mapGenerator.dm index 864e43c1ea6..f421b1db0ee 100644 --- a/code/modules/procedural mapping/mapGenerator.dm +++ b/code/modules/procedural mapping/mapGenerator.dm @@ -32,7 +32,7 @@ //Defines the region the map represents, sets map //Returns the map -/datum/mapGenerator/proc/defineRegion(var/turf/Start, var/turf/End, var/replace = 0) +/datum/mapGenerator/proc/defineRegion(turf/Start, turf/End, replace = 0) if(!checkRegion(Start, End)) return 0 @@ -45,7 +45,7 @@ //Defines the region the map represents, as a CIRCLE!, sets map //Returns the map -/datum/mapGenerator/proc/defineCircularRegion(var/turf/Start, var/turf/End, var/replace = 0) +/datum/mapGenerator/proc/defineCircularRegion(turf/Start, turf/End, replace = 0) if(!checkRegion(Start, End)) return 0 @@ -86,7 +86,7 @@ //Checks for and Rejects bad region coordinates //Returns 1/0 -/datum/mapGenerator/proc/checkRegion(var/turf/Start, var/turf/End) +/datum/mapGenerator/proc/checkRegion(turf/Start, turf/End) . = 1 if(!Start || !End) @@ -113,7 +113,7 @@ //Requests the mapGeneratorModule(s) to (re)generate this one turf -/datum/mapGenerator/proc/generateOneTurf(var/turf/T) +/datum/mapGenerator/proc/generateOneTurf(turf/T) if(!T) return syncModules() @@ -178,7 +178,7 @@ var/moduleClusters = input("Cluster Flags (Cancel to leave unchanged from defaults)","Map Gen Settings") as null|anything in clusters //null for default - + var/theCluster = 0 if(moduleClusters != "None") if(!clusters[moduleClusters]) @@ -187,7 +187,7 @@ theCluster = clusters[moduleClusters] else theCluster = CLUSTER_CHECK_NONE - + if(theCluster) for(var/datum/mapGeneratorModule/M in N.modules) M.clusterCheckFlags = theCluster diff --git a/code/modules/procedural mapping/mapGeneratorModule.dm b/code/modules/procedural mapping/mapGeneratorModule.dm index da08a540ef3..847b679225d 100644 --- a/code/modules/procedural mapping/mapGeneratorModule.dm +++ b/code/modules/procedural mapping/mapGeneratorModule.dm @@ -10,7 +10,7 @@ //Syncs the module up with it's mother -/datum/mapGeneratorModule/proc/sync(var/datum/mapGenerator/mum) +/datum/mapGeneratorModule/proc/sync(datum/mapGenerator/mum) mother = null if(mum) mother = mum @@ -26,7 +26,7 @@ //Place a spawnable atom or turf on this turf -/datum/mapGeneratorModule/proc/place(var/turf/T) +/datum/mapGeneratorModule/proc/place(turf/T) if(!T) return 0 @@ -104,7 +104,7 @@ //Checks and Rejects dense turfs -/datum/mapGeneratorModule/proc/checkPlaceAtom(var/turf/T) +/datum/mapGeneratorModule/proc/checkPlaceAtom(turf/T) . = 1 if(!T) return 0 diff --git a/code/modules/procedural mapping/mapGeneratorModules/helpers.dm b/code/modules/procedural mapping/mapGeneratorModules/helpers.dm index bad449a9e8f..2c76915504b 100644 --- a/code/modules/procedural mapping/mapGeneratorModules/helpers.dm +++ b/code/modules/procedural mapping/mapGeneratorModules/helpers.dm @@ -33,7 +33,7 @@ if(is_border(T)) place(T) -/datum/mapGeneratorModule/border/proc/is_border(var/turf/T) +/datum/mapGeneratorModule/border/proc/is_border(turf/T) for(var/direction in list(SOUTH,EAST,WEST,NORTH)) if (get_step(T,direction) in mother.map) continue diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 5cce24c6dba..27a1309f57b 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -34,7 +34,7 @@ BB = new projectile_type(src) return -/obj/item/ammo_casing/attackby(obj/item/ammo_box/box as obj, mob/user as mob, params) +/obj/item/ammo_casing/attackby(obj/item/ammo_box/box, mob/user, params) if (!istype(box, /obj/item/ammo_box)) return if(isturf(src.loc)) @@ -79,7 +79,7 @@ stored_ammo += new ammo_type(src) update_icon() -/obj/item/ammo_box/proc/get_round(var/keep = 0) +/obj/item/ammo_box/proc/get_round(keep = 0) if (!stored_ammo.len) return null else @@ -89,7 +89,7 @@ stored_ammo.Insert(1,b) return b -/obj/item/ammo_box/proc/give_round(var/obj/item/ammo_casing/R, var/replace_spent = 0) +/obj/item/ammo_box/proc/give_round(obj/item/ammo_casing/R, replace_spent = 0) // Boxes don't have a caliber type, magazines do. Not sure if it's intended or not, but if we fail to find a caliber, then we fall back to ammo_type. if(!R || (caliber && R.caliber != caliber) || (!caliber && R.type != ammo_type)) return 0 @@ -112,7 +112,7 @@ return 0 -/obj/item/ammo_box/attackby(var/obj/item/A as obj, mob/user as mob, params, var/silent = 0, var/replace_spent = 0) +/obj/item/ammo_box/attackby(obj/item/A, mob/user, params, silent = 0, replace_spent = 0) var/num_loaded = 0 if(istype(A, /obj/item/ammo_box)) var/obj/item/ammo_box/AM = A @@ -138,7 +138,7 @@ return num_loaded -/obj/item/ammo_box/attack_self(mob/user as mob) +/obj/item/ammo_box/attack_self(mob/user) var/obj/item/ammo_casing/A = get_round() if(A) user.put_in_hands(A) diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index 3e0afd3ee2e..586102cbe70 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -196,7 +196,7 @@ desc = "A caseless bullet casing." -/obj/item/ammo_casing/caseless/fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, params, var/distro, var/quiet) +/obj/item/ammo_casing/caseless/fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, params, distro, quiet) if (..()) loc = null return 1 @@ -244,7 +244,7 @@ icon_state = "foamdart_empty" desc = "Its nerf or nothing! ... Although, this one doesn't look too safe." -/obj/item/ammo_casing/caseless/foam_dart/attackby(var/obj/item/A as obj, mob/user as mob, params) +/obj/item/ammo_casing/caseless/foam_dart/attackby(obj/item/A, mob/user, params) ..() if (istype(A, /obj/item/weapon/screwdriver) && !modified) modified = 1 diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index 9a3c97ab7e7..c776a60e0a4 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -1,7 +1,7 @@ ////////////////INTERNAL MAGAZINES////////////////////// //internals magazines are accessible, so replace spent ammo if full when trying to put a live one in -/obj/item/ammo_box/magazine/internal/give_round(var/obj/item/ammo_casing/R) +/obj/item/ammo_box/magazine/internal/give_round(obj/item/ammo_casing/R) return ..(R,1) /obj/item/ammo_box/magazine/internal/cylinder @@ -11,7 +11,7 @@ caliber = "357" max_ammo = 7 -/obj/item/ammo_box/magazine/internal/cylinder/ammo_count(var/countempties = 1) +/obj/item/ammo_box/magazine/internal/cylinder/ammo_count(countempties = 1) if (!countempties) var/boolets = 0 for (var/i = 1, i <= stored_ammo.len, i++) diff --git a/code/modules/projectiles/firing.dm b/code/modules/projectiles/firing.dm index d130f56e32b..a90eda4508f 100644 --- a/code/modules/projectiles/firing.dm +++ b/code/modules/projectiles/firing.dm @@ -1,4 +1,4 @@ -/obj/item/ammo_casing/proc/fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, params, var/distro, var/quiet) +/obj/item/ammo_casing/proc/fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, params, distro, quiet) distro += variance for (var/i = max(1, pellets), i > 0, i--) var/curloc = user.loc @@ -15,7 +15,7 @@ update_icon() return 1 -/obj/item/ammo_casing/proc/ready_proj(atom/target as mob|obj|turf, mob/living/user, var/quiet) +/obj/item/ammo_casing/proc/ready_proj(atom/target as mob|obj|turf, mob/living/user, quiet) if (!BB) return BB.original = target @@ -53,7 +53,7 @@ BB = null return 1 -/obj/item/ammo_casing/proc/spread(var/turf/target, var/turf/current, var/distro) +/obj/item/ammo_casing/proc/spread(turf/target, turf/current, distro) var/dx = abs(target.x - current.x) var/dy = abs(target.y - current.y) return locate(target.x + round(gaussian(0, distro) * (dy+2)/8, 1), target.y + round(gaussian(0, distro) * (dx+2)/8, 1), target.z) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index c2aec9dd829..e692bd7bb97 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -87,7 +87,7 @@ return -/obj/item/weapon/gun/proc/shoot_live_shot(mob/living/user as mob|obj, var/pointblank = 0, var/mob/pbtarget = null, var/message = 1) +/obj/item/weapon/gun/proc/shoot_live_shot(mob/living/user as mob|obj, pointblank = 0, mob/pbtarget = null, message = 1) if(recoil) spawn() shake_camera(user, recoil + 1, recoil) @@ -172,7 +172,7 @@ return 0 -/obj/item/weapon/gun/proc/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, var/message = 1, params) +/obj/item/weapon/gun/proc/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params) add_fingerprint(user) if(semicd) @@ -235,7 +235,7 @@ else return -/obj/item/weapon/gun/attackby(var/obj/item/A as obj, mob/user as mob, params) +/obj/item/weapon/gun/attackby(obj/item/A, mob/user, params) if(istype(A, /obj/item/device/flashlight/seclite)) var/obj/item/device/flashlight/seclite/S = A if(can_flashlight) @@ -293,7 +293,7 @@ update_gunlight(user) return -/obj/item/weapon/gun/proc/update_gunlight(var/mob/user = null) +/obj/item/weapon/gun/proc/update_gunlight(mob/user = null) if(F) action_button_name = "Toggle Gunlight" if(F.on) @@ -328,13 +328,13 @@ SetLuminosity(F.brightness_on) -/obj/item/weapon/gun/attack_hand(mob/user as mob) +/obj/item/weapon/gun/attack_hand(mob/user) if(unique_reskin && !reskinned && loc == user) reskin_gun(user) return ..() -/obj/item/weapon/gun/proc/reskin_gun(var/mob/M) +/obj/item/weapon/gun/proc/reskin_gun(mob/M) var/choice = input(M,"Warning, you can only reskin your weapon once!","Reskin Gun") in options if(src && choice && !M.stat && in_range(M,src) && !M.restrained() && M.canmove) @@ -348,7 +348,7 @@ reskinned = 1 return -/obj/item/weapon/gun/proc/rename_gun(var/mob/M) +/obj/item/weapon/gun/proc/rename_gun(mob/M) var/input = stripped_input(M,"What do you want to name the gun?", ,"", MAX_NAME_LEN) if(src && input && !M.stat && in_range(M,src) && !M.restrained() && M.canmove) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index b16bfeb140f..15115001e06 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -59,7 +59,7 @@ chambered = null //either way, released the prepared shot return -/obj/item/weapon/gun/energy/proc/select_fire(mob/living/user as mob) +/obj/item/weapon/gun/energy/proc/select_fire(mob/living/user) select++ if (select > ammo_type.len) select = 1 diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index 6de08880434..90e201e2a61 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -8,7 +8,7 @@ modifystate = 2 can_flashlight = 1 -/obj/item/weapon/gun/energy/gun/attack_self(mob/living/user as mob) +/obj/item/weapon/gun/energy/gun/attack_self(mob/living/user) select_fire(user) update_icon() diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm index d638e39a10b..734b408bfba 100644 --- a/code/modules/projectiles/guns/energy/pulse.dm +++ b/code/modules/projectiles/guns/energy/pulse.dm @@ -10,7 +10,7 @@ ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse, /obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser) cell_type = "/obj/item/weapon/stock_parts/cell/pulse" -/obj/item/weapon/gun/energy/pulse/attack_self(mob/living/user as mob) +/obj/item/weapon/gun/energy/pulse/attack_self(mob/living/user) select_fire(user) /obj/item/weapon/gun/energy/pulse/emp_act(severity) @@ -51,7 +51,7 @@ cell_type = "/obj/item/weapon/stock_parts/cell/infinite" ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse) -/obj/item/weapon/gun/energy/pulse/destroyer/attack_self(mob/living/user as mob) +/obj/item/weapon/gun/energy/pulse/destroyer/attack_self(mob/living/user) user << "[src.name] has three settings, and they are all DESTROY." /obj/item/weapon/gun/energy/pulse/pistol/m1911 diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index c3c78b2010c..78d77697bab 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -62,7 +62,7 @@ update_icon() return 1 -/obj/item/weapon/gun/energy/floragun/attack_self(mob/living/user as mob) +/obj/item/weapon/gun/energy/floragun/attack_self(mob/living/user) select_fire(user) update_icon() return @@ -192,7 +192,7 @@ if(power_supply) user <<"[src] is [round(power_supply.percent())]% charged." -/obj/item/weapon/gun/energy/plasmacutter/attackby(var/obj/item/A, var/mob/user) +/obj/item/weapon/gun/energy/plasmacutter/attackby(obj/item/A, mob/user) if(istype(A, /obj/item/stack/sheet/mineral/plasma)) var/obj/item/stack/sheet/S = A S.use(1) @@ -263,14 +263,14 @@ icon_state = "[initial(icon_state)][select]" return -/obj/item/weapon/gun/energy/wormhole_projector/attack_self(mob/living/user as mob) +/obj/item/weapon/gun/energy/wormhole_projector/attack_self(mob/living/user) select_fire(user) /obj/item/weapon/gun/energy/wormhole_projector/process_chamber() ..() select_fire() -/obj/item/weapon/gun/energy/wormhole_projector/proc/portal_destroyed(var/obj/effect/portal/P) +/obj/item/weapon/gun/energy/wormhole_projector/proc/portal_destroyed(obj/effect/portal/P) if(P.icon_state == "portal") blue = null if(orange) @@ -280,7 +280,7 @@ if(blue) blue.target = null -/obj/item/weapon/gun/energy/wormhole_projector/proc/create_portal(var/obj/item/projectile/beam/wormhole/W) +/obj/item/weapon/gun/energy/wormhole_projector/proc/create_portal(obj/item/projectile/beam/wormhole/W) var/obj/effect/portal/P = new /obj/effect/portal(get_turf(W), null, src) P.precision = 0 if(W.name == "bluespace beam") diff --git a/code/modules/projectiles/guns/energy/temperature.dm b/code/modules/projectiles/guns/energy/temperature.dm index 0db80cb561e..cdf7625e393 100644 --- a/code/modules/projectiles/guns/energy/temperature.dm +++ b/code/modules/projectiles/guns/energy/temperature.dm @@ -8,7 +8,7 @@ pin = null -/obj/item/weapon/gun/energy/temperature/attack_self(mob/living/user as mob) +/obj/item/weapon/gun/energy/temperature/attack_self(mob/living/user) select_fire(user) update_icon() return \ No newline at end of file diff --git a/code/modules/projectiles/guns/grenade_launcher.dm b/code/modules/projectiles/guns/grenade_launcher.dm index 20fa083d6e0..39a23d5c07d 100644 --- a/code/modules/projectiles/guns/grenade_launcher.dm +++ b/code/modules/projectiles/guns/grenade_launcher.dm @@ -16,7 +16,7 @@ ..() user << "[grenades.len] / [max_grenades] grenades loaded." -/obj/item/weapon/gun/grenadelauncher/attackby(obj/item/I as obj, mob/user as mob, params) +/obj/item/weapon/gun/grenadelauncher/attackby(obj/item/I, mob/user, params) if((istype(I, /obj/item/weapon/grenade))) if(grenades.len < max_grenades) diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm index 96cc485ab71..645d078002e 100644 --- a/code/modules/projectiles/guns/magic.dm +++ b/code/modules/projectiles/guns/magic.dm @@ -22,7 +22,7 @@ lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' //not really a gun and some toys use these inhands righthand_file = 'icons/mob/inhands/items_righthand.dmi' -/obj/item/weapon/gun/magic/afterattack(atom/target as mob, mob/living/user as mob, flag) +/obj/item/weapon/gun/magic/afterattack(atom/target, mob/living/user, flag) newshot() if(no_den_usage) var/area/A = get_area(user) diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm index 55f9ff2849f..f1734712170 100644 --- a/code/modules/projectiles/guns/magic/wand.dm +++ b/code/modules/projectiles/guns/magic/wand.dm @@ -24,12 +24,12 @@ /obj/item/weapon/gun/magic/wand/update_icon() icon_state = "[initial(icon_state)][charges ? "" : "-drained"]" -/obj/item/weapon/gun/magic/wand/attack(atom/target as mob, mob/living/user as mob) +/obj/item/weapon/gun/magic/wand/attack(atom/target, mob/living/user) if(target == user) return ..() -/obj/item/weapon/gun/magic/wand/afterattack(atom/target as mob, mob/living/user as mob) +/obj/item/weapon/gun/magic/wand/afterattack(atom/target, mob/living/user) if(!charges) shoot_with_empty_chamber(user) return @@ -47,7 +47,7 @@ update_icon() -/obj/item/weapon/gun/magic/wand/proc/zap_self(mob/living/user as mob) +/obj/item/weapon/gun/magic/wand/proc/zap_self(mob/living/user) user.visible_message("[user] zaps \himself with [src].") playsound(user, fire_sound, 50, 1) user.attack_log += "\[[time_stamp()]\] [user]/[user.ckey] zapped \himself with a [src]" @@ -65,7 +65,7 @@ icon_state = "deathwand" max_charges = 3 //3, 2, 2, 1 -/obj/item/weapon/gun/magic/wand/death/zap_self(mob/living/user as mob) +/obj/item/weapon/gun/magic/wand/death/zap_self(mob/living/user) var/message ="You irradiate yourself with pure energy! " message += pick("Do not pass go. Do not collect 200 zorkmids.","You feel more confident in your spell casting skills.","You Die...","Do you want your possessions identified?") user << message @@ -85,7 +85,7 @@ icon_state = "revivewand" max_charges = 10 //10, 5, 5, 4 -/obj/item/weapon/gun/magic/wand/resurrection/zap_self(mob/living/user as mob) +/obj/item/weapon/gun/magic/wand/resurrection/zap_self(mob/living/user) user.revive() user << "You feel great!" charges-- @@ -103,7 +103,7 @@ fire_sound = "sound/magic/Staff_Change.ogg" max_charges = 10 //10, 5, 5, 4 -/obj/item/weapon/gun/magic/wand/polymorph/zap_self(mob/living/user as mob) +/obj/item/weapon/gun/magic/wand/polymorph/zap_self(mob/living/user) ..() //because the user mob ceases to exists by the time wabbajack fully resolves wabbajack(user) charges-- @@ -121,7 +121,7 @@ max_charges = 10 //10, 5, 5, 4 no_den_usage = 1 -/obj/item/weapon/gun/magic/wand/teleport/zap_self(mob/living/user as mob) +/obj/item/weapon/gun/magic/wand/teleport/zap_self(mob/living/user) do_teleport(user, user, 10) var/datum/effect/effect/system/smoke_spread/smoke = new smoke.set_up(10, 0, user.loc) @@ -157,7 +157,7 @@ icon_state = "firewand" max_charges = 8 //8, 4, 4, 3 -/obj/item/weapon/gun/magic/wand/fireball/zap_self(mob/living/user as mob) +/obj/item/weapon/gun/magic/wand/fireball/zap_self(mob/living/user) explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2) charges-- ..() \ No newline at end of file diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index 9a9c0267e6b..03c38726f09 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -17,7 +17,7 @@ update_icon() return -/obj/item/weapon/gun/projectile/process_chamber(var/eject_casing = 1, var/empty_chamber = 1) +/obj/item/weapon/gun/projectile/process_chamber(eject_casing = 1, empty_chamber = 1) // if(in_chamber) // return 1 var/obj/item/ammo_casing/AC = chambered //Find chambered round @@ -46,7 +46,7 @@ return 0 return 1 -/obj/item/weapon/gun/projectile/attackby(var/obj/item/A as obj, mob/user as mob, params) +/obj/item/weapon/gun/projectile/attackby(obj/item/A, mob/user, params) ..() if (istype(A, /obj/item/ammo_box/magazine)) var/obj/item/ammo_box/magazine/AM = A @@ -87,7 +87,7 @@ return return 0 -/obj/item/weapon/gun/projectile/attack_hand(mob/user as mob) +/obj/item/weapon/gun/projectile/attack_hand(mob/user) if(loc == user) if(suppressed) var/obj/item/weapon/suppressor/S = suppressed @@ -103,7 +103,7 @@ return ..() -/obj/item/weapon/gun/projectile/attack_self(mob/living/user as mob) +/obj/item/weapon/gun/projectile/attack_self(mob/living/user) var/obj/item/ammo_casing/AC = chambered //Find chambered round if(magazine) magazine.loc = get_turf(src.loc) @@ -126,7 +126,7 @@ ..() user << "Has [get_ammo()] round\s remaining." -/obj/item/weapon/gun/projectile/proc/get_ammo(var/countchambered = 1) +/obj/item/weapon/gun/projectile/proc/get_ammo(countchambered = 1) var/boolets = 0 //mature var names for mature people if (chambered && countchambered) boolets++ diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 19545232181..a08f9b37260 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -25,7 +25,7 @@ icon_state = "[initial(icon_state)][magazine ? "-[magazine.max_ammo]" : ""][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]" return -/obj/item/weapon/gun/projectile/automatic/attackby(var/obj/item/A as obj, mob/user as mob, params) +/obj/item/weapon/gun/projectile/automatic/attackby(obj/item/A, mob/user, params) . = ..() if(.) return @@ -130,7 +130,7 @@ fire_delay = 3 pin = /obj/item/device/firing_pin/implant/pindicate -/obj/item/weapon/gun/projectile/automatic/l6_saw/attack_self(mob/user as mob) +/obj/item/weapon/gun/projectile/automatic/l6_saw/attack_self(mob/user) cover_open = !cover_open user << "You [cover_open ? "open" : "close"] [src]'s cover." update_icon() @@ -148,7 +148,7 @@ update_icon() -/obj/item/weapon/gun/projectile/automatic/l6_saw/attack_hand(mob/user as mob) +/obj/item/weapon/gun/projectile/automatic/l6_saw/attack_hand(mob/user) if(loc != user) ..() return //let them pick it up @@ -164,7 +164,7 @@ user << "You remove the magazine from [src]." -/obj/item/weapon/gun/projectile/automatic/l6_saw/attackby(var/obj/item/A as obj, mob/user as mob, params) +/obj/item/weapon/gun/projectile/automatic/l6_saw/attackby(obj/item/A, mob/user, params) if(!cover_open) user << "[src]'s cover is closed! You can't insert a new mag." return @@ -190,13 +190,13 @@ underbarrel = new /obj/item/weapon/gun/projectile/revolver/grenadelauncher(src) update_icon() return -/obj/item/weapon/gun/projectile/automatic/m90/afterattack(var/atom/target, var/mob/living/user, flag, params) +/obj/item/weapon/gun/projectile/automatic/m90/afterattack(atom/target, mob/living/user, flag, params) if(select == 2) underbarrel.afterattack(target, user, flag, params) else ..() return -/obj/item/weapon/gun/projectile/automatic/m90/attackby(var/obj/item/A, mob/user, params) +/obj/item/weapon/gun/projectile/automatic/m90/attackby(obj/item/A, mob/user, params) if(istype(A, /obj/item/ammo_casing)) if(istype(A, underbarrel.magazine.ammo_type)) underbarrel.attack_self() diff --git a/code/modules/projectiles/guns/projectile/launchers.dm b/code/modules/projectiles/guns/projectile/launchers.dm index 4b05c3f86dc..4bddd2d3ce4 100644 --- a/code/modules/projectiles/guns/projectile/launchers.dm +++ b/code/modules/projectiles/guns/projectile/launchers.dm @@ -10,7 +10,7 @@ fire_sound = 'sound/weapons/grenadelaunch.ogg' w_class = 3 -/obj/item/weapon/gun/projectile/revolver/grenadelauncher/attackby(var/obj/item/A, mob/user, params) +/obj/item/weapon/gun/projectile/revolver/grenadelauncher/attackby(obj/item/A, mob/user, params) ..() if(istype(A, /obj/item/ammo_box) || istype(A, /obj/item/ammo_casing)) chamber_round() @@ -36,7 +36,7 @@ fire_delay = 0 action_button_name = null -/obj/item/weapon/gun/projectile/automatic/gyropistol/process_chamber(var/eject_casing = 0, var/empty_chamber = 1) +/obj/item/weapon/gun/projectile/automatic/gyropistol/process_chamber(eject_casing = 0, empty_chamber = 1) ..() /obj/item/weapon/gun/projectile/automatic/gyropistol/update_icon() @@ -65,10 +65,10 @@ /obj/item/weapon/gun/projectile/automatic/speargun/attack_self() return -/obj/item/weapon/gun/projectile/automatic/speargun/process_chamber(var/eject_casing = 0, var/empty_chamber = 1) +/obj/item/weapon/gun/projectile/automatic/speargun/process_chamber(eject_casing = 0, empty_chamber = 1) ..() -/obj/item/weapon/gun/projectile/automatic/speargun/attackby(var/obj/item/A, mob/user, params) +/obj/item/weapon/gun/projectile/automatic/speargun/attackby(obj/item/A, mob/user, params) var/num_loaded = magazine.attackby(A, user, params, 1) if(num_loaded) user << "You load [num_loaded] spear\s into \the [src]." diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 6e8d226b7e7..1a9c2fdd071 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -14,7 +14,7 @@ /obj/item/weapon/gun/projectile/revolver/process_chamber() return ..(0, 1) -/obj/item/weapon/gun/projectile/revolver/attackby(var/obj/item/A as obj, mob/user as mob, params) +/obj/item/weapon/gun/projectile/revolver/attackby(obj/item/A, mob/user, params) var/num_loaded = magazine.attackby(A, user, params, 1) if(num_loaded) user << "You load [num_loaded] shell\s into \the [src]." @@ -26,7 +26,7 @@ if(istype(A, /obj/item/weapon/pen)) rename_gun(user) -/obj/item/weapon/gun/projectile/revolver/attack_self(mob/living/user as mob) +/obj/item/weapon/gun/projectile/revolver/attack_self(mob/living/user) var/num_unloaded = 0 while (get_ammo() > 0) var/obj/item/ammo_casing/CB @@ -44,7 +44,7 @@ /obj/item/weapon/gun/projectile/revolver/can_shoot() return get_ammo(0,0) -/obj/item/weapon/gun/projectile/revolver/get_ammo(var/countchambered = 0, var/countempties = 1) +/obj/item/weapon/gun/projectile/revolver/get_ammo(countchambered = 0, countempties = 1) var/boolets = 0 //mature var names for mature people if (chambered && countchambered) boolets++ @@ -73,7 +73,7 @@ options["The Peacemaker"] = "detective_peacemaker" options["Cancel"] = null -/obj/item/weapon/gun/projectile/revolver/detective/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, var/message = 1, params) +/obj/item/weapon/gun/projectile/revolver/detective/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params) if(magazine.caliber != initial(magazine.caliber)) if(prob(70 - (magazine.ammo_count() * 10))) //minimum probability of 10, maximum of 60 playsound(user, fire_sound, 50, 1) @@ -83,7 +83,7 @@ return 0 ..() -/obj/item/weapon/gun/projectile/revolver/detective/attackby(var/obj/item/A as obj, mob/user as mob, params) +/obj/item/weapon/gun/projectile/revolver/detective/attackby(obj/item/A, mob/user, params) ..() if(istype(A, /obj/item/weapon/screwdriver)) if(magazine.caliber == "38") @@ -143,7 +143,7 @@ chamber_round() spun = 1 -/obj/item/weapon/gun/projectile/revolver/russian/attackby(var/obj/item/A as obj, mob/user as mob, params) +/obj/item/weapon/gun/projectile/revolver/russian/attackby(obj/item/A, mob/user, params) var/num_loaded = ..() if(num_loaded) user.visible_message("[user] loads a single bullet into the revolver and spins the chamber.", "You load a single bullet into the chamber and spin it.") @@ -155,7 +155,7 @@ A.update_icon() return -/obj/item/weapon/gun/projectile/revolver/russian/attack_self(mob/user as mob) +/obj/item/weapon/gun/projectile/revolver/russian/attack_self(mob/user) if(!spun && can_shoot()) user.visible_message("[user] spins the chamber of the revolver.", "You spin the revolver's chamber.") Spin() diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 56fb14a3dd1..cda97e37feb 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -11,7 +11,7 @@ mag_type = /obj/item/ammo_box/magazine/internal/shot var/recentpump = 0 // to prevent spammage -/obj/item/weapon/gun/projectile/shotgun/attackby(var/obj/item/A as obj, mob/user as mob, params) +/obj/item/weapon/gun/projectile/shotgun/attackby(obj/item/A, mob/user, params) var/num_loaded = magazine.attackby(A, user, params, 1) if(num_loaded) user << "You load [num_loaded] shell\s into \the [src]!" @@ -71,7 +71,7 @@ mag_type = /obj/item/ammo_box/magazine/internal/shotriot sawn_desc = "Come with me if you want to live." -/obj/item/weapon/gun/projectile/shotgun/riot/attackby(var/obj/item/A as obj, mob/user as mob, params) +/obj/item/weapon/gun/projectile/shotgun/riot/attackby(obj/item/A, mob/user, params) ..() if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/gun/energy/plasmacutter)) sawoff(user) @@ -103,7 +103,7 @@ update_icon() //I.E. fix the desc return 1 -/obj/item/weapon/gun/projectile/shotgun/boltaction/attackby(var/obj/item/A as obj, mob/user as mob, params) +/obj/item/weapon/gun/projectile/shotgun/boltaction/attackby(obj/item/A, mob/user, params) if(!bolt_open) user << "The bolt is closed!" return @@ -142,7 +142,7 @@ options["Rosewood"] = "dshotgun-p" options["Cancel"] = null -/obj/item/weapon/gun/projectile/revolver/doublebarrel/attackby(var/obj/item/A as obj, mob/user as mob, params) +/obj/item/weapon/gun/projectile/revolver/doublebarrel/attackby(obj/item/A, mob/user, params) ..() if(istype(A, /obj/item/ammo_box) || istype(A, /obj/item/ammo_casing)) chamber_round() @@ -153,7 +153,7 @@ if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/gun/energy/plasmacutter)) sawoff(user) -/obj/item/weapon/gun/projectile/revolver/doublebarrel/attack_self(mob/living/user as mob) +/obj/item/weapon/gun/projectile/revolver/doublebarrel/attack_self(mob/living/user) var/num_unloaded = 0 while (get_ammo() > 0) var/obj/item/ammo_casing/CB @@ -184,7 +184,7 @@ unique_rename = 0 unique_reskin = 0 -/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/attackby(var/obj/item/A as obj, mob/user as mob, params) +/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/attackby(obj/item/A, mob/user, params) ..() if(istype(A, /obj/item/stack/cable_coil) && !sawn_state) var/obj/item/stack/cable_coil/C = A @@ -199,20 +199,20 @@ // Sawing guns related procs // -/obj/item/weapon/gun/projectile/proc/blow_up(mob/user as mob) +/obj/item/weapon/gun/projectile/proc/blow_up(mob/user) . = 0 for(var/obj/item/ammo_casing/AC in magazine.stored_ammo) if(AC.BB) process_fire(user, user,0) . = 1 -/obj/item/weapon/gun/projectile/shotgun/blow_up(mob/user as mob) +/obj/item/weapon/gun/projectile/shotgun/blow_up(mob/user) . = 0 if(chambered && chambered.BB) process_fire(user, user,0) . = 1 -/obj/item/weapon/gun/projectile/proc/sawoff(mob/user as mob) +/obj/item/weapon/gun/projectile/proc/sawoff(mob/user) if(sawn_state == SAWN_OFF) user << "\The [src] is already shortened!" return @@ -296,4 +296,4 @@ icon_state = "cshotgun" origin_tech = "combat=5;materials=2" mag_type = /obj/item/ammo_box/magazine/internal/shotcom - w_class = 5 + w_class = 5 diff --git a/code/modules/projectiles/guns/projectile/toy.dm b/code/modules/projectiles/guns/projectile/toy.dm index 67a5aa56406..06fd47933ba 100644 --- a/code/modules/projectiles/guns/projectile/toy.dm +++ b/code/modules/projectiles/guns/projectile/toy.dm @@ -13,7 +13,7 @@ clumsy_check = 0 needs_permit = 0 -/obj/item/weapon/gun/projectile/automatic/toy/process_chamber(var/eject_casing = 0, var/empty_chamber = 1) +/obj/item/weapon/gun/projectile/automatic/toy/process_chamber(eject_casing = 0, empty_chamber = 1) ..() /obj/item/weapon/gun/projectile/automatic/toy/pistol @@ -74,7 +74,7 @@ needs_permit = 0 mag_type = /obj/item/ammo_box/magazine/toy/smgm45 -/obj/item/weapon/gun/projectile/automatic/c20r/toy/process_chamber(var/eject_casing = 0, var/empty_chamber = 1) +/obj/item/weapon/gun/projectile/automatic/c20r/toy/process_chamber(eject_casing = 0, empty_chamber = 1) ..() /obj/item/weapon/gun/projectile/automatic/l6_saw/toy @@ -85,5 +85,5 @@ needs_permit = 0 mag_type = /obj/item/ammo_box/magazine/toy/m762 -/obj/item/weapon/gun/projectile/automatic/l6_saw/toy/process_chamber(var/eject_casing = 0, var/empty_chamber = 1) +/obj/item/weapon/gun/projectile/automatic/l6_saw/toy/process_chamber(eject_casing = 0, empty_chamber = 1) ..() \ No newline at end of file diff --git a/code/modules/projectiles/guns/syringe_gun.dm b/code/modules/projectiles/guns/syringe_gun.dm index 67c4cb7191f..e44ae121576 100644 --- a/code/modules/projectiles/guns/syringe_gun.dm +++ b/code/modules/projectiles/guns/syringe_gun.dm @@ -45,7 +45,7 @@ ..() user << "Can hold [max_syringes] syringe\s. Has [syringes.len] syringe\s remaining." -/obj/item/weapon/gun/syringe/attack_self(mob/living/user as mob) +/obj/item/weapon/gun/syringe/attack_self(mob/living/user) if(!syringes.len) user << "[src] is empty!" return 0 @@ -60,7 +60,7 @@ return 1 -/obj/item/weapon/gun/syringe/attackby(var/obj/item/A as obj, mob/user as mob, params, var/show_msg = 1) +/obj/item/weapon/gun/syringe/attackby(obj/item/A, mob/user, params, show_msg = 1) if(istype(A, /obj/item/weapon/reagent_containers/syringe)) if(syringes.len < max_syringes) if(!user.unEquip(A)) diff --git a/code/modules/projectiles/pins.dm b/code/modules/projectiles/pins.dm index 123e35a2fd8..4d630ce494b 100644 --- a/code/modules/projectiles/pins.dm +++ b/code/modules/projectiles/pins.dm @@ -42,7 +42,7 @@ emagged = 1 user << "You override the authentication mechanism." -/obj/item/device/firing_pin/proc/gun_insert(mob/living/user, var/obj/item/weapon/gun/G) +/obj/item/device/firing_pin/proc/gun_insert(mob/living/user, obj/item/weapon/gun/G) gun = G loc = gun gun.pin = src @@ -132,7 +132,7 @@ return 0 return 1 -/obj/item/device/firing_pin/clown/ultra/gun_insert(mob/living/user, var/obj/item/weapon/gun/G) +/obj/item/device/firing_pin/clown/ultra/gun_insert(mob/living/user, obj/item/weapon/gun/G) ..() G.clumsy_check = 0 diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 7854bbf8e7c..29931e4e7bc 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -142,7 +142,7 @@ sleep(1) -/obj/item/projectile/Crossed(atom/movable/AM as mob) //A mob moving on a tile with a projectile is hit by it. +/obj/item/projectile/Crossed(atom/movable/AM) //A mob moving on a tile with a projectile is hit by it. ..() if(isliving(AM) && AM.density && !checkpass(PASSMOB)) Bump(AM, 1) \ No newline at end of file diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 00cd2fc1a42..f2c4eb31045 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -47,7 +47,7 @@ icon_state = "u_laser" damage = 50 -/obj/item/projectile/beam/pulse/on_hit(var/atom/target, var/blocked = 0) +/obj/item/projectile/beam/pulse/on_hit(atom/target, blocked = 0) . = ..() if(istype(target,/turf/)||istype(target,/obj/structure/)) target.ex_act(2) @@ -76,7 +76,7 @@ pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE var/suit_types = list(/obj/item/clothing/suit/redtag, /obj/item/clothing/suit/bluetag) -/obj/item/projectile/lasertag/on_hit(var/atom/target, var/blocked = 0) +/obj/item/projectile/lasertag/on_hit(atom/target, blocked = 0) . = ..() if(ishuman(target)) var/mob/living/carbon/human/M = target diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index d3fb315bc53..84bbe11872b 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -59,7 +59,7 @@ icon_state = "spark" color = "#FFFF00" -/obj/item/projectile/bullet/incendiary/on_hit(var/atom/target, var/blocked = 0) +/obj/item/projectile/bullet/incendiary/on_hit(atom/target, blocked = 0) . = ..() if(iscarbon(target)) var/mob/living/carbon/M = target @@ -92,7 +92,7 @@ stun = 8 hitsound = 'sound/effects/meteorimpact.ogg' -/obj/item/projectile/bullet/meteorshot/on_hit(var/atom/target, var/blocked = 0) +/obj/item/projectile/bullet/meteorshot/on_hit(atom/target, blocked = 0) . = ..() if(istype(target, /atom/movable)) var/atom/movable/M = target @@ -107,7 +107,7 @@ /obj/item/projectile/bullet/mime damage = 20 -/obj/item/projectile/bullet/mime/on_hit(var/atom/target, var/blocked = 0) +/obj/item/projectile/bullet/mime/on_hit(atom/target, blocked = 0) . = ..() if(iscarbon(target)) var/mob/living/carbon/M = target @@ -124,7 +124,7 @@ flags |= NOREACT create_reagents(50) -/obj/item/projectile/bullet/dart/on_hit(var/atom/target, var/blocked = 0, var/hit_zone) +/obj/item/projectile/bullet/dart/on_hit(atom/target, blocked = 0, hit_zone) var/deflect = 0 if(iscarbon(target)) var/mob/living/carbon/M = target @@ -162,7 +162,7 @@ damage_type = TOX weaken = 5 -/obj/item/projectile/bullet/neurotoxin/on_hit(var/atom/target, var/blocked = 0) +/obj/item/projectile/bullet/neurotoxin/on_hit(atom/target, blocked = 0) if(isalien(target)) weaken = 0 nodamage = 1 diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index 2cfe90da467..f8e6dbf479b 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -18,7 +18,7 @@ hitsound = 'sound/weapons/taserhit.ogg' range = 7 -/obj/item/projectile/energy/electrode/on_hit(var/atom/target, var/blocked = 0) +/obj/item/projectile/energy/electrode/on_hit(atom/target, blocked = 0) . = ..() if(!ismob(target) || blocked >= 2) //Fully blocked by mob or collided with dense object - burst into sparks! var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread @@ -50,7 +50,7 @@ ..() SpinAnimation() -/obj/item/projectile/energy/net/on_hit(var/atom/target, var/blocked = 0) +/obj/item/projectile/energy/net/on_hit(atom/target, blocked = 0) if(isliving(target) && !locate(/obj/effect/nettingportal) in loc) new/obj/effect/nettingportal(get_turf(target)) ..() @@ -97,7 +97,7 @@ hitsound = 'sound/weapons/taserhit.ogg' range = 4 -/obj/item/projectile/energy/trap/on_hit(var/atom/target, var/blocked = 0) +/obj/item/projectile/energy/trap/on_hit(atom/target, blocked = 0) if(!ismob(target) || blocked >= 2) //Fully blocked by mob or collided with dense object - drop a trap new/obj/item/weapon/restraints/legcuffs/beartrap/energy(get_turf(loc)) else if(iscarbon(target)) diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index 36e2edb9db3..7ad01293b93 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -10,7 +10,7 @@ name = "bolt of death" icon_state = "pulse1_bl" -/obj/item/projectile/magic/death/on_hit(var/target) +/obj/item/projectile/magic/death/on_hit(target) . = ..() if(ismob(target)) var/mob/M = target @@ -31,7 +31,7 @@ return ..() -/obj/item/projectile/magic/fireball/on_hit(var/target) +/obj/item/projectile/magic/fireball/on_hit(target) . = ..() var/turf/T = get_turf(target) explosion(T, -1, 0, 2, 3, 0, flame_range = 2) @@ -47,7 +47,7 @@ nodamage = 1 flag = "magic" -/obj/item/projectile/magic/resurrection/on_hit(var/mob/living/carbon/target) +/obj/item/projectile/magic/resurrection/on_hit(mob/living/carbon/target) . = ..() if(ismob(target)) var/old_stat = target.stat @@ -73,7 +73,7 @@ var/inner_tele_radius = 0 var/outer_tele_radius = 6 -/obj/item/projectile/magic/teleport/on_hit(var/mob/target) +/obj/item/projectile/magic/teleport/on_hit(mob/target) . = ..() var/teleammount = 0 var/teleloc = target @@ -95,7 +95,7 @@ nodamage = 1 flag = "magic" -/obj/item/projectile/magic/door/on_hit(var/atom/target) +/obj/item/projectile/magic/door/on_hit(atom/target) . = ..() var/atom/T = target.loc if(isturf(target) && target.density) @@ -103,7 +103,7 @@ else if (isturf(T) && T.density) CreateDoor(T) -/obj/item/projectile/magic/door/proc/CreateDoor(var/turf/T) +/obj/item/projectile/magic/door/proc/CreateDoor(turf/T) new /obj/structure/mineral_door/wood(T) T.ChangeTurf(/turf/simulated/floor/plating) @@ -116,7 +116,7 @@ nodamage = 1 flag = "magic" -/obj/item/projectile/magic/change/on_hit(var/atom/change) +/obj/item/projectile/magic/change/on_hit(atom/change) . = ..() wabbajack(change) @@ -259,7 +259,7 @@ nodamage = 1 flag = "magic" -/obj/item/projectile/magic/animate/Bump(var/atom/change) +/obj/item/projectile/magic/animate/Bump(atom/change) ..() if(istype(change, /obj/item) || istype(change, /obj/structure) && !is_type_in_list(change, protected_objects)) if(istype(change, /obj/structure/closet/statue)) diff --git a/code/modules/projectiles/projectile/reusable.dm b/code/modules/projectiles/projectile/reusable.dm index 414be55b31a..321ae1c6b42 100644 --- a/code/modules/projectiles/projectile/reusable.dm +++ b/code/modules/projectiles/projectile/reusable.dm @@ -3,7 +3,7 @@ desc = "How do you even reuse a bullet?" var/obj/item/ammo_casing/caseless/ammo_type = /obj/item/ammo_casing/caseless/ -/obj/item/projectile/bullet/reusable/on_hit(var/atom/target, var/blocked = 0) +/obj/item/projectile/bullet/reusable/on_hit(atom/target, blocked = 0) . = ..() if (src.contents.len) var/obj/content diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index 80e24ad2fba..ed67992617a 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -177,7 +177,7 @@ obj/item/projectile/kinetic/New() /obj/item/ammo_casing/energy/wormhole/New(var/obj/item/weapon/gun/energy/wormhole_projector/wh) gun = wh -/obj/item/projectile/beam/wormhole/on_hit(var/atom/target) +/obj/item/projectile/beam/wormhole/on_hit(atom/target) if(ismob(target)) return ..() if(!gun) @@ -220,7 +220,7 @@ obj/item/projectile/kinetic/New() range += 3 ..() -/obj/item/projectile/plasma/on_hit(var/atom/target) +/obj/item/projectile/plasma/on_hit(atom/target) if(istype(target, /turf/simulated/mineral)) var/turf/simulated/mineral/M = target M.gets_drilled(firer) diff --git a/code/modules/reagents/Chemistry-Colours.dm b/code/modules/reagents/Chemistry-Colours.dm index 1378315276e..7251c9c25e1 100644 --- a/code/modules/reagents/Chemistry-Colours.dm +++ b/code/modules/reagents/Chemistry-Colours.dm @@ -1,5 +1,5 @@ -/proc/mix_color_from_reagents(var/list/reagent_list) +/proc/mix_color_from_reagents(list/reagent_list) if(!istype(reagent_list)) return diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 0978a34f58f..e83acf03014 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -61,7 +61,7 @@ var/const/INGEST = 2 if(my_atom && my_atom.reagents == src) my_atom.reagents = null -/datum/reagents/proc/remove_any(var/amount=1) +/datum/reagents/proc/remove_any(amount=1) var/total_transfered = 0 var/current_list_element = 1 @@ -103,7 +103,7 @@ var/const/INGEST = 2 return the_id -/datum/reagents/proc/trans_to(var/obj/target, var/amount=1, var/multiplier=1, var/preserve_data=1)//if preserve_data=0, the reagents data will be lost. Usefull if you use data for some strange stuff and don't want it to be transferred. +/datum/reagents/proc/trans_to(obj/target, amount=1, multiplier=1, preserve_data=1)//if preserve_data=0, the reagents data will be lost. Usefull if you use data for some strange stuff and don't want it to be transferred. if (!target ) return var/datum/reagents/R @@ -133,7 +133,7 @@ var/const/INGEST = 2 src.handle_reactions() return amount -/datum/reagents/proc/copy_to(var/obj/target, var/amount=1, var/multiplier=1, var/preserve_data=1) +/datum/reagents/proc/copy_to(obj/target, amount=1, multiplier=1, preserve_data=1) if(!target) return if(!target.reagents || src.total_volume<=0) @@ -154,7 +154,7 @@ var/const/INGEST = 2 src.handle_reactions() return amount -/datum/reagents/proc/trans_id_to(var/obj/target, var/reagent, var/amount=1, var/preserve_data=1)//Not sure why this proc didn't exist before. It does now! /N +/datum/reagents/proc/trans_id_to(obj/target, reagent, amount=1, preserve_data=1)//Not sure why this proc didn't exist before. It does now! /N if (!target) return if (!target.reagents || src.total_volume<=0 || !src.get_reagent_amount(reagent)) @@ -211,7 +211,7 @@ var/const/INGEST = 2 return total_transfered */ -/datum/reagents/proc/metabolize(var/mob/M) +/datum/reagents/proc/metabolize(mob/M) if(M) chem_temp = M.bodytemperature handle_reactions() @@ -270,12 +270,12 @@ var/const/INGEST = 2 R.on_tick() return -/datum/reagents/proc/conditional_update_move(var/atom/A, var/Running = 0) +/datum/reagents/proc/conditional_update_move(atom/A, Running = 0) for(var/datum/reagent/R in reagent_list) R.on_move (A, Running) update_total() -/datum/reagents/proc/conditional_update(var/atom/A) +/datum/reagents/proc/conditional_update(atom/A) for(var/datum/reagent/R in reagent_list) R.on_update (A) update_total() @@ -367,14 +367,14 @@ var/const/INGEST = 2 update_total() return 0 -/datum/reagents/proc/isolate_reagent(var/reagent) +/datum/reagents/proc/isolate_reagent(reagent) for(var/A in reagent_list) var/datum/reagent/R = A if (R.id != reagent) del_reagent(R.id) update_total() -/datum/reagents/proc/del_reagent(var/reagent) +/datum/reagents/proc/del_reagent(reagent) for(var/datum/reagent/R in reagent_list) if (R.id == reagent) if(istype(my_atom, /mob/living)) @@ -389,21 +389,21 @@ var/const/INGEST = 2 check_goreallyfast(my_atom) return 1 -/datum/reagents/proc/check_ignoreslow(var/mob/M) +/datum/reagents/proc/check_ignoreslow(mob/M) if(istype(M, /mob)) if(M.reagents.has_reagent("morphine")||M.reagents.has_reagent("ephedrine")) return 1 else M.status_flags &= ~IGNORESLOWDOWN -/datum/reagents/proc/check_gofast(var/mob/M) +/datum/reagents/proc/check_gofast(mob/M) if(istype(M, /mob)) if(M.reagents.has_reagent("unholywater")||M.reagents.has_reagent("nuka_cola")) return 1 else M.status_flags &= ~GOTTAGOFAST -/datum/reagents/proc/check_goreallyfast(var/mob/M) +/datum/reagents/proc/check_goreallyfast(mob/M) if(istype(M, /mob)) if(M.reagents.has_reagent("methamphetamine")) return 1 @@ -425,7 +425,7 @@ var/const/INGEST = 2 del_reagent(R.id) return 0 -/datum/reagents/proc/reaction(var/atom/A, var/method=TOUCH, var/volume_modifier=1,var/show_message=1) +/datum/reagents/proc/reaction(atom/A, method=TOUCH, volume_modifier=1,show_message=1) if(isliving(A)) var/mob/living/L = A var/touch_protection = 0 @@ -440,7 +440,7 @@ var/const/INGEST = 2 for(var/datum/reagent/R in reagent_list) R.reaction_obj(A, R.volume*volume_modifier, show_message) -/datum/reagents/proc/add_reagent(var/reagent, var/amount, var/list/data=null, var/reagtemp = 300, var/no_react = 0) +/datum/reagents/proc/add_reagent(reagent, amount, list/data=null, reagtemp = 300, no_react = 0) if(!isnum(amount) || !amount) return 1 update_total() @@ -483,12 +483,12 @@ var/const/INGEST = 2 return 1 -/datum/reagents/proc/add_reagent_list(var/list/list_reagents, var/list/data=null) // Like add_reagent but you can enter a list. Format it like this: list("toxin" = 10, "beer" = 15) +/datum/reagents/proc/add_reagent_list(list/list_reagents, list/data=null) // Like add_reagent but you can enter a list. Format it like this: list("toxin" = 10, "beer" = 15) for(var/r_id in list_reagents) var/amt = list_reagents[r_id] add_reagent(r_id, amt, data) -/datum/reagents/proc/remove_reagent(var/reagent, var/amount, var/safety)//Added a safety check for the trans_id_to +/datum/reagents/proc/remove_reagent(reagent, amount, safety)//Added a safety check for the trans_id_to if(!isnum(amount)) return 1 @@ -504,7 +504,7 @@ var/const/INGEST = 2 return 1 -/datum/reagents/proc/has_reagent(var/reagent, var/amount = -1) +/datum/reagents/proc/has_reagent(reagent, amount = -1) for(var/A in reagent_list) var/datum/reagent/R = A @@ -516,7 +516,7 @@ var/const/INGEST = 2 return 0 -/datum/reagents/proc/get_reagent_amount(var/reagent) +/datum/reagents/proc/get_reagent_amount(reagent) for(var/A in reagent_list) var/datum/reagent/R = A if (R.id == reagent) @@ -532,7 +532,7 @@ var/const/INGEST = 2 return res -/datum/reagents/proc/remove_all_type(var/reagent_type, var/amount, var/strict = 0, var/safety = 1) // Removes all reagent of X type. @strict set to 1 determines whether the childs of the type are included. +/datum/reagents/proc/remove_all_type(reagent_type, amount, strict = 0, safety = 1) // Removes all reagent of X type. @strict set to 1 determines whether the childs of the type are included. if(!isnum(amount)) return 1 var/has_removed_reagent = 0 @@ -554,19 +554,19 @@ var/const/INGEST = 2 return has_removed_reagent //two helper functions to preserve data across reactions (needed for xenoarch) -/datum/reagents/proc/get_data(var/reagent_id) +/datum/reagents/proc/get_data(reagent_id) for(var/datum/reagent/D in reagent_list) if(D.id == reagent_id) //world << "proffering a data-carrying reagent ([reagent_id])" return D.data -/datum/reagents/proc/set_data(var/reagent_id, var/new_data) +/datum/reagents/proc/set_data(reagent_id, new_data) for(var/datum/reagent/D in reagent_list) if(D.id == reagent_id) //world << "reagent data set ([reagent_id])" D.data = new_data -/datum/reagents/proc/copy_data(var/datum/reagent/current_reagent) +/datum/reagents/proc/copy_data(datum/reagent/current_reagent) if (!current_reagent || !current_reagent.data) return null if (!istype(current_reagent.data, /list)) return current_reagent.data @@ -591,7 +591,7 @@ var/const/INGEST = 2 // Convenience proc to create a reagents holder for an atom // Max vol is maximum volume of holder -/atom/proc/create_reagents(var/max_vol) +/atom/proc/create_reagents(max_vol) if(reagents) qdel(reagents) reagents = new/datum/reagents(max_vol) diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 5c79572d938..8b42b95134d 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -71,7 +71,7 @@ * * @return nothing */ -/obj/machinery/chem_dispenser/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/chem_dispenser/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if(stat & (BROKEN)) return if(user.stat || user.restrained()) return @@ -137,7 +137,7 @@ add_fingerprint(usr) return 1 // update UIs attached to this object -/obj/machinery/chem_dispenser/attackby(var/obj/item/weapon/reagent_containers/glass/B as obj, var/mob/user as mob, params) +/obj/machinery/chem_dispenser/attackby(obj/item/weapon/reagent_containers/glass/B, mob/user, params) if(isrobot(user)) return @@ -160,13 +160,13 @@ icon_beaker.pixel_x = rand(-10,5) overlays += icon_beaker -/obj/machinery/chem_dispenser/attack_ai(mob/user as mob) +/obj/machinery/chem_dispenser/attack_ai(mob/user) return src.attack_hand(user) -/obj/machinery/chem_dispenser/attack_paw(mob/user as mob) +/obj/machinery/chem_dispenser/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/chem_dispenser/attack_hand(mob/user as mob) +/obj/machinery/chem_dispenser/attack_hand(mob/user) if(stat & BROKEN) return @@ -273,7 +273,7 @@ stat |= NOPOWER -/obj/machinery/chem_master/attackby(var/obj/item/B as obj, var/mob/user as mob, params) +/obj/machinery/chem_master/attackby(obj/item/B, mob/user, params) if(default_unfasten_wrench(user, B)) return @@ -475,13 +475,13 @@ src.updateUsrDialog() return -/obj/machinery/chem_master/attack_ai(mob/user as mob) +/obj/machinery/chem_master/attack_ai(mob/user) return src.attack_hand(user) -/obj/machinery/chem_master/attack_paw(mob/user as mob) +/obj/machinery/chem_master/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/chem_master/attack_hand(mob/user as mob) +/obj/machinery/chem_master/attack_hand(mob/user) if(stat & BROKEN) return @@ -556,7 +556,7 @@ popup.open(1) return -/obj/machinery/chem_master/proc/isgoodnumber(var/num) +/obj/machinery/chem_master/proc/isgoodnumber(num) if(isnum(num)) if(num > 200) num = 200 @@ -589,7 +589,7 @@ component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(null) component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(null) -/obj/machinery/chem_master/constructable/attackby(var/obj/item/B as obj, var/mob/user as mob, params) +/obj/machinery/chem_master/constructable/attackby(obj/item/B, mob/user, params) if(default_deconstruction_screwdriver(user, "mixer0_nopower", "mixer0", B)) if(beaker) @@ -665,7 +665,7 @@ overlays.Cut() stat |= BROKEN -/obj/machinery/computer/pandemic/proc/GetVirusByIndex(var/index) +/obj/machinery/computer/pandemic/proc/GetVirusByIndex(index) if(beaker && beaker.reagents) if(beaker.reagents.reagent_list.len) var/datum/reagent/blood/BL = locate() in beaker.reagents.reagent_list @@ -675,7 +675,7 @@ return viruses[index] return null -/obj/machinery/computer/pandemic/proc/GetResistancesByIndex(var/index) +/obj/machinery/computer/pandemic/proc/GetResistancesByIndex(index) if(beaker && beaker.reagents) if(beaker.reagents.reagent_list.len) var/datum/reagent/blood/BL = locate() in beaker.reagents.reagent_list @@ -685,13 +685,13 @@ return resistances[index] return null -/obj/machinery/computer/pandemic/proc/GetVirusTypeByIndex(var/index) +/obj/machinery/computer/pandemic/proc/GetVirusTypeByIndex(index) var/datum/disease/D = GetVirusByIndex(index) if(D) return D.GetDiseaseID() return null -/obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime) +/obj/machinery/computer/pandemic/proc/replicator_cooldown(waittime) wait = 1 update_icon() spawn(waittime) @@ -816,7 +816,7 @@ src.add_fingerprint(usr) return -/obj/machinery/computer/pandemic/attack_hand(mob/user as mob) +/obj/machinery/computer/pandemic/attack_hand(mob/user) if(..()) return user.set_machine(src) @@ -914,7 +914,7 @@ return -/obj/machinery/computer/pandemic/attackby(var/obj/I as obj, var/mob/user as mob, params) +/obj/machinery/computer/pandemic/attackby(obj/I, mob/user, params) if(istype(I, /obj/item/weapon/reagent_containers/glass)) if(stat & (NOPOWER|BROKEN)) return if(src.beaker) @@ -1043,7 +1043,7 @@ return -/obj/machinery/reagentgrinder/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/reagentgrinder/attackby(obj/item/O, mob/user, params) if(default_unfasten_wrench(user, O)) return @@ -1101,17 +1101,17 @@ src.updateUsrDialog() return 0 -/obj/machinery/reagentgrinder/attack_paw(mob/user as mob) +/obj/machinery/reagentgrinder/attack_paw(mob/user) return src.attack_hand(user) -/obj/machinery/reagentgrinder/attack_ai(mob/user as mob) +/obj/machinery/reagentgrinder/attack_ai(mob/user) return 0 -/obj/machinery/reagentgrinder/attack_hand(mob/user as mob) +/obj/machinery/reagentgrinder/attack_hand(mob/user) user.set_machine(src) interact(user) -/obj/machinery/reagentgrinder/interact(mob/user as mob) // The microwave Menu +/obj/machinery/reagentgrinder/interact(mob/user) // The microwave Menu var/is_chamber_empty = 0 var/is_beaker_ready = 0 var/processing_chamber = "" @@ -1200,28 +1200,28 @@ holdingitems = list() updateUsrDialog() -/obj/machinery/reagentgrinder/proc/is_allowed(var/obj/item/weapon/reagent_containers/O) +/obj/machinery/reagentgrinder/proc/is_allowed(obj/item/weapon/reagent_containers/O) for (var/i in blend_items) if(istype(O, i)) return 1 return 0 -/obj/machinery/reagentgrinder/proc/get_allowed_by_id(var/obj/item/O) +/obj/machinery/reagentgrinder/proc/get_allowed_by_id(obj/item/O) for (var/i in blend_items) if (istype(O, i)) return blend_items[i] -/obj/machinery/reagentgrinder/proc/get_allowed_snack_by_id(var/obj/item/weapon/reagent_containers/food/snacks/O) +/obj/machinery/reagentgrinder/proc/get_allowed_snack_by_id(obj/item/weapon/reagent_containers/food/snacks/O) for(var/i in blend_items) if(istype(O, i)) return blend_items[i] -/obj/machinery/reagentgrinder/proc/get_allowed_juice_by_id(var/obj/item/weapon/reagent_containers/food/snacks/O) +/obj/machinery/reagentgrinder/proc/get_allowed_juice_by_id(obj/item/weapon/reagent_containers/food/snacks/O) for(var/i in juice_items) if(istype(O, i)) return juice_items[i] -/obj/machinery/reagentgrinder/proc/get_grownweapon_amount(var/obj/item/weapon/grown/O) +/obj/machinery/reagentgrinder/proc/get_grownweapon_amount(obj/item/weapon/grown/O) if (!istype(O)) return 5 else if (O.potency == -1) @@ -1229,7 +1229,7 @@ else return round(O.potency) -/obj/machinery/reagentgrinder/proc/get_juice_amount(var/obj/item/weapon/reagent_containers/food/snacks/grown/O) +/obj/machinery/reagentgrinder/proc/get_juice_amount(obj/item/weapon/reagent_containers/food/snacks/grown/O) if (!istype(O)) return 5 else if (O.potency == -1) @@ -1237,7 +1237,7 @@ else return round(5*sqrt(O.potency)) -/obj/machinery/reagentgrinder/proc/remove_object(var/obj/item/O) +/obj/machinery/reagentgrinder/proc/remove_object(obj/item/O) holdingitems -= O qdel(O) @@ -1446,7 +1446,7 @@ stat |= NOPOWER SSnano.update_uis(src) -/obj/machinery/chem_heater/attackby(var/obj/item/I as obj, var/mob/user as mob, params) +/obj/machinery/chem_heater/attackby(obj/item/I, mob/user, params) if(isrobot(user)) return @@ -1474,7 +1474,7 @@ default_deconstruction_crowbar(I) return 1 -/obj/machinery/chem_heater/attack_hand(var/mob/user as mob) +/obj/machinery/chem_heater/attack_hand(mob/user) ui_interact(user) /obj/machinery/chem_heater/Topic(href, href_list) @@ -1499,7 +1499,7 @@ eject_beaker() . = 0 //updated in eject_beaker() already -/obj/machinery/chem_heater/ui_interact(var/mob/user, ui_key = "main", var/datum/nanoui/ui = null) +/obj/machinery/chem_heater/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) if(user.stat || user.restrained()) return ui = SSnano.push_open_or_new_ui(user, src, ui_key, ui, "chem_heater.tmpl", "ChemHeater", 350, 270, 0) @@ -1536,7 +1536,7 @@ uiname = "Soda Dispenser" dispensable_reagents = list("water","ice","coffee","cream","tea","icetea","cola","spacemountainwind","dr_gibb","space_up","tonic","sodawater","lemon_lime","sugar","orangejuice","limejuice","tomatojuice") -/obj/machinery/chem_dispenser/drinks/attackby(var/obj/item/O as obj, var/mob/user as mob) +/obj/machinery/chem_dispenser/drinks/attackby(obj/item/O, mob/user) if(default_unfasten_wrench(user, O)) return diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 5fe6dc7e8fa..c89a5d434eb 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -34,7 +34,7 @@ ..() holder = null -/datum/reagent/proc/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume, var/show_message = 1, var/touch_protection = 0) +/datum/reagent/proc/reaction_mob(mob/living/M, method=TOUCH, volume, show_message = 1, touch_protection = 0) if(!istype(M)) return 0 var/datum/reagent/self = src @@ -48,15 +48,15 @@ M.reagents.add_reagent(self.id, amount) return 1 -/datum/reagent/proc/reaction_obj(var/obj/O, var/volume) +/datum/reagent/proc/reaction_obj(obj/O, volume) src = null return -/datum/reagent/proc/reaction_turf(var/turf/T, var/volume) +/datum/reagent/proc/reaction_turf(turf/T, volume) src = null return -/datum/reagent/proc/on_mob_life(var/mob/living/M as mob) +/datum/reagent/proc/on_mob_life(mob/living/M) current_cycle++ if(!istype(M, /mob/living)) return //Noticed runtime errors from facid trying to damage ghosts, this should fix. --NEO @@ -67,52 +67,52 @@ /datum/reagent/proc/on_mob_delete(mob/M) return -/datum/reagent/proc/on_move(var/mob/M) +/datum/reagent/proc/on_move(mob/M) return // Called after add_reagents creates a new reagent. -/datum/reagent/proc/on_new(var/data) +/datum/reagent/proc/on_new(data) return // Called when two reagents of the same are mixing. -/datum/reagent/proc/on_merge(var/data) +/datum/reagent/proc/on_merge(data) return -/datum/reagent/proc/on_update(var/atom/A) +/datum/reagent/proc/on_update(atom/A) return // Called every time reagent containers process. -/datum/reagent/proc/on_tick(var/data) +/datum/reagent/proc/on_tick(data) return // Called when the reagent container is hit by an explosion -/datum/reagent/proc/on_ex_act(var/severity) +/datum/reagent/proc/on_ex_act(severity) return // Called if the reagent has passed the overdose threshold and is set to be triggering overdose effects -/datum/reagent/proc/overdose_process(var/mob/living/M as mob) +/datum/reagent/proc/overdose_process(mob/living/M) return -/datum/reagent/proc/overdose_start(var/mob/living/M as mob) +/datum/reagent/proc/overdose_start(mob/living/M) M << "You feel like you took too much of [name]!" return -/datum/reagent/proc/addiction_act_stage1(var/mob/living/M as mob) +/datum/reagent/proc/addiction_act_stage1(mob/living/M) if(prob(30)) M << "You feel like some [name] right about now." return -/datum/reagent/proc/addiction_act_stage2(var/mob/living/M as mob) +/datum/reagent/proc/addiction_act_stage2(mob/living/M) if(prob(30)) M << "You feel like you need [name]. You just can't get enough." return -/datum/reagent/proc/addiction_act_stage3(var/mob/living/M as mob) +/datum/reagent/proc/addiction_act_stage3(mob/living/M) if(prob(30)) M << "You have an intense craving for [name]." return -/datum/reagent/proc/addiction_act_stage4(var/mob/living/M as mob) +/datum/reagent/proc/addiction_act_stage4(mob/living/M) if(prob(30)) M << "You're not feeling good at all! You really need some [name]." return diff --git a/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm index 19826ce0d21..d181130314c 100644 --- a/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm @@ -11,7 +11,7 @@ color = "#B68D00" message = "The blob splashes you with burning oil" -/datum/reagent/blob/boiling_oil/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume) +/datum/reagent/blob/boiling_oil/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == TOUCH) var/ratio = volume/25 M.apply_damage(15*ratio, BURN) @@ -27,7 +27,7 @@ color = "#008000" message_living = ", and you feel sick and nauseated" -/datum/reagent/blob/toxic_goop/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume) +/datum/reagent/blob/toxic_goop/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == TOUCH) var/ratio = volume/25 M.apply_damage(20*ratio, TOX) @@ -39,7 +39,7 @@ color = "#FF4C4C" message_living = ", and you feel your skin ripping and tearing off" -/datum/reagent/blob/skin_ripper/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume) +/datum/reagent/blob/skin_ripper/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == TOUCH) var/ratio = volume/25 M.apply_damage(20*ratio, BRUTE) @@ -55,7 +55,7 @@ color = "#7F0000" message_living = ", and you feel your skin char and melt" -/datum/reagent/blob/skin_melter/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume) +/datum/reagent/blob/skin_melter/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == TOUCH) var/ratio = volume/25 M.apply_damage(10*ratio, BRUTE) @@ -72,7 +72,7 @@ color = "#00FFC5" message_living = ", and your lungs feel heavy and weak" -/datum/reagent/blob/lung_destroying_toxin/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume) +/datum/reagent/blob/lung_destroying_toxin/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == TOUCH) var/ratio = volume/25 M.apply_damage(20* ratio, OXY) @@ -88,7 +88,7 @@ color = "#00EE00" message_living = ", and your skin feels papery and everything hurts" -/datum/reagent/blob/radioactive_liquid/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume) +/datum/reagent/blob/radioactive_liquid/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == TOUCH) var/ratio = volume/25 M.apply_damage(10*ratio, BRUTE) @@ -108,7 +108,7 @@ color = "#61407E" message = "You feel a thrum as the blob strikes you, and everything flies at you" -/datum/reagent/blob/dark_matter/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume) +/datum/reagent/blob/dark_matter/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == TOUCH) var/ratio = volume/25 M.apply_damage(15*ratio, BRUTE) @@ -122,7 +122,7 @@ color = "#808000" message = "The blob slams into you, and sends you flying" -/datum/reagent/blob/b_sorium/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume) +/datum/reagent/blob/b_sorium/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == TOUCH) var/ratio = volume/25 M.apply_damage(15*ratio, BRUTE) @@ -136,7 +136,7 @@ color = "#FFA500" message = "The blob strikes you, and its tendrils explode" -/datum/reagent/blob/explosive/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume) +/datum/reagent/blob/explosive/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == TOUCH) var/ratio = volume/25 if(prob(75*ratio)) @@ -150,7 +150,7 @@ message = "The blob squirts something at you" message_living = ", and you feel great" -/datum/reagent/blob/omnizine/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume) +/datum/reagent/blob/omnizine/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == TOUCH) var/ratio = volume/25 M.reagents.add_reagent("omnizine", 11*ratio) @@ -163,7 +163,7 @@ message = "The blob squirts something at you" message_living = ", and you feel funny" -/datum/reagent/blob/spacedrugs/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume) +/datum/reagent/blob/spacedrugs/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == TOUCH) var/ratio = volume/25 M.hallucination += 20*ratio @@ -171,7 +171,7 @@ M.apply_damage(10*ratio, TOX) -/datum/reagent/blob/proc/reagent_vortex(var/mob/living/M as mob, var/setting_type) +/datum/reagent/blob/proc/reagent_vortex(mob/living/M, setting_type) var/turf/pull = get_turf(M) for(var/atom/movable/X in range(4,pull)) if(istype(X, /atom/movable)) @@ -184,7 +184,7 @@ else X.throw_at(pull) -/datum/reagent/blob/proc/send_message(var/mob/living/M as mob) +/datum/reagent/blob/proc/send_message(mob/living/M) var/totalmessage = message if(message_living && !issilicon(M)) totalmessage += message_living diff --git a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Alcohols.dm b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Alcohols.dm index 7a0b91da733..df637f4eab8 100644 --- a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Alcohols.dm +++ b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Alcohols.dm @@ -21,7 +21,7 @@ nutriment_factor = 0 var/boozepwr = 10 //lower numbers mean the booze will have an effect faster. -/datum/reagent/consumable/ethanol/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/ethanol/on_mob_life(mob/living/M) M.jitteriness = max(M.jitteriness-5,0) if(current_cycle >= boozepwr) if (!M.slurring) M.slurring = 1 @@ -34,7 +34,7 @@ M.adjustToxLoss(2) ..() return -/datum/reagent/consumable/ethanol/reaction_obj(var/obj/O, var/volume) +/datum/reagent/consumable/ethanol/reaction_obj(obj/O, volume) if(istype(O,/obj/item/weapon/paper)) var/obj/item/weapon/paper/paperaffected = O paperaffected.clearpaper() @@ -48,7 +48,7 @@ usr << "It wasn't enough..." return -/datum/reagent/consumable/ethanol/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with ethanol isn't quite as good as fuel. +/datum/reagent/consumable/ethanol/reaction_mob(mob/living/M, method=TOUCH, volume)//Splashing people with ethanol isn't quite as good as fuel. if(!istype(M, /mob/living)) return if(method == TOUCH) @@ -76,7 +76,7 @@ color = "#664300" // rgb: 102, 67, 0 boozepwr = 45 -/datum/reagent/consumable/ethanol/kahlua/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/ethanol/kahlua/on_mob_life(mob/living/M) M.dizziness = max(0,M.dizziness-5) M.drowsyness = max(0,M.drowsyness-3) M.sleeping = max(0,M.sleeping-2) @@ -99,7 +99,7 @@ nutriment_factor = 1 * REAGENTS_METABOLISM boozepwr = 35 -/datum/reagent/consumable/ethanol/thirteenloko/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/ethanol/thirteenloko/on_mob_life(mob/living/M) M.drowsyness = max(0,M.drowsyness-7) M.sleeping = max(0,M.sleeping-2) if (M.bodytemperature > 310) @@ -115,7 +115,7 @@ color = "#0064C8" // rgb: 0, 100, 200 boozepwr = 35 -/datum/reagent/consumable/ethanol/vodka/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/ethanol/vodka/on_mob_life(mob/living/M) M.radiation = max(M.radiation-2,0) ..() return @@ -128,7 +128,7 @@ nutriment_factor = 2 * REAGENTS_METABOLISM boozepwr = 55 -/datum/reagent/consumable/ethanol/bilk/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/ethanol/bilk/on_mob_life(mob/living/M) if(M.getBruteLoss() && prob(10)) M.heal_organ_damage(1,0) ..() @@ -141,7 +141,7 @@ color = "#666340" // rgb: 102, 99, 64 boozepwr = 15 -/datum/reagent/consumable/ethanol/threemileisland/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/ethanol/threemileisland/on_mob_life(mob/living/M) M.druggy = max(M.druggy, 50) ..() return @@ -314,7 +314,7 @@ boozepwr = 25 metabolization_rate = 0.8 -/datum/reagent/consumable/ethanol/beepsky_smash/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/ethanol/beepsky_smash/on_mob_life(mob/living/M) M.Stun(1) ..() return @@ -389,7 +389,7 @@ color = "#664300" // rgb: 102, 67, 0 boozepwr = 15 -/datum/reagent/consumable/ethanol/manhattan_proj/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/ethanol/manhattan_proj/on_mob_life(mob/living/M) M.druggy = max(M.druggy, 30) ..() return @@ -408,7 +408,7 @@ color = "#664300" // rgb: 102, 67, 0 boozepwr = 25 -/datum/reagent/consumable/ethanol/antifreeze/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/ethanol/antifreeze/on_mob_life(mob/living/M) if (M.bodytemperature < 330) M.bodytemperature = min(330, M.bodytemperature + (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 ..() @@ -470,7 +470,7 @@ color = "#664300" // rgb: 102, 67, 0 boozepwr = 35 -/datum/reagent/consumable/ethanol/sbiten/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/ethanol/sbiten/on_mob_life(mob/living/M) if (M.bodytemperature < 360) M.bodytemperature = min(360, M.bodytemperature + (50 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 ..() @@ -505,7 +505,7 @@ color = "#664300" // rgb: 102, 67, 0 boozepwr = 55 -/datum/reagent/consumable/ethanol/iced_beer/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/ethanol/iced_beer/on_mob_life(mob/living/M) if(M.bodytemperature > 270) M.bodytemperature = max(270, M.bodytemperature - (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 ..() @@ -597,7 +597,7 @@ color = "#FFFF91" // rgb: 255, 255, 140 boozepwr = 25 -/datum/reagent/consumable/ethanol/bananahonk/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/ethanol/bananahonk/on_mob_life(mob/living/M) if( ( istype(M, /mob/living/carbon/human) && M.job in list("Clown") ) || istype(M, /mob/living/carbon/monkey) ) M.heal_organ_damage(1,1) ..() @@ -611,7 +611,7 @@ color = "#664300" // rgb: 102, 67, 0 boozepwr = 15 -/datum/reagent/consumable/ethanol/silencer/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/ethanol/silencer/on_mob_life(mob/living/M) if(istype(M, /mob/living/carbon/human) && M.job in list("Mime")) M.heal_organ_damage(1,1) ..() diff --git a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm index 7ef486912ea..89c9a9a54c4 100644 --- a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm @@ -10,7 +10,7 @@ description = "Both delicious AND rich in Vitamin C, what more do you need?" color = "#E78108" // rgb: 231, 129, 8 -/datum/reagent/consumable/orangejuice/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/orangejuice/on_mob_life(mob/living/M) if(M.getOxyLoss() && prob(30)) M.adjustOxyLoss(-1) ..() @@ -22,7 +22,7 @@ description = "Tomatoes made into juice. What a waste of big, juicy tomatoes, huh?" color = "#731008" // rgb: 115, 16, 8 -/datum/reagent/consumable/tomatojuice/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/tomatojuice/on_mob_life(mob/living/M) if(M.getFireLoss() && prob(20)) M.heal_organ_damage(0,1) ..() @@ -34,7 +34,7 @@ description = "The sweet-sour juice of limes." color = "#365E30" // rgb: 54, 94, 48 -/datum/reagent/consumable/limejuice/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/limejuice/on_mob_life(mob/living/M) if(M.getToxLoss() && prob(20)) M.adjustToxLoss(-1*REM) ..() @@ -46,7 +46,7 @@ description = "It is just like a carrot but without crunching." color = "#973800" // rgb: 151, 56, 0 -/datum/reagent/consumable/carrotjuice/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/carrotjuice/on_mob_life(mob/living/M) M.eye_blurry = max(M.eye_blurry-1 , 0) M.eye_blind = max(M.eye_blind-1 , 0) switch(current_cycle) @@ -70,7 +70,7 @@ description = "A tasty juice blended from various kinds of very deadly and toxic berries." color = "#863353" // rgb: 134, 51, 83 -/datum/reagent/consumable/poisonberryjuice/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/poisonberryjuice/on_mob_life(mob/living/M) M.adjustToxLoss(1) ..() return @@ -93,7 +93,7 @@ description = "The raw essence of a banana. HONK" color = "#863333" // rgb: 175, 175, 0 -/datum/reagent/consumable/banana/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/banana/on_mob_life(mob/living/M) if( ( istype(M, /mob/living/carbon/human) && M.job in list("Clown") ) || istype(M, /mob/living/carbon/monkey) ) M.heal_organ_damage(1,1) ..() @@ -103,7 +103,7 @@ id = "nothing" description = "Absolutely nothing." -/datum/reagent/consumable/nothing/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/nothing/on_mob_life(mob/living/M) if(istype(M, /mob/living/carbon/human) && M.job in list("Mime")) M.heal_organ_damage(1,1) ..() @@ -121,7 +121,7 @@ description = "An opaque white liquid produced by the mammary glands of mammals." color = "#DFDFDF" // rgb: 223, 223, 223 -/datum/reagent/consumable/milk/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/milk/on_mob_life(mob/living/M) if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0) if(holder.has_reagent("capsaicin")) @@ -135,7 +135,7 @@ description = "An opaque white liquid made from soybeans." color = "#DFDFC7" // rgb: 223, 223, 199 -/datum/reagent/consumable/soymilk/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/soymilk/on_mob_life(mob/living/M) if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0) ..() @@ -147,7 +147,7 @@ description = "The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?" color = "#DFD7AF" // rgb: 223, 215, 175 -/datum/reagent/consumable/cream/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/cream/on_mob_life(mob/living/M) if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0) ..() @@ -161,11 +161,11 @@ nutriment_factor = 0 overdose_threshold = 80 -/datum/reagent/consumable/coffee/overdose_process(var/mob/living/M as mob) +/datum/reagent/consumable/coffee/overdose_process(mob/living/M) M.Jitter(5) ..() -/datum/reagent/consumable/coffee/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/coffee/on_mob_life(mob/living/M) M.dizziness = max(0,M.dizziness-5) M.drowsyness = max(0,M.drowsyness-3) M.sleeping = max(0,M.sleeping - 2) @@ -182,7 +182,7 @@ color = "#101000" // rgb: 16, 16, 0 nutriment_factor = 0 -/datum/reagent/consumable/tea/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/tea/on_mob_life(mob/living/M) M.dizziness = max(0,M.dizziness-2) M.drowsyness = max(0,M.drowsyness-1) M.jitteriness = max(0,M.jitteriness-3) @@ -201,7 +201,7 @@ color = "#102838" // rgb: 16, 40, 56 nutriment_factor = 0 -/datum/reagent/consumable/icecoffee/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/icecoffee/on_mob_life(mob/living/M) M.dizziness = max(0,M.dizziness-5) M.drowsyness = max(0,M.drowsyness-3) M.sleeping = max(0,M.sleeping-2) @@ -218,7 +218,7 @@ color = "#104038" // rgb: 16, 64, 56 nutriment_factor = 0 -/datum/reagent/consumable/icetea/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/icetea/on_mob_life(mob/living/M) M.dizziness = max(0,M.dizziness-2) M.drowsyness = max(0,M.drowsyness-1) M.sleeping = max(0,M.sleeping-2) @@ -235,7 +235,7 @@ description = "A refreshing beverage." color = "#100800" // rgb: 16, 8, 0 -/datum/reagent/consumable/space_cola/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/space_cola/on_mob_life(mob/living/M) M.drowsyness = max(0,M.drowsyness-5) if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055 M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) @@ -248,7 +248,7 @@ description = "Cola, cola never changes." color = "#100800" // rgb: 16, 8, 0 -/datum/reagent/consumable/nuka_cola/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/nuka_cola/on_mob_life(mob/living/M) M.Jitter(20) M.druggy = max(M.druggy, 30) M.dizziness +=5 @@ -266,7 +266,7 @@ description = "Blows right through you like a space wind." color = "#102000" // rgb: 16, 32, 0 -/datum/reagent/consumable/spacemountainwind/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/spacemountainwind/on_mob_life(mob/living/M) M.drowsyness = max(0,M.drowsyness-7) M.sleeping = max(0,M.sleeping-1) if (M.bodytemperature > 310) @@ -281,7 +281,7 @@ description = "A delicious blend of 42 different flavours" color = "#102000" // rgb: 16, 32, 0 -/datum/reagent/consumable/dr_gibb/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/dr_gibb/on_mob_life(mob/living/M) M.drowsyness = max(0,M.drowsyness-6) if (M.bodytemperature > 310) M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 @@ -294,7 +294,7 @@ description = "Tastes like a hull breach in your mouth." color = "#00FF00" // rgb: 0, 255, 0 -/datum/reagent/consumable/space_up/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/space_up/on_mob_life(mob/living/M) if (M.bodytemperature > 310) M.bodytemperature = max(310, M.bodytemperature - (8 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 ..() @@ -306,7 +306,7 @@ id = "lemon_lime" color = "#8CFF00" // rgb: 135, 255, 0 -/datum/reagent/consumable/lemon_lime/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/lemon_lime/on_mob_life(mob/living/M) if (M.bodytemperature > 310) M.bodytemperature = max(310, M.bodytemperature - (8 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 ..() @@ -318,7 +318,7 @@ description = "A can of club soda. Why not make a scotch and soda?" color = "#619494" // rgb: 97, 148, 148 -/datum/reagent/consumable/sodawater/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/sodawater/on_mob_life(mob/living/M) M.dizziness = max(0,M.dizziness-5) M.drowsyness = max(0,M.drowsyness-3) if (M.bodytemperature > 310) @@ -332,7 +332,7 @@ description = "It tastes strange but at least the quinine keeps the Space Malaria at bay." color = "#0064C8" // rgb: 0, 100, 200 -/datum/reagent/consumable/tonic/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/tonic/on_mob_life(mob/living/M) M.dizziness = max(0,M.dizziness-5) M.drowsyness = max(0,M.drowsyness-3) M.sleeping = max(0,M.sleeping-2) @@ -348,7 +348,7 @@ reagent_state = SOLID color = "#619494" // rgb: 97, 148, 148 -/datum/reagent/consumable/ice/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/ice/on_mob_life(mob/living/M) M.bodytemperature -= 5 * TEMPERATURE_DAMAGE_COEFFICIENT ..() return @@ -359,7 +359,7 @@ description = "A nice and tasty beverage while you are reading your hippie books." color = "#664300" // rgb: 102, 67, 0 -/datum/reagent/consumable/soy_latte/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/soy_latte/on_mob_life(mob/living/M) M.dizziness = max(0,M.dizziness-5) M.drowsyness = max(0,M.drowsyness-3) M.sleeping = 0 @@ -377,7 +377,7 @@ description = "A nice, strong and tasty beverage while you are reading." color = "#664300" // rgb: 102, 67, 0 -/datum/reagent/consumable/cafe_latte/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/cafe_latte/on_mob_life(mob/living/M) M.dizziness = max(0,M.dizziness-5) M.drowsyness = max(0,M.drowsyness-3) M.sleeping = 0 @@ -464,7 +464,7 @@ description = "Nuclear proliferation never tasted so good." color = "#666300" // rgb: 102, 99, 0 -/datum/reagent/consumable/atomicbomb/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/atomicbomb/on_mob_life(mob/living/M) M.druggy = max(M.druggy, 50) M.confused = max(M.confused+2,0) M.Dizzy(10) @@ -486,7 +486,7 @@ description = "Whoah, this stuff looks volatile!" color = "#664300" // rgb: 102, 67, 0 -/datum/reagent/consumable/gargle_blaster/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/gargle_blaster/on_mob_life(mob/living/M) M.dizziness +=6 switch(current_cycle) if(15 to 45) @@ -509,7 +509,7 @@ description = "A strong neurotoxin that puts the subject into a death-like state." color = "#2E2E61" // rgb: 46, 46, 97 -/datum/reagent/consumable/neurotoxin/on_mob_life(var/mob/living/carbon/M as mob) +/datum/reagent/consumable/neurotoxin/on_mob_life(mob/living/carbon/M) M.weakened = max(M.weakened, 3) M.dizziness +=6 switch(current_cycle) @@ -535,7 +535,7 @@ nutriment_factor = 0 metabolization_rate = 0.2 * REAGENTS_METABOLISM -/datum/reagent/consumable/hippies_delight/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/hippies_delight/on_mob_life(mob/living/M) M.druggy = max(M.druggy, 50) switch(current_cycle) if(1 to 5) diff --git a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm index 64ac0c3278b..6ca5afcf052 100644 --- a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm @@ -12,7 +12,7 @@ id = "consumable" var/nutriment_factor = 1 * REAGENTS_METABOLISM -/datum/reagent/consumable/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/on_mob_life(mob/living/M) current_cycle++ M.nutrition += nutriment_factor holder.remove_reagent(src.id, metabolization_rate) @@ -25,7 +25,7 @@ nutriment_factor = 15 * REAGENTS_METABOLISM color = "#664330" // rgb: 102, 67, 48 -/datum/reagent/consumable/nutriment/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/nutriment/on_mob_life(mob/living/M) if(prob(50)) M.heal_organ_damage(1,0) ..() @@ -38,7 +38,7 @@ reagent_state = SOLID color = "#664330" // rgb: 102, 67, 48 -/datum/reagent/consumable/vitamin/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/vitamin/on_mob_life(mob/living/M) if(prob(50)) M.heal_organ_damage(1,1) if(M.satiety < 600) @@ -56,12 +56,12 @@ metabolization_rate = 2 * REAGENTS_METABOLISM overdose_threshold = 200 // Hyperglycaemic shock -/datum/reagent/consumable/sugar/overdose_start(var/mob/living/M as mob) +/datum/reagent/consumable/sugar/overdose_start(mob/living/M) M << "You go into hyperglycaemic shock! Lay off the twinkies!" M.sleeping += 30 return -/datum/reagent/consumable/sugar/overdose_process(var/mob/living/M as mob) +/datum/reagent/consumable/sugar/overdose_process(mob/living/M) M.sleeping += 3 ..() return @@ -94,7 +94,7 @@ description = "This is what makes chilis hot." color = "#B31008" // rgb: 179, 16, 8 -/datum/reagent/consumable/capsaicin/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/capsaicin/on_mob_life(mob/living/M) switch(current_cycle) if(1 to 15) M.bodytemperature += 5 * TEMPERATURE_DAMAGE_COEFFICIENT @@ -123,7 +123,7 @@ description = "A special oil that noticably chills the body. Extraced from Icepeppers." color = "#B31008" // rgb: 139, 166, 233 -/datum/reagent/consumable/frostoil/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/frostoil/on_mob_life(mob/living/M) switch(current_cycle) if(1 to 15) M.bodytemperature -= 10 * TEMPERATURE_DAMAGE_COEFFICIENT @@ -150,7 +150,7 @@ ..() return -/datum/reagent/consumable/frostoil/reaction_turf(var/turf/simulated/T, var/volume) +/datum/reagent/consumable/frostoil/reaction_turf(turf/simulated/T, volume) if(volume >= 5) for(var/mob/living/simple_animal/slime/M in T) M.adjustToxLoss(rand(15,30)) @@ -163,7 +163,7 @@ description = "A chemical agent used for self-defense and in police work." color = "#B31008" // rgb: 179, 16, 8 -/datum/reagent/consumable/condensedcapsaicin/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) +/datum/reagent/consumable/condensedcapsaicin/reaction_mob(mob/living/M, method=TOUCH, volume) if(!istype(M, /mob/living/carbon/human) && !istype(M, /mob/living/carbon/monkey)) return @@ -225,7 +225,7 @@ victim.Weaken(5) victim.drop_item() -/datum/reagent/consumable/condensedcapsaicin/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/condensedcapsaicin/on_mob_life(mob/living/M) if(prob(5)) M.visible_message("[M] [pick("dry heaves!","coughs!","splutters!")]") ..() @@ -260,7 +260,7 @@ nutriment_factor = 3 * REAGENTS_METABOLISM color = "#403010" // rgb: 64, 48, 16 -/datum/reagent/consumable/hot_coco/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/hot_coco/on_mob_life(mob/living/M) if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) ..() @@ -273,7 +273,7 @@ color = "#E700E7" // rgb: 231, 0, 231 metabolization_rate = 0.2 * REAGENTS_METABOLISM -/datum/reagent/mushroomhallucinogen/on_mob_life(var/mob/living/M as mob) +/datum/reagent/mushroomhallucinogen/on_mob_life(mob/living/M) M.druggy = max(M.druggy, 30) switch(current_cycle) if(1 to 5) @@ -307,7 +307,7 @@ description = "Multi-colored little bits of sugar, commonly found on donuts. Loved by cops." color = "#FF00FF" // rgb: 255, 0, 255 -/datum/reagent/consumable/sprinkles/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/sprinkles/on_mob_life(mob/living/M) if(istype(M, /mob/living/carbon/human) && M.job in list("Security Officer", "Head of Security", "Detective", "Warden")) M.heal_organ_damage(1,1) ..() @@ -321,7 +321,7 @@ nutriment_factor = 20 * REAGENTS_METABOLISM color = "#302000" // rgb: 48, 32, 0 -/datum/reagent/consumable/cornoil/reaction_turf(var/turf/simulated/T, var/volume) +/datum/reagent/consumable/cornoil/reaction_turf(turf/simulated/T, volume) if (!istype(T)) return src = null @@ -355,7 +355,7 @@ nutriment_factor = 5 * REAGENTS_METABOLISM color = "#302000" // rgb: 48, 32, 0 -/datum/reagent/consumable/hot_ramen/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/hot_ramen/on_mob_life(mob/living/M) if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 M.bodytemperature = min(310, M.bodytemperature + (10 * TEMPERATURE_DAMAGE_COEFFICIENT)) ..() @@ -368,7 +368,7 @@ nutriment_factor = 5 * REAGENTS_METABOLISM color = "#302000" // rgb: 48, 32, 0 -/datum/reagent/consumable/hell_ramen/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/hell_ramen/on_mob_life(mob/living/M) M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT ..() return @@ -380,7 +380,7 @@ reagent_state = SOLID color = "#FFFFFF" // rgb: 0, 0, 0 -/datum/reagent/consumable/flour/reaction_turf(var/turf/T, var/volume) +/datum/reagent/consumable/flour/reaction_turf(turf/T, volume) src = null if(!istype(T, /turf/space)) var/obj/effect/decal/cleanable/reagentdecal = new/obj/effect/decal/cleanable/flour(T) @@ -432,7 +432,7 @@ description = "Decays into sugar." color = "#C8A5DC" -/datum/reagent/consumable/corn_syrup/on_mob_life(var/mob/living/M as mob) +/datum/reagent/consumable/corn_syrup/on_mob_life(mob/living/M) M.reagents.add_reagent("sugar", 3) M.reagents.remove_reagent("corn_syrup", 1) ..() diff --git a/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm index c21cdf68b33..a4854c28153 100644 --- a/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm @@ -12,7 +12,7 @@ color = "#60A584" // rgb: 96, 165, 132 overdose_threshold = 30 -/datum/reagent/drug/space_drugs/on_mob_life(var/mob/living/M as mob) +/datum/reagent/drug/space_drugs/on_mob_life(mob/living/M) M.druggy = max(M.druggy, 15) if(isturf(M.loc) && !istype(M.loc, /turf/space)) if(M.canmove) @@ -22,11 +22,11 @@ ..() return -/datum/reagent/drug/space_drugs/overdose_start(var/mob/living/M as mob) +/datum/reagent/drug/space_drugs/overdose_start(mob/living/M) M << "You start tripping hard!" -/datum/reagent/drug/space_drugs/overdose_process(var/mob/living/M as mob) +/datum/reagent/drug/space_drugs/overdose_process(mob/living/M) if(M.hallucination < volume && prob(20)) M.hallucination += 5 ..() @@ -40,7 +40,7 @@ color = "#60A584" // rgb: 96, 165, 132 addiction_threshold = 30 -/datum/reagent/drug/nicotine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/drug/nicotine/on_mob_life(mob/living/M) if(prob(1)) var/smoke_message = pick("You feel relaxed.", "You feel calmed.","You feel alert.","You feel rugged.") M << "[smoke_message]" @@ -57,7 +57,7 @@ overdose_threshold = 20 addiction_threshold = 10 -/datum/reagent/drug/crank/on_mob_life(var/mob/living/M as mob) +/datum/reagent/drug/crank/on_mob_life(mob/living/M) var/high_message = pick("You feel jittery.", "You feel like you gotta go fast.", "You feel like you need to step it up.") if(prob(5)) M << "[high_message]" @@ -66,25 +66,25 @@ M.AdjustWeakened(-1) ..() -/datum/reagent/drug/crank/overdose_process(var/mob/living/M as mob) +/datum/reagent/drug/crank/overdose_process(mob/living/M) M.adjustBrainLoss(2*REM) M.adjustToxLoss(2*REM) M.adjustBruteLoss(2*REM) ..() -/datum/reagent/drug/crank/addiction_act_stage1(var/mob/living/M as mob) +/datum/reagent/drug/crank/addiction_act_stage1(mob/living/M) M.adjustBrainLoss(5*REM) ..() -/datum/reagent/drug/crank/addiction_act_stage2(var/mob/living/M as mob) +/datum/reagent/drug/crank/addiction_act_stage2(mob/living/M) M.adjustToxLoss(5*REM) ..() -/datum/reagent/drug/crank/addiction_act_stage3(var/mob/living/M as mob) +/datum/reagent/drug/crank/addiction_act_stage3(mob/living/M) M.adjustBruteLoss(5*REM) ..() -/datum/reagent/drug/crank/addiction_act_stage4(var/mob/living/M as mob) +/datum/reagent/drug/crank/addiction_act_stage4(mob/living/M) M.adjustBrainLoss(5*REM) M.adjustToxLoss(5*REM) M.adjustBruteLoss(5*REM) @@ -100,38 +100,38 @@ addiction_threshold = 15 -/datum/reagent/drug/krokodil/on_mob_life(var/mob/living/M as mob) +/datum/reagent/drug/krokodil/on_mob_life(mob/living/M) var/high_message = pick("You feel calm.", "You feel collected.", "You feel like you need to relax.") if(prob(5)) M << "[high_message]" ..() return -/datum/reagent/drug/krokodil/overdose_process(var/mob/living/M as mob) +/datum/reagent/drug/krokodil/overdose_process(mob/living/M) M.adjustBrainLoss(0.25*REM) M.adjustToxLoss(0.25*REM) ..() return -/datum/reagent/drug/krokodil/addiction_act_stage1(var/mob/living/M as mob) +/datum/reagent/drug/krokodil/addiction_act_stage1(mob/living/M) M.adjustBrainLoss(2*REM) M.adjustToxLoss(2*REM) ..() return -/datum/reagent/krokodil/addiction_act_stage2(var/mob/living/M as mob) +/datum/reagent/krokodil/addiction_act_stage2(mob/living/M) if(prob(25)) M << "Your skin feels loose..." ..() return -/datum/reagent/drug/krokodil/addiction_act_stage3(var/mob/living/M as mob) +/datum/reagent/drug/krokodil/addiction_act_stage3(mob/living/M) if(prob(25)) M << "Your skin starts to peel away..." M.adjustBruteLoss(3*REM) ..() return -/datum/reagent/drug/krokodil/addiction_act_stage4(var/mob/living/carbon/human/M as mob) +/datum/reagent/drug/krokodil/addiction_act_stage4(mob/living/carbon/human/M) if(!istype(M.dna.species, /datum/species/cosmetic_zombie)) M << "Your skin falls off easily!" M.adjustBruteLoss(50*REM) // holy shit your skin just FELL THE FUCK OFF @@ -151,7 +151,7 @@ addiction_threshold = 10 metabolization_rate = 0.75 * REAGENTS_METABOLISM -/datum/reagent/drug/methamphetamine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/drug/methamphetamine/on_mob_life(mob/living/M) var/high_message = pick("You feel hyper.", "You feel like you need to go faster.", "You feel like you can run the world.") if(prob(5)) M << "[high_message]" @@ -167,7 +167,7 @@ ..() return -/datum/reagent/drug/methamphetamine/overdose_process(var/mob/living/M as mob) +/datum/reagent/drug/methamphetamine/overdose_process(mob/living/M) if(M.canmove && !istype(M.loc, /atom/movable)) for(var/i = 0, i < 4, i++) step(M, pick(cardinal)) @@ -183,20 +183,20 @@ M.adjustBrainLoss(pick(0.5, 0.6, 0.7, 0.8, 0.9, 1)) return -/datum/reagent/drug/methamphetamine/addiction_act_stage1(var/mob/living/M as mob) +/datum/reagent/drug/methamphetamine/addiction_act_stage1(mob/living/M) M.Jitter(5) if(prob(20)) M.emote(pick("twitch","drool","moan")) ..() return -/datum/reagent/drug/methamphetamine/addiction_act_stage2(var/mob/living/M as mob) +/datum/reagent/drug/methamphetamine/addiction_act_stage2(mob/living/M) M.Jitter(10) M.Dizzy(10) if(prob(30)) M.emote(pick("twitch","drool","moan")) ..() return -/datum/reagent/drug/methamphetamine/addiction_act_stage3(var/mob/living/M as mob) +/datum/reagent/drug/methamphetamine/addiction_act_stage3(mob/living/M) if(M.canmove && !istype(M.loc, /atom/movable)) for(var/i = 0, i < 4, i++) step(M, pick(cardinal)) @@ -206,7 +206,7 @@ M.emote(pick("twitch","drool","moan")) ..() return -/datum/reagent/drug/methamphetamine/addiction_act_stage4(var/mob/living/carbon/human/M as mob) +/datum/reagent/drug/methamphetamine/addiction_act_stage4(mob/living/carbon/human/M) if(M.canmove && !istype(M.loc, /atom/movable)) for(var/i = 0, i < 8, i++) step(M, pick(cardinal)) @@ -228,7 +228,7 @@ addiction_threshold = 10 -/datum/reagent/drug/bath_salts/on_mob_life(var/mob/living/M as mob) +/datum/reagent/drug/bath_salts/on_mob_life(mob/living/M) var/high_message = pick("You feel amped up.", "You feel ready.", "You feel like you can push it to the limit.") if(prob(5)) M << "[high_message]" @@ -245,7 +245,7 @@ ..() return -/datum/reagent/drug/bath_salts/overdose_process(var/mob/living/M as mob) +/datum/reagent/drug/bath_salts/overdose_process(mob/living/M) M.hallucination += 10 if(M.canmove && !istype(M.loc, /atom/movable)) for(var/i = 0, i < 8, i++) @@ -259,7 +259,7 @@ ..() return -/datum/reagent/drug/bath_salts/addiction_act_stage1(var/mob/living/M as mob) +/datum/reagent/drug/bath_salts/addiction_act_stage1(mob/living/M) M.hallucination += 10 if(M.canmove && !istype(M.loc, /atom/movable)) for(var/i = 0, i < 8, i++) @@ -270,7 +270,7 @@ M.emote(pick("twitch","drool","moan")) ..() return -/datum/reagent/drug/bath_salts/addiction_act_stage2(var/mob/living/M as mob) +/datum/reagent/drug/bath_salts/addiction_act_stage2(mob/living/M) M.hallucination += 20 if(M.canmove && !istype(M.loc, /atom/movable)) for(var/i = 0, i < 8, i++) @@ -282,7 +282,7 @@ M.emote(pick("twitch","drool","moan")) ..() return -/datum/reagent/drug/bath_salts/addiction_act_stage3(var/mob/living/M as mob) +/datum/reagent/drug/bath_salts/addiction_act_stage3(mob/living/M) M.hallucination += 30 if(M.canmove && !istype(M.loc, /atom/movable)) for(var/i = 0, i < 12, i++) @@ -294,7 +294,7 @@ M.emote(pick("twitch","drool","moan")) ..() return -/datum/reagent/drug/bath_salts/addiction_act_stage4(var/mob/living/carbon/human/M as mob) +/datum/reagent/drug/bath_salts/addiction_act_stage4(mob/living/carbon/human/M) M.hallucination += 40 if(M.canmove && !istype(M.loc, /atom/movable)) for(var/i = 0, i < 16, i++) @@ -315,7 +315,7 @@ reagent_state = LIQUID color = "#60A584" // rgb: 96, 165, 132 -/datum/reagent/drug/aranesp/on_mob_life(var/mob/living/M as mob) +/datum/reagent/drug/aranesp/on_mob_life(mob/living/M) var/high_message = pick("You feel amped up.", "You feel ready.", "You feel like you can push it to the limit.") if(prob(5)) M << "[high_message]" diff --git a/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm index f0e16a9924c..38290e992d5 100644 --- a/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm @@ -9,7 +9,7 @@ name = "Medicine" id = "medicine" -/datum/reagent/medicine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/on_mob_life(mob/living/M) current_cycle++ holder.remove_reagent(src.id, metabolization_rate / M.metabolism_efficiency) //medicine reagents stay longer if you have a better metabolism @@ -19,7 +19,7 @@ description = "Leporazine can be use to stabilize an individuals body temperature." color = "#C8A5DC" // rgb: 200, 165, 220 -/datum/reagent/medicine/leporazine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/leporazine/on_mob_life(mob/living/M) if(M.bodytemperature > 310) M.bodytemperature = max(310, M.bodytemperature - (40 * TEMPERATURE_DAMAGE_COEFFICIENT)) else if(M.bodytemperature < 311) @@ -32,7 +32,7 @@ description = "It's magic. We don't have to explain it." color = "#C8A5DC" // rgb: 200, 165, 220 -/datum/reagent/medicine/adminordrazine/on_mob_life(var/mob/living/carbon/M as mob) +/datum/reagent/medicine/adminordrazine/on_mob_life(mob/living/carbon/M) M.reagents.remove_all_type(/datum/reagent/toxin, 5*REM, 0, 1) M.setCloneLoss(0) M.setOxyLoss(0) @@ -76,7 +76,7 @@ description = "Synaptizine is used to treat various diseases." color = "#C8A5DC" // rgb: 200, 165, 220 -/datum/reagent/medicine/synaptizine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/synaptizine/on_mob_life(mob/living/M) M.drowsyness = max(M.drowsyness-5, 0) M.AdjustParalysis(-1) M.AdjustStunned(-1) @@ -94,7 +94,7 @@ description = "Heals ear damage." color = "#6600FF" // rgb: 100, 165, 255 -/datum/reagent/medicine/inacusiate/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/inacusiate/on_mob_life(mob/living/M) M.setEarDamage(0,0) ..() return @@ -105,7 +105,7 @@ description = "A chemical mixture with almost magical healing powers. Its main limitation is that the targets body temperature must be under 170K for it to metabolise correctly." color = "#0000C8" -/datum/reagent/medicine/cryoxadone/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/cryoxadone/on_mob_life(mob/living/M) if(M.stat != DEAD && M.bodytemperature < 270) M.adjustCloneLoss(-4) M.adjustOxyLoss(-10) @@ -124,7 +124,7 @@ reagent_state = SOLID color = "#669900" // rgb: 102, 153, 0 -/datum/reagent/medicine/rezadone/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/rezadone/on_mob_life(mob/living/M) switch(current_cycle) if(1 to 15) M.adjustCloneLoss(-1) @@ -163,7 +163,7 @@ reagent_state = LIQUID color = "#C8A5DC" -/datum/reagent/medicine/silver_sulfadiazine/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume, var/show_message = 1) +/datum/reagent/medicine/silver_sulfadiazine/reaction_mob(mob/living/M, method=TOUCH, volume, show_message = 1) if(iscarbon(M)) if(method == TOUCH) M.adjustFireLoss(-volume) @@ -177,7 +177,7 @@ ..() return -/datum/reagent/medicine/silver_sulfadiazine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/silver_sulfadiazine/on_mob_life(mob/living/M) M.adjustFireLoss(-2*REM) ..() return @@ -189,7 +189,7 @@ reagent_state = LIQUID color = "#C8A5DC" -/datum/reagent/medicine/styptic_powder/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume, var/show_message = 1) +/datum/reagent/medicine/styptic_powder/reaction_mob(mob/living/M, method=TOUCH, volume, show_message = 1) if(iscarbon(M)) if(method == TOUCH) M.adjustBruteLoss(-volume) @@ -204,7 +204,7 @@ ..() return -/datum/reagent/medicine/styptic_powder/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/styptic_powder/on_mob_life(mob/living/M) M.adjustBruteLoss(-2*REM) ..() return @@ -217,7 +217,7 @@ color = "#C8A5DC" metabolization_rate = 0.5 * REAGENTS_METABOLISM -/datum/reagent/medicine/salglu_solution/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/salglu_solution/on_mob_life(mob/living/M) if(prob(33)) M.adjustBruteLoss(-0.5*REM) M.adjustFireLoss(-0.5*REM) @@ -231,7 +231,7 @@ reagent_state = LIQUID color = "#C8A5DC" -/datum/reagent/medicine/synthflesh/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume,var/show_message = 1) +/datum/reagent/medicine/synthflesh/reaction_mob(mob/living/M, method=TOUCH, volume,show_message = 1) if(iscarbon(M)) if(method == TOUCH) M.adjustBruteLoss(-1.5*volume) @@ -249,7 +249,7 @@ color = "#C8A5DC" metabolization_rate = 0.5 * REAGENTS_METABOLISM -/datum/reagent/medicine/charcoal/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/charcoal/on_mob_life(mob/living/M) M.adjustToxLoss(-2*REM) for(var/datum/reagent/R in M.reagents.reagent_list) if(R != src) @@ -266,7 +266,7 @@ metabolization_rate = 0.25 * REAGENTS_METABOLISM overdose_threshold = 30 -/datum/reagent/medicine/omnizine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/omnizine/on_mob_life(mob/living/M) M.adjustToxLoss(-0.5*REM) M.adjustOxyLoss(-0.5*REM) M.adjustBruteLoss(-0.5*REM) @@ -274,7 +274,7 @@ ..() return -/datum/reagent/medicine/omnizine/overdose_process(var/mob/living/M as mob) +/datum/reagent/medicine/omnizine/overdose_process(mob/living/M) M.adjustToxLoss(1.5*REM) M.adjustOxyLoss(1.5*REM) M.adjustBruteLoss(1.5*REM) @@ -290,7 +290,7 @@ color = "#C8A5DC" metabolization_rate = 0.5 * REAGENTS_METABOLISM -/datum/reagent/medicine/calomel/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/calomel/on_mob_life(mob/living/M) for(var/datum/reagent/R in M.reagents.reagent_list) if(R != src) M.reagents.remove_reagent(R.id,2.5) @@ -307,7 +307,7 @@ color = "#C8A5DC" metabolization_rate = 2 * REAGENTS_METABOLISM -/datum/reagent/medicine/potass_iodide/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/potass_iodide/on_mob_life(mob/living/M) if(M.radiation > 0) M.radiation-- if(M.radiation < 0) @@ -323,7 +323,7 @@ color = "#C8A5DC" metabolization_rate = 0.5 * REAGENTS_METABOLISM -/datum/reagent/medicine/pen_acid/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/pen_acid/on_mob_life(mob/living/M) if(M.radiation > 0) M.radiation -= 4 M.adjustToxLoss(-2*REM) @@ -346,13 +346,13 @@ metabolization_rate = 0.5 * REAGENTS_METABOLISM overdose_threshold = 25 -/datum/reagent/medicine/sal_acid/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/sal_acid/on_mob_life(mob/living/M) if(M.getBruteLoss() < 50) M.adjustBruteLoss(-0.25*REM) ..() return -/datum/reagent/medicine/sal_acid/overdose_process(var/mob/living/M as mob) +/datum/reagent/medicine/sal_acid/overdose_process(mob/living/M) if(M.getBruteLoss() < 50) M.adjustBruteLoss(0.5*REM) ..() @@ -366,7 +366,7 @@ color = "#C8A5DC" metabolization_rate = 0.25 * REAGENTS_METABOLISM -/datum/reagent/medicine/salbutamol/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/salbutamol/on_mob_life(mob/living/M) M.adjustOxyLoss(-3*REM) if(M.losebreath >= 4) M.losebreath -= 2 @@ -381,7 +381,7 @@ color = "#C8A5DC" metabolization_rate = 0.25 * REAGENTS_METABOLISM -/datum/reagent/medicine/perfluorodecalin/on_mob_life(var/mob/living/carbon/human/M as mob) +/datum/reagent/medicine/perfluorodecalin/on_mob_life(mob/living/carbon/human/M) M.adjustOxyLoss(-12*REM) M.silent = max(M.silent, 5) if(prob(33)) @@ -400,7 +400,7 @@ overdose_threshold = 45 addiction_threshold = 30 -/datum/reagent/medicine/ephedrine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/ephedrine/on_mob_life(mob/living/M) M.status_flags |= GOTTAGOFAST M.AdjustParalysis(-1) M.AdjustStunned(-1) @@ -409,32 +409,32 @@ ..() return -/datum/reagent/medicine/ephedrine/overdose_process(var/mob/living/M as mob) +/datum/reagent/medicine/ephedrine/overdose_process(mob/living/M) if(prob(33)) M.adjustToxLoss(0.5*REM) M.losebreath++ ..() return -/datum/reagent/medicine/ephedrine/addiction_act_stage1(var/mob/living/M as mob) +/datum/reagent/medicine/ephedrine/addiction_act_stage1(mob/living/M) if(prob(33)) M.adjustToxLoss(2*REM) M.losebreath += 2 ..() return -/datum/reagent/medicine/ephedrine/addiction_act_stage2(var/mob/living/M as mob) +/datum/reagent/medicine/ephedrine/addiction_act_stage2(mob/living/M) if(prob(33)) M.adjustToxLoss(3*REM) M.losebreath += 3 ..() return -/datum/reagent/medicine/ephedrine/addiction_act_stage3(var/mob/living/M as mob) +/datum/reagent/medicine/ephedrine/addiction_act_stage3(mob/living/M) if(prob(33)) M.adjustToxLoss(4*REM) M.losebreath += 4 ..() return -/datum/reagent/medicine/ephedrine/addiction_act_stage4(var/mob/living/M as mob) +/datum/reagent/medicine/ephedrine/addiction_act_stage4(mob/living/M) if(prob(33)) M.adjustToxLoss(5*REM) M.losebreath += 5 @@ -449,7 +449,7 @@ color = "#C8A5DC" metabolization_rate = 0.5 * REAGENTS_METABOLISM -/datum/reagent/medicine/diphenhydramine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/diphenhydramine/on_mob_life(mob/living/M) if(prob(50)) M.drowsyness += 1 M.jitteriness -= 1 @@ -468,14 +468,14 @@ addiction_threshold = 25 -/datum/reagent/medicine/morphine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/morphine/on_mob_life(mob/living/M) M.status_flags |= IGNORESLOWDOWN if(current_cycle >= 12) M.sleeping += 1 ..() return -/datum/reagent/medicine/morphine/overdose_process(var/mob/living/M as mob) +/datum/reagent/medicine/morphine/overdose_process(mob/living/M) if(prob(33)) var/obj/item/I = M.get_active_hand() if(I) @@ -485,7 +485,7 @@ ..() return -/datum/reagent/medicine/morphine/addiction_act_stage1(var/mob/living/M as mob) +/datum/reagent/medicine/morphine/addiction_act_stage1(mob/living/M) if(prob(33)) var/obj/item/I = M.get_active_hand() if(I) @@ -494,7 +494,7 @@ M.Jitter(2) ..() return -/datum/reagent/medicine/morphine/addiction_act_stage2(var/mob/living/M as mob) +/datum/reagent/medicine/morphine/addiction_act_stage2(mob/living/M) if(prob(33)) var/obj/item/I = M.get_active_hand() if(I) @@ -504,7 +504,7 @@ M.Jitter(3) ..() return -/datum/reagent/medicine/morphine/addiction_act_stage3(var/mob/living/M as mob) +/datum/reagent/medicine/morphine/addiction_act_stage3(mob/living/M) if(prob(33)) var/obj/item/I = M.get_active_hand() if(I) @@ -514,7 +514,7 @@ M.Jitter(4) ..() return -/datum/reagent/medicine/morphine/addiction_act_stage4(var/mob/living/M as mob) +/datum/reagent/medicine/morphine/addiction_act_stage4(mob/living/M) if(prob(33)) var/obj/item/I = M.get_active_hand() if(I) @@ -533,7 +533,7 @@ color = "#C8A5DC" metabolization_rate = 0.25 * REAGENTS_METABOLISM -/datum/reagent/medicine/oculine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/oculine/on_mob_life(mob/living/M) if(M.eye_blind > 0 && current_cycle > 20) if(prob(30)) M.eye_blind = 0 @@ -555,7 +555,7 @@ metabolization_rate = 0.25 * REAGENTS_METABOLISM overdose_threshold = 35 -/datum/reagent/medicine/atropine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/atropine/on_mob_life(mob/living/M) if(M.health > -60) M.adjustToxLoss(0.5*REM) if(M.health < -25) @@ -571,7 +571,7 @@ ..() return -/datum/reagent/medicine/atropine/overdose_process(var/mob/living/M as mob) +/datum/reagent/medicine/atropine/overdose_process(mob/living/M) M.adjustToxLoss(0.5*REM) M.Dizzy(1) M.Jitter(1) @@ -587,7 +587,7 @@ metabolization_rate = 0.25 * REAGENTS_METABOLISM overdose_threshold = 30 -/datum/reagent/medicine/epinephrine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/epinephrine/on_mob_life(mob/living/M) if(M.health < -10 && M.health > -65) M.adjustToxLoss(-0.5*REM) M.adjustBruteLoss(-0.5*REM) @@ -606,7 +606,7 @@ ..() return -/datum/reagent/medicine/epinephrine/overdose_process(var/mob/living/M as mob) +/datum/reagent/medicine/epinephrine/overdose_process(mob/living/M) if(prob(33)) M.adjustStaminaLoss(2.5*REM) M.adjustToxLoss(1*REM) @@ -622,7 +622,7 @@ color = "#C8A5DC" metabolization_rate = 0.5 * REAGENTS_METABOLISM -/datum/reagent/medicine/strange_reagent/reaction_mob(var/mob/living/carbon/human/M as mob, var/method=TOUCH, var/volume) +/datum/reagent/medicine/strange_reagent/reaction_mob(mob/living/carbon/human/M, method=TOUCH, volume) if(M.stat == DEAD) if(M.getBruteLoss() >= 100 || M.getFireLoss() >= 100) M.visible_message("[M]'s body convulses a bit, and then falls still once more.") @@ -644,7 +644,7 @@ ..() return -/datum/reagent/medicine/strange_reagent/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/strange_reagent/on_mob_life(mob/living/M) M.adjustBruteLoss(0.5*REM) M.adjustFireLoss(0.5*REM) ..() @@ -656,7 +656,7 @@ description = "Heals brain damage effectively. Use it in cyro tubes alongside Cryoxadone." color = "#C8A5DC" -/datum/reagent/medicine/mannitol/on_mob_life(mob/living/M as mob) +/datum/reagent/medicine/mannitol/on_mob_life(mob/living/M) M.adjustBrainLoss(-3*REM) ..() return @@ -667,7 +667,7 @@ description = "Heals your genetic defects." color = "#C8A5DC" -/datum/reagent/medicine/mutadone/on_mob_life(var/mob/living/carbon/human/M as mob) +/datum/reagent/medicine/mutadone/on_mob_life(mob/living/carbon/human/M) M.jitteriness = 0 if(istype(M) && M.dna) M.dna.remove_all_mutations() @@ -680,7 +680,7 @@ description = "Helps remove Alcohol from someone's body, as well as eliminating its side effects." color = "#C8A5DC" -/datum/reagent/medicine/antihol/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/antihol/on_mob_life(mob/living/M) M.dizziness = 0 M.drowsyness = 0 M.slurring = 0 @@ -697,7 +697,7 @@ metabolization_rate = 0.5 * REAGENTS_METABOLISM overdose_threshold = 60 -/datum/reagent/medicine/stimulants/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/stimulants/on_mob_life(mob/living/M) M.status_flags |= GOTTAGOFAST if(M.health < 50 && M.health > 0) M.adjustOxyLoss(-1*REM) @@ -710,7 +710,7 @@ M.adjustStaminaLoss(-5*REM) ..() -/datum/reagent/medicine/stimulants/overdose_process(var/mob/living/M as mob) +/datum/reagent/medicine/stimulants/overdose_process(mob/living/M) if(prob(33)) M.adjustStaminaLoss(2.5*REM) M.adjustToxLoss(1*REM) @@ -726,7 +726,7 @@ color = "#C8A5DC" metabolization_rate = 0.5 * REAGENTS_METABOLISM -/datum/reagent/medicine/insulin/on_mob_life(var/mob/living/M as mob) +/datum/reagent/medicine/insulin/on_mob_life(mob/living/M) if(M.sleeping) M.sleeping-- M.reagents.remove_reagent("sugar", 3) @@ -741,12 +741,12 @@ datum/reagent/medicine/bicaridine color = "#C8A5DC" overdose_threshold = 30 -datum/reagent/medicine/bicaridine/on_mob_life(var/mob/living/M as mob) +datum/reagent/medicine/bicaridine/on_mob_life(mob/living/M) M.adjustBruteLoss(-2*REM) ..() return -datum/reagent/medicine/bicaridine/overdose_process(var/mob/living/M as mob) +datum/reagent/medicine/bicaridine/overdose_process(mob/living/M) M.adjustBruteLoss(4*REM) // End result is 2 oxygen loss taken, because it heals 2 and then removes 4. ..() return @@ -759,12 +759,12 @@ datum/reagent/medicine/dexalin color = "#C8A5DC" overdose_threshold = 30 -datum/reagent/medicine/dexalin/on_mob_life(var/mob/living/M as mob) +datum/reagent/medicine/dexalin/on_mob_life(mob/living/M) M.adjustOxyLoss(-2*REM) ..() return -datum/reagent/medicine/dexalin/overdose_process(var/mob/living/M as mob) +datum/reagent/medicine/dexalin/overdose_process(mob/living/M) M.adjustOxyLoss(4*REM) // End result is 2 oxygen loss taken, because it heals 2 and then removes 4. ..() return @@ -777,12 +777,12 @@ datum/reagent/medicine/kelotane color = "#C8A5DC" overdose_threshold = 30 -datum/reagent/medicine/kelotane/on_mob_life(var/mob/living/M as mob) +datum/reagent/medicine/kelotane/on_mob_life(mob/living/M) M.adjustFireLoss(-2*REM) ..() return -datum/reagent/medicine/kelotane/overdose_process(var/mob/living/M as mob) +datum/reagent/medicine/kelotane/overdose_process(mob/living/M) M.adjustFireLoss(4*REM) // End result is 2 burn loss taken, because it heals 2 and then removes 4. ..() return @@ -796,7 +796,7 @@ datum/reagent/medicine/antitoxin color = "#C8A5DC" overdose_threshold = 30 -datum/reagent/medicine/antitoxin/on_mob_life(var/mob/living/M as mob) +datum/reagent/medicine/antitoxin/on_mob_life(mob/living/M) M.adjustToxLoss(-2*REM) for(var/datum/reagent/toxin/R in M.reagents.reagent_list) if(R != src) @@ -804,7 +804,7 @@ datum/reagent/medicine/antitoxin/on_mob_life(var/mob/living/M as mob) ..() return -datum/reagent/medicine/antitoxin/overdose_process(var/mob/living/M as mob) +datum/reagent/medicine/antitoxin/overdose_process(mob/living/M) M.adjustToxLoss(4*REM) // End result is 2 toxin loss taken, because it heals 2 and then removes 4. ..() return @@ -817,7 +817,7 @@ datum/reagent/medicine/inaprovaline reagent_state = LIQUID color = "#C8A5DC" -datum/reagent/medicine/inaprovaline/on_mob_life(var/mob/living/M as mob) +datum/reagent/medicine/inaprovaline/on_mob_life(mob/living/M) if(M.losebreath >= 5) M.losebreath -= 5 ..() @@ -831,7 +831,7 @@ datum/reagent/medicine/tricordrazine color = "#C8A5DC" overdose_threshold = 30 -datum/reagent/medicine/tricordrazine/on_mob_life(var/mob/living/M as mob) +datum/reagent/medicine/tricordrazine/on_mob_life(mob/living/M) if(prob(80)) M.adjustBruteLoss(-1*REM) M.adjustFireLoss(-1*REM) @@ -840,7 +840,7 @@ datum/reagent/medicine/tricordrazine/on_mob_life(var/mob/living/M as mob) ..() return -datum/reagent/medicine/tricordrazine/overdose_process(var/mob/living/M as mob) +datum/reagent/medicine/tricordrazine/overdose_process(mob/living/M) M.adjustToxLoss(2*REM) M.adjustOxyLoss(2*REM) M.adjustBruteLoss(2*REM) diff --git a/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm index 8a9ecf7173f..923dfa759b9 100644 --- a/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm @@ -5,7 +5,7 @@ id = "blood" color = "#C80000" // rgb: 200, 0, 0 -/datum/reagent/blood/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) +/datum/reagent/blood/reaction_mob(mob/M, method=TOUCH, volume) var/datum/reagent/blood/self = src src = null if(self.data && self.data["viruses"]) @@ -19,11 +19,11 @@ else //injected M.ForceContractDisease(D) -/datum/reagent/blood/on_new(var/list/data) +/datum/reagent/blood/on_new(list/data) if(istype(data)) SetViruses(src, data) -/datum/reagent/blood/on_merge(var/list/data) +/datum/reagent/blood/on_merge(list/data) if(src.data && data) src.data["cloneable"] = 0 //On mix, consider the genetic sampling unviable for pod cloning, or else we won't know who's even getting cloned, etc if(src.data["viruses"] || data["viruses"]) @@ -48,7 +48,7 @@ src.data["viruses"] = preserve return 1 -/datum/reagent/blood/reaction_turf(var/turf/simulated/T, var/volume)//splash the blood all over the place +/datum/reagent/blood/reaction_turf(turf/simulated/T, volume)//splash the blood all over the place if(!istype(T)) return var/datum/reagent/blood/self = src src = null @@ -93,7 +93,7 @@ id = "vaccine" color = "#C81040" // rgb: 200, 16, 64 -/datum/reagent/vaccine/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) +/datum/reagent/vaccine/reaction_mob(mob/M, method=TOUCH, volume) var/datum/reagent/vaccine/self = src src = null if(islist(self.data) && method == INGEST) @@ -103,7 +103,7 @@ M.resistances |= self.data return -/datum/reagent/vaccine/on_merge(var/list/data) +/datum/reagent/vaccine/on_merge(list/data) if(istype(data)) src.data |= data.Copy() @@ -119,7 +119,7 @@ * Water reaction to turf */ -/datum/reagent/water/reaction_turf(var/turf/simulated/T, var/volume) +/datum/reagent/water/reaction_turf(turf/simulated/T, volume) if (!istype(T)) return var/CT = cooling_temperature src = null @@ -142,7 +142,7 @@ * Water reaction to an object */ -/datum/reagent/water/reaction_obj(var/obj/O, var/volume) +/datum/reagent/water/reaction_obj(obj/O, volume) src = null if(istype(O,/obj/item)) @@ -166,7 +166,7 @@ * Water reaction to a mob */ -/datum/reagent/water/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with water can help put them out! +/datum/reagent/water/reaction_mob(mob/living/M, method=TOUCH, volume)//Splashing people with water can help put them out! if(!istype(M, /mob/living)) return if(method == TOUCH) @@ -178,7 +178,7 @@ description = "Water blessed by some deity." color = "#E0E8EF" // rgb: 224, 232, 239 -/datum/reagent/water/holywater/on_mob_life(var/mob/living/M as mob) +/datum/reagent/water/holywater/on_mob_life(mob/living/M) if(!data) data = 1 data++ M.jitteriness = max(M.jitteriness-5,0) @@ -200,7 +200,7 @@ holder.remove_reagent(src.id, 0.4) //fixed consumption to prevent balancing going out of whack return -/datum/reagent/water/holywater/reaction_turf(var/turf/simulated/T, var/volume) +/datum/reagent/water/holywater/reaction_turf(turf/simulated/T, volume) ..() if(!istype(T)) return if(volume>=10) @@ -213,7 +213,7 @@ id = "unholywater" description = "Something that shouldn't exist on this plane of existance." -/datum/reagent/fuel/unholywater/on_mob_life(var/mob/living/M as mob) +/datum/reagent/fuel/unholywater/on_mob_life(mob/living/M) M.adjustBrainLoss(3) if(iscultist(M)) M.status_flags |= GOTTAGOFAST @@ -233,7 +233,7 @@ id = "hell_water" description = "YOUR FLESH! IT BURNS!" -/datum/reagent/hellwater/on_mob_life(var/mob/living/M as mob) +/datum/reagent/hellwater/on_mob_life(mob/living/M) M.fire_stacks = min(5,M.fire_stacks + 3) M.IgniteMob() //Only problem with igniting people is currently the commonly availible fire suits make you immune to being on fire M.adjustToxLoss(1) @@ -247,7 +247,7 @@ description = "Lubricant is a substance introduced between two moving surfaces to reduce the friction and wear between them. giggity." color = "#009CA8" // rgb: 0, 156, 168 -/datum/reagent/lube/reaction_turf(var/turf/simulated/T, var/volume) +/datum/reagent/lube/reaction_turf(turf/simulated/T, volume) if (!istype(T)) return src = null if(volume >= 1) @@ -266,7 +266,7 @@ color = "#5EFF3B" //RGB: 94, 255, 59 metabolization_rate = INFINITY //So it instantly removes all of itself -/datum/reagent/unstableslimetoxin/on_mob_life(var/mob/living/carbon/human/H as mob) +/datum/reagent/unstableslimetoxin/on_mob_life(mob/living/carbon/human/H) ..() H << "You crumple in agony as your flesh wildly morphs into new forms!" H.visible_message("[H] falls to the ground and screams as their skin bubbles and froths!") //'froths' sounds painful when used with SKIN. @@ -293,7 +293,7 @@ description = "An advanced corruptive toxin produced by slimes." color = "#13BC5E" // rgb: 19, 188, 94 -/datum/reagent/aslimetoxin/reaction_mob(var/mob/M, var/volume) +/datum/reagent/aslimetoxin/reaction_mob(mob/M, volume) src = null M.ForceContractDisease(new /datum/disease/transformation/slime(0)) @@ -304,7 +304,7 @@ color = "#202040" // rgb: 20, 20, 40 metabolization_rate = 0.25 * REAGENTS_METABOLISM -/datum/reagent/serotrotium/on_mob_life(var/mob/living/M as mob) +/datum/reagent/serotrotium/on_mob_life(mob/living/M) if(ishuman(M)) if(prob(7)) M.emote(pick("twitch","drool","moan","gasp")) ..() @@ -351,7 +351,7 @@ description = "A chemical element." color = "#484848" // rgb: 72, 72, 72 -/datum/reagent/mercury/on_mob_life(var/mob/living/M as mob) +/datum/reagent/mercury/on_mob_life(mob/living/M) if(M.canmove && istype(M.loc, /turf/space)) step(M, pick(cardinal)) if(prob(5)) @@ -374,7 +374,7 @@ reagent_state = SOLID color = "#1C1300" // rgb: 30, 20, 0 -/datum/reagent/carbon/reaction_turf(var/turf/T, var/volume) +/datum/reagent/carbon/reaction_turf(turf/T, volume) src = null if(!istype(T, /turf/space)) new /obj/effect/decal/cleanable/dirt(T) @@ -386,7 +386,7 @@ reagent_state = GAS color = "#808080" // rgb: 128, 128, 128 -/datum/reagent/chlorine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/chlorine/on_mob_life(mob/living/M) M.take_organ_damage(1*REM, 0) ..() return @@ -398,7 +398,7 @@ reagent_state = GAS color = "#808080" // rgb: 128, 128, 128 -/datum/reagent/fluorine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/fluorine/on_mob_life(mob/living/M) M.adjustToxLoss(1*REM) ..() return @@ -424,7 +424,7 @@ reagent_state = SOLID color = "#808080" // rgb: 128, 128, 128 -/datum/reagent/lithium/on_mob_life(var/mob/living/M as mob) +/datum/reagent/lithium/on_mob_life(mob/living/M) if(M.canmove && istype(M.loc, /turf/space)) step(M, pick(cardinal)) if(prob(5)) @@ -445,12 +445,12 @@ reagent_state = SOLID color = "#C7C7C7" // rgb: 199,199,199 -/datum/reagent/radium/on_mob_life(var/mob/living/M as mob) +/datum/reagent/radium/on_mob_life(mob/living/M) M.apply_effect(2*REM/M.metabolism_efficiency,IRRADIATE,0) ..() return -/datum/reagent/radium/reaction_turf(var/turf/T, var/volume) +/datum/reagent/radium/reaction_turf(turf/T, volume) src = null if(volume >= 3) if(!istype(T, /turf/space)) @@ -491,13 +491,13 @@ reagent_state = SOLID color = "#B8B8C0" // rgb: 184, 184, 192 -/datum/reagent/uranium/on_mob_life(var/mob/living/M as mob) +/datum/reagent/uranium/on_mob_life(mob/living/M) M.apply_effect(1/M.metabolism_efficiency,IRRADIATE,0) ..() return -/datum/reagent/uranium/reaction_turf(var/turf/T, var/volume) +/datum/reagent/uranium/reaction_turf(turf/T, volume) src = null if(volume >= 3) if(!istype(T, /turf/space)) @@ -524,14 +524,14 @@ description = "Required for welders. Flamable." color = "#660000" // rgb: 102, 0, 0 -/datum/reagent/fuel/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with welding fuel to make them easy to ignite! +/datum/reagent/fuel/reaction_mob(mob/living/M, method=TOUCH, volume)//Splashing people with welding fuel to make them easy to ignite! if(!istype(M, /mob/living)) return if(method == TOUCH) M.adjust_fire_stacks(volume / 10) return -/datum/reagent/fuel/on_mob_life(var/mob/living/M as mob) +/datum/reagent/fuel/on_mob_life(mob/living/M) M.adjustToxLoss(1) ..() return @@ -542,14 +542,14 @@ description = "A compound used to clean things. Now with 50% more sodium hypochlorite!" color = "#A5F0EE" // rgb: 165, 240, 238 -/datum/reagent/space_cleaner/reaction_obj(var/obj/O, var/volume) +/datum/reagent/space_cleaner/reaction_obj(obj/O, volume) if(istype(O,/obj/effect/decal/cleanable)) qdel(O) else if(O) O.clean_blood() -/datum/reagent/space_cleaner/reaction_turf(var/turf/T, var/volume) +/datum/reagent/space_cleaner/reaction_turf(turf/T, volume) if(volume >= 1) T.clean_blood() for(var/obj/effect/decal/cleanable/C in T) @@ -562,7 +562,7 @@ if(volume >= 1) F.dirt = 0 -/datum/reagent/space_cleaner/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) +/datum/reagent/space_cleaner/reaction_mob(mob/M, method=TOUCH, volume) if(iscarbon(M)) var/mob/living/carbon/C = M if(istype(M,/mob/living/carbon/human)) @@ -600,7 +600,7 @@ color = "#C8A5DC" // rgb: 200, 165, 220 metabolization_rate = 1.5 * REAGENTS_METABOLISM -/datum/reagent/cryptobiolin/on_mob_life(var/mob/living/M as mob) +/datum/reagent/cryptobiolin/on_mob_life(mob/living/M) M.Dizzy(1) if(!M.confused) M.confused = 1 @@ -614,7 +614,7 @@ description = "Impedrezene is a narcotic that impedes one's ability by slowing down the higher brain cell functions." color = "#C8A5DC" // rgb: 200, 165, 220 -/datum/reagent/impedrezene/on_mob_life(var/mob/living/M as mob) +/datum/reagent/impedrezene/on_mob_life(mob/living/M) M.jitteriness = max(M.jitteriness-5,0) if(prob(80)) M.adjustBrainLoss(1*REM) if(prob(50)) M.drowsyness = max(M.drowsyness, 3) @@ -628,7 +628,7 @@ description = "Microscopic construction robots." color = "#535E66" // rgb: 83, 94, 102 -/datum/reagent/nanites/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) +/datum/reagent/nanites/reaction_mob(mob/M, method=TOUCH, volume) src = null if( (prob(min(10, volume)) && method==TOUCH) || method==INGEST) M.ForceContractDisease(new /datum/disease/transformation/robot(0)) @@ -639,7 +639,7 @@ description = "Microbes with an entirely alien cellular structure." color = "#535E66" // rgb: 83, 94, 102 -/datum/reagent/xenomicrobes/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) +/datum/reagent/xenomicrobes/reaction_mob(mob/M, method=TOUCH, volume) src = null if( (prob(min(10, volume)) && method==TOUCH) || method==INGEST) M.ContractDisease(new /datum/disease/transformation/xeno(0)) @@ -741,7 +741,7 @@ color = "#000000" // RBG: 0, 0, 0 var/tox_prob = 0 -/datum/reagent/plantnutriment/on_mob_life(var/mob/living/M as mob) +/datum/reagent/plantnutriment/on_mob_life(mob/living/M) if(prob(tox_prob)) M.adjustToxLoss(1*REM) ..() @@ -813,7 +813,7 @@ reagent_state = LIQUID color = "#C8A5DC" -/datum/reagent/carpet/reaction_turf(var/turf/simulated/T, var/volume) +/datum/reagent/carpet/reaction_turf(turf/simulated/T, volume) if(istype(T, /turf/simulated/floor/plating) || istype(T, /turf/simulated/floor/plasteel)) var/turf/simulated/floor/F = T F.ChangeTurf(/turf/simulated/floor/carpet) @@ -857,23 +857,23 @@ var/list/random_color_list = list("#00aedb","#a200ff","#f47835","#d41243","#d11141","#00b159","#00aedb","#f37735","#ffc425","#008744","#0057e7","#d62d20","#ffa700") -/datum/reagent/colorful_reagent/on_mob_life(var/mob/living/M as mob) +/datum/reagent/colorful_reagent/on_mob_life(mob/living/M) if(M && isliving(M)) M.color = pick(random_color_list) ..() return -/datum/reagent/colorful_reagent/reaction_mob(var/mob/living/M, var/volume) +/datum/reagent/colorful_reagent/reaction_mob(mob/living/M, volume) if(M && isliving(M)) M.color = pick(random_color_list) ..() return -/datum/reagent/colorful_reagent/reaction_obj(var/obj/O, var/volume) +/datum/reagent/colorful_reagent/reaction_obj(obj/O, volume) if(O) O.color = pick(random_color_list) ..() return -/datum/reagent/colorful_reagent/reaction_turf(var/turf/T, var/volume) +/datum/reagent/colorful_reagent/reaction_turf(turf/T, volume) if(T) T.color = pick(random_color_list) ..() @@ -887,7 +887,7 @@ color = "#C8A5DC" var/list/potential_colors = list("0ad","a0f","f73","d14","d14","0b5","0ad","f73","fc2","084","05e","d22","fa0") // fucking hair code -/datum/reagent/hair_dye/reaction_mob(var/mob/living/M, var/volume) +/datum/reagent/hair_dye/reaction_mob(mob/living/M, volume) if(M && ishuman(M)) var/mob/living/carbon/human/H = M H.hair_color = pick(potential_colors) @@ -903,7 +903,7 @@ reagent_state = LIQUID color = "#C8A5DC" -/datum/reagent/barbers_aid/reaction_mob(var/mob/living/M, var/volume) +/datum/reagent/barbers_aid/reaction_mob(mob/living/M, volume) if(M && ishuman(M)) var/mob/living/carbon/human/H = M var/datum/sprite_accessory/hair/picked_hair = pick(hair_styles_list) @@ -921,7 +921,7 @@ reagent_state = LIQUID color = "#C8A5DC" -/datum/reagent/concentrated_barbers_aid/reaction_mob(var/mob/living/M, var/volume) +/datum/reagent/concentrated_barbers_aid/reaction_mob(mob/living/M, volume) if(M && ishuman(M)) var/mob/living/carbon/human/H = M H.hair_style = "Very Long Hair" diff --git a/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm index 545f4020afb..56300fffd97 100644 --- a/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm @@ -6,7 +6,7 @@ reagent_state = SOLID color = "#673910" // rgb: 103, 57, 16 -/datum/reagent/thermite/reaction_turf(var/turf/T, var/volume) +/datum/reagent/thermite/reaction_turf(turf/T, volume) src = null if(volume >= 1 && istype(T, /turf/simulated/wall)) var/turf/simulated/wall/Wall = T @@ -17,7 +17,7 @@ Wall.overlays = list() Wall.overlays += image('icons/effects/effects.dmi',"thermite") -/datum/reagent/thermite/on_mob_life(var/mob/living/M as mob) +/datum/reagent/thermite/on_mob_life(mob/living/M) M.adjustFireLoss(1) ..() @@ -42,13 +42,13 @@ color = "#FF0000" metabolization_rate = 0.5 * REAGENTS_METABOLISM -/datum/reagent/clf3/on_mob_life(var/mob/living/M as mob) +/datum/reagent/clf3/on_mob_life(mob/living/M) M.adjust_fire_stacks(2) var/burndmg = max(0.3*M.fire_stacks, 0.3) M.adjustFireLoss(burndmg) ..() -/datum/reagent/clf3/reaction_turf(var/turf/simulated/T, var/volume) +/datum/reagent/clf3/reaction_turf(turf/simulated/T, volume) if(istype(T, /turf/simulated/floor/plating)) var/turf/simulated/floor/plating/F = T if(prob(1 + F.burnt + 5*F.broken)) //broken or burnt plating is more susceptible to being destroyed @@ -66,7 +66,7 @@ if(prob(volume/10)) W.ChangeTurf(/turf/simulated/floor/plating) -/datum/reagent/clf3/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) +/datum/reagent/clf3/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == TOUCH && isliving(M)) M.adjust_fire_stacks(min(volume/5, 10)) M.IgniteMob() @@ -129,7 +129,7 @@ reagent_state = LIQUID color = "#FF9999" -/datum/reagent/phlogiston/on_mob_life(var/mob/living/M as mob) +/datum/reagent/phlogiston/on_mob_life(mob/living/M) M.adjust_fire_stacks(1) M.IgniteMob() M.adjustFireLoss(0.2*M.fire_stacks) @@ -143,11 +143,11 @@ reagent_state = LIQUID color = "#FF9999" -/datum/reagent/napalm/on_mob_life(var/mob/living/M as mob) +/datum/reagent/napalm/on_mob_life(mob/living/M) M.adjust_fire_stacks(1) ..() -/datum/reagent/napalm/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) +/datum/reagent/napalm/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == TOUCH && isliving(M)) M.adjust_fire_stacks(min(volume/4, 20)) @@ -159,7 +159,7 @@ metabolization_rate = 0.5 * REAGENTS_METABOLISM -/datum/reagent/cryostylane/on_mob_life(var/mob/living/M as mob) //TODO: code freezing into an ice cube +/datum/reagent/cryostylane/on_mob_life(mob/living/M) //TODO: code freezing into an ice cube if(M.reagents.has_reagent("oxygen")) M.reagents.remove_reagent("oxygen", 0.5) M.bodytemperature -= 15 @@ -172,7 +172,7 @@ holder.handle_reactions() ..() -/datum/reagent/cryostylane/reaction_turf(var/turf/simulated/T, var/volume) +/datum/reagent/cryostylane/reaction_turf(turf/simulated/T, volume) if(volume >= 5) for(var/mob/living/simple_animal/slime/M in T) M.adjustToxLoss(rand(15,30)) @@ -184,7 +184,7 @@ color = "#B20000" // rgb: 139, 166, 233 metabolization_rate = 0.5 * REAGENTS_METABOLISM -/datum/reagent/pyrosium/on_mob_life(var/mob/living/M as mob) +/datum/reagent/pyrosium/on_mob_life(mob/living/M) if(M.reagents.has_reagent("oxygen")) M.reagents.remove_reagent("oxygen", 0.5) M.bodytemperature += 15 diff --git a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm index 04b93d4c856..d693da360a1 100644 --- a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm @@ -8,7 +8,7 @@ color = "#CF3600" // rgb: 207, 54, 0 var/toxpwr = 1.5 -/datum/reagent/toxin/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/on_mob_life(mob/living/M) if(toxpwr) M.adjustToxLoss(toxpwr*REM) ..() @@ -28,7 +28,7 @@ color = "#13BC5E" // rgb: 19, 188, 94 toxpwr = 0 -/datum/reagent/toxin/mutagen/reaction_mob(var/mob/living/carbon/M, var/method=TOUCH, var/volume) +/datum/reagent/toxin/mutagen/reaction_mob(mob/living/carbon/M, method=TOUCH, volume) if(!..()) return if(!istype(M) || !M.dna) @@ -44,7 +44,7 @@ updateappearance(M) return -/datum/reagent/toxin/mutagen/on_mob_life(var/mob/living/carbon/M) +/datum/reagent/toxin/mutagen/on_mob_life(mob/living/carbon/M) if(istype(M)) M.apply_effect(5,IRRADIATE,0) ..() @@ -57,13 +57,13 @@ color = "#500064" // rgb: 80, 0, 100 toxpwr = 3 -/datum/reagent/toxin/plasma/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/plasma/on_mob_life(mob/living/M) if(holder.has_reagent("epinephrine")) holder.remove_reagent("epinephrine", 2*REM) ..() return -/datum/reagent/toxin/plasma/reaction_obj(var/obj/O, var/volume) +/datum/reagent/toxin/plasma/reaction_obj(obj/O, volume) src = null /*if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/egg/slime)) var/obj/item/weapon/reagent_containers/food/snacks/egg/slime/egg = O @@ -72,13 +72,13 @@ if((!O) || (!volume)) return 0 O.atmos_spawn_air(SPAWN_TOXINS|SPAWN_20C, volume) -/datum/reagent/toxin/plasma/reaction_turf(var/turf/simulated/T, var/volume) +/datum/reagent/toxin/plasma/reaction_turf(turf/simulated/T, volume) src = null if(istype(T)) T.atmos_spawn_air(SPAWN_TOXINS|SPAWN_20C, volume) return -/datum/reagent/toxin/plasma/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with plasma is stronger than fuel! +/datum/reagent/toxin/plasma/reaction_mob(mob/living/M, method=TOUCH, volume)//Splashing people with plasma is stronger than fuel! if(!istype(M, /mob/living)) return if(method == TOUCH) @@ -92,7 +92,7 @@ color = "#C8A5DC" // rgb: 200, 165, 220 toxpwr = 0 -/datum/reagent/toxin/lexorin/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/lexorin/on_mob_life(mob/living/M) if(M.stat != DEAD) if(prob(33)) M.take_organ_damage(1*REM, 0) @@ -109,7 +109,7 @@ color = "#801E28" // rgb: 128, 30, 40 toxpwr = 0 -/datum/reagent/toxin/slimejelly/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/slimejelly/on_mob_life(mob/living/M) if(prob(10)) M << "Your insides are burning!" M.adjustToxLoss(rand(20,60)*REM) @@ -125,7 +125,7 @@ color = "#CF3600" // rgb: 207, 54, 0 toxpwr = 0 -/datum/reagent/toxin/minttoxin/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/minttoxin/on_mob_life(mob/living/M) if (FAT in M.mutations) M.gib() ..() @@ -146,7 +146,7 @@ color = "#669900" // rgb: 102, 153, 0 toxpwr = 0.5 -/datum/reagent/toxin/zombiepowder/on_mob_life(var/mob/living/carbon/M as mob) +/datum/reagent/toxin/zombiepowder/on_mob_life(mob/living/carbon/M) M.status_flags |= FAKEDEATH M.adjustOxyLoss(0.5*REM) M.Weaken(5) @@ -166,7 +166,7 @@ color = "#B31008" // rgb: 139, 166, 233 toxpwr = 0 -/datum/reagent/toxin/mindbreaker/on_mob_life(var/mob/living/M) +/datum/reagent/toxin/mindbreaker/on_mob_life(mob/living/M) M.hallucination += 10 ..() return @@ -178,7 +178,7 @@ color = "#49002E" // rgb: 73, 0, 46 toxpwr = 1 -/datum/reagent/toxin/plantbgone/reaction_obj(var/obj/O, var/volume) +/datum/reagent/toxin/plantbgone/reaction_obj(obj/O, volume) if(istype(O,/obj/structure/alien/weeds/)) var/obj/structure/alien/weeds/alien_weeds = O alien_weeds.health -= rand(15,35) // Kills alien weeds pretty fast @@ -189,7 +189,7 @@ var/obj/effect/spacevine/SV = O SV.on_chem_effect(src) -/datum/reagent/toxin/plantbgone/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) +/datum/reagent/toxin/plantbgone/reaction_mob(mob/living/M, method=TOUCH, volume) src = null if(iscarbon(M)) var/mob/living/carbon/C = M @@ -210,7 +210,7 @@ color = "#4B004B" // rgb: 75, 0, 75 toxpwr = 1 -/datum/reagent/toxin/pestkiller/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) +/datum/reagent/toxin/pestkiller/reaction_mob(mob/living/M, method=TOUCH, volume) src = null if(iscarbon(M)) var/mob/living/carbon/C = M @@ -225,7 +225,7 @@ color = "#9ACD32" toxpwr = 0.5 -/datum/reagent/toxin/spore/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/spore/on_mob_life(mob/living/M) M.damageoverlaytemp = 60 M.eye_blurry = max(M.eye_blurry, 3) ..() @@ -239,7 +239,7 @@ color = "#9ACD32" toxpwr = 0.5 -/datum/reagent/toxin/spore_burning/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/spore_burning/on_mob_life(mob/living/M) ..() M.adjust_fire_stacks(2) M.IgniteMob() @@ -253,7 +253,7 @@ toxpwr = 0 metabolization_rate = 1.5 * REAGENTS_METABOLISM -/datum/reagent/toxin/chloralhydrate/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/chloralhydrate/on_mob_life(mob/living/M) switch(current_cycle) if(1 to 10) M.confused += 2 @@ -273,7 +273,7 @@ color = "#664300" // rgb: 102, 67, 0 metabolization_rate = 1.5 * REAGENTS_METABOLISM -/datum/reagent/toxin/beer2/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/beer2/on_mob_life(mob/living/M) switch(current_cycle) if(1 to 50) M.sleeping += 1 @@ -332,7 +332,7 @@ metabolization_rate = 0.125 * REAGENTS_METABOLISM toxpwr = 0 -/datum/reagent/toxin/polonium/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/polonium/on_mob_life(mob/living/M) M.radiation += 4 ..() @@ -346,7 +346,7 @@ overdose_threshold = 30 toxpwr = 0 -/datum/reagent/toxin/histamine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/histamine/on_mob_life(mob/living/M) if(prob(50)) switch(pick(1, 2, 3, 4)) if(1) @@ -362,7 +362,7 @@ M.adjustBruteLoss(2*REM) ..() -/datum/reagent/toxin/histamine/overdose_process(var/mob/living/M as mob) +/datum/reagent/toxin/histamine/overdose_process(mob/living/M) M.adjustOxyLoss(2*REM) M.adjustBruteLoss(2*REM) M.adjustToxLoss(2*REM) @@ -377,7 +377,7 @@ metabolization_rate = 0.5 * REAGENTS_METABOLISM toxpwr = 1 -/datum/reagent/toxin/formaldehyde/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/formaldehyde/on_mob_life(mob/living/M) if(prob(5)) M.reagents.add_reagent("histamine",pick(5,15)) M.reagents.remove_reagent("formaldehyde",1) @@ -392,7 +392,7 @@ metabolization_rate = 0.25 * REAGENTS_METABOLISM toxpwr = 0 -/datum/reagent/toxin/venom/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/venom/on_mob_life(mob/living/M) toxpwr = 0.2*volume M.adjustBruteLoss((0.3*volume)*REM) if(prob(15)) @@ -409,7 +409,7 @@ metabolization_rate = 0.5 * REAGENTS_METABOLISM toxpwr = 0 -/datum/reagent/toxin/neurotoxin2/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/neurotoxin2/on_mob_life(mob/living/M) if(M.brainloss + M.toxloss <= 60) M.adjustBrainLoss(1*REM) M.adjustToxLoss(1*REM) @@ -426,7 +426,7 @@ metabolization_rate = 0.125 * REAGENTS_METABOLISM toxpwr = 1.25 -/datum/reagent/toxin/cyanide/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/cyanide/on_mob_life(mob/living/M) if(prob(5)) M.losebreath += 1 if(prob(8)) @@ -453,12 +453,12 @@ metabolization_rate = 0.4 * REAGENTS_METABOLISM toxpwr = 0 -/datum/reagent/toxin/itching_powder/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) +/datum/reagent/toxin/itching_powder/reaction_mob(mob/living/M, method=TOUCH, volume) if(method == TOUCH) M.reagents.add_reagent("itching_powder", volume) return -/datum/reagent/toxin/itching_powder/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/itching_powder/on_mob_life(mob/living/M) if(prob(15)) M << "You scratch at your head." M.adjustBruteLoss(0.2*REM) @@ -482,7 +482,7 @@ metabolization_rate = 0.5 * REAGENTS_METABOLISM toxpwr = 2.5 -/datum/reagent/toxin/initropidril/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/initropidril/on_mob_life(mob/living/M) if(prob(25)) var/picked_option = rand(1,3) switch(picked_option) @@ -513,7 +513,7 @@ metabolization_rate = 0.25 * REAGENTS_METABOLISM toxpwr = 0 -/datum/reagent/toxin/pancuronium/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/pancuronium/on_mob_life(mob/living/M) if(current_cycle >= 10) M.SetParalysis(1) if(prob(20)) @@ -529,7 +529,7 @@ metabolization_rate = 0.75 * REAGENTS_METABOLISM toxpwr = 0 -/datum/reagent/toxin/sodium_thiopental/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/sodium_thiopental/on_mob_life(mob/living/M) if(current_cycle >= 10) M.sleeping += 1 M.adjustStaminaLoss(10*REM) @@ -544,7 +544,7 @@ metabolization_rate = 0.125 * REAGENTS_METABOLISM toxpwr = 0.5 -/datum/reagent/toxin/sulfonal/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/sulfonal/on_mob_life(mob/living/M) if(current_cycle >= 22) M.sleeping += 1 ..() @@ -558,7 +558,7 @@ toxpwr = 0 metabolization_rate = 0.5 * REAGENTS_METABOLISM -/datum/reagent/toxin/amanitin/on_mob_delete(var/mob/living/M as mob) +/datum/reagent/toxin/amanitin/on_mob_delete(mob/living/M) M.adjustToxLoss(current_cycle*3*REM) ..() @@ -571,7 +571,7 @@ metabolization_rate = 0.5 * REAGENTS_METABOLISM toxpwr = 0.5 -/datum/reagent/toxin/lipolicide/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/lipolicide/on_mob_life(mob/living/M) if(!holder.has_reagent("nutriment")) M.adjustToxLoss(0.5*REM) M.nutrition -= 5 * REAGENTS_METABOLISM @@ -589,7 +589,7 @@ metabolization_rate = 0.06 * REAGENTS_METABOLISM toxpwr = 1.75 -/datum/reagent/toxin/coniine/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/coniine/on_mob_life(mob/living/M) M.losebreath += 5 ..() @@ -602,7 +602,7 @@ metabolization_rate = 0.125 * REAGENTS_METABOLISM toxpwr = 1 -/datum/reagent/toxin/curare/on_mob_life(var/mob/living/M as mob) +/datum/reagent/toxin/curare/on_mob_life(mob/living/M) if(current_cycle >= 11) M.Weaken(1) M.adjustOxyLoss(1*REM) @@ -620,7 +620,7 @@ toxpwr = 1 var/acidpwr = 10 //the amount of protection removed from the armour -/datum/reagent/toxin/acid/reaction_mob(var/mob/living/carbon/C, var/method=TOUCH, var/volume) +/datum/reagent/toxin/acid/reaction_mob(mob/living/carbon/C, method=TOUCH, volume) if(!istype(C)) return volume = round(volume,0.1) @@ -630,7 +630,7 @@ C.acid_act(acidpwr, toxpwr, volume) -/datum/reagent/toxin/acid/reaction_obj(var/obj/O, var/volume) +/datum/reagent/toxin/acid/reaction_obj(obj/O, volume) if(istype(O.loc, /mob)) //handled in human acid_act() return volume = round(volume,0.1) diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 9555c8a126a..6a238b39c41 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -17,12 +17,12 @@ var/required_temp = 0 var/mix_message = "The solution begins to bubble." -/datum/chemical_reaction/proc/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/proc/on_reaction(datum/reagents/holder, created_volume) return //I recommend you set the result amount to the total volume of all components. -/datum/chemical_reaction/proc/chemical_mob_spawn(var/datum/reagents/holder, var/amount_to_spawn, var/reaction_name, var/mob_faction = "chemicalsummon") +/datum/chemical_reaction/proc/chemical_mob_spawn(datum/reagents/holder, amount_to_spawn, reaction_name, mob_faction = "chemicalsummon") if(holder && holder.my_atom) var/blocked = list(/mob/living/simple_animal/hostile, /mob/living/simple_animal/hostile/pirate, @@ -78,7 +78,7 @@ for(var/j = 1, j <= rand(1, 3), j++) step(C, pick(NORTH,SOUTH,EAST,WEST)) -/datum/chemical_reaction/proc/goonchem_vortex(var/turf/simulated/T, var/setting_type, var/range, var/pull_times) +/datum/chemical_reaction/proc/goonchem_vortex(turf/simulated/T, setting_type, range, pull_times) for(var/atom/movable/X in orange(range, T)) if(istype(X, /obj/effect)) continue //stop pulling smoke and hotspots please diff --git a/code/modules/reagents/Chemistry-Recipes/Others.dm b/code/modules/reagents/Chemistry-Recipes/Others.dm index f03bec05038..b839ad05c4c 100644 --- a/code/modules/reagents/Chemistry-Recipes/Others.dm +++ b/code/modules/reagents/Chemistry-Recipes/Others.dm @@ -49,7 +49,7 @@ result_amount = 1 mob_react = 1 -/datum/chemical_reaction/plasmasolidification/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/plasmasolidification/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) new /obj/item/stack/sheet/mineral/plasma(location) return @@ -80,7 +80,7 @@ var/level_min = 0 var/level_max = 2 -/datum/chemical_reaction/mix_virus/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/mix_virus/on_reaction(datum/reagents/holder, created_volume) var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list if(B && B.data) @@ -112,7 +112,7 @@ required_reagents = list("synaptizine" = 1) required_catalysts = list("blood" = 1) -/datum/chemical_reaction/mix_virus/rem_virus/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/mix_virus/rem_virus/on_reaction(datum/reagents/holder, created_volume) var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list if(B && B.data) @@ -141,7 +141,7 @@ result_amount = 2 mob_react = 1 -/datum/chemical_reaction/foam/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/foam/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) for(var/mob/M in viewers(5, location)) M << "The solution spews out foam!" @@ -160,7 +160,7 @@ result_amount = 5 mob_react = 1 -/datum/chemical_reaction/metalfoam/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/metalfoam/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) for(var/mob/M in viewers(5, location)) @@ -179,7 +179,7 @@ result_amount = 5 mob_react = 1 -/datum/chemical_reaction/ironfoam/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/ironfoam/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) for(var/mob/M in viewers(5, location)) M << "The solution spews out a metallic foam!" @@ -295,7 +295,7 @@ result_amount = 1 required_temp = 374 -/datum/chemical_reaction/life/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/life/on_reaction(datum/reagents/holder, created_volume) chemical_mob_spawn(holder, 1, "Life") /datum/chemical_reaction/corgium @@ -306,7 +306,7 @@ result_amount = 1 required_temp = 374 -/datum/chemical_reaction/corgium/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/corgium/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) new /mob/living/simple_animal/pet/corgi(location) ..() diff --git a/code/modules/reagents/Chemistry-Recipes/Pyrotechnics.dm b/code/modules/reagents/Chemistry-Recipes/Pyrotechnics.dm index ba20b7c7817..d0344d28fb4 100644 --- a/code/modules/reagents/Chemistry-Recipes/Pyrotechnics.dm +++ b/code/modules/reagents/Chemistry-Recipes/Pyrotechnics.dm @@ -6,7 +6,7 @@ required_reagents = list("glycerol" = 1, "facid" = 1, "sacid" = 1) result_amount = 2 -/datum/chemical_reaction/nitroglycerin/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/nitroglycerin/on_reaction(datum/reagents/holder, created_volume) if(holder.has_reagent("stabilizing_agent")) return holder.remove_reagent("nitroglycerin", created_volume) @@ -24,7 +24,7 @@ result_amount = 1 required_temp = 474 -/datum/chemical_reaction/nitroglycerin_explosion/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/nitroglycerin_explosion/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) var/datum/effect/effect/system/reagents_explosion/e = new() e.set_up(round(created_volume/2, 1), location, 0, 0) @@ -38,7 +38,7 @@ required_reagents = list("water" = 1, "potassium" = 1) result_amount = 2 -/datum/chemical_reaction/potassium_explosion/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/potassium_explosion/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) var/datum/effect/effect/system/reagents_explosion/e = new() e.set_up(round (created_volume/10, 1), location, 0, 0) @@ -61,7 +61,7 @@ required_temp = 474 mix_message = "Sparks start flying around the black powder!" -/datum/chemical_reaction/blackpowder_explosion/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/blackpowder_explosion/on_reaction(datum/reagents/holder, created_volume) sleep(rand(50,100)) var/location = get_turf(holder.my_atom) var/datum/effect/effect/system/reagents_explosion/e = new() @@ -83,7 +83,7 @@ required_reagents = list("uranium" = 1, "iron" = 1) // Yes, laugh, it's the best recipe I could think of that makes a little bit of sense result_amount = 2 -/datum/chemical_reaction/emp_pulse/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/emp_pulse/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) // 100 created volume = 4 heavy range & 7 light range. A few tiles smaller than traitor EMP grandes. // 200 created volume = 8 heavy range & 14 light range. 4 tiles larger than traitor EMP grenades. @@ -106,7 +106,7 @@ result_amount = 4 required_temp = 424 -/datum/chemical_reaction/clf3/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/clf3/on_reaction(datum/reagents/holder, created_volume) var/turf/T = get_turf(holder.my_atom) for(var/turf/turf in range(1,T)) PoolOrNew(/obj/effect/hotspot, turf) @@ -119,7 +119,7 @@ required_reagents = list("mercury" = 1, "oxygen" = 1, "nitrogen" = 1, "carbon" = 1) result_amount = 4 -/datum/chemical_reaction/sorium/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/sorium/on_reaction(datum/reagents/holder, created_volume) if(holder.has_reagent("stabilizing_agent")) return holder.remove_reagent("sorium", created_volume) @@ -133,7 +133,7 @@ required_reagents = list("sorium" = 1) required_temp = 474 -/datum/chemical_reaction/sorium_vortex/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/sorium_vortex/on_reaction(datum/reagents/holder, created_volume) var/turf/simulated/T = get_turf(holder.my_atom) goonchem_vortex(T, 1, 5, 6) @@ -145,7 +145,7 @@ required_reagents = list("stable_plasma" = 1, "radium" = 1, "carbon" = 1) result_amount = 3 -/datum/chemical_reaction/liquid_dark_matter/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/liquid_dark_matter/on_reaction(datum/reagents/holder, created_volume) if(holder.has_reagent("stabilizing_agent")) return holder.remove_reagent("liquid_dark_matter", created_volume) @@ -159,7 +159,7 @@ required_reagents = list("liquid_dark_matter" = 1) required_temp = 474 -/datum/chemical_reaction/ldm_vortex/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/ldm_vortex/on_reaction(datum/reagents/holder, created_volume) var/turf/simulated/T = get_turf(holder.my_atom) goonchem_vortex(T, 0, 5, 6) @@ -170,7 +170,7 @@ required_reagents = list("aluminium" = 1, "potassium" = 1, "sulfur" = 1 ) result_amount = 3 -/datum/chemical_reaction/flash_powder/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/flash_powder/on_reaction(datum/reagents/holder, created_volume) if(holder.has_reagent("stabilizing_agent")) return var/location = get_turf(holder.my_atom) @@ -193,7 +193,7 @@ result_amount = 1 required_temp = 374 -/datum/chemical_reaction/flash_powder_flash/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/flash_powder_flash/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(2, 1, location) @@ -212,7 +212,7 @@ required_reagents = list("potassium" = 1, "sugar" = 1, "phosphorus" = 1) result_amount = 3 -/datum/chemical_reaction/smoke_powder/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/smoke_powder/on_reaction(datum/reagents/holder, created_volume) if(holder.has_reagent("stabilizing_agent")) return holder.remove_reagent("smoke_powder", created_volume) @@ -237,7 +237,7 @@ secondary = 1 mob_react = 1 -/datum/chemical_reaction/smoke_powder_smoke/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/smoke_powder_smoke/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) var/smoke_amount = round(Clamp(created_volume/5, 1, 20),1) var/datum/effect/effect/system/smoke_spread/chem/S = new @@ -258,7 +258,7 @@ required_reagents = list("oxygen" = 1, "cola" = 1, "phosphorus" = 1) result_amount = 3 -/datum/chemical_reaction/sonic_powder/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/sonic_powder/on_reaction(datum/reagents/holder, created_volume) if(holder.has_reagent("stabilizing_agent")) return holder.remove_reagent("sonic_powder", created_volume) @@ -284,7 +284,7 @@ required_temp = 374 result_amount = 1 -/datum/chemical_reaction/sonic_powder_deafen/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/sonic_powder_deafen/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) playsound(location, 'sound/effects/bang.ogg', 25, 1) for(var/mob/living/carbon/C in get_hearers_in_view(created_volume/10, location)) @@ -307,7 +307,7 @@ required_reagents = list("phosphorus" = 1, "sacid" = 1, "stable_plasma" = 1) result_amount = 3 -/datum/chemical_reaction/phlogiston/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/phlogiston/on_reaction(datum/reagents/holder, created_volume) if(holder.has_reagent("stabilizing_agent")) return var/turf/simulated/T = get_turf(holder.my_atom) @@ -332,7 +332,7 @@ required_reagents = list("water" = 1, "stable_plasma" = 1, "nitrogen" = 1) result_amount = 3 -/datum/chemical_reaction/cryostylane/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/cryostylane/on_reaction(datum/reagents/holder, created_volume) holder.chem_temp = 20 // cools the fuck down return @@ -344,6 +344,6 @@ required_reagents = list("stable_plasma" = 1, "radium" = 1, "phosphorus" = 1) result_amount = 3 -/datum/chemical_reaction/pyrosium/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/pyrosium/on_reaction(datum/reagents/holder, created_volume) holder.chem_temp = 20 // also cools the fuck down return \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm b/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm index 98f34ef9f73..49048502ad0 100644 --- a/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm +++ b/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm @@ -9,7 +9,7 @@ required_container = /obj/item/slime_extract/grey required_other = 1 -/datum/chemical_reaction/slimespawn/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimespawn/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/mob/living/simple_animal/slime/S = new /mob/living/simple_animal/slime S.loc = get_turf(holder.my_atom) @@ -24,7 +24,7 @@ required_other = 1 required_container = /obj/item/slime_extract/grey -/datum/chemical_reaction/slimeinaprov/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimeinaprov/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") /datum/chemical_reaction/slimemonkey @@ -36,7 +36,7 @@ required_container = /obj/item/slime_extract/grey required_other = 1 -/datum/chemical_reaction/slimemonkey/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimemonkey/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") for(var/i = 1, i <= 3, i++) var /obj/item/weapon/reagent_containers/food/snacks/monkeycube/M = new /obj/item/weapon/reagent_containers/food/snacks/monkeycube @@ -52,7 +52,7 @@ required_other = 1 required_container = /obj/item/slime_extract/green -/datum/chemical_reaction/slimemutate/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimemutate/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") //Mutated Green @@ -66,7 +66,7 @@ required_container = /obj/item/slime_extract/green mix_message = "The mixture rapidly expands and contracts, its appearance shifting into a sickening green." -/datum/chemical_reaction/slimemutate_unstable/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimemutate_unstable/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") //Metal @@ -79,7 +79,7 @@ required_container = /obj/item/slime_extract/metal required_other = 1 -/datum/chemical_reaction/slimemetal/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimemetal/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/metal M.amount = 15 @@ -98,7 +98,7 @@ required_container = /obj/item/slime_extract/gold required_other = 1 -/datum/chemical_reaction/slimecrit/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimecrit/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") for(var/mob/O in viewers(get_turf(holder.my_atom), null)) O.show_message(text("The slime extract begins to vibrate violently !"), 1) @@ -115,7 +115,7 @@ required_container = /obj/item/slime_extract/gold required_other = 1 -/datum/chemical_reaction/slimecritlesser/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimecritlesser/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") for(var/mob/O in viewers(get_turf(holder.my_atom), null)) O.show_message(text("The slime extract begins to vibrate violently !"), 1) @@ -133,7 +133,7 @@ required_container = /obj/item/slime_extract/silver required_other = 1 -/datum/chemical_reaction/slimebork/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimebork/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/list/blocked = list(/obj/item/weapon/reagent_containers/food/snacks, @@ -181,7 +181,7 @@ required_container = /obj/item/slime_extract/silver required_other = 1 -/datum/chemical_reaction/slimebork2/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimebork2/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/list/blocked = list(/obj/item/weapon/reagent_containers/food/drinks) @@ -214,7 +214,7 @@ required_container = /obj/item/slime_extract/blue required_other = 1 -/datum/chemical_reaction/slimefrost/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimefrost/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") @@ -227,7 +227,7 @@ required_container = /obj/item/slime_extract/blue required_other = 1 -/datum/chemical_reaction/slimestabilizer/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimestabilizer/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/obj/item/weapon/slimestabilizer/P = new /obj/item/weapon/slimestabilizer P.loc = get_turf(holder.my_atom) @@ -244,7 +244,7 @@ required_container = /obj/item/slime_extract/darkblue required_other = 1 -/datum/chemical_reaction/slimefreeze/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimefreeze/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") for(var/mob/O in viewers(get_turf(holder.my_atom), null)) O.show_message(text("The slime extract begins to vibrate violently !"), 1) @@ -265,7 +265,7 @@ required_container = /obj/item/slime_extract/orange required_other = 1 -/datum/chemical_reaction/slimecasp/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimecasp/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") /datum/chemical_reaction/slimefire @@ -277,7 +277,7 @@ required_container = /obj/item/slime_extract/orange required_other = 1 -/datum/chemical_reaction/slimefire/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimefire/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") for(var/mob/O in viewers(get_turf(holder.my_atom), null)) O.show_message(text("The slime extract begins to vibrate violently !"), 1) @@ -298,7 +298,7 @@ required_container = /obj/item/slime_extract/yellow required_other = 1 -/datum/chemical_reaction/slimeoverload/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/slimeoverload/on_reaction(datum/reagents/holder, created_volume) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") empulse(get_turf(holder.my_atom), 3, 7) @@ -312,7 +312,7 @@ required_container = /obj/item/slime_extract/yellow required_other = 1 -/datum/chemical_reaction/slimecell/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/slimecell/on_reaction(datum/reagents/holder, created_volume) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/obj/item/weapon/stock_parts/cell/high/slime/P = new /obj/item/weapon/stock_parts/cell/high/slime P.loc = get_turf(holder.my_atom) @@ -326,7 +326,7 @@ required_container = /obj/item/slime_extract/yellow required_other = 1 -/datum/chemical_reaction/slimeglow/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimeglow/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") for(var/mob/O in viewers(get_turf(holder.my_atom), null)) O.show_message(text("The slime begins to emit a soft light. Squeezing it will cause it to grow brightly."), 1) @@ -344,7 +344,7 @@ required_container = /obj/item/slime_extract/purple required_other = 1 -/datum/chemical_reaction/slimepsteroid/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimepsteroid/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/obj/item/weapon/slimesteroid/P = new /obj/item/weapon/slimesteroid P.loc = get_turf(holder.my_atom) @@ -358,7 +358,7 @@ required_container = /obj/item/slime_extract/purple required_other = 1 -/datum/chemical_reaction/slimejam/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimejam/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") @@ -372,7 +372,7 @@ required_container = /obj/item/slime_extract/darkpurple required_other = 1 -/datum/chemical_reaction/slimeplasma/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimeplasma/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/obj/item/stack/sheet/mineral/plasma/P = new /obj/item/stack/sheet/mineral/plasma P.amount = 10 @@ -401,7 +401,7 @@ required_container = /obj/item/slime_extract/red required_other = 1 -/datum/chemical_reaction/slimemutator/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimemutator/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/obj/item/weapon/slimemutator/P = new /obj/item/weapon/slimemutator P.loc = get_turf(holder.my_atom) @@ -415,7 +415,7 @@ required_container = /obj/item/slime_extract/red required_other = 1 -/datum/chemical_reaction/slimebloodlust/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimebloodlust/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") for(var/mob/living/simple_animal/slime/slime in viewers(get_turf(holder.my_atom), null)) slime.rabid = 1 @@ -432,7 +432,7 @@ required_container = /obj/item/slime_extract/pink required_other = 1 -/datum/chemical_reaction/slimeppotion/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimeppotion/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/obj/item/slimepotion/P = new /obj/item/slimepotion P.loc = get_turf(holder.my_atom) @@ -448,7 +448,7 @@ required_other = 1 required_container = /obj/item/slime_extract/black -/datum/chemical_reaction/slimemutate2/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimemutate2/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") //Oil @@ -461,7 +461,7 @@ required_container = /obj/item/slime_extract/oil required_other = 1 -/datum/chemical_reaction/slimeexplosion/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimeexplosion/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") for(var/mob/O in viewers(get_turf(holder.my_atom), null)) O.show_message(text("The slime extract begins to vibrate violently !"), 1) @@ -479,7 +479,7 @@ required_reagents = list("plasma" = 1) required_other = 1 -/datum/chemical_reaction/slimepotion2/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimepotion2/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/obj/item/slimepotion2/P = new /obj/item/slimepotion2 P.loc = get_turf(holder.my_atom) @@ -494,7 +494,7 @@ required_container = /obj/item/slime_extract/adamantine required_other = 1 -/datum/chemical_reaction/slimegolem/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimegolem/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/obj/effect/golemrune/Z = new /obj/effect/golemrune Z.loc = get_turf(holder.my_atom) @@ -510,7 +510,7 @@ required_container = /obj/item/slime_extract/bluespace required_other = 1 -/datum/chemical_reaction/slimefloor2/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/slimefloor2/on_reaction(datum/reagents/holder, created_volume) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/obj/item/stack/tile/bluespace/P = new /obj/item/stack/tile/bluespace P.amount = 25 @@ -526,7 +526,7 @@ required_container = /obj/item/slime_extract/bluespace required_other = 1 -/datum/chemical_reaction/slimecrystal/on_reaction(var/datum/reagents/holder, var/created_volume) +/datum/chemical_reaction/slimecrystal/on_reaction(datum/reagents/holder, created_volume) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") if(holder.my_atom) var/obj/item/bluespace_crystal/BC = new(get_turf(holder.my_atom)) @@ -542,7 +542,7 @@ required_container = /obj/item/slime_extract/cerulean required_other = 1 -/datum/chemical_reaction/slimepsteroid2/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimepsteroid2/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/obj/item/weapon/slimesteroid2/P = new /obj/item/weapon/slimesteroid2 P.loc = get_turf(holder.my_atom) @@ -557,7 +557,7 @@ required_container = /obj/item/slime_extract/sepia required_other = 1 -/datum/chemical_reaction/slimestop/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimestop/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/mob/mob = get_mob_by_key(holder.my_atom.fingerprintslast) var/obj/effect/timestop/T = new /obj/effect/timestop @@ -575,7 +575,7 @@ required_container = /obj/item/slime_extract/sepia required_other = 1 -/datum/chemical_reaction/slimecamera/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimecamera/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/obj/item/device/camera/P = new /obj/item/device/camera P.loc = get_turf(holder.my_atom) @@ -591,7 +591,7 @@ required_container = /obj/item/slime_extract/sepia required_other = 1 -/datum/chemical_reaction/slimefloor/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimefloor/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/obj/item/stack/tile/sepia/P = new /obj/item/stack/tile/sepia P.amount = 25 @@ -610,7 +610,7 @@ required_container = /obj/item/slime_extract/pyrite required_other = 1 -/datum/chemical_reaction/slimepaint/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimepaint/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/list/paints = typesof(/obj/item/weapon/paint) - /obj/item/weapon/paint var/chosen = pick(paints) @@ -628,7 +628,7 @@ required_other = 1 required_container = /obj/item/slime_extract/rainbow -/datum/chemical_reaction/slimeRNG/on_reaction(var/datum/reagents/holder) +/datum/chemical_reaction/slimeRNG/on_reaction(datum/reagents/holder) feedback_add_details("slime_cores_used","[replacetext(name," ","_")]") var/mob/living/simple_animal/slime/S = new /mob/living/simple_animal/slime S.colour = pick("grey","orange", "metal", "blue", "purple", "dark purple", "dark blue", "green", "silver", "yellow", "gold", "yellow", "red", "silver", "pink", "cerulean", "sepia", "bluespace", "pyrite", "light pink", "oil", "adamantine", "black") diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index b8edfbae4a6..c75e6c3e82d 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -36,16 +36,16 @@ if(list_reagents) reagents.add_reagent_list(list_reagents) -/obj/item/weapon/reagent_containers/attack_self(mob/user as mob) +/obj/item/weapon/reagent_containers/attack_self(mob/user) return -/obj/item/weapon/reagent_containers/attack(mob/M as mob, mob/user as mob, def_zone) +/obj/item/weapon/reagent_containers/attack(mob/M, mob/user, def_zone) return /obj/item/weapon/reagent_containers/afterattack(obj/target, mob/user , flag) return -/obj/item/weapon/reagent_containers/proc/reagentlist(var/obj/item/weapon/reagent_containers/snack) //Attack logs for regents in pills +/obj/item/weapon/reagent_containers/proc/reagentlist(obj/item/weapon/reagent_containers/snack) //Attack logs for regents in pills var/data if(snack.reagents.reagent_list && snack.reagents.reagent_list.len) //find a reagent list if there is and check if it has entries for (var/datum/reagent/R in snack.reagents.reagent_list) //no reagents will be left behind diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index f7425424367..ab68ee49f79 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -64,7 +64,7 @@ Borg Hypospray // Use this to add more chemicals for the borghypo to produce. -/obj/item/weapon/reagent_containers/borghypo/proc/add_reagent(var/reagent) +/obj/item/weapon/reagent_containers/borghypo/proc/add_reagent(reagent) reagent_ids |= reagent var/datum/reagents/RG = new(30) RG.my_atom = src @@ -82,7 +82,7 @@ Borg Hypospray R.cell.use(charge_cost) //Take power from borg... RG.add_reagent(reagent_ids[mode], 5) //And fill hypo with reagent. -/obj/item/weapon/reagent_containers/borghypo/attack(mob/living/M as mob, mob/user as mob) +/obj/item/weapon/reagent_containers/borghypo/attack(mob/living/M, mob/user) var/datum/reagents/R = reagent_list[mode] if(!R.total_volume) user << "The injector is empty." @@ -139,7 +139,7 @@ Borg Shaker reagent_ids = list("beer", "orangejuice", "limejuice", "tomatojuice", "cola", "tonic", "sodawater", "ice", "cream", "whiskey", "vodka", "rum", "gin", "tequila", "vermouth", "wine", "kahlua", "cognac", "ale") -/obj/item/weapon/reagent_containers/borghypo/borgshaker/attack(mob/M as mob, mob/user as mob) +/obj/item/weapon/reagent_containers/borghypo/borgshaker/attack(mob/M, mob/user) return //Can't inject stuff with a shaker, can we? /obj/item/weapon/reagent_containers/borghypo/borgshaker/regenerate_reagents() diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 149a5c5c365..28f2344db58 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -34,7 +34,7 @@ -/obj/item/weapon/reagent_containers/glass/attack(mob/M as mob, mob/user as mob, obj/target) +/obj/item/weapon/reagent_containers/glass/attack(mob/M, mob/user, obj/target) if(!canconsume(M, user)) return @@ -125,7 +125,7 @@ reagents.reaction(target, TOUCH) reagents.clear_reagents() -/obj/item/weapon/reagent_containers/glass/attackby(var/obj/item/I, mob/user as mob, params) +/obj/item/weapon/reagent_containers/glass/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/clothing/mask/cigarette)) //ciggies are weird return var/hotness = is_hot(I) @@ -265,7 +265,7 @@ volume = 70 flags = OPENCONTAINER -/obj/item/weapon/reagent_containers/glass/bucket/attackby(var/obj/O, mob/user as mob, params) +/obj/item/weapon/reagent_containers/glass/bucket/attackby(obj/O, mob/user, params) if(istype(O, /obj/item/weapon/mop)) if(reagents.total_volume < 1) user << "[src] is out of water!" diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 4ab2c5b5268..5c7b6096d40 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -74,7 +74,7 @@ update_icon() return -/obj/item/weapon/reagent_containers/hypospray/medipen/attack(mob/M as mob, mob/user as mob) +/obj/item/weapon/reagent_containers/hypospray/medipen/attack(mob/M, mob/user) ..() update_icon() return diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 1f606a3f885..40a495450fc 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -17,7 +17,7 @@ possible_transfer_amounts = null -/obj/item/weapon/reagent_containers/spray/afterattack(atom/A as mob|obj, mob/user as mob) +/obj/item/weapon/reagent_containers/spray/afterattack(atom/A as mob|obj, mob/user) if(istype(A, /obj/item/weapon/storage) || istype(A, /obj/structure/table) || istype(A, /obj/structure/rack) || istype(A, /obj/structure/closet) \ || istype(A, /obj/item/weapon/reagent_containers) || istype(A, /obj/structure/sink) || istype(A, /obj/structure/janitorialcart) || istype(A, /obj/machinery/hydroponics)) return @@ -60,7 +60,7 @@ return -/obj/item/weapon/reagent_containers/spray/proc/spray(var/atom/A) +/obj/item/weapon/reagent_containers/spray/proc/spray(atom/A) var/range = max(min(spray_currentrange, get_dist(src, A)), 1) var/obj/effect/decal/chempuff/D = new /obj/effect/decal/chempuff(get_turf(src)) D.create_reagents(amount_per_transfer_from_this) @@ -92,7 +92,7 @@ return qdel(D) -/obj/item/weapon/reagent_containers/spray/attack_self(var/mob/user) +/obj/item/weapon/reagent_containers/spray/attack_self(mob/user) amount_per_transfer_from_this = (amount_per_transfer_from_this == 10 ? 5 : 10) spray_currentrange = (spray_currentrange == 1 ? spray_maxrange : 1) @@ -141,7 +141,7 @@ volume = 10 list_reagents = list("water" = 10) -/obj/item/weapon/reagent_containers/spray/waterflower/attack_self(var/mob/user) //Don't allow changing how much the flower sprays +/obj/item/weapon/reagent_containers/spray/waterflower/attack_self(mob/user) //Don't allow changing how much the flower sprays return //chemsprayer @@ -160,7 +160,7 @@ origin_tech = "combat=3;materials=3;engineering=3" -/obj/item/weapon/reagent_containers/spray/chemsprayer/spray(var/atom/A) +/obj/item/weapon/reagent_containers/spray/chemsprayer/spray(atom/A) var/direction = get_dir(src, A) var/turf/T = get_turf(A) var/turf/T1 = get_step(T,turn(direction, 90)) @@ -172,7 +172,7 @@ return ..(the_targets[i]) -/obj/item/weapon/reagent_containers/spray/chemsprayer/attack_self(var/mob/user) +/obj/item/weapon/reagent_containers/spray/chemsprayer/attack_self(mob/user) amount_per_transfer_from_this = (amount_per_transfer_from_this == 10 ? 5 : 10) user << "You adjust the output switch. You'll now use [amount_per_transfer_from_this] units per spray." diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 553f6c9cfbc..4a53376ceb6 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -30,7 +30,7 @@ if(prob(50)) qdel(src) -/obj/structure/reagent_dispensers/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/reagent_dispensers/attackby(obj/item/weapon/W, mob/user, params) return /obj/structure/reagent_dispensers/New() @@ -94,7 +94,7 @@ reagents.add_reagent("welding_fuel",1000) -/obj/structure/reagent_dispensers/fueltank/bullet_act(var/obj/item/projectile/Proj) +/obj/structure/reagent_dispensers/fueltank/bullet_act(obj/item/projectile/Proj) ..() if(istype(Proj ,/obj/item/projectile/beam)||istype(Proj,/obj/item/projectile/bullet)) if((Proj.damage_type == BURN) || (Proj.damage_type == BRUTE)) @@ -145,7 +145,7 @@ ..() reagents.add_reagent("water",500) -/obj/structure/reagent_dispensers/water_cooler/attack_hand(var/mob/living/carbon/human/user) +/obj/structure/reagent_dispensers/water_cooler/attack_hand(mob/living/carbon/human/user) if((!istype(user)) || (user.stat)) return if(cups <= 0) @@ -155,7 +155,7 @@ user.put_in_hands(new /obj/item/weapon/reagent_containers/food/drinks/sillycup) user.visible_message("[user] gets a cup from [src].","You get a cup from [src].") -/obj/structure/reagent_dispensers/water_cooler/attackby(var/obj/item/I, var/mob/user, params) +/obj/structure/reagent_dispensers/water_cooler/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/paper)) if(!user.drop_item()) return diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 5e077f56ea3..749b76bb1eb 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -115,7 +115,7 @@ break // attack with item, place item on conveyor -/obj/machinery/conveyor/attackby(var/obj/item/I, mob/user, params) +/obj/machinery/conveyor/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/crowbar)) if(!(stat & BROKEN)) var/obj/item/conveyor_construct/C = new/obj/item/conveyor_construct(src.loc) @@ -132,7 +132,7 @@ return // attack with hand, move pulled object onto conveyor -/obj/machinery/conveyor/attack_hand(mob/user as mob) +/obj/machinery/conveyor/attack_hand(mob/user) user.Move_Pulled(src) @@ -257,7 +257,7 @@ S.position = position S.update() -/obj/machinery/conveyor_switch/attackby(var/obj/item/I, mob/user, params) +/obj/machinery/conveyor_switch/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/crowbar)) var/obj/item/conveyor_switch_construct/C = new/obj/item/conveyor_switch_construct(src.loc) C.id = id diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm index 2576dcfc98c..e85c1218e39 100644 --- a/code/modules/recycling/disposal-construction.dm +++ b/code/modules/recycling/disposal-construction.dm @@ -153,7 +153,7 @@ // wrench: (un)anchor // weldingtool: convert to real pipe -/obj/structure/disposalconstruct/attackby(var/obj/item/I, var/mob/user, params) +/obj/structure/disposalconstruct/attackby(obj/item/I, mob/user, params) var/nicetype = "pipe" var/ispipe = is_pipe() // Indicates if we should change the level of this pipe add_fingerprint(user) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 6c071c54d0b..0ad17216e87 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -71,7 +71,7 @@ trunk_check() // attack by item places it in to disposal -/obj/machinery/disposal/attackby(var/obj/item/I, var/mob/user, params) +/obj/machinery/disposal/attackby(obj/item/I, mob/user, params) if(stat & BROKEN || !I || !user) return @@ -152,8 +152,8 @@ target.visible_message("[user] starts putting [target] into [src].", \ "[user] starts putting you into [src]!") if(do_mob(user, target, 20)) - if (!src.loc) - return + if (!src.loc) + return if (target.client) target.client.perspective = EYE_PERSPECTIVE target.client.eye = src @@ -171,14 +171,14 @@ /obj/machinery/disposal/alter_health() return get_turf(src) -/obj/machinery/disposal/relaymove(mob/user as mob) +/obj/machinery/disposal/relaymove(mob/user) attempt_escape(user) // resist to escape the bin /obj/machinery/disposal/container_resist() attempt_escape(usr) -/obj/machinery/disposal/proc/attempt_escape(mob/user as mob) +/obj/machinery/disposal/proc/attempt_escape(mob/user) if(src.flushing) return go_out(user) @@ -196,18 +196,18 @@ // monkeys and xenos can only pull the flush lever -/obj/machinery/disposal/attack_paw(mob/user as mob) +/obj/machinery/disposal/attack_paw(mob/user) if(stat & BROKEN) return flush = !flush update() // ai as human but can't flush -/obj/machinery/disposal/attack_ai(mob/user as mob) +/obj/machinery/disposal/attack_ai(mob/user) interact(user, 1) // human interact with machine -/obj/machinery/disposal/attack_hand(mob/user as mob) +/obj/machinery/disposal/attack_hand(mob/user) if(user && user.loc == src) usr << "You cannot reach the controls from inside!" return @@ -219,7 +219,7 @@ interact(user, 0) // hostile mob escape from disposals -/obj/machinery/disposal/attack_animal(var/mob/living/simple_animal/M) +/obj/machinery/disposal/attack_animal(mob/living/simple_animal/M) if(M.environment_smash) M.do_attack_animation(src) visible_message("[M.name] smashes \the [src] apart!") @@ -227,7 +227,7 @@ return // user interaction -/obj/machinery/disposal/interact(mob/user, var/ai=0) +/obj/machinery/disposal/interact(mob/user, ai=0) src.add_fingerprint(user) if(stat & BROKEN) @@ -417,7 +417,7 @@ // called when holder is expelled from a disposal // should usually only occur if the pipe network is modified -/obj/machinery/disposal/proc/expel(var/obj/structure/disposalholder/H) +/obj/machinery/disposal/proc/expel(obj/structure/disposalholder/H) var/turf/target playsound(src, 'sound/machines/hiss.ogg', 50, 0, 0) @@ -486,7 +486,7 @@ ..() // initialize a holder from the contents of a disposal unit -/obj/structure/disposalholder/proc/init(var/obj/machinery/disposal/D) +/obj/structure/disposalholder/proc/init(obj/machinery/disposal/D) gas = D.air_contents// transfer gas resv. into holder object //Check for any living mobs trigger hasmob. @@ -521,7 +521,7 @@ // start the movement process // argument is the disposal unit the holder started in -/obj/structure/disposalholder/proc/start(var/obj/machinery/disposal/D) +/obj/structure/disposalholder/proc/start(obj/machinery/disposal/D) if(!D.trunk) D.expel(src) // no trunk connected, so expel immediately return @@ -554,7 +554,7 @@ return get_step(loc,dir) // find a matching pipe on a turf -/obj/structure/disposalholder/proc/findpipe(var/turf/T) +/obj/structure/disposalholder/proc/findpipe(turf/T) if(!T) return null @@ -568,7 +568,7 @@ // merge two holder objects // used when a a holder meets a stuck holder -/obj/structure/disposalholder/proc/merge(var/obj/structure/disposalholder/other) +/obj/structure/disposalholder/proc/merge(obj/structure/disposalholder/other) for(var/atom/movable/AM in other) AM.loc = src // move everything in other holder to this one if(ismob(AM)) @@ -579,7 +579,7 @@ // called when player tries to move while in a pipe -/obj/structure/disposalholder/relaymove(mob/user as mob) +/obj/structure/disposalholder/relaymove(mob/user) if (user.stat) return if (src.loc) @@ -588,7 +588,7 @@ playsound(src.loc, 'sound/effects/clang.ogg', 50, 0, 0) // called to vent all gas in holder to a location -/obj/structure/disposalholder/proc/vent_gas(var/atom/location) +/obj/structure/disposalholder/proc/vent_gas(atom/location) if(location) location.assume_air(gas) // vent all gas to turf air_update_turf() @@ -673,13 +673,13 @@ // returns the direction of the next pipe object, given the entrance dir // by default, returns the bitmask of remaining directions -/obj/structure/disposalpipe/proc/nextdir(var/fromdir) +/obj/structure/disposalpipe/proc/nextdir(fromdir) return dpdir & (~turn(fromdir, 180)) // transfer the holder through this pipe segment // overriden for special behaviour // -/obj/structure/disposalpipe/proc/transfer(var/obj/structure/disposalholder/H) +/obj/structure/disposalpipe/proc/transfer(obj/structure/disposalholder/H) var/nextdir = nextdir(H.dir) H.dir = nextdir var/turf/T = H.nextloc() @@ -726,7 +726,7 @@ // called when there is a break in the pipe // -/obj/structure/disposalpipe/proc/expel(var/obj/structure/disposalholder/H, var/turf/T, var/direction) +/obj/structure/disposalpipe/proc/expel(obj/structure/disposalholder/H, turf/T, direction) var/turf/target @@ -772,7 +772,7 @@ // will expel any holder inside at the time // then delete the pipe // remains : set to leave broken pipe pieces in place -/obj/structure/disposalpipe/proc/broken(var/remains = 0) +/obj/structure/disposalpipe/proc/broken(remains = 0) if(remains) for(var/D in cardinal) if(D & dpdir) @@ -836,7 +836,7 @@ //attack by item //weldingtool: unfasten and convert to obj/disposalconstruct -/obj/structure/disposalpipe/attackby(var/obj/item/I, var/mob/user, params) +/obj/structure/disposalpipe/attackby(obj/item/I, mob/user, params) var/turf/T = src.loc if(T.intact) @@ -915,7 +915,7 @@ // if coming in from secondary dirs, then next is primary dir // if coming in from primary dir, then next is equal chance of other dirs -/obj/structure/disposalpipe/junction/nextdir(var/fromdir) +/obj/structure/disposalpipe/junction/nextdir(fromdir) var/flipdir = turn(fromdir, 180) if(flipdir != dir) // came from secondary dir return dir // so exit through primary @@ -973,7 +973,7 @@ update() return -/obj/structure/disposalpipe/sortjunction/attackby(var/obj/item/I, var/mob/user, params) +/obj/structure/disposalpipe/sortjunction/attackby(obj/item/I, mob/user, params) if(..()) return @@ -993,7 +993,7 @@ // if coming in from posdir, then flip around and go back to posdir // if coming in from sortdir, go to posdir -/obj/structure/disposalpipe/sortjunction/nextdir(var/fromdir, var/sortTag) +/obj/structure/disposalpipe/sortjunction/nextdir(fromdir, sortTag) //var/flipdir = turn(fromdir, 180) if(fromdir != sortdir) // probably came from the negdir @@ -1005,7 +1005,7 @@ // so go with the flow to positive direction return posdir -/obj/structure/disposalpipe/sortjunction/transfer(var/obj/structure/disposalholder/H) +/obj/structure/disposalpipe/sortjunction/transfer(obj/structure/disposalholder/H) var/nextdir = nextdir(H.dir, H.destinationTag) H.dir = nextdir var/turf/T = H.nextloc() @@ -1054,7 +1054,7 @@ // if coming in from posdir, then flip around and go back to posdir // if coming in from sortdir, go to posdir -/obj/structure/disposalpipe/wrapsortjunction/nextdir(var/fromdir, var/istomail) +/obj/structure/disposalpipe/wrapsortjunction/nextdir(fromdir, istomail) //var/flipdir = turn(fromdir, 180) if(fromdir != sortdir) // probably came from the negdir @@ -1066,7 +1066,7 @@ // so go with the flow to positive direction return posdir -/obj/structure/disposalpipe/wrapsortjunction/transfer(var/obj/structure/disposalholder/H) +/obj/structure/disposalpipe/wrapsortjunction/transfer(obj/structure/disposalholder/H) var/nextdir = nextdir(H.dir, H.tomail) H.dir = nextdir var/turf/T = H.nextloc() @@ -1119,7 +1119,7 @@ return // Override attackby so we disallow trunkremoval when somethings ontop -/obj/structure/disposalpipe/trunk/attackby(var/obj/item/I, var/mob/user, params) +/obj/structure/disposalpipe/trunk/attackby(obj/item/I, mob/user, params) //Disposal bins or chutes /* @@ -1164,7 +1164,7 @@ // if not entering from disposal bin, // transfer to linked object (outlet or bin) -/obj/structure/disposalpipe/trunk/transfer(var/obj/structure/disposalholder/H) +/obj/structure/disposalpipe/trunk/transfer(obj/structure/disposalholder/H) if(H.dir == DOWN) // we just entered from a disposer return ..() // so do base transfer proc @@ -1184,7 +1184,7 @@ // nextdir -/obj/structure/disposalpipe/trunk/nextdir(var/fromdir) +/obj/structure/disposalpipe/trunk/nextdir(fromdir) if(fromdir == DOWN) return dir else @@ -1246,7 +1246,7 @@ // expel the contents of the holder object, then delete it // called when the holder exits the outlet -/obj/structure/disposaloutlet/proc/expel(var/obj/structure/disposalholder/H) +/obj/structure/disposaloutlet/proc/expel(obj/structure/disposalholder/H) flick("outlet-open", src) if((start_eject + 30) < world.time) @@ -1267,7 +1267,7 @@ qdel(H) return -/obj/structure/disposaloutlet/attackby(var/obj/item/I, var/mob/user, params) +/obj/structure/disposaloutlet/attackby(obj/item/I, mob/user, params) if(!I || !user) return src.add_fingerprint(user) @@ -1305,7 +1305,7 @@ // called when movable is expelled from a disposal pipe or outlet // by default does nothing, override for special behaviour -/atom/movable/proc/pipe_eject(var/direction) +/atom/movable/proc/pipe_eject(direction) return // check if mob has client, if so restore client view on eject @@ -1316,7 +1316,7 @@ return -/obj/effect/decal/cleanable/blood/gibs/pipe_eject(var/direction) +/obj/effect/decal/cleanable/blood/gibs/pipe_eject(direction) var/list/dirs if(direction) dirs = list( direction, turn(direction, -45), turn(direction, 45)) @@ -1325,11 +1325,11 @@ src.streak(dirs) -/obj/effect/decal/cleanable/robot_debris/gib/pipe_eject(var/direction) +/obj/effect/decal/cleanable/robot_debris/gib/pipe_eject(direction) var/list/dirs if(direction) dirs = list( direction, turn(direction, -45), turn(direction, 45)) else dirs = alldirs.Copy() - src.streak(dirs) + src.streak(dirs) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 5225e5a4d48..fc8b12cbe5b 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -10,7 +10,7 @@ var/sortTag = 0 -/obj/structure/bigDelivery/attack_hand(mob/user as mob) +/obj/structure/bigDelivery/attack_hand(mob/user) playsound(src.loc, 'sound/items/poster_ripped.ogg', 50, 1) qdel(src) @@ -25,7 +25,7 @@ AM.loc = T ..() -/obj/structure/bigDelivery/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/structure/bigDelivery/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/device/destTagger)) var/obj/item/device/destTagger/O = W @@ -68,7 +68,7 @@ var/sortTag = 0 -/obj/item/smallDelivery/attack_self(mob/user as mob) +/obj/item/smallDelivery/attack_self(mob/user) if(wrapped && wrapped.loc) //sometimes items can disappear. For example, bombs. --rastaf0 wrapped.loc = user.loc if(ishuman(user)) @@ -79,7 +79,7 @@ qdel(src) -/obj/item/smallDelivery/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/smallDelivery/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/device/destTagger)) var/obj/item/device/destTagger/O = W @@ -120,7 +120,7 @@ burn_state = 0 //burnable -/obj/item/stack/packageWrap/afterattack(var/obj/target as obj, mob/user as mob, proximity) +/obj/item/stack/packageWrap/afterattack(obj/target, mob/user, proximity) if(!proximity) return if(!istype(target)) //this really shouldn't be necessary (but it is). -Pete return @@ -204,7 +204,7 @@ flags = CONDUCT slot_flags = SLOT_BELT -/obj/item/device/destTagger/proc/openwindow(mob/user as mob) +/obj/item/device/destTagger/proc/openwindow(mob/user) var/dat = "

    TagMaster 2.2

    " dat += "" @@ -219,7 +219,7 @@ user << browse(dat, "window=destTagScreen;size=450x350") onclose(user, "destTagScreen") -/obj/item/device/destTagger/attack_self(mob/user as mob) +/obj/item/device/destTagger/attack_self(mob/user) openwindow(user) return @@ -256,7 +256,7 @@ /obj/machinery/disposal/deliveryChute/update() return -/obj/machinery/disposal/deliveryChute/Bumped(var/atom/movable/AM) //Go straight into the chute +/obj/machinery/disposal/deliveryChute/Bumped(atom/movable/AM) //Go straight into the chute if(!AM.disposalEnterTry()) return switch(dir) @@ -292,7 +292,7 @@ /obj/machinery/disposal/deliveryChute/newHolderDestination(obj/structure/disposalholder/H) H.destinationTag = 1 -/obj/machinery/disposal/deliveryChute/attackby(var/obj/item/I, var/mob/user, params) +/obj/machinery/disposal/deliveryChute/attackby(obj/item/I, mob/user, params) if(!I || !user) return diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index ad73173fdbe..59205f31359 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -59,7 +59,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). qdel(src) -/obj/machinery/r_n_d/circuit_imprinter/proc/check_mat(datum/design/being_built, var/M) +/obj/machinery/r_n_d/circuit_imprinter/proc/check_mat(datum/design/being_built, M) switch(M) if(MAT_GLASS) return (g_amount - (being_built.materials[M]/efficiency_coeff) >= 0) @@ -74,7 +74,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). /obj/machinery/r_n_d/circuit_imprinter/proc/TotalMaterials() return g_amount + gold_amount + diamond_amount -/obj/machinery/r_n_d/circuit_imprinter/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/r_n_d/circuit_imprinter/attackby(obj/item/O, mob/user, params) if (shocked) shock(user,50) if (default_deconstruction_screwdriver(user, "circuit_imprinter_t", "circuit_imprinter", O)) diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index a7af564216a..4f7414e3457 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -44,7 +44,7 @@ other types of metals and chemistry for reagents). //A proc to calculate the reliability of a design based on tech levels and innate modifiers. //Input: A list of /datum/tech; Output: The new reliabilty. -/datum/design/proc/CalcReliability(var/list/temp_techs) +/datum/design/proc/CalcReliability(list/temp_techs) var/new_reliability for(var/datum/tech/T in temp_techs) if(T.id in req_tech) diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index 57f36ad9179..6fef356857b 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -30,14 +30,14 @@ Note: Must be placed within 3 tiles of the R&D Console decon_mod = T -/obj/machinery/r_n_d/destructive_analyzer/proc/ConvertReqString2List(var/list/source_list) +/obj/machinery/r_n_d/destructive_analyzer/proc/ConvertReqString2List(list/source_list) var/list/temp_list = params2list(source_list) for(var/O in temp_list) temp_list[O] = text2num(temp_list[O]) return temp_list -/obj/machinery/r_n_d/destructive_analyzer/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/r_n_d/destructive_analyzer/attackby(obj/item/O, mob/user, params) if (shocked) shock(user,50) if (default_deconstruction_screwdriver(user, "d_analyzer_t", "d_analyzer", O)) diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index 731a78e8b7c..0d9299f5ce1 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -34,7 +34,7 @@ var/list/valid_items = list() //valid items for special reactions like transforming var/list/critical_items = list() //items that can cause critical reactions -/obj/machinery/r_n_d/experimentor/proc/ConvertReqString2List(var/list/source_list) +/obj/machinery/r_n_d/experimentor/proc/ConvertReqString2List(list/source_list) var/list/temp_list = params2list(source_list) for(var/O in temp_list) temp_list[O] = text2num(temp_list[O]) @@ -106,7 +106,7 @@ for(var/obj/item/weapon/stock_parts/micro_laser/M in component_parts) badThingCoeff += M.rating -/obj/machinery/r_n_d/experimentor/proc/checkCircumstances(var/obj/item/O as obj) +/obj/machinery/r_n_d/experimentor/proc/checkCircumstances(obj/item/O) //snowflake check to only take "made" bombs if(istype(O,/obj/item/device/transfer_valve)) var/obj/item/device/transfer_valve/T = O @@ -114,7 +114,7 @@ return FALSE return TRUE -/obj/machinery/r_n_d/experimentor/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/r_n_d/experimentor/attackby(obj/item/O, mob/user, params) if (shocked) shock(user,50) @@ -162,11 +162,11 @@ return -/obj/machinery/r_n_d/experimentor/default_deconstruction_crowbar(var/obj/item/O) +/obj/machinery/r_n_d/experimentor/default_deconstruction_crowbar(obj/item/O) ejectItem() ..(O) -/obj/machinery/r_n_d/experimentor/attack_hand(mob/user as mob) +/obj/machinery/r_n_d/experimentor/attack_hand(mob/user) user.set_machine(src) var/dat = "
    " if(!linked_console) @@ -200,7 +200,7 @@ onclose(user, "experimentor") -/obj/machinery/r_n_d/experimentor/proc/matchReaction(var/matching,var/reaction) +/obj/machinery/r_n_d/experimentor/proc/matchReaction(matching,reaction) var/obj/item/D = matching if(D) if(item_reactions.Find("[D.type]")) @@ -214,7 +214,7 @@ else return FAIL -/obj/machinery/r_n_d/experimentor/proc/ejectItem(var/delete=FALSE) +/obj/machinery/r_n_d/experimentor/proc/ejectItem(delete=FALSE) if(loaded_item) if(cloneMode && cloneCount > 0) visible_message("A duplicate [loaded_item] pops out!") @@ -230,12 +230,12 @@ qdel(loaded_item) loaded_item = null -/obj/machinery/r_n_d/experimentor/proc/throwSmoke(var/turf/where) +/obj/machinery/r_n_d/experimentor/proc/throwSmoke(turf/where) var/datum/effect/effect/system/smoke_spread/smoke = new smoke.set_up(1,0, where, 0) smoke.start() -/obj/machinery/r_n_d/experimentor/proc/pickWeighted(var/list/from) +/obj/machinery/r_n_d/experimentor/proc/pickWeighted(list/from) var/result = FALSE var/counter = 1 while(!result) @@ -248,7 +248,7 @@ else counter = 1 -/obj/machinery/r_n_d/experimentor/proc/experiment(var/exp,var/obj/item/exp_on) +/obj/machinery/r_n_d/experimentor/proc/experiment(exp,obj/item/exp_on) recentlyExperimented = 1 icon_state = "h_lathe_wloop" var/chosenchem @@ -588,7 +588,7 @@ return //~~~~~~~~Admin logging proc, aka the Powergamer Alarm~~~~~~~~ -/obj/machinery/r_n_d/experimentor/proc/warn_admins(var/mob/user, var/ReactionName) +/obj/machinery/r_n_d/experimentor/proc/warn_admins(mob/user, ReactionName) var/turf/T = get_turf(src) message_admins("Experimentor reaction: [ReactionName] generated by [key_name_admin(user)](?) (FLW) at ([T.x],[T.y],[T.z] - JMP)",0,1) log_game("Experimentor reaction: [ReactionName] generated by [key_name(user)] in ([T.x],[T.y],[T.z])") @@ -636,7 +636,7 @@ cooldownMax = rand(60,300) realProc = pick("teleport","explode","rapidDupe","petSpray","flash","clean","corgicannon") -/obj/item/weapon/relic/attack_self(mob/user as mob) +/obj/item/weapon/relic/attack_self(mob/user) if(revealed) if(cooldown) user << "[src] does not react!" @@ -651,31 +651,31 @@ //////////////// RELIC PROCS ///////////////////////////// -/obj/item/weapon/relic/proc/throwSmoke(var/turf/where) +/obj/item/weapon/relic/proc/throwSmoke(turf/where) var/datum/effect/effect/system/smoke_spread/smoke = new smoke.set_up(1,0, where, 0) smoke.start() -/obj/item/weapon/relic/proc/corgicannon(var/mob/user) +/obj/item/weapon/relic/proc/corgicannon(mob/user) playsound(src.loc, "sparks", rand(25,50), 1) var/mob/living/simple_animal/pet/corgi/C = new/mob/living/simple_animal/pet/corgi(get_turf(user)) C.throw_at(pick(oview(10,user)),10,rand(3,8)) throwSmoke(get_turf(C)) warn_admins(user, "Corgi Cannon", 0) -/obj/item/weapon/relic/proc/clean(var/mob/user) +/obj/item/weapon/relic/proc/clean(mob/user) playsound(src.loc, "sparks", rand(25,50), 1) var/obj/item/weapon/grenade/chem_grenade/cleaner/CL = new/obj/item/weapon/grenade/chem_grenade/cleaner(get_turf(user)) CL.prime() warn_admins(user, "Smoke", 0) -/obj/item/weapon/relic/proc/flash(var/mob/user) +/obj/item/weapon/relic/proc/flash(mob/user) playsound(src.loc, "sparks", rand(25,50), 1) var/obj/item/weapon/grenade/flashbang/CB = new/obj/item/weapon/grenade/flashbang(get_turf(user)) CB.prime() warn_admins(user, "Flash") -/obj/item/weapon/relic/proc/petSpray(var/mob/user) +/obj/item/weapon/relic/proc/petSpray(mob/user) var/message = "[src] begans to shake, and in the distance the sound of rampaging animals arises!" visible_message(message) user << message @@ -690,7 +690,7 @@ user << "[src] falls apart!" qdel(src) -/obj/item/weapon/relic/proc/rapidDupe(var/mob/user) +/obj/item/weapon/relic/proc/rapidDupe(mob/user) audible_message("[src] emits a loud pop!") var/list/dupes = list() var/counter @@ -711,7 +711,7 @@ qdel(R) warn_admins(user, "Rapid duplicator", 0) -/obj/item/weapon/relic/proc/explode(var/mob/user) +/obj/item/weapon/relic/proc/explode(mob/user) user << "[src] begins to heat up!" spawn(rand(35,100)) if(src.loc == user) @@ -720,7 +720,7 @@ warn_admins(user, "Explosion") qdel(src) //Comment this line to produce a light grenade (the bomb that keeps on exploding when used)!! -/obj/item/weapon/relic/proc/teleport(var/mob/user) +/obj/item/weapon/relic/proc/teleport(mob/user) user << "The [src] begins to vibrate!" spawn(rand(10,30)) var/turf/userturf = get_turf(user) @@ -732,7 +732,7 @@ warn_admins(user, "Teleport", 0) //Admin Warning proc for relics -/obj/item/weapon/relic/proc/warn_admins(var/mob/user, var/RelicType, var/priority = 1) +/obj/item/weapon/relic/proc/warn_admins(mob/user, RelicType, priority = 1) var/turf/T = get_turf(src) var/log_msg = "[RelicType] relic used by [key_name(user)] in ([T.x],[T.y],[T.z])" if(priority) //For truly dangerous relics that may need an admin's attention. BWOINK! diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index 6c584bc1a15..901d291e947 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -116,17 +116,17 @@ var/global/list/obj/machinery/message_server/message_servers = list() update_icon() return -/obj/machinery/message_server/proc/send_chat_message(var/sender = "", var/channel = "", var/message = "") +/obj/machinery/message_server/proc/send_chat_message(sender = "", channel = "", message = "") chat_msgs += new/datum/data_chat_msg(sender,channel,message) -/obj/machinery/message_server/proc/send_pda_message(var/recipient = "",var/sender = "",var/message = "",var/photo=null) +/obj/machinery/message_server/proc/send_pda_message(recipient = "",sender = "",message = "",photo=null) . = new/datum/data_pda_msg(recipient,sender,message,photo) pda_msgs += . -/obj/machinery/message_server/proc/send_rc_message(var/recipient = "",var/sender = "",var/message = "",var/stamp = "", var/id_auth = "", var/priority = 1) +/obj/machinery/message_server/proc/send_rc_message(recipient = "",sender = "",message = "",stamp = "", id_auth = "", priority = 1) rc_msgs += new/datum/data_rc_msg(recipient,sender,message,stamp,id_auth) -/obj/machinery/message_server/attack_hand(user as mob) +/obj/machinery/message_server/attack_hand(mob/user) // user << "\blue There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few Centcom delays." user << "You toggle PDA message passing from [active ? "On" : "Off"] to [active ? "Off" : "On"]" active = !active @@ -154,7 +154,7 @@ var/global/list/obj/machinery/message_server/message_servers = list() variable = param_variable value = param_value -/datum/feedback_variable/proc/inc(var/num = 1) +/datum/feedback_variable/proc/inc(num = 1) if (isnum(value)) value += num else @@ -164,7 +164,7 @@ var/global/list/obj/machinery/message_server/message_servers = list() else value = num -/datum/feedback_variable/proc/dec(var/num = 1) +/datum/feedback_variable/proc/dec(num = 1) if (isnum(value)) value -= num else @@ -174,7 +174,7 @@ var/global/list/obj/machinery/message_server/message_servers = list() else value = -num -/datum/feedback_variable/proc/set_value(var/num) +/datum/feedback_variable/proc/set_value(num) if (isnum(num)) value = num @@ -186,11 +186,11 @@ var/global/list/obj/machinery/message_server/message_servers = list() /datum/feedback_variable/proc/get_variable() return variable -/datum/feedback_variable/proc/set_details(var/text) +/datum/feedback_variable/proc/set_details(text) if (istext(text)) details = text -/datum/feedback_variable/proc/add_details(var/text) +/datum/feedback_variable/proc/add_details(text) if (istext(text)) text = replacetext(text, " ", "_") if (!details) @@ -260,7 +260,7 @@ var/obj/machinery/blackbox_recorder/blackbox blackbox = BR ..() -/obj/machinery/blackbox_recorder/proc/find_feedback_datum(var/variable) +/obj/machinery/blackbox_recorder/proc/find_feedback_datum(variable) for (var/datum/feedback_variable/FV in feedback) if (FV.get_variable() == variable) return FV @@ -340,7 +340,7 @@ var/obj/machinery/blackbox_recorder/blackbox query_insert.Execute() -/proc/feedback_set(var/variable,var/value) +/proc/feedback_set(variable,value) if (!blackbox) return var/datum/feedback_variable/FV = blackbox.find_feedback_datum(variable) @@ -349,7 +349,7 @@ var/obj/machinery/blackbox_recorder/blackbox FV.set_value(value) -/proc/feedback_inc(var/variable,var/value) +/proc/feedback_inc(variable,value) if (!blackbox) return var/datum/feedback_variable/FV = blackbox.find_feedback_datum(variable) @@ -358,7 +358,7 @@ var/obj/machinery/blackbox_recorder/blackbox FV.inc(value) -/proc/feedback_dec(var/variable,var/value) +/proc/feedback_dec(variable,value) if (!blackbox) return var/datum/feedback_variable/FV = blackbox.find_feedback_datum(variable) @@ -367,7 +367,7 @@ var/obj/machinery/blackbox_recorder/blackbox FV.dec(value) -/proc/feedback_set_details(var/variable,var/details) +/proc/feedback_set_details(variable,details) if (!blackbox) return var/datum/feedback_variable/FV = blackbox.find_feedback_datum(variable) @@ -376,7 +376,7 @@ var/obj/machinery/blackbox_recorder/blackbox FV.set_details(details) -/proc/feedback_add_details(var/variable,var/details) +/proc/feedback_add_details(variable,details) if (!blackbox) return var/datum/feedback_variable/FV = blackbox.find_feedback_datum(variable) diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 6ab22db8ebc..07ab76f7b5d 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -70,7 +70,7 @@ Note: Must be placed west/left of and R&D console to function. T += (M.rating/3) efficiency_coeff = max(T, 1) -/obj/machinery/r_n_d/protolathe/proc/check_mat(datum/design/being_built, var/M) // now returns how many times the item can be built with the material +/obj/machinery/r_n_d/protolathe/proc/check_mat(datum/design/being_built, M) // now returns how many times the item can be built with the material var/A = 0 switch(M) if(MAT_METAL) @@ -94,7 +94,7 @@ Note: Must be placed west/left of and R&D console to function. A = A / max(1, (being_built.materials[M]/efficiency_coeff)) return A -/obj/machinery/r_n_d/protolathe/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/r_n_d/protolathe/attackby(obj/item/O, mob/user, params) if (shocked) shock(user,50) if (default_deconstruction_screwdriver(user, "protolathe_t", "protolathe", O)) diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index b96bc830e9b..a3e8c47888d 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -52,7 +52,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, var/list/datum/design/matching_designs = list() //for the search function -/obj/machinery/computer/rdconsole/proc/CallTechName(var/ID) //A simple helper proc to find the name of a tech with a given ID. +/obj/machinery/computer/rdconsole/proc/CallTechName(ID) //A simple helper proc to find the name of a tech with a given ID. var/datum/tech/check_tech var/return_name = null for(var/T in typesof(/datum/tech) - /datum/tech) @@ -66,7 +66,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, return return_name -/obj/machinery/computer/rdconsole/proc/CallMaterialName(var/ID) +/obj/machinery/computer/rdconsole/proc/CallMaterialName(ID) var/datum/reagent/temp_reagent var/return_name = null if (copytext(ID, 1, 2) == "$") @@ -144,7 +144,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, griefProtection() */ -/obj/machinery/computer/rdconsole/attackby(var/obj/item/weapon/D as obj, var/mob/user as mob, params) +/obj/machinery/computer/rdconsole/attackby(obj/item/weapon/D, mob/user, params) //Loading a disk into it. if(istype(D, /obj/item/weapon/disk)) @@ -166,7 +166,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, src.updateUsrDialog() return -/obj/machinery/computer/rdconsole/emag_act(mob/user as mob) +/obj/machinery/computer/rdconsole/emag_act(mob/user) if(!emagged) playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 @@ -603,7 +603,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, return -/obj/machinery/computer/rdconsole/attack_hand(mob/user as mob) +/obj/machinery/computer/rdconsole/attack_hand(mob/user) if(..()) return interact(user) @@ -1063,7 +1063,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, return //helper proc, which return a table containing categories -/obj/machinery/computer/rdconsole/proc/list_categories(var/list/categories, var/menu_num as num) +/obj/machinery/computer/rdconsole/proc/list_categories(list/categories, menu_num as num) if(!categories) return diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm index e4ed832817e..91a33aa41be 100644 --- a/code/modules/research/rdmachines.dm +++ b/code/modules/research/rdmachines.dm @@ -49,7 +49,7 @@ else return 0 -/obj/machinery/r_n_d/attack_hand(mob/user as mob) +/obj/machinery/r_n_d/attack_hand(mob/user) if (shocked) shock(user,50) if(panel_open) diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm index 397f6edbad4..ac43f99f99c 100644 --- a/code/modules/research/research.dm +++ b/code/modules/research/research.dm @@ -63,7 +63,7 @@ research holder datum. //Checks to see if tech has all the required pre-reqs. //Input: datum/tech; Output: 0/1 (false/true) -/datum/research/proc/TechHasReqs(var/datum/tech/T) +/datum/research/proc/TechHasReqs(datum/tech/T) if(T.req_tech.len == 0) return 1 var/matches = 0 @@ -79,7 +79,7 @@ research holder datum. //Checks to see if design has all the required pre-reqs. //Input: datum/design; Output: 0/1 (false/true) -/datum/research/proc/DesignHasReqs(var/datum/design/D)//Heavily optimized -Sieve +/datum/research/proc/DesignHasReqs(datum/design/D)//Heavily optimized -Sieve if(D.req_tech.len == 0) return 1 for(var/datum/tech/T in known_tech) @@ -106,7 +106,7 @@ research holder datum. */ //Adds a tech to known_tech list. Checks to make sure there aren't duplicates and updates existing tech's levels if needed. //Input: datum/tech; Output: Null -/datum/research/proc/AddTech2Known(var/datum/tech/T) +/datum/research/proc/AddTech2Known(datum/tech/T) for(var/datum/tech/known in known_tech) if(T.id == known.id) if(T.level > known.level) @@ -115,7 +115,7 @@ research holder datum. known_tech += T return -/datum/research/proc/AddDesign2Known(var/datum/design/D) +/datum/research/proc/AddDesign2Known(datum/design/D) for(var/datum/design/known in known_designs) if(D.id == known.id) if(D.reliability > known.reliability) @@ -141,14 +141,14 @@ research holder datum. //Refreshes the levels of a given tech. //Input: Tech's ID and Level; Output: null -/datum/research/proc/UpdateTech(var/ID, var/level) +/datum/research/proc/UpdateTech(ID, level) for(var/datum/tech/KT in known_tech) if(KT.id == ID) if(KT.level <= level) KT.level = max((KT.level + 1), (level - 1)) return -/datum/research/proc/UpdateDesigns(var/obj/item/I, var/list/temp_tech) +/datum/research/proc/UpdateDesigns(obj/item/I, list/temp_tech) for(var/T in temp_tech) if(temp_tech[T] - 1 >= known_tech[T]) for(var/datum/design/D in known_designs) @@ -159,7 +159,7 @@ research holder datum. if(I.crit_fail) D.reliability = min(100, D.reliability + rand(3, 5)) -/datum/research/proc/FindDesignByID(var/id) +/datum/research/proc/FindDesignByID(id) for(var/datum/design/D in known_designs) if(D.id == id) return D @@ -175,7 +175,7 @@ research holder datum. if((D.build_type & AUTOLATHE) && ("initial" in D.category)) //autolathe starts without hacked designs AddDesign2Known(D) -/datum/research/autolathe/AddDesign2Known(var/datum/design/D) +/datum/research/autolathe/AddDesign2Known(datum/design/D) if(!(D.build_type & AUTOLATHE)) return ..() diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index fb56e869fe8..af580b93b83 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -121,7 +121,7 @@ env.merge(removed) air_update_turf() -/obj/machinery/r_n_d/server/attackby(var/obj/item/O as obj, var/mob/user as mob, params) +/obj/machinery/r_n_d/server/attackby(obj/item/O, mob/user, params) if (disabled) return if (shocked) @@ -256,7 +256,7 @@ updateUsrDialog() return -/obj/machinery/computer/rdservercontrol/attack_hand(mob/user as mob) +/obj/machinery/computer/rdservercontrol/attack_hand(mob/user) if(..()) return user.set_machine(src) @@ -317,12 +317,12 @@ onclose(user, "server_control") return -/obj/machinery/computer/rdservercontrol/attackby(var/obj/item/weapon/D as obj, var/mob/user as mob, params) +/obj/machinery/computer/rdservercontrol/attackby(obj/item/weapon/D, mob/user, params) ..() src.updateUsrDialog() return -/obj/machinery/computer/rdservercontrol/emag_act(mob/user as mob) +/obj/machinery/computer/rdservercontrol/emag_act(mob/user) if(!emagged) playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm index a36af9c71ca..ac15222b3ff 100644 --- a/code/modules/research/stock_parts.dm +++ b/code/modules/research/stock_parts.dm @@ -18,7 +18,7 @@ var/pshoom_or_beepboopblorpzingshadashwoosh = 'sound/items/rped.ogg' var/alt_sound = null -/obj/item/weapon/storage/part_replacer/afterattack(obj/machinery/T as obj, mob/living/carbon/human/user as mob, flag, params) +/obj/item/weapon/storage/part_replacer/afterattack(obj/machinery/T, mob/living/carbon/human/user, flag, params) if(flag) return else @@ -62,7 +62,7 @@ //Sorts stock parts inside an RPED by their rating. //Only use /obj/item/weapon/stock_parts/ with this sort proc! -/proc/cmp_rped_sort(var/obj/item/weapon/stock_parts/A, var/obj/item/weapon/stock_parts/B) +/proc/cmp_rped_sort(obj/item/weapon/stock_parts/A, obj/item/weapon/stock_parts/B) return B.rating - A.rating /obj/item/weapon/stock_parts diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index 6042955456d..e91fa523046 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -15,7 +15,7 @@ var/Uses = 1 // uses before it goes inert var/enhanced = 0 //has it been enhanced before? -/obj/item/slime_extract/attackby(obj/item/O as obj, mob/user as mob) +/obj/item/slime_extract/attackby(obj/item/O, mob/user) if(istype(O, /obj/item/weapon/slimesteroid2)) if(enhanced == 1) user << "This extract has already been enhanced!" @@ -128,7 +128,7 @@ icon = 'icons/obj/chemical.dmi' icon_state = "bottle19" -/obj/item/slimepotion/attack(mob/living/simple_animal/slime/M as mob, mob/user as mob) +/obj/item/slimepotion/attack(mob/living/simple_animal/slime/M, mob/user) if(!isslime(M)) user << "The potion only works on slimes!" return ..() @@ -156,7 +156,7 @@ var/list/not_interested = list() var/being_used = 0 -/obj/item/slimepotion2/afterattack(mob/living/M as mob, mob/user as mob) +/obj/item/slimepotion2/afterattack(mob/living/M, mob/user) if(being_used || !ismob(M)) return if(!isanimal(M) || M.ckey) //only works on animals that aren't player controlled @@ -218,7 +218,7 @@ icon = 'icons/obj/chemical.dmi' icon_state = "bottle16" -/obj/item/weapon/slimesteroid/attack(mob/living/simple_animal/slime/M as mob, mob/user as mob) +/obj/item/weapon/slimesteroid/attack(mob/living/simple_animal/slime/M, mob/user) if(!isslime(M))//If target is not a slime. user << "The steroid only works on baby slimes!" return ..() @@ -269,7 +269,7 @@ icon = 'icons/obj/chemical.dmi' icon_state = "bottle15" -/obj/item/weapon/slimestabilizer/attack(mob/living/simple_animal/slime/M as mob, mob/user as mob) +/obj/item/weapon/slimestabilizer/attack(mob/living/simple_animal/slime/M, mob/user) if(!isslime(M)) user << "The stabilizer only works on slimes!" return ..() @@ -290,7 +290,7 @@ icon = 'icons/obj/chemical.dmi' icon_state = "bottle3" -/obj/item/weapon/slimemutator/attack(mob/living/simple_animal/slime/M as mob, mob/user as mob) +/obj/item/weapon/slimemutator/attack(mob/living/simple_animal/slime/M, mob/user) if(!isslime(M)) user << "The mutator only works on slimes!" return ..() @@ -397,7 +397,7 @@ else icon_state = "golem" -/obj/effect/golemrune/attack_hand(mob/living/user as mob) +/obj/effect/golemrune/attack_hand(mob/living/user) var/mob/dead/observer/ghost for(var/mob/dead/observer/O in src.loc) if(!O.client) continue diff --git a/code/modules/scripting/Implementations/Telecomms.dm b/code/modules/scripting/Implementations/Telecomms.dm index f2d999e59f8..cd8c7258b05 100644 --- a/code/modules/scripting/Implementations/Telecomms.dm +++ b/code/modules/scripting/Implementations/Telecomms.dm @@ -58,7 +58,7 @@ var/list/allowed_custom_spans = list(SPAN_ROBOT,SPAN_YELL,SPAN_ITALICS,SPAN_SANS /* -- Execute the compiled code -- */ - proc/Run(var/datum/signal/signal) + proc/Run(datum/signal/signal) if(!ready) return @@ -256,7 +256,7 @@ var/const/SIGNAL_COOLDOWN = 20 // 2 seconds /datum/signal - proc/mem(var/address, var/value) + proc/mem(address, value) if(istext(address)) var/obj/machinery/telecomms/server/S = data["server"] @@ -268,7 +268,7 @@ var/const/SIGNAL_COOLDOWN = 20 // 2 seconds S.memory[address] = value - proc/signaler(var/freq = 1459, var/code = 30) + proc/signaler(freq = 1459, code = 30) if(isnum(freq) && isnum(code)) @@ -299,7 +299,7 @@ var/const/SIGNAL_COOLDOWN = 20 // 2 seconds lastsignalers.Add("[time] : [S.id] sent a signal command, which was triggered by NTSL.: [format_frequency(freq)]/[code]") - proc/tcombroadcast(var/message, var/freq, var/source, var/job, var/spans, var/say = "says", var/ask = "asks", var/yell = "yells", var/exclaim = "exclaims") + proc/tcombroadcast(message, freq, source, job, spans, say = "says", ask = "asks", yell = "yells", exclaim = "exclaims") var/datum/signal/newsign = new var/obj/machinery/telecomms/server/S = data["server"] diff --git a/code/modules/scripting/Implementations/_Logic.dm b/code/modules/scripting/Implementations/_Logic.dm index 6fd47acf7c8..723ffe4490f 100644 --- a/code/modules/scripting/Implementations/_Logic.dm +++ b/code/modules/scripting/Implementations/_Logic.dm @@ -26,7 +26,7 @@ return pick(finalpick) // Gets/Sets a value at a key in the list -/proc/n_listpos(var/list/L, var/pos, var/value) +/proc/n_listpos(list/L, pos, value) if(!istype(L, /list)) return if(isnum(pos)) if(!value) @@ -42,7 +42,7 @@ L[pos] = value // Copies the list into a new one -/proc/n_listcopy(var/list/L, var/start, var/end) +/proc/n_listcopy(list/L, start, end) if(!istype(L, /list)) return return L.Copy(start, end) @@ -75,25 +75,25 @@ chosenlist.Remove(e) // Cuts out a copy of a list -/proc/n_listcut(var/list/L, var/start, var/end) +/proc/n_listcut(list/L, start, end) if(!istype(L, /list)) return return L.Cut(start, end) // Swaps two values in the list -/proc/n_listswap(var/list/L, var/firstindex, var/secondindex) +/proc/n_listswap(list/L, firstindex, secondindex) if(!istype(L, /list)) return if(L.len >= secondindex && L.len >= firstindex) return L.Swap(firstindex, secondindex) // Inserts a value into the list -/proc/n_listinsert(var/list/L, var/index, var/element) +/proc/n_listinsert(list/L, index, element) if(!istype(L, /list)) return return L.Insert(index, element) // --- String methods --- //If list, finds a value in it, if text, finds a substring in it -/proc/n_smartfind(var/haystack, var/needle, var/start = 1, var/end = 0) +/proc/n_smartfind(haystack, needle, start = 1, end = 0) if(haystack && needle) if(isobject(haystack)) if(istype(haystack, /list)) @@ -107,40 +107,40 @@ return findtext(haystack, needle, start, end) //Returns a substring of the string -/proc/n_substr(var/string, var/start = 1, var/end = 0) +/proc/n_substr(string, start = 1, end = 0) if(istext(string) && isnum(start) && isnum(end)) if(start > 0) return copytext(string, start, end) //Returns the length of the string or list -/proc/n_smartlength(var/container) +/proc/n_smartlength(container) if(container) if(istype(container, /list) || istext(container)) return length(container) return 0 //Lowercase all characters -/proc/n_lower(var/string) +/proc/n_lower(string) if(istext(string)) return lowertext(string) //Uppercase all characters -/proc/n_upper(var/string) +/proc/n_upper(string) if(istext(string)) return uppertext(string) //Converts a string to a list -/proc/n_explode(var/string, var/separator = "") +/proc/n_explode(string, separator = "") if(istext(string) && (istext(separator) || isnull(separator))) return text2list(string, separator) //Converts a list to a string -/proc/n_implode(var/list/li, var/separator) +/proc/n_implode(list/li, separator) if(istype(li) && (istext(separator) || isnull(separator))) return list2text(li, separator) //Repeats the string x times -/proc/n_repeat(var/string, var/amount) +/proc/n_repeat(string, amount) if(istext(string) && isnum(amount)) var/i var/newstring = "" @@ -154,7 +154,7 @@ return newstring //Reverses the order of the string. "Clown" becomes "nwolC" -/proc/n_reverse(var/string) +/proc/n_reverse(string) if(istext(string)) var/newstring = "" var/i @@ -166,11 +166,11 @@ return newstring // String -> Number -/proc/n_str2num(var/string) +/proc/n_str2num(string) if(istext(string)) return text2num(string) -/proc/n_proper(var/string) +/proc/n_proper(string) if(!istext(string)) return "" @@ -203,53 +203,53 @@ return min -/proc/n_prob(var/chance) +/proc/n_prob(chance) return prob(chance) -/proc/n_randseed(var/seed) +/proc/n_randseed(seed) rand_seed(seed) return 0 -/proc/n_rand(var/low, var/high) +/proc/n_rand(low, high) if(isnull(low) && isnull(high)) return rand() return rand(low, high) // Number -> String -/proc/n_num2str(var/num) +/proc/n_num2str(num) if(isnum(num)) return num2text(num) // Squareroot -/proc/n_sqrt(var/num) +/proc/n_sqrt(num) if(isnum(num)) return sqrt(num) // Magnitude of num -/proc/n_abs(var/num) +/proc/n_abs(num) if(isnum(num)) return abs(num) // Round down -/proc/n_floor(var/num) +/proc/n_floor(num) if(isnum(num)) return round(num) // Round up -/proc/n_ceil(var/num) +/proc/n_ceil(num) if(isnum(num)) return round(num)+1 // Round to nearest integer -/proc/n_round(var/num) +/proc/n_round(num) if(isnum(num)) if(num-round(num)<0.5) return round(num) return n_ceil(num) // Clamps N between min and max -/proc/n_clamp(var/num, var/min=-1, var/max=1) +/proc/n_clamp(num, min=-1, max=1) if(isnum(num)&&isnum(min)&&isnum(max)) if(num<=min) return min @@ -258,32 +258,32 @@ return num // Returns 1 if N is inbetween Min and Max -/proc/n_inrange(var/num, var/min=-1, var/max=1) +/proc/n_inrange(num, min=-1, max=1) if(isnum(num)&&isnum(min)&&isnum(max)) return ((min <= num) && (num <= max)) // Returns the sine of num -/proc/n_sin(var/num) +/proc/n_sin(num) if(isnum(num)) return sin(num) // Returns the cosine of num -/proc/n_cos(var/num) +/proc/n_cos(num) if(isnum(num)) return cos(num) // Returns the arcsine of num -/proc/n_asin(var/num) +/proc/n_asin(num) if(isnum(num)&&-1<=num&&num<=1) return arcsin(num) // Returns the arccosine of num -/proc/n_acos(var/num) +/proc/n_acos(num) if(isnum(num)&&-1<=num&&num<=1) return arccos(num) // Returns the natural log of num -/proc/n_log(var/num) +/proc/n_log(num) if(isnum(num)&&0 */ - ParseParamExpression(var/check_functions = 0) + ParseParamExpression(check_functions = 0) var/cf = check_functions return ParseExpression(list(",", ")"), check_functions = cf) \ No newline at end of file diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm index 2a1909a15dd..d87e5fdf524 100644 --- a/code/modules/security levels/keycard authentication.dm +++ b/code/modules/security levels/keycard authentication.dm @@ -20,15 +20,15 @@ active_power_usage = 6 power_channel = ENVIRON -/obj/machinery/keycard_auth/attack_ai(mob/user as mob) +/obj/machinery/keycard_auth/attack_ai(mob/user) user << "The station AI is not to interact with these devices." return -/obj/machinery/keycard_auth/attack_paw(mob/user as mob) +/obj/machinery/keycard_auth/attack_paw(mob/user) user << "You are too primitive to use this device!" return -/obj/machinery/keycard_auth/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/keycard_auth/attackby(obj/item/weapon/W, mob/user, params) if(stat & (NOPOWER|BROKEN)) user << "This device is not powered." return @@ -51,7 +51,7 @@ else stat |= NOPOWER -/obj/machinery/keycard_auth/attack_hand(mob/user as mob) +/obj/machinery/keycard_auth/attack_hand(mob/user) if(user.stat || stat & (NOPOWER|BROKEN)) user << "This device is not powered!" return @@ -120,7 +120,7 @@ message_admins("[key_name(event_triggered_by)] triggered and [key_name(event_confirmed_by)] confirmed event [event]") reset() -/obj/machinery/keycard_auth/proc/receive_request(var/obj/machinery/keycard_auth/source) +/obj/machinery/keycard_auth/proc/receive_request(obj/machinery/keycard_auth/source) if(stat & (BROKEN|NOPOWER)) return event_source = source diff --git a/code/modules/security levels/security levels.dm b/code/modules/security levels/security levels.dm index 29a04c4f92a..da714890067 100644 --- a/code/modules/security levels/security levels.dm +++ b/code/modules/security levels/security levels.dm @@ -6,7 +6,7 @@ //config.alert_desc_blue_downto -/proc/set_security_level(var/level) +/proc/set_security_level(level) switch(level) if("green") level = SEC_LEVEL_GREEN @@ -70,7 +70,7 @@ if(SEC_LEVEL_DELTA) return "delta" -/proc/num2seclevel(var/num) +/proc/num2seclevel(num) switch(num) if(SEC_LEVEL_GREEN) return "green" @@ -81,7 +81,7 @@ if(SEC_LEVEL_DELTA) return "delta" -/proc/seclevel2num(var/seclevel) +/proc/seclevel2num(seclevel) switch( lowertext(seclevel) ) if("green") return SEC_LEVEL_GREEN diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 673e7176eaa..dfbb6085368 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -496,7 +496,7 @@ possible_destinations = C.possible_destinations shuttleId = C.shuttleId -/obj/machinery/computer/shuttle/attack_hand(user as mob) +/obj/machinery/computer/shuttle/attack_hand(mob/user) if(..(user)) return src.add_fingerprint(usr) @@ -540,7 +540,7 @@ if(1) usr << "Invalid shuttle requested." else usr << "Unable to comply." -/obj/machinery/computer/shuttle/emag_act(mob/user as mob) +/obj/machinery/computer/shuttle/emag_act(mob/user) if(!emagged) src.req_access = list() emagged = 1 diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm index 2025f3c155b..05ae58ccc21 100644 --- a/code/modules/surgery/organs/organ.dm +++ b/code/modules/surgery/organs/organ.dm @@ -137,7 +137,7 @@ //Heals brute and burn damage for the organ. Returns 1 if the damage-icon states changed at all. //Damage cannot go below zero. //Cannot remove negative damage (i.e. apply damage) -/obj/item/organ/limb/proc/heal_damage(brute, burn, var/robotic) +/obj/item/organ/limb/proc/heal_damage(brute, burn, robotic) if(robotic && status != ORGAN_ROBOTIC) // This makes organic limbs not heal when the proc is in Robotic mode. brute = max(0, brute - 3) diff --git a/code/modules/telesci/bscrystal.dm b/code/modules/telesci/bscrystal.dm index 74b9807dade..589731a3635 100644 --- a/code/modules/telesci/bscrystal.dm +++ b/code/modules/telesci/bscrystal.dm @@ -16,7 +16,7 @@ pixel_y = rand(-5, 5) -/obj/item/bluespace_crystal/attack_self(var/mob/user) +/obj/item/bluespace_crystal/attack_self(mob/user) user.visible_message("[user] crushes [src]!", "You crush [src]!") PoolOrNew(/obj/effect/effect/sparks, loc) playsound(src.loc, "sparks", 50, 1) @@ -24,7 +24,7 @@ user.unEquip(src) qdel(src) -/obj/item/bluespace_crystal/proc/blink_mob(var/mob/living/L) +/obj/item/bluespace_crystal/proc/blink_mob(mob/living/L) do_teleport(L, get_turf(L), blink_range, asoundin = 'sound/effects/phasein.ogg') /obj/item/bluespace_crystal/throw_impact(atom/hit_atom) diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm index 883a6fc01cd..05eaa989580 100644 --- a/code/modules/telesci/gps.dm +++ b/code/modules/telesci/gps.dm @@ -30,7 +30,7 @@ var/list/GPS_list = list() overlays -= "emp" overlays += "working" -/obj/item/device/gps/attack_self(mob/user as mob) +/obj/item/device/gps/attack_self(mob/user) var/obj/item/device/gps/t = "" var/gps_window_height = 110 + GPS_list.len * 20 // Variable window height, depending on how many GPS units there are to show diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm index e1f4a37d288..4d585a48c8f 100644 --- a/code/modules/telesci/telepad.dm +++ b/code/modules/telesci/telepad.dm @@ -54,7 +54,7 @@ idle_power_usage = 20 active_power_usage = 500 var/stage = 0 -/obj/machinery/telepad_cargo/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/machinery/telepad_cargo/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/wrench)) anchored = 0 playsound(src, 'sound/items/Ratchet.ogg', 50, 1) @@ -89,7 +89,7 @@ item_state = "signaler" origin_tech = "bluespace=3" -/obj/item/device/telepad_beacon/attack_self(mob/user as mob) +/obj/item/device/telepad_beacon/attack_self(mob/user) if(user) user << "Locked In" new /obj/machinery/telepad_cargo(user.loc) @@ -148,7 +148,7 @@ playsound(src.loc, 'sound/effects/pop.ogg', 50, 0) user << "You calibrate the telepad locator." -/obj/item/weapon/rcs/emag_act(mob/user as mob) +/obj/item/weapon/rcs/emag_act(mob/user) if(!emagged) emagged = 1 var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread diff --git a/code/orphaned procs/AStar.dm b/code/orphaned procs/AStar.dm index eb491ee48ff..4f79d75e9d7 100644 --- a/code/orphaned procs/AStar.dm +++ b/code/orphaned procs/AStar.dm @@ -63,7 +63,7 @@ length to avoid portals or something i guess?? Not that they're counted right no //add an element in the list, //immediatly ordering it to its position using Insertion sort -/PriorityQueue/proc/Enqueue(var/atom/A) +/PriorityQueue/proc/Enqueue(atom/A) var/i L.Add(A) i = L.len -1 @@ -80,7 +80,7 @@ length to avoid portals or something i guess?? Not that they're counted right no return . //removes an element -/PriorityQueue/proc/Remove(var/atom/A) +/PriorityQueue/proc/Remove(atom/A) return L.Remove(A) //returns a copy of the elements list @@ -89,17 +89,17 @@ length to avoid portals or something i guess?? Not that they're counted right no return ret //return the position of an element or 0 if not found -/PriorityQueue/proc/Seek(var/atom/A) +/PriorityQueue/proc/Seek(atom/A) return L.Find(A) //return the element at the i_th position -/PriorityQueue/proc/Get(var/i) +/PriorityQueue/proc/Get(i) if(i > L.len || i < 1) return 0 return L[i] //replace the passed element at it's right position using the cmp proc -/PriorityQueue/proc/ReSort(var/atom/A) +/PriorityQueue/proc/ReSort(atom/A) var/i = Seek(A) if(i == 0) return @@ -144,7 +144,7 @@ length to avoid portals or something i guess?? Not that they're counted right no return a.f - b.f //search if there's a PathNode that points to turf T in the Priority Queue -/proc/SeekTurf(var/PriorityQueue/Queue, var/turf/T) +/proc/SeekTurf(var/PriorityQueue/Queue, turf/T) var/i = 1 var/PathNode/PN while(i < Queue.L.len + 1) @@ -162,7 +162,7 @@ length to avoid portals or something i guess?? Not that they're counted right no return path //the actual algorithm -/proc/AStar(start, end, atom, dist, maxnodes, maxnodedepth = 30, mintargetdist, minnodedist, id=null, var/turf/exclude=null) +/proc/AStar(start, end, atom, dist, maxnodes, maxnodedepth = 30, mintargetdist, minnodedist, id=null, turf/exclude=null) var/PriorityQueue/open = new /PriorityQueue(/proc/PathWeightCompare) //the open list, ordered using the PathWeightCompare proc, from lower f to higher var/list/closed = new() //the closed list var/list/path = null //the returned path, if any diff --git a/code/orphaned procs/priority_announce.dm b/code/orphaned procs/priority_announce.dm index 3630b9d58df..de3599f614b 100644 --- a/code/orphaned procs/priority_announce.dm +++ b/code/orphaned procs/priority_announce.dm @@ -1,4 +1,4 @@ -/proc/priority_announce(var/text, var/title = "", var/sound = 'sound/AI/attention.ogg', var/type) +/proc/priority_announce(text, title = "", sound = 'sound/AI/attention.ogg', type) if(!text) return @@ -29,7 +29,7 @@ M << announcement M << sound(sound) -/proc/print_command_report(var/text = "", var/title = "Central Command Update") +/proc/print_command_report(text = "", title = "Central Command Update") for (var/obj/machinery/computer/communications/C in machines) if(!(C.stat & (BROKEN|NOPOWER)) && C.z == ZLEVEL_STATION) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc ) @@ -38,7 +38,7 @@ C.messagetitle.Add("[title]") C.messagetext.Add(text) -/proc/minor_announce(var/message, var/title = "Attention:", var/alert) +/proc/minor_announce(message, title = "Attention:", alert) if(!message) return diff --git a/code/orphaned procs/statistics.dm b/code/orphaned procs/statistics.dm index 3f979dbc302..55acae66087 100644 --- a/code/orphaned procs/statistics.dm +++ b/code/orphaned procs/statistics.dm @@ -40,7 +40,7 @@ if(!config.sql_enabled) return -/proc/sql_report_death(var/mob/living/carbon/human/H) +/proc/sql_report_death(mob/living/carbon/human/H) if(!config.sql_enabled) return if(!H) @@ -75,7 +75,7 @@ log_game("SQL ERROR during death reporting. Error : \[[err]\]\n") -/proc/sql_report_cyborg_death(var/mob/living/silicon/robot/H) +/proc/sql_report_cyborg_death(mob/living/silicon/robot/H) if(!config.sql_enabled) return if(!H) diff --git a/code/world.dm b/code/world.dm index 2eefe8ed0b7..d515df42aed 100644 --- a/code/world.dm +++ b/code/world.dm @@ -181,7 +181,7 @@ master_mode = Lines[1] diary << "Saved mode is '[master_mode]'" -/world/proc/save_mode(var/the_mode) +/world/proc/save_mode(the_mode) var/F = file("data/mode.txt") fdel(F) F << the_mode diff --git a/tgstation.dme b/tgstation.dme index 8144137aef2..82e85b7b2a3 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6,6 +6,63 @@ // BEGIN_FILE_DIR #define FILE_DIR . +#define FILE_DIR "code" +#define FILE_DIR "code/modules" +#define FILE_DIR "code/modules/games" +#define FILE_DIR "code/modules/html_interface" +#define FILE_DIR "code/modules/html_interface/cards" +#define FILE_DIR "code/modules/html_interface/nanotrasen" +#define FILE_DIR "html" +#define FILE_DIR "icons" +#define FILE_DIR "icons/ass" +#define FILE_DIR "icons/effects" +#define FILE_DIR "icons/mecha" +#define FILE_DIR "icons/misc" +#define FILE_DIR "icons/mob" +#define FILE_DIR "icons/mob/inhands" +#define FILE_DIR "icons/obj" +#define FILE_DIR "icons/obj/assemblies" +#define FILE_DIR "icons/obj/atmospherics" +#define FILE_DIR "icons/obj/atmospherics/pipes" +#define FILE_DIR "icons/obj/clothing" +#define FILE_DIR "icons/obj/doors" +#define FILE_DIR "icons/obj/flora" +#define FILE_DIR "icons/obj/food" +#define FILE_DIR "icons/obj/guns" +#define FILE_DIR "icons/obj/hydroponics" +#define FILE_DIR "icons/obj/machines" +#define FILE_DIR "icons/obj/power_cond" +#define FILE_DIR "icons/obj/smooth_structures" +#define FILE_DIR "icons/obj/smooth_structures/alien" +#define FILE_DIR "icons/pda_icons" +#define FILE_DIR "icons/spideros_icons" +#define FILE_DIR "icons/stamp_icons" +#define FILE_DIR "icons/Testing" +#define FILE_DIR "icons/turf" +#define FILE_DIR "icons/turf/floors" +#define FILE_DIR "icons/turf/walls" +#define FILE_DIR "icons/vending_icons" +#define FILE_DIR "nano" +#define FILE_DIR "nano/images" +#define FILE_DIR "sound" +#define FILE_DIR "sound/AI" +#define FILE_DIR "sound/ambience" +#define FILE_DIR "sound/arcade" +#define FILE_DIR "sound/effects" +#define FILE_DIR "sound/guitar" +#define FILE_DIR "sound/hallucinations" +#define FILE_DIR "sound/items" +#define FILE_DIR "sound/machines" +#define FILE_DIR "sound/magic" +#define FILE_DIR "sound/mecha" +#define FILE_DIR "sound/misc" +#define FILE_DIR "sound/piano" +#define FILE_DIR "sound/spookoween" +#define FILE_DIR "sound/violin" +#define FILE_DIR "sound/voice" +#define FILE_DIR "sound/voice/complionator" +#define FILE_DIR "sound/vox_fem" +#define FILE_DIR "sound/weapons" // END_FILE_DIR // BEGIN_PREFERENCES