Merge pull request #10997 from Owai-Seek/tinytweaks-2-9-20

Sprites, Tweaks, and Snacks, QoL

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -51,6 +51,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
 	new/datum/stack_recipe("closet", /obj/structure/closet, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
 	null, \
 	new/datum/stack_recipe("canister", /obj/machinery/portable_atmospherics/canister, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
+	new/datum/stack_recipe("trash bin", /obj/structure/closet/crate/bin, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE),\
 	null, \
 	new/datum/stack_recipe("floor tile", /obj/item/stack/tile/plasteel, 1, 4, 20), \
 	new/datum/stack_recipe("metal rod", /obj/item/stack/rods, 1, 2, 60), \
@@ -733,7 +734,6 @@ GLOBAL_LIST_INIT(plastic_recipes, list(
 	new /datum/stack_recipe("opaque plastic flaps", /obj/structure/plasticflaps/opaque, 5, one_per_turf = TRUE, on_floor = TRUE, time = 40), \
 	new /datum/stack_recipe("water bottle", /obj/item/reagent_containers/glass/beaker/waterbottle/empty), \
 	new /datum/stack_recipe("large water bottle", /obj/item/reagent_containers/glass/beaker/waterbottle/large/empty,3), \
-	new /datum/stack_recipe("large trash cart", /obj/structure/closet/crate/bin,50),\
 	new /datum/stack_recipe("wet floor sign", /obj/item/caution, 2)))
 
 /obj/item/stack/sheet/plastic

code/game/objects/items/storage/bags.dm

@@ -399,10 +399,12 @@
 /obj/item/storage/bag/bio/ComponentInitialize()
 	. = ..()
 	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	STR.max_w_class = WEIGHT_CLASS_NORMAL //Allows you to pick up Lungs, Liver, and Stomach
 	STR.max_combined_w_class = 200
 	STR.max_items = 25
 	STR.insert_preposition = "in"
-	STR.can_hold = typecacheof(list(/obj/item/slime_extract, /obj/item/reagent_containers/syringe, /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/reagent_containers/food/snacks/deadmouse, /obj/item/reagent_containers/food/snacks/monkeycube))
+	STR.can_hold = typecacheof(list(/obj/item/slime_extract, /obj/item/reagent_containers/syringe, /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/reagent_containers/food/snacks/deadmouse, /obj/item/reagent_containers/food/snacks/monkeycube, /obj/item/organ, /obj/item/reagent_containers/food/snacks/meat/slab, /obj/item/bodypart))
+	STR.cant_hold = typecacheof(list(/obj/item/organ/brain, /obj/item/organ/liver/cybernetic, /obj/item/organ/heart/cybernetic, /obj/item/organ/lungs/cybernetic, /obj/item/organ/tongue/cybernetic, /obj/item/organ/ears/cybernetic, /obj/item/organ/eyes/robotic, /obj/item/organ/cyberimp))
 
 /obj/item/storage/bag/bio/holding
 	name = "bio bag of holding"

code/game/objects/structures/crates_lockers/crates/bins.dm

@@ -4,8 +4,8 @@
 	icon_state = "largebins"
 	open_sound = 'sound/effects/bin_open.ogg'
 	close_sound = 'sound/effects/bin_close.ogg'
-	material_drop = /obj/item/stack/sheet/plastic
-	material_drop_amount = 40
+	material_drop = /obj/item/stack/sheet/metal
+	material_drop_amount = 10
 	anchored = TRUE
 	horizontal = FALSE
 	delivery_icon = null

code/modules/cargo/exports/large_objects.dm

@@ -6,7 +6,7 @@
 	k_elasticity = 0
 	unit_name = "crate"
 	export_types = list(/obj/structure/closet/crate)
-	exclude_types = list(/obj/structure/closet/crate/large, /obj/structure/closet/crate/wooden)
+	exclude_types = list(/obj/structure/closet/crate/large, /obj/structure/closet/crate/wooden, /obj/structure/closet/crate/bin)
 
 /datum/export/large/crate/total_printout(datum/export_report/ex, notes = TRUE) // That's why a goddamn metal crate costs that much.
 	. = ..()

code/modules/food_and_drinks/drinks/drinks.dm

@@ -280,19 +280,24 @@
 	spillable = TRUE
 
 /obj/item/reagent_containers/food/drinks/mug/on_reagent_change(changetype)
+	cut_overlays()    
 	if(reagents.total_volume)
-		icon_state = "tea"
+		var/mutable_appearance/MA = mutable_appearance(icon,"mugoverlay")
+		MA.color = mix_color_from_reagents(reagents.reagent_list)
+		add_overlay(MA)
 	else
 		icon_state = "tea_empty"
 
 /obj/item/reagent_containers/food/drinks/mug/tea
 	name = "Duke Purple tea"
+	icon_state = "tea"
 	desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea."
 	list_reagents = list(/datum/reagent/consumable/tea = 30)
 
 /obj/item/reagent_containers/food/drinks/mug/coco
 	name = "Dutch hot coco"
 	desc = "Made in Space South America."
+	icon_state = "coco"
 	list_reagents = list(/datum/reagent/consumable/hot_coco = 30, /datum/reagent/consumable/sugar = 5)
 	foodtype = SUGAR
 	resistance_flags = FREEZE_PROOF

code/modules/food_and_drinks/food/snacks_egg.dm

@@ -96,6 +96,16 @@
 	tastes = list("egg" = 4, "salt" = 1, "pepper" = 1)
 	foodtype = MEAT | FRIED | BREAKFAST
 
+/obj/item/reagent_containers/food/snacks/baconegg
+	name = "bacon and eggs"
+	desc = "A fried egg with a side of bacon. Delicious!"
+	icon_state = "baconegg"
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	bitesize = 1
+	filling_color = "#FFFFF0"
+	tastes = list("egg" = 2, "bacon" = 2, "salt" = 1, "pepper" = 1)
+	foodtype = MEAT | FRIED | BREAKFAST
+
 /obj/item/reagent_containers/food/snacks/boiledegg
 	name = "boiled egg"
 	desc = "A hard boiled egg."

code/modules/food_and_drinks/food/snacks_pastry.dm

@@ -353,6 +353,13 @@
 	tastes = list("muffin" = 3, "spookiness" = 1)
 	foodtype = GRAIN | FRUIT | SUGAR | BREAKFAST
 
+/obj/item/reagent_containers/food/snacks/muffin/poppy
+	name = "poppy muffin"
+	icon_state = "poppymuffin"
+	desc = "A classic lemon poppy seed muffin. Do not consume prior to drug testing."
+	tastes = list("muffin" = 3, "lemon" = 1, "seeds" = 1)
+	foodtype = GRAIN | SUGAR | BREAKFAST
+
 /obj/item/reagent_containers/food/snacks/chawanmushi
 	name = "chawanmushi"
 	desc = "A legendary egg custard that makes friends out of enemies. Probably too hot for a cat to eat."

code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm

@@ -13,6 +13,15 @@
 	result = /obj/item/reagent_containers/food/snacks/friedegg
 	subcategory = CAT_EGG
 
+/datum/crafting_recipe/food/baconegg
+	name = "Bacon and Eggs"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/friedegg = 1,
+		/obj/item/reagent_containers/food/snacks/meat/bacon = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/baconegg
+	subcategory = CAT_EGG
+
 /datum/crafting_recipe/food/omelette
 	name = "Omelette"
 	reqs = list(

code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm

@@ -377,6 +377,17 @@ datum/crafting_recipe/food/donut/meat
 	result = /obj/item/reagent_containers/food/snacks/muffin/booberry
 	subcategory = CAT_PASTRY
 
+/datum/crafting_recipe/food/poppymuffin
+	name = "Poppy muffin"
+	reqs = list(
+		/datum/reagent/consumable/milk = 5,
+		/obj/item/reagent_containers/food/snacks/pastrybase = 1,
+		/obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 1,
+		/obj/item/seeds/poppy = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/muffin/poppy
+	subcategory = CAT_PASTRY
+
 /datum/crafting_recipe/food/chawanmushi
 	name = "Chawanmushi"
 	reqs = list(

code/modules/reagents/chemistry/reagents/food_reagents.dm

@@ -383,7 +383,7 @@
 	name = "Hot Chocolate"
 	description = "Made with love! And coco beans."
 	nutriment_factor = 3 * REAGENTS_METABOLISM
-	color = "#403010" // rgb: 64, 48, 16
+	color = "#660000" // rgb: 221, 202, 134
 	taste_description = "creamy chocolate"
 	glass_icon_state  = "chocolateglass"
 	glass_name = "glass of chocolate"

code/modules/reagents/reagent_containers/spray.dm

@@ -172,6 +172,7 @@
 /obj/item/reagent_containers/spray/drying_agent
 	name = "drying agent spray"
 	desc = "A spray bottle for drying agent."
+	icon_state = "cleaner_drying"
 	volume = 100
 	list_reagents = list(/datum/reagent/drying_agent = 100)
 	amount_per_transfer_from_this = 2

code/modules/research/designs/misc_designs.dm

@@ -289,6 +289,16 @@
 ////////////Janitor Designs//////////////
 /////////////////////////////////////////
 
+/datum/design/mop
+	name = "Mop"
+	desc = "Just your everyday standard mop."
+	id = "mop"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 1200, MAT_GLASS = 100)
+	build_path = /obj/item/mop
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
+
 /datum/design/advmop
 	name = "Advanced Mop"
 	desc = "An upgraded mop with a large internal capacity for holding water or other cleaning chemicals."

code/modules/research/techweb/all_nodes.dm

@@ -602,7 +602,7 @@
 	display_name = "Basic Tools"
 	description = "Basic mechanical, electronic, surgical and botanical tools."
 	prereq_ids = list("base")
-	design_ids = list("screwdriver", "wrench", "wirecutters", "crowbar", "multitool", "welding_tool", "tscanner", "analyzer", "cable_coil", "pipe_painter", "airlock_painter", "scalpel", "circular_saw", "surgicaldrill", "retractor", "cautery", "hemostat", "cultivator", "plant_analyzer", "shovel", "spade", "hatchet")
+	design_ids = list("screwdriver", "wrench", "wirecutters", "crowbar", "multitool", "welding_tool", "tscanner", "analyzer", "cable_coil", "pipe_painter", "airlock_painter", "scalpel", "circular_saw", "surgicaldrill", "retractor", "cautery", "hemostat", "cultivator", "plant_analyzer", "shovel", "spade", "hatchet", "mop")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 500)
 	export_price = 5000
 

code/modules/surgery/bodyparts/bodyparts.dm

@@ -5,6 +5,7 @@
 	force = 3
 	throwforce = 3
 	icon = 'icons/mob/human_parts.dmi'
+	w_class = WEIGHT_CLASS_SMALL
 	icon_state = ""
 	layer = BELOW_MOB_LAYER //so it isn't hidden behind objects when on the floor
 	var/mob/living/carbon/owner = null

code/modules/vending/snack.dm

@@ -4,22 +4,25 @@
 	product_slogans = "Try our new nougat bar!;Twice the calories for half the price!"
 	product_ads = "The healthiest!;Award-winning chocolate bars!;Mmm! So good!;Oh my god it's so juicy!;Have a snack.;Snacks are good for you!;Have some more Getmore!;Best quality snacks straight from mars.;We love chocolate!;Try our new jerky!"
 	icon_state = "snack"
-	products = list(/obj/item/reagent_containers/food/snacks/candy = 6,
-					/obj/item/reagent_containers/food/drinks/dry_ramen = 6,
-					/obj/item/reagent_containers/food/snacks/chips = 6,
-					/obj/item/reagent_containers/food/snacks/sosjerky = 6,
-					/obj/item/reagent_containers/food/snacks/no_raisin = 6,
-					/obj/item/reagent_containers/food/snacks/spacetwinkie = 6,
-					/obj/item/reagent_containers/food/snacks/cheesiehonkers = 6)
+	products = list(/obj/item/reagent_containers/food/snacks/candy = 5,
+					/obj/item/reagent_containers/food/snacks/chocolatebar = 5,
+					/obj/item/reagent_containers/food/drinks/dry_ramen = 5,
+					/obj/item/reagent_containers/food/snacks/chips = 5,
+					/obj/item/reagent_containers/food/snacks/sosjerky = 5,
+					/obj/item/reagent_containers/food/snacks/no_raisin = 5,
+					/obj/item/reagent_containers/food/snacks/spacetwinkie = 5,
+					/obj/item/reagent_containers/food/snacks/cheesiehonkers = 5,
+					/obj/item/reagent_containers/food/snacks/cornchips = 5)
 	contraband = list(
-					/obj/item/reagent_containers/food/snacks/cracker = 12,
-					/obj/item/reagent_containers/food/snacks/beans = 2,
-					/obj/item/reagent_containers/food/snacks/honeybar = 6,
-					/obj/item/reagent_containers/food/snacks/syndicake = 6)
+					/obj/item/reagent_containers/food/snacks/cracker = 10,
+					/obj/item/reagent_containers/food/snacks/honeybar = 5,
+					/obj/item/reagent_containers/food/snacks/syndicake = 5,
+					/obj/item/reagent_containers/food/snacks/beans = 2)
 	premium = list(
 					/obj/item/reagent_containers/food/snacks/lollipop = 2,
 					/obj/item/reagent_containers/food/snacks/spiderlollipop = 2,
 					/obj/item/reagent_containers/food/snacks/chococoin = 1,
+					/obj/item/storage/box/marshmallow = 1,
 					/obj/item/storage/box/donkpockets = 2)
 
 	refill_canister = /obj/item/vending_refill/snack