diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index f06d912f2e..98ebc5a626 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -17,9 +17,6 @@ /*/obj/machinery/bodyscanner/allow_drop() return 0*/ -/obj/machinery/bodyscanner/process() - return - /obj/machinery/bodyscanner/relaymove(mob/user as mob) if (user.stat) return diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index a72b38a589..5f6e40e414 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -15,8 +15,6 @@ var/cooldown_on = 0 req_access = list(access_ai_upload) -/obj/machinery/ai_slipper/process() - return /obj/machinery/ai_slipper/New() ..() diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 3ad9cb9116..9b5cfaa526 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -23,8 +23,6 @@ var/datum/wires/autolathe/wires = null -/obj/machinery/autolathe/process() - return /obj/machinery/autolathe/New() diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index 35a70dd30c..8fd27904ce 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -14,8 +14,6 @@ var/build_eff = 1 var/eat_eff = 1 -/obj/machinery/biogenerator/process() - return /obj/machinery/biogenerator/New() ..() diff --git a/code/game/machinery/bioprinter.dm b/code/game/machinery/bioprinter.dm index fae30db595..eab4af69a3 100644 --- a/code/game/machinery/bioprinter.dm +++ b/code/game/machinery/bioprinter.dm @@ -23,9 +23,6 @@ "liver" = list(/obj/item/organ/liver, 50) ) -/obj/machinery/bioprinter/process() - return - /obj/machinery/bioprinter/prosthetics name = "prosthetics fabricator" desc = "It's a machine that prints prosthetic organs." diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 51772b5aa3..ec844b6004 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -10,8 +10,6 @@ idle_power_usage = 2 active_power_usage = 4 -/obj/machinery/button/process() - return /obj/machinery/button/attack_ai(mob/user as mob) return src.attack_hand(user) diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index 5d996e6569..25aff55578 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -34,8 +34,6 @@ idle_power_usage = 2 active_power_usage = 4 -/obj/machinery/door_control/process() - return /obj/machinery/door_control/attack_ai(mob/user as mob) if(wires & 2) diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index c6744ef96a..dbe7f1b8a7 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -13,9 +13,6 @@ var/list/doppler_arrays = list() doppler_arrays -= src ..() -/obj/machinery/doppler_array/process() - return PROCESS_KILL - /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) if(stat & NOPOWER) return if(z != z0) return diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 49e8761264..4f310de8b9 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -12,6 +12,8 @@ var/strength = 10 //How weakened targets are when flashed. var/base_state = "mflash" anchored = 1 + use_power = 1 + idle_power_usage = 2 /obj/machinery/flasher/portable //Portable version of the flasher. Only flashes when anchored name = "portable flasher" @@ -22,9 +24,6 @@ base_state = "pflash" density = 1 -/obj/machinery/flasher/process() - return - /* /obj/machinery/flasher/New() sleep(4) //<--- What the fuck are you doing? D= diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 4cf51f09b2..71894c2983 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -173,9 +173,6 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ idle_power_usage = 5 active_power_usage = 100 -/obj/machinery/hologram/process() - return - //Destruction procs. /obj/machinery/hologram/ex_act(severity) switch(severity) diff --git a/code/game/machinery/holosign.dm b/code/game/machinery/holosign.dm index 222975316f..e51025aee2 100644 --- a/code/game/machinery/holosign.dm +++ b/code/game/machinery/holosign.dm @@ -5,7 +5,9 @@ icon = 'icons/obj/holosign.dmi' icon_state = "sign_off" layer = 4 + use_power = 1 idle_power_usage = 2 + active_power_usage = 4 var/lit = 0 var/id = null var/on_icon = "sign_on" @@ -14,12 +16,9 @@ if (stat & (BROKEN|NOPOWER)) return lit = !lit - use_power = lit ? 1 : 0 + use_power = lit ? 2 : 1 update_icon() -/obj/machinery/holosign/process() - return - /obj/machinery/holosign/update_icon() if (!lit) icon_state = "sign_off" diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 63bee09b9e..50dc4e10b2 100755 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -53,9 +53,10 @@ var/last_spark = 0 var/base_state = "migniter" anchored = 1 + use_power = 1 + idle_power_usage = 2 + active_power_usage = 4 -/obj/machinery/sparker/process() - return /obj/machinery/sparker/New() ..() diff --git a/code/game/machinery/jukebox.dm b/code/game/machinery/jukebox.dm index d119fd3c44..f87dc8ca9c 100644 --- a/code/game/machinery/jukebox.dm +++ b/code/game/machinery/jukebox.dm @@ -35,8 +35,6 @@ datum/track/New(var/title_name, var/audio) new/datum/track("Trai`Tor", 'sound/music/traitor.ogg'), ) -/obj/machinery/media/jukebox/process() - return /obj/machinery/media/jukebox/Del() StopPlaying() diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index 2a3589db2d..b67bc17986 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -39,7 +39,4 @@ if(stat & (BROKEN|NOPOWER)) return drive() - ..(severity) - -/obj/machinery/mass_driver/process() - return \ No newline at end of file + ..(severity) \ No newline at end of file diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm index 1f4a765c9d..0c3ae56115 100644 --- a/code/game/machinery/robot_fabricator.dm +++ b/code/game/machinery/robot_fabricator.dm @@ -11,9 +11,6 @@ idle_power_usage = 40 active_power_usage = 10000 -/obj/machinery/robotic_fabricator/process() - return - /obj/machinery/robotic_fabricator/attackby(var/obj/item/O as obj, var/mob/user as mob) if (istype(O, /obj/item/stack/sheet/metal)) var/obj/item/stack/sheet/metal/M = O diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 4c257a38e6..9e68791df0 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -175,8 +175,6 @@ active_power_usage = 2000 var/obj/machinery/computer/teleporter/com -/obj/machinery/teleport/hub/process() - return /obj/machinery/teleport/hub/New() ..() @@ -314,9 +312,6 @@ active_power_usage = 2000 var/obj/machinery/teleport/hub/com -/obj/machinery/teleport/station/process() - return - /obj/machinery/teleport/station/New() ..() overlays.Cut()