Merge pull request #15783 from E-MonaRhg/just-defibrillator-things

More compact defibs: Electric boogaloo
This commit is contained in:
variableundefined
2021-09-06 21:56:46 -05:00
committed by GitHub
13 changed files with 101 additions and 40 deletions
+7 -1
View File
@@ -284,6 +284,12 @@
charge = 0
update_icon()
/obj/item/stock_parts/cell/bluespace/charging
name = "self-charging bluespace power cell"
desc = "An experimental, self-charging, transdimensional power cell."
origin_tech = "powerstorage=10;bluespace=10"
self_recharge = TRUE
/obj/item/stock_parts/cell/infinite
name = "infinite-capacity power cell!"
icon_state = "icell"
@@ -294,7 +300,7 @@
chargerate = 30000
/obj/item/stock_parts/cell/infinite/use()
return 1
return TRUE
/obj/item/stock_parts/cell/infinite/abductor
name = "void core"
@@ -72,6 +72,16 @@
build_path = /obj/item/defibrillator
category = list("Medical")
/datum/design/compact_defib
name = "Compact Defibrillator"
desc = "A belt-mounted defibrillator for rapid deployment."
id = "compact_defib"
req_tech = list("materials" = 7, "biotech" = 7, "powerstorage" = 6)
build_type = PROTOLATHE
materials = list(MAT_METAL = 10000, MAT_GLASS = 4000, MAT_SILVER = 2000)
build_path = /obj/item/defibrillator/compact
category = list("Medical")
/datum/design/defib_mount
name = "Defibrillator Wall Mount"
desc = "A wall mount for defibrillator units."
+2 -2
View File
@@ -340,7 +340,7 @@
/obj/item/organ/internal/cyberimp/arm/surgery,
/obj/item/organ/internal/cyberimp/chest/nutriment
)
belt = /obj/item/defibrillator/compact/loaded
belt = /obj/item/defibrillator/compact/advanced/loaded
l_pocket = /obj/item/reagent_containers/hypospray/safety/ert
r_pocket = /obj/item/melee/classic_baton/telescopic
@@ -369,7 +369,7 @@
mask = /obj/item/clothing/mask/gas/sechailer/swat
suit_store = /obj/item/gun/energy/gun/blueshield/pdw9
belt = /obj/item/defibrillator/compact/loaded
belt = /obj/item/defibrillator/compact/advanced/loaded
l_pocket = /obj/item/reagent_containers/hypospray/combat/nanites
r_pocket = /obj/item/reagent_containers/hypospray/autoinjector