Skip to content

Commit

Permalink
Fixes proc arguments
Browse files Browse the repository at this point in the history
  • Loading branch information
Firecage committed Jul 15, 2015
1 parent 6a0faa4 commit 4688c2c
Show file tree
Hide file tree
Showing 832 changed files with 3,721 additions and 3,664 deletions.
20 changes: 10 additions & 10 deletions code/ATMOSPHERICS/atmospherics.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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

Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -212,15 +212,15 @@ 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


#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

Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions code/ATMOSPHERICS/components/binary_devices/pump.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions code/ATMOSPHERICS/components/trinary_devices/filter.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions code/ATMOSPHERICS/components/trinary_devices/mixer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
6 changes: 3 additions & 3 deletions code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/ATMOSPHERICS/components/unary_devices/unary_base.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion code/ATMOSPHERICS/pipes/manifold.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion code/ATMOSPHERICS/pipes/manifold4w.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion code/ATMOSPHERICS/pipes/simple.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
12 changes: 6 additions & 6 deletions code/LINDA/LINDA_system.dm
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down
8 changes: 4 additions & 4 deletions code/LINDA/LINDA_turf_tile.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
Loading

0 comments on commit 4688c2c

Please sign in to comment.