diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm index 780b549040f..0dc26d356b7 100644 --- a/code/modules/research/designs/biogenerator_designs.dm +++ b/code/modules/research/designs/biogenerator_designs.dm @@ -66,16 +66,6 @@ build_path = /obj/item/food/monkeycube category = list("initial","Food") -//SKYRAT EDIT ADDITION BEGIN -/datum/design/biomeat - name = "Meat Product" - id = "meatp" - build_type = BIOGENERATOR - materials = list(/datum/material/biomass= 125) //Monkey Cube is more efficient, but this is easier on the chef. - build_path = /obj/item/food/meat/slab/meatproduct - category = list("initial","Food") -//SKYRAT EDIT ADDITION END - /datum/design/ez_nut //easy nut :) name = "25u E-Z Nutrient" id = "ez_nut" diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 6b0a1afa6eb..945232229c9 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -80,7 +80,8 @@ /obj/item/clothing/suit/apron/surgical = 4, /obj/item/clothing/mask/surgical = 4, /obj/item/clothing/gloves/color/latex/nitrile = 2, //SKYRAT EDIT ADDITION - /obj/item/clothing/suit/toggle/labcoat/hospitalgown = 4) //SKYRAT EDIT ADDITION + /obj/item/clothing/suit/toggle/labcoat/hospitalgown = 4, //SKYRAT EDIT ADDITION + /obj/item/storage/belt/medbandolier = 2) // SKYRAT EDIT ADDITION refill_canister = /obj/item/vending_refill/wardrobe/medi_wardrobe payment_department = ACCOUNT_MED diff --git a/modular_skyrat/master_files/code/modules/research/designs/biogenerator_designs.dm b/modular_skyrat/master_files/code/modules/research/designs/biogenerator_designs.dm new file mode 100644 index 00000000000..11cf9de2e02 --- /dev/null +++ b/modular_skyrat/master_files/code/modules/research/designs/biogenerator_designs.dm @@ -0,0 +1,15 @@ +/datum/design/medbandolier + name = "Medical Bandolier" + id = "medban" + build_type = BIOGENERATOR + materials = list(/datum/material/biomass = 600) + build_path = /obj/item/storage/belt/medbandolier + category = list("initial","Organic Materials") + +/datum/design/biomeat + name = "Meat Product" + id = "meatp" + build_type = BIOGENERATOR + materials = list(/datum/material/biomass= 125) //Monkey Cube is more efficient, but this is easier on the chef. + build_path = /obj/item/food/meat/slab/meatproduct + category = list("initial","Food") diff --git a/modular_skyrat/master_files/icons/mob/clothing/back.dmi b/modular_skyrat/master_files/icons/mob/clothing/back.dmi index 984c68d4cbf..2f8de54d6c6 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/back.dmi and b/modular_skyrat/master_files/icons/mob/clothing/back.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/belt.dmi b/modular_skyrat/master_files/icons/mob/clothing/belt.dmi index 366b198287b..ac9db71175a 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/belt.dmi and b/modular_skyrat/master_files/icons/mob/clothing/belt.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/belts.dmi b/modular_skyrat/master_files/icons/obj/clothing/belts.dmi index 30bfbdd581a..89a98f7506b 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/belts.dmi and b/modular_skyrat/master_files/icons/obj/clothing/belts.dmi differ diff --git a/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm b/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm index e1bae34dc12..7d25f77697d 100644 --- a/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm +++ b/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm @@ -135,3 +135,38 @@ icon_state = "cowboy_belt" worn_icon_state = "cowboy_belt" inhand_icon_state = "utility" + +/obj/item/storage/belt/medbandolier + icon = 'modular_skyrat/master_files/icons/obj/clothing/belts.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/belt.dmi' + name = "medical bandolier" + desc = "A pocketed, pine green belt slung like a sash over the shoulder. Features numerous pockets for medicines, poisons, and your smoke break. Now is coward healing time." + icon_state = "med_bandolier" + worn_icon_state = "med_bandolier" + +/obj/item/storage/belt/medbandolier/ComponentInitialize() + . = ..() + var/datum/component/storage/bandolier_storage = GetComponent(/datum/component/storage) + bandolier_storage.max_w_class = WEIGHT_CLASS_NORMAL + bandolier_storage.max_combined_w_class = 21 + bandolier_storage.set_holdable(list( + /obj/item/dnainjector, + /obj/item/reagent_containers/dropper, + /obj/item/reagent_containers/glass/beaker, + /obj/item/reagent_containers/glass/bottle, + /obj/item/reagent_containers/pill, + /obj/item/reagent_containers/syringe, + /obj/item/reagent_containers/medigel, + /obj/item/reagent_containers/glass/bottle/vial, + /obj/item/lighter, // This was too funny to pass up. + /obj/item/storage/fancy/cigarettes, // Same here. + /obj/item/storage/pill_bottle, + /obj/item/reagent_containers/hypospray, + /obj/item/hypospray/mkii, + /obj/item/gun/syringe/syndicate, + /obj/item/implantcase, + /obj/item/implant, + /obj/item/implanter, + /obj/item/reagent_containers/spray, + /obj/item/medicell + )) diff --git a/tgstation.dme b/tgstation.dme index deb36eddac4..fa583b39369 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3891,6 +3891,7 @@ #include "modular_skyrat\master_files\code\modules\projectiles\guns\ballistic\revolver.dm" #include "modular_skyrat\master_files\code\modules\reagents\chemistry\colors.dm" #include "modular_skyrat\master_files\code\modules\reagents\withdrawal\generic_addictions.dm" +#include "modular_skyrat\master_files\code\modules\research\designs\biogenerator_designs.dm" #include "modular_skyrat\master_files\code\modules\research\designs\misc_designs.dm" #include "modular_skyrat\master_files\code\modules\shuttle\shuttle.dm" #include "modular_skyrat\master_files\code\modules\shuttle\supply.dm"