From 8e5751a63222db70172bd8028f9201086da16486 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Baldomir?= Date: Sat, 14 Mar 2015 19:27:36 +0100 Subject: [PATCH 1/6] Bodyscanner : idle 60, active 10k --- code/game/machinery/adv_med.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 98ebc5a626..f06d912f2e 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -17,6 +17,9 @@ /*/obj/machinery/bodyscanner/allow_drop() return 0*/ +/obj/machinery/bodyscanner/process() + return + /obj/machinery/bodyscanner/relaymove(mob/user as mob) if (user.stat) return From 78798e7548f229817a54470888784875dfe9ff84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Baldomir?= Date: Sat, 14 Mar 2015 19:45:34 +0100 Subject: [PATCH 2/6] Added process on machines A to J. Changed some world iterations to machines iterations. --- code/game/machinery/ai_slipper.dm | 5 +++++ code/game/machinery/autolathe.dm | 7 +++++-- code/game/machinery/biogenerator.dm | 3 +++ code/game/machinery/bioprinter.dm | 5 +++++ code/game/machinery/buttons.dm | 3 +++ code/game/machinery/door_control.dm | 3 +++ code/game/machinery/flasher.dm | 5 ++++- code/game/machinery/hologram.dm | 3 +++ code/game/machinery/igniter.dm | 7 +++++-- code/game/machinery/jukebox.dm | 8 ++++++++ 10 files changed, 44 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 3f2b1dc3bb..a72b38a589 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -4,6 +4,8 @@ icon_state = "motion0" layer = 3 anchored = 1.0 + use_power = 1 + idle_power_usage = 10 var/uses = 20 var/disabled = 1 var/lethal = 0 @@ -13,6 +15,9 @@ var/cooldown_on = 0 req_access = list(access_ai_upload) +/obj/machinery/ai_slipper/process() + return + /obj/machinery/ai_slipper/New() ..() update_icon() diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 5361bea23a..7fb4160d16 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -23,6 +23,9 @@ var/datum/wires/autolathe/wires = null +/obj/machinery/autolathe/process() + return + /obj/machinery/autolathe/New() ..() @@ -233,8 +236,7 @@ return busy = 1 - //This needs some work. - use_power(max(2000, (making.power_use*multiplier))) + update_use_power(2) //Check if we still have the materials. for(var/material in making.resources) @@ -253,6 +255,7 @@ sleep(build_time) busy = 0 + update_use_power(1) //Sanity check. if(!making || !src) return diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index 4afd4f0e44..35a70dd30c 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -14,6 +14,9 @@ var/build_eff = 1 var/eat_eff = 1 +/obj/machinery/biogenerator/process() + return + /obj/machinery/biogenerator/New() ..() var/datum/reagents/R = new/datum/reagents(1000) diff --git a/code/game/machinery/bioprinter.dm b/code/game/machinery/bioprinter.dm index a0ac4258cc..fae30db595 100644 --- a/code/game/machinery/bioprinter.dm +++ b/code/game/machinery/bioprinter.dm @@ -7,6 +7,8 @@ anchored = 1 density = 1 + use_power = 1 + idle_power_usage = 40 icon_state = "bioprinter" @@ -21,6 +23,9 @@ "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 ad72835fae..51772b5aa3 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -10,6 +10,9 @@ 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 51bc9b69e6..5d996e6569 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -34,6 +34,9 @@ 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) return src.attack_hand(user) diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 2ebefc8625..49e8761264 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -22,6 +22,9 @@ base_state = "pflash" density = 1 +/obj/machinery/flasher/process() + return + /* /obj/machinery/flasher/New() sleep(4) //<--- What the fuck are you doing? D= @@ -133,7 +136,7 @@ active = 1 icon_state = "launcheract" - for(var/obj/machinery/flasher/M in world) + for(var/obj/machinery/flasher/M in machines) if(M.id == src.id) spawn() M.flash() diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 71894c2983..4cf51f09b2 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -173,6 +173,9 @@ 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/igniter.dm b/code/game/machinery/igniter.dm index a9be665022..63bee09b9e 100755 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -54,6 +54,9 @@ var/base_state = "migniter" anchored = 1 +/obj/machinery/sparker/process() + return + /obj/machinery/sparker/New() ..() @@ -129,12 +132,12 @@ active = 1 icon_state = "launcheract" - for(var/obj/machinery/sparker/M in world) + for(var/obj/machinery/sparker/M in machines) if (M.id == src.id) spawn( 0 ) M.ignite() - for(var/obj/machinery/igniter/M in world) + for(var/obj/machinery/igniter/M in machines) if(M.id == src.id) use_power(50) M.on = !( M.on ) diff --git a/code/game/machinery/jukebox.dm b/code/game/machinery/jukebox.dm index 2a6755015b..d119fd3c44 100644 --- a/code/game/machinery/jukebox.dm +++ b/code/game/machinery/jukebox.dm @@ -16,6 +16,9 @@ datum/track/New(var/title_name, var/audio) anchored = 1 density = 1 power_channel = EQUIP + use_power = 1 + idle_power_usage = 10 + active_power_usage = 100 var/playing = 0 @@ -32,6 +35,9 @@ 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() ..() @@ -189,6 +195,7 @@ datum/track/New(var/title_name, var/audio) A.forced_ambience = null playing = 0 + update_use_power(1) update_icon() @@ -205,4 +212,5 @@ datum/track/New(var/title_name, var/audio) A.play_ambience(M) playing = 1 + update_use_power(2) update_icon() From 9e464d823f6799daaef82850dc3eb0dc904c43c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Baldomir?= Date: Sat, 14 Mar 2015 20:06:52 +0100 Subject: [PATCH 3/6] Added process to robo-fabs and teleporter. --- code/game/machinery/robot_fabricator.dm | 3 +++ code/game/machinery/teleporter.dm | 12 +++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm index 0c3ae56115..1f4a765c9d 100644 --- a/code/game/machinery/robot_fabricator.dm +++ b/code/game/machinery/robot_fabricator.dm @@ -11,6 +11,9 @@ 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 f5db4a1ac0..4c257a38e6 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -86,7 +86,7 @@ /obj/machinery/computer/teleporter/attack_hand(user as mob) if(..()) return - + /* Ghosts can't use this one because it's a direct selection */ if(istype(user, /mob/dead/observer)) return @@ -175,6 +175,9 @@ active_power_usage = 2000 var/obj/machinery/computer/teleporter/com +/obj/machinery/teleport/hub/process() + return + /obj/machinery/teleport/hub/New() ..() underlays.Cut() @@ -311,6 +314,9 @@ active_power_usage = 2000 var/obj/machinery/teleport/hub/com +/obj/machinery/teleport/station/process() + return + /obj/machinery/teleport/station/New() ..() overlays.Cut() @@ -335,6 +341,8 @@ if (com) com.icon_state = "tele1" use_power(5000) + update_use_power(2) + com.update_use_power(2) for(var/mob/O in hearers(src, null)) O.show_message("\blue Teleporter engaged!", 2) src.add_fingerprint(usr) @@ -348,6 +356,8 @@ if (com) com.icon_state = "tele0" com.accurate = 0 + com.update_use_power(1) + update_use_power(1) for(var/mob/O in hearers(src, null)) O.show_message("\blue Teleporter disengaged!", 2) src.add_fingerprint(usr) From 1c67f811a7fe05670cbfc1cb8f6f00b6cf404904 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Baldomir?= Date: Sat, 14 Mar 2015 20:46:41 +0100 Subject: [PATCH 4/6] Updated power usage of the Autholathe. --- code/game/machinery/autolathe.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 7fb4160d16..3ad9cb9116 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -6,7 +6,7 @@ anchored = 1 use_power = 1 idle_power_usage = 10 - active_power_usage = 100 + active_power_usage = 2000 var/list/machine_recipes var/list/stored_material = list("metal" = 0, "glass" = 0) From a50bebcbae473465e691e45452a1c1521f3860de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Baldomir?= Date: Sat, 14 Mar 2015 21:07:55 +0100 Subject: [PATCH 5/6] Added check for use_power in machinery.dm process --- code/game/machinery/machinery.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 042889157a..5a4e6d7255 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -126,7 +126,10 @@ Class Procs: ..() /obj/machinery/process()//If you dont use process or power why are you here - return PROCESS_KILL + if(!(use_power || idle_power_usage || active_power_usage)) + return PROCESS_KILL + + return /obj/machinery/emp_act(severity) if(use_power && stat == 0) From 2e571e5448fc453d3adbac5e4d8941f1a23b3357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Baldomir?= Date: Sat, 14 Mar 2015 21:38:23 +0100 Subject: [PATCH 6/6] Pass at removing empty process() on game/machinery --- code/game/machinery/adv_med.dm | 3 --- code/game/machinery/ai_slipper.dm | 2 -- code/game/machinery/autolathe.dm | 2 -- code/game/machinery/biogenerator.dm | 2 -- code/game/machinery/bioprinter.dm | 3 --- code/game/machinery/buttons.dm | 2 -- code/game/machinery/door_control.dm | 2 -- code/game/machinery/doppler_array.dm | 3 --- code/game/machinery/flasher.dm | 5 ++--- code/game/machinery/hologram.dm | 3 --- code/game/machinery/holosign.dm | 7 +++---- code/game/machinery/igniter.dm | 5 +++-- code/game/machinery/jukebox.dm | 2 -- code/game/machinery/mass_driver.dm | 5 +---- code/game/machinery/robot_fabricator.dm | 3 --- code/game/machinery/teleporter.dm | 5 ----- 16 files changed, 9 insertions(+), 45 deletions(-) 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()