Merge pull request #1808 from Hubblenaut/power

Spaceheater/Recharger Power Changes
This commit is contained in:
Yoshax
2016-05-30 13:46:18 +01:00
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -7,7 +7,7 @@ obj/machinery/recharger
anchored = 1
use_power = 1
idle_power_usage = 4
active_power_usage = 15000 //15 kW
active_power_usage = 40000 //40 kW
var/obj/item/charging = null
var/list/allowed_devices = list(/obj/item/weapon/gun/energy, /obj/item/weapon/melee/baton, /obj/item/device/laptop, /obj/item/weapon/cell)
var/icon_state_charged = "recharger2"
+2 -2
View File
@@ -6,9 +6,9 @@
name = "space heater"
desc = "Made by Space Amish using traditional space techniques, this heater is guaranteed not to set the station on fire."
var/obj/item/weapon/cell/cell
var/cell_type = /obj/item/weapon/cell/apc
var/cell_type = /obj/item/weapon/cell/high
var/on = 0
var/set_temperature = T0C + 50 //K
var/set_temperature = T0C + 20 //K
var/heating_power = 40000