cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-21 12:16:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6752 from listerla/defib-charge

Browse Source 
Defibrilators can be charged in rechargers
This commit is contained in:
Atermonera
2020-02-27 20:54:03 -08:00
committed by GitHub
parent 46c2c4c762 25e52ec1db
commit aff506f6e6
3 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/recharger.dm
+1 -1
View File
@@ -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)
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)
var/icon_state_charged = "recharger2"
var/icon_state_charging = "recharger1"
var/icon_state_idle = "recharger0" //also when unpowered
code/game/objects/items/devices/defib.dm
+3
View File
@@ -19,6 +19,9 @@
var/obj/item/weapon/shockpaddles/linked/paddles
var/obj/item/weapon/cell/bcell = null
/obj/item/device/defib_kit/get_cell()
return bcell
/obj/item/device/defib_kit/New() //starts without a cell for rnd
..()
if(ispath(paddles))