Updates all storage bag icons (#64978)

imageadd: Changes all storage bag sprites
This commit is contained in:
Wallem
2022-02-25 16:36:54 -05:00
committed by GitHub
parent 582bcde0cb
commit 782006a07e
15 changed files with 40 additions and 10 deletions
@@ -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), \
+33 -4
View File
@@ -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,
@@ -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)
@@ -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)
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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
@@ -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."))
@@ -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)
Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 61 KiB

After

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB