cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 16:47:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes proc arguments

Browse Source
This commit is contained in:
Firecage
2015-07-15 23:52:35 +02:00
parent 6a0faa4ff6
commit 4688c2c969
832 changed files with 3721 additions and 3664 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
+1 -1
View File
@@ -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)
code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
+2 -2
View File
@@ -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)
code/ATMOSPHERICS/components/binary_devices/pump.dm
+3 -3
View File
@@ -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)
code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
+3 -3
View File
@@ -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)
code/ATMOSPHERICS/components/trinary_devices/filter.dm
+2 -2
View File
@@ -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
code/ATMOSPHERICS/components/trinary_devices/mixer.dm
+2 -2
View File
@@ -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
code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
+3 -3
View File
@@ -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)
code/ATMOSPHERICS/components/unary_devices/unary_base.dm
+1 -1
View File
@@ -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)
code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
+1 -1
View File
@@ -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))