Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties

2020-03-02 17:38:08 +01:00
parent e5e05d5d61 797e96d985
commit 50a1feeb89
22 changed files with 255 additions and 132 deletions
@@ -242,10 +242,8 @@
 	if(slot == user.getBeltSlot())
 		return TRUE

-/obj/item/defibrillator/compact/loaded/Initialize()
-	. = ..()
-	cell = new(src)
-	update_power()
+/obj/item/defibrillator/compact/loaded
+	cell = /obj/item/stock_parts/cell/high

 /obj/item/defibrillator/compact/combat
 	name = "combat defibrillator"