Skip to content

Commit

Permalink
more stuff has idle draw, hydroponics standardized
Browse files Browse the repository at this point in the history
  • Loading branch information
Thera-Pissed committed Jan 11, 2024
1 parent d3f1c4d commit 363413f
Show file tree
Hide file tree
Showing 14 changed files with 34 additions and 7 deletions.
2 changes: 2 additions & 0 deletions code/game/machinery/PDApainter.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
icon_state = "pdapainter"
base_icon_state = "pdapainter"
density = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = IDLE_DRAW_MINIMAL
max_integrity = 200
var/obj/item/pda/storedpda = null
var/list/colorlist = list()
Expand Down
2 changes: 2 additions & 0 deletions code/game/machinery/Sleeper.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
icon_state = "sleeper"
base_icon_state = "sleeper"
density = FALSE
use_power = IDLE_POWER_USE
idle_power_usage = IDLE_DRAW_LOW
state_open = TRUE
circuit = /obj/item/circuitboard/machine/sleeper
clicksound = 'sound/machines/pda_button1.ogg'
Expand Down
2 changes: 2 additions & 0 deletions code/game/machinery/cloning.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
density = TRUE
icon = 'icons/obj/machines/cloning.dmi'
icon_state = "pod_0"
use_power = IDLE_POWER_USE
idle_power_usage = IDLE_DRAW_LOW
req_access = list(ACCESS_CLONING) //FOR PREMATURE UNLOCKING.
verb_say = "states"
circuit = /obj/item/circuitboard/machine/clonepod
Expand Down
2 changes: 2 additions & 0 deletions code/game/machinery/dance_machine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
icon_state = "jukebox-"
verb_say = "states"
density = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = IDLE_DRAW_MINIMAL
var/active = FALSE
var/list/rangers = list()
var/stop = 0
Expand Down
2 changes: 2 additions & 0 deletions code/game/machinery/doppler_array.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
icon = 'icons/obj/machines/research.dmi'
base_icon_state = "tdoppler"
density = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = IDLE_DRAW_LOW
verb_say = "states coldly"
var/cooldown = 10
var/next_announce = 0
Expand Down
2 changes: 2 additions & 0 deletions code/game/machinery/droneDispenser.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
icon = 'icons/obj/machines/droneDispenser.dmi'
icon_state = "on"
density = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = IDLE_DRAW_LOW

max_integrity = 250
integrity_failure = 0.33
Expand Down
2 changes: 2 additions & 0 deletions code/game/machinery/harvester.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
name = "organ harvester"
desc = "An advanced machine used for harvesting organs and limbs from the deceased."
density = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = IDLE_DRAW_LOW
icon = 'icons/obj/machines/harvester.dmi'
icon_state = "harvester"
base_icon_state = "harvester"
Expand Down
2 changes: 2 additions & 0 deletions code/game/machinery/hypnochair.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
base_icon_state = "hypnochair"
circuit = /obj/item/circuitboard/machine/hypnochair
density = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = IDLE_DRAW_LOW
opacity = FALSE

var/mob/living/carbon/victim = null ///Keeps track of the victim to apply effects if it teleports away
Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/launch_pad.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
desc = "A bluespace pad able to thrust matter through bluespace, teleporting it to or from nearby locations."
icon = 'icons/obj/telescience.dmi'
icon_state = "lpad-idle"
use_power = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = IDLE_DRAW_LOW
active_power_usage = ACTIVE_DRAW_EXTREME
hud_possible = list(DIAG_LAUNCHPAD_HUD)
Expand Down Expand Up @@ -149,7 +149,7 @@
teleporting = FALSE

// use a lot of power
use_power(1000)
use_power(active_power_usage)

var/turf/source = target
var/list/log_msg = list()
Expand Down
2 changes: 2 additions & 0 deletions code/game/machinery/medical_kiosk.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
base_icon_state = "kiosk"
layer = ABOVE_MOB_LAYER
density = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = IDLE_DRAW_LOW
circuit = /obj/item/circuitboard/machine/medical_kiosk
var/obj/item/scanner_wand
var/default_price = 15 //I'm defaulting to a low price on this, but in the future I wouldn't have an issue making it more or less expensive.
Expand Down
2 changes: 2 additions & 0 deletions code/game/machinery/recycler.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
icon_state = "grinder-o0"
layer = ABOVE_ALL_MOB_LAYER // Overhead
density = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = IDLE_DRAW_LOW
circuit = /obj/item/circuitboard/machine/recycler
var/safety_mode = FALSE // Temporarily stops machine if it detects a mob
var/icon_name = "grinder-o"
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/slotmachine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
base_icon_state = "slots"
density = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = IDLE_DRAW_LOW
idle_power_usage = IDLE_DRAW_MINIMAL
circuit = /obj/item/circuitboard/computer/slot_machine
light_color = LIGHT_COLOR_BROWN
unique_icon = TRUE
Expand Down
2 changes: 2 additions & 0 deletions code/game/machinery/suit_storage_unit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
icon_state = "ssu_classic"
base_icon_state = "ssu_classic"
density = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = IDLE_DRAW_MINIMAL
max_integrity = 250

var/obj/item/clothing/suit/space/suit = null
Expand Down
13 changes: 9 additions & 4 deletions code/modules/hydroponics/hydroponics.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
pixel_z = 1
obj_flags = CAN_BE_HIT | UNIQUE_RENAME
circuit = /obj/item/circuitboard/machine/hydroponics
idle_power_usage = 0
use_power = IDLE_POWER_USE
idle_power_usage = IDLE_DRAW_LOW
active_power_usage = ACTIVE_DRAW_HIGH
var/waterlevel = 100 //The amount of water in the tray (max 100)
var/maxwater = 100 //The maximum amount of water in the tray
var/nutridrain = 1 // How many units of nutrient will be drained in the tray
Expand Down Expand Up @@ -121,7 +123,7 @@

if(!powered() && self_sustaining)
visible_message("<span class='warning'>[name]'s auto-grow functionality shuts off!</span>")
idle_power_usage = 0
use_power = IDLE_POWER_USE
self_sustaining = FALSE
update_appearance()

Expand Down Expand Up @@ -682,7 +684,10 @@
if(!anchored)
return
self_sustaining = !self_sustaining
idle_power_usage = self_sustaining ? 1250 : 0
if(self_sustaining)
use_power = ACTIVE_POWER_USE
else
use_power = IDLE_POWER_USE
to_chat(user, "<span class='notice'>You [self_sustaining ? "activate" : "deactivated"] [src]'s autogrow function[self_sustaining ? ", maintaining the tray's health while using high amounts of power" : ""].")
update_appearance()

Expand Down Expand Up @@ -713,7 +718,7 @@
desc = initial(desc)
TRAY_NAME_UPDATE
if(self_sustaining) //No reason to pay for an empty tray.
idle_power_usage = 0
use_power = IDLE_POWER_USE
self_sustaining = FALSE
update_appearance()

Expand Down

0 comments on commit 363413f

Please sign in to comment.