This commit is contained in:
Superhats
2018-07-15 00:29:08 +02:00
parent e817921ddc
commit 6704f2b999
7 changed files with 97 additions and 33 deletions
+11
View File
@@ -229,6 +229,17 @@
combat = 1
safety = 0
/obj/item/defibrillator/compact/combat/ERT
desc = "A belt-equipped defibrillator that can be rapidly deployed. Does not have the restrictions or safeties of conventional defibrillators and can revive through space suits."
/obj/item/defibrillator/compact/combat/ERT/loaded/New()
..()
paddles = make_paddles()
bcell = new /obj/item/stock_parts/cell/infinite(src)
update_icon()
return
/obj/item/defibrillator/compact/combat/loaded/New()
..()
paddles = make_paddles()
@@ -133,6 +133,40 @@
/obj/item/wrench/medical,
)
/obj/item/storage/belt/medical/surgery
max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 17
use_to_pickup = 1
name = "Surgical Belt"
desc = "Can hold various surgery tools."
storage_slots = 9
use_item_overlays = 1
can_hold = list(
/obj/item/scalpel,
/obj/item/hemostat,
/obj/item/retractor,
/obj/item/circular_saw,
/obj/item/bonegel,
/obj/item/bonesetter,
/obj/item/FixOVein,
/obj/item/surgicaldrill,
/obj/item/cautery,
)
/obj/item/storage/belt/medical/surgery/response_team
/obj/item/storage/belt/medical/surgery/response_team/New()
..()
new /obj/item/scalpel(src)
new /obj/item/hemostat(src)
new /obj/item/retractor(src)
new /obj/item/circular_saw(src)
new /obj/item/bonegel(src)
new /obj/item/bonesetter(src)
new /obj/item/FixOVein(src)
new /obj/item/surgicaldrill(src)
new /obj/item/cautery(src)
/obj/item/storage/belt/medical/response_team
/obj/item/storage/belt/medical/response_team/New()
@@ -203,7 +237,7 @@
/obj/item/storage/belt/security/response_team/New()
..()
new /obj/item/kitchen/knife/combat(src)
new /obj/item/reagent_containers/spray/pepper(src)
new /obj/item/melee/baton/loaded(src)
new /obj/item/flash(src)
new /obj/item/melee/classic_baton/telescopic(src)
@@ -227,10 +227,21 @@
var/base_name = ""
var/label_text = ""
/obj/item/storage/pill_bottle/ERT
/obj/item/storage/pill_bottle/New()
..()
base_name = name
/obj/item/storage/pill_bottle/ERT/New()
..()
new /obj/item/reagent_containers/food/pill/salicylic(src)
new /obj/item/reagent_containers/food/pill/salicylic(src)
new /obj/item/reagent_containers/food/pill/salicylic(src)
new /obj/item/reagent_containers/food/pill/charcoal(src)
new /obj/item/reagent_containers/food/pill/charcoal(src)
new /obj/item/reagent_containers/food/pill/charcoal(src)
/obj/item/storage/pill_bottle/MouseDrop(obj/over_object as obj) //Quick pillbottle fix. -Agouri
if(ishuman(usr)) //Can monkeys even place items in the pocket slots? Leaving this in just in case~
var/mob/M = usr