diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index e8f77ad3d34..aaf33265342 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -365,6 +365,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ new/datum/stack_recipe("mining satchel", /obj/item/storage/bag/ore, 4), \ new/datum/stack_recipe("chemistry bag", /obj/item/storage/bag/chemistry, 4), \ new/datum/stack_recipe("bio bag", /obj/item/storage/bag/bio, 4), \ + new/datum/stack_recipe("science bag", /obj/item/storage/bag/xeno, 4), \ new/datum/stack_recipe("construction bag", /obj/item/storage/bag/construction, 4), \ null, \ new/datum/stack_recipe("improvised gauze", /obj/item/stack/medical/gauze/improvised, 1, 2, 6), \ diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index 6d714a00043..2267fd8ac48 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -440,7 +440,7 @@ )) /* - * Biowaste bag (mostly for xenobiologists) + * Biowaste bag (mostly for virologists) */ /obj/item/storage/bag/bio @@ -448,10 +448,41 @@ icon = 'icons/obj/chemical.dmi' icon_state = "biobag" worn_icon_state = "biobag" - desc = "A bag for the safe transportation and disposal of biowaste and other biological materials." + desc = "A bag for the safe transportation and disposal of biowaste and other virulent materials." resistance_flags = FLAMMABLE /obj/item/storage/bag/bio/ComponentInitialize() + . = ..() + var/datum/component/storage/STR = GetComponent(/datum/component/storage) + STR.max_combined_w_class = 200 + STR.max_items = 25 + STR.insert_preposition = "in" + STR.set_holdable(list( + /obj/item/reagent_containers/syringe, + /obj/item/reagent_containers/dropper, + /obj/item/reagent_containers/glass/beaker, + /obj/item/reagent_containers/glass/bottle, + /obj/item/reagent_containers/blood, + /obj/item/reagent_containers/hypospray/medipen, + /obj/item/food/monkeycube, + /obj/item/organ, + /obj/item/bodypart, + /obj/item/healthanalyzer + )) + +/* + * Science bag (mostly for xenobiologists) + */ + +/obj/item/storage/bag/xeno + name = "science bag" + icon = 'icons/obj/chemical.dmi' + icon_state = "xenobag" + worn_icon_state = "xenobag" + desc = "A bag for the storage and transport of anomalous materials." + resistance_flags = FLAMMABLE + +/obj/item/storage/bag/xeno/ComponentInitialize() . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_combined_w_class = 200 @@ -463,8 +494,6 @@ /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle, - /obj/item/reagent_containers/blood, - /obj/item/reagent_containers/hypospray/medipen, /obj/item/food/deadmouse, /obj/item/food/monkeycube, /obj/item/organ, diff --git a/code/game/objects/structures/crates_lockers/closets/l3closet.dm b/code/game/objects/structures/crates_lockers/closets/l3closet.dm index 22d996c5ef7..3de4ef99a0e 100644 --- a/code/game/objects/structures/crates_lockers/closets/l3closet.dm +++ b/code/game/objects/structures/crates_lockers/closets/l3closet.dm @@ -46,7 +46,7 @@ icon_state = "bio_viro" /obj/structure/closet/l3closet/scientist/PopulateContents() - new /obj/item/storage/bag/bio(src) + new /obj/item/storage/bag/xeno(src) new /obj/item/clothing/suit/bio_suit/scientist(src) new /obj/item/clothing/head/bio_hood/scientist(src) new /obj/item/clothing/mask/breath(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index f7ecc674144..c0bb728f877 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -32,7 +32,7 @@ . = ..() new /obj/item/pushbroom(src) new /obj/item/plunger(src) - new /obj/item/storage/bag/bio(src) + new /obj/item/storage/bag/xeno(src) new /obj/item/storage/box/petridish(src) new /obj/item/stack/ducts/fifty(src) for(var/i in 1 to 2) diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 92b45239ba7..482ef2e91f5 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -83,7 +83,7 @@ /obj/item/clothing/suit/toggle/labcoat/science/Initialize(mapload) . = ..() - allowed += /obj/item/storage/bag/bio + allowed += /obj/item/storage/bag/xeno /obj/item/clothing/suit/toggle/labcoat/roboticist name = "roboticist labcoat" diff --git a/code/modules/clothing/suits/wintercoats.dm b/code/modules/clothing/suits/wintercoats.dm index ba8faa925b3..8f2d9f51b42 100644 --- a/code/modules/clothing/suits/wintercoats.dm +++ b/code/modules/clothing/suits/wintercoats.dm @@ -271,7 +271,7 @@ /obj/item/reagent_containers/pill, /obj/item/reagent_containers/syringe, /obj/item/storage/pill_bottle, - /obj/item/storage/bag/bio, + /obj/item/storage/bag/xeno, ) armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 10, BIO = 0, FIRE = 20, ACID = 0) hoodtype = /obj/item/clothing/head/hooded/winterhood/science diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm index bb704d392de..bd047480c3a 100644 --- a/code/modules/mob/living/simple_animal/slime/slime.dm +++ b/code/modules/mob/living/simple_animal/slime/slime.dm @@ -384,7 +384,7 @@ force_effect = round(W.force/2) if(prob(10 + force_effect)) discipline_slime(user) - if(istype(W, /obj/item/storage/bag/bio)) + if(istype(W, /obj/item/storage/bag/xeno)) var/obj/item/storage/P = W if(!effectmod) to_chat(user, span_warning("The slime is not currently being mutated.")) diff --git a/code/modules/research/xenobiology/crossbreeding/reproductive.dm b/code/modules/research/xenobiology/crossbreeding/reproductive.dm index 3c5bef5776c..204cf215417 100644 --- a/code/modules/research/xenobiology/crossbreeding/reproductive.dm +++ b/code/modules/research/xenobiology/crossbreeding/reproductive.dm @@ -35,7 +35,7 @@ Reproductive extracts: slimeStorage.processCubes(src, user) return - if(istype(O, /obj/item/storage/bag/bio)) + if(istype(O, /obj/item/storage/bag/xeno)) var/list/inserted = list() SEND_SIGNAL(O, COMSIG_TRY_STORAGE_TAKE_TYPE, /obj/item/food/monkeycube, src, feedAmount - length(contents), TRUE, FALSE, user, inserted) if(inserted.len) diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi index 071fdd73a3d..462dea7cf10 100644 Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ diff --git a/icons/mob/clothing/belt_mirror.dmi b/icons/mob/clothing/belt_mirror.dmi index bf314ba1ea7..81376d8e76d 100644 Binary files a/icons/mob/clothing/belt_mirror.dmi and b/icons/mob/clothing/belt_mirror.dmi differ diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi index 65d9e4b19a8..a9238cf0a52 100644 Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ diff --git a/icons/obj/hydroponics/equipment.dmi b/icons/obj/hydroponics/equipment.dmi index 385bed4d95e..f7ad72bb3f0 100644 Binary files a/icons/obj/hydroponics/equipment.dmi and b/icons/obj/hydroponics/equipment.dmi differ diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi index 2c6468f863f..5ff617fa633 100644 Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ diff --git a/icons/obj/mining.dmi b/icons/obj/mining.dmi index 51a6d6f1ed1..31aaa6a2ced 100644 Binary files a/icons/obj/mining.dmi and b/icons/obj/mining.dmi differ diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi index 8bfdd660691..c6a1da23d05 100644 Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ