diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index db5594685e..75b78d4114 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -10,7 +10,7 @@ active_power_usage = 40000 //40 kW var/efficiency = 40000 //will provide the modified power rate when upgraded var/obj/item/charging = null - var/list/allowed_devices = list(/obj/item/weapon/gun/energy, /obj/item/weapon/melee/baton, /obj/item/modular_computer, /obj/item/weapon/computer_hardware/battery_module, /obj/item/weapon/cell, /obj/item/device/flashlight, /obj/item/device/electronic_assembly, /obj/item/weapon/weldingtool/electric, /obj/item/ammo_magazine/smart, /obj/item/device/flash, /obj/item/device/defib_kit, /obj/item/ammo_casing/microbattery) //VOREStation Add - NSFW Batteries + var/list/allowed_devices = list(/obj/item/weapon/gun/energy, /obj/item/weapon/melee/baton, /obj/item/modular_computer, /obj/item/weapon/computer_hardware/battery_module, /obj/item/weapon/cell, /obj/item/device/suit_cooling_unit/emergency, /obj/item/device/flashlight, /obj/item/device/electronic_assembly, /obj/item/weapon/weldingtool/electric, /obj/item/ammo_magazine/smart, /obj/item/device/flash, /obj/item/device/defib_kit, /obj/item/ammo_casing/microbattery) //VOREStation Add - NSFW Batteries var/icon_state_charged = "recharger2" var/icon_state_charging = "recharger1" var/icon_state_idle = "recharger0" //also when unpowered diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index 0c097295bb..390084f9fe 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -18,7 +18,7 @@ var/on = 0 //is it turned on? var/cover_open = 0 //is the cover open? - var/obj/item/weapon/cell/cell + var/obj/item/weapon/cell/cell = /obj/item/weapon/cell/high var/max_cooling = 15 // in degrees per second - probably don't need to mess with heat capacity here var/charge_consumption = 3 // charge per second at max_cooling var/thermostat = T20C @@ -30,7 +30,8 @@ /obj/item/device/suit_cooling_unit/Initialize() . = ..() - cell = new/obj/item/weapon/cell/high(src) //comes not with the crappy default power cell - because this is dedicated EVA equipment + if(ispath(cell)) + cell = new cell(src) /obj/item/device/suit_cooling_unit/Destroy() qdel_null(cell) @@ -200,3 +201,23 @@ . += "The charge meter reads [round(cell.percent())]%." else . += "It doesn't have a power cell installed." + +/obj/item/device/suit_cooling_unit/emergency + icon_state = "esuitcooler" + cell = /obj/item/weapon/cell + w_class = ITEMSIZE_NORMAL + +/obj/item/device/suit_cooling_unit/emergency/updateicon() + return + +/obj/item/device/suit_cooling_unit/emergency/get_cell() + if(on) + return null // Don't let recharging happen while we're on + return cell + +/obj/item/device/suit_cooling_unit/emergency/attackby(obj/item/weapon/W as obj, mob/user as mob) + if (W.is_screwdriver()) + to_chat(user, "This model has the cell permanently installed!") + return + + return ..() diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi index 606e8dbfe8..3b41c35fcd 100644 Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ