Merge remote-tracking branch 'citadel/master' into clickcd_experimental

code/modules/food_and_drinks/food/snacks_meat.dm

@@ -174,6 +174,27 @@
 	tastes = list("meat" = 1, "smoke" = 1)
 	foodtype = MEAT
 
+/obj/item/reagent_containers/food/snacks/meatloaf
+	name = "meatloaf"
+	desc = "Meat! In a loaf!"
+	icon_state = "meatloaf"
+	filling_color = "#8f0f0f"
+	list_reagents = list(/datum/reagent/consumable/nutriment = 10)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/ketchup = 5)
+	tastes = list("meat" = 1, "ketchup" = 1)
+	slices_num = 5
+	slice_path = /obj/item/reagent_containers/food/snacks/meatloaf_slice
+	foodtype = MEAT
+
+/obj/item/reagent_containers/food/snacks/meatloaf_slice
+	name = "meatloaf slice"
+	filling_color = "#8f0f0f"
+	desc = "Meat! In chunky slices!"
+	icon_state = "meatloaf_slice"
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/ketchup = 1)
+	tastes = list("meat" = 1, "ketchup" = 1)
+	foodtype = MEAT
+
 /obj/item/reagent_containers/food/snacks/kebab
 	trash = /obj/item/stack/rods
 	icon_state = "kebab"
@@ -302,6 +323,16 @@
 	desc = "A 'chicken' nugget vaguely shaped like a [shape]."
 	icon_state = "nugget_[shape]"
 
+/obj/item/reagent_containers/food/snacks/sweet_and_sour
+	name = "sweet and sour chicken"
+	desc = "More sweet than sour, but delicious nonetheless."
+	icon_state = "sweet_and_sour"
+	filling_color = "#B22222"
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/consumable/soysauce = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 9, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/soysauce = 2)
+	tastes = list("\"chicken\"" = 1)
+	foodtype = MEAT | PINEAPPLE
+
 /obj/item/reagent_containers/food/snacks/pigblanket
 	name = "pig in a blanket"
 	desc = "A tiny sausage wrapped in a flakey, buttery roll. Free this pig from its blanket prison by eating it."

code/modules/food_and_drinks/food/snacks_other.dm

@@ -557,6 +557,26 @@
 	tastes = list("butter" = 1)
 	foodtype = JUNKFOOD
 
+/obj/item/reagent_containers/food/snacks/mashedpotato
+	name = "mashed potatoes"
+	desc = "A diced and smashed potato, served with sour cream."
+	icon_state = "mashedpotato"
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/sodiumchloride = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	filling_color = "#FFD700"
+	tastes = list("butter" = 1, "sour cream" = 1)
+	foodtype = GRAIN
+
+/obj/item/reagent_containers/food/snacks/butteredpotato
+	name = "buttered potatoes"
+	desc = "Mashed potatoes served with an ample serving of butter, and sour cream."
+	icon_state = "buttermash"
+	list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/sodiumchloride = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 1)
+	filling_color = "#FFD700"
+	tastes = list("potatoes" = 1, "sour cream" = 1, "butter" = 1)
+	foodtype = GRAIN | DAIRY
+
 /obj/item/reagent_containers/food/snacks/onionrings
 	name = "onion rings"
 	desc = "Onion slices coated in batter."

code/modules/food_and_drinks/food/snacks_sandwichtoast.dm

@@ -153,3 +153,13 @@
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
 	tastes = list("tuna" = 4, "mayonnaise" = 2, "bread" = 2)
 	foodtype = GRAIN | MEAT
+
+/obj/item/reagent_containers/food/snacks/meatballsub
+	name = "meatball sub"
+	desc = "At some point, you need to be the cheif sub."
+	icon = 'icons/obj/food/food.dmi'
+	icon_state = "meatballsub"
+	list_reagents = list(/datum/reagent/consumable/nutriment = 12, /datum/reagent/consumable/nutriment/vitamin = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
+	tastes = list("meat" = 2, "toasted bread" = 1)
+	foodtype = GRAIN | MEAT

code/modules/food_and_drinks/food/snacks_soup.dm

@@ -125,6 +125,15 @@
 	tastes = list("tomato" = 1, "mint" = 1)
 	foodtype = VEGETABLES
 
+/obj/item/reagent_containers/food/snacks/soup/bearchili
+	name = "bear chili"
+	desc = "Sensationally seasoned bear meat diced up with some peppers."
+	icon_state = "bearchili"
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/capsaicin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/medicine/morphine = 5, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/capsaicin = 5)
+	tastes = list("the outdoors" = 1, "hot peppers" = 1)
+	foodtype = VEGETABLES | MEAT
+
 /obj/item/reagent_containers/food/snacks/soup/monkeysdelight
 	name = "monkey's delight"
 	desc = "A delicious soup with dumplings and hunks of monkey meat simmered to perfection, in a broth that tastes faintly of bananas."
@@ -253,6 +262,16 @@
 	filling_color = "#CC2B52"
 	foodtype = VEGETABLES | TOXIC
 
+/obj/item/reagent_containers/food/snacks/soup/spiral_soup
+	name = "spiral soup"
+	desc = "The swirling of this soup is both frightening, and enticing."
+	icon_state = "spiral_soup"
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/liquidelectricity = 5, /datum/reagent/cryptobiolin = 10, /datum/reagent/toxin/rotatium = 10)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/cryptobiolin = 15, /datum/reagent/toxin/rotatium = 15, /datum/reagent/consumable/liquidelectricity = 2)
+	tastes = list("the floor" = 1, "the ceiling" = 1, "regret" = 2)
+	filling_color = "#4476e2"
+	foodtype = GROSS | TOXIC | VEGETABLES
+
 /obj/item/reagent_containers/food/snacks/soup/bungocurry
 	name = "bungo curry"
 	desc = "A spicy vegetable curry made with the humble bungo fruit, Exotic!"

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

@@ -84,6 +84,17 @@
 	result = /obj/item/reagent_containers/food/snacks/nugget
 	subcategory = CAT_MEAT
 
+/datum/crafting_recipe/food/sweet_and_sour
+	name = "Sweet and sour \"chicken\""
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/nugget = 2,
+		/obj/item/reagent_containers/food/snacks/pineappleslice = 1,
+		/datum/reagent/consumable/soysauce = 2,
+		/datum/reagent/consumable/sodiumchloride = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/sweet_and_sour
+	subcategory = CAT_MEAT
+
 /datum/crafting_recipe/food/corndog
 	name = "Corndog meal"
 	reqs = list(
@@ -135,6 +146,16 @@
 	result = /obj/item/reagent_containers/food/snacks/sausage
 	subcategory = CAT_MEAT
 
+/datum/crafting_recipe/food/meatloaf
+	name = "Meatloaf"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/meat/cutlet = 4,
+		/datum/reagent/consumable/eggyolk = 10,
+		/datum/reagent/consumable/ketchup = 5
+	)
+	result = /obj/item/reagent_containers/food/snacks/meatloaf
+	subcategory = CAT_MEAT
+
 /datum/crafting_recipe/food/pigblanket
 	name = "Pig in a Blanket"
 	reqs = list(

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

@@ -113,6 +113,25 @@
 	result = /obj/item/reagent_containers/food/snacks/loadedbakedpotato
 	subcategory = CAT_MISCFOOD
 
+/datum/crafting_recipe/food/mashedpotato
+	name = "Mashed potato"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/grown/potato = 1,
+		/datum/reagent/consumable/cream = 5,
+		/datum/reagent/consumable/sodiumchloride = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/mashedpotato
+	subcategory = CAT_MISCFOOD
+
+/datum/crafting_recipe/food/butteredpotato
+	name = "Buttered mash"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/mashedpotato = 1,
+		/obj/item/reagent_containers/food/snacks/butter = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/butteredpotato
+	subcategory = CAT_MISCFOOD
+
 /datum/crafting_recipe/food/melonfruitbowl
 	name ="Melon fruit bowl"
 	reqs = list(

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

@@ -115,6 +115,15 @@
 	result = /obj/item/reagent_containers/food/snacks/tuna_sandwich
 	subcategory = CAT_SANDWICH
 
+/datum/crafting_recipe/food/meatballsub
+	name = "Meatball sub"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/meatball = 3,
+		/obj/item/reagent_containers/food/snacks/bun = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/meatballsub
+	subcategory = CAT_SANDWICH
+	
 /datum/crafting_recipe/food/hotdog
 	name = "Hot dog"
 	reqs = list(

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

@@ -13,6 +13,17 @@
 	result = /obj/item/reagent_containers/food/snacks/soup/amanitajelly
 	subcategory = CAT_SOUP
 
+/datum/crafting_recipe/food/bearchili
+	name = "Bear chili"
+	reqs = list(
+		/datum/reagent/water = 10,
+		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/food/snacks/meat/steak/bear = 1,
+		/obj/item/reagent_containers/food/snacks/grown/chili = 1,
+	)
+	result = /obj/item/reagent_containers/food/snacks/soup/bearchili
+	subcategory = CAT_SOUP
+
 /datum/crafting_recipe/food/beetsoup
 	name = "Beet soup"
 	reqs = list(
@@ -204,6 +215,18 @@
 	result = /obj/item/reagent_containers/food/snacks/soup/spacylibertyduff
 	subcategory = CAT_SOUP
 
+/datum/crafting_recipe/food/spiralsoup
+	name = "Spiral soup"
+	reqs = list(
+		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/reagent_containers/food/snacks/grown/mushroom/jupitercup = 2,
+		/datum/reagent/cryptobiolin = 15,
+		/datum/reagent/toxin/rotatium = 15,
+		/datum/reagent/consumable/milk = 10
+	)
+	result = /obj/item/reagent_containers/food/snacks/soup/spacylibertyduff
+	subcategory = CAT_SOUP
+
 /datum/crafting_recipe/food/sweetpotatosoup
 	name = "Sweet potato soup"
 	reqs = list(

code/modules/mob/living/carbon/human/species_types/zombies.dm

@@ -33,7 +33,7 @@
 	limbs_id = "zombie"
 	mutanthands = /obj/item/zombie_hand
 	armor = 20 // 120 damage to KO a zombie, which kills it
-	speedmod = 1.6
+	speedmod = 1.6 // they're very slow
 	mutanteyes = /obj/item/organ/eyes/night_vision/zombie
 	var/heal_rate = 1
 	var/regen_cooldown = 0
@@ -41,7 +41,6 @@
 /datum/species/zombie/infectious/check_roundstart_eligible()
 	return FALSE
 
-
 /datum/species/zombie/infectious/spec_stun(mob/living/carbon/human/H,amount)
 	. = min(20, amount)
 
@@ -89,6 +88,11 @@
 		infection = new()
 		infection.Insert(C)
 
+	//make their bodyparts stamina-resistant
+	var/incoming_stam_mult = 0.7
+	for(var/obj/item/bodypart/part in C.bodyparts)
+		part.incoming_stam_mult = incoming_stam_mult
+		//todo: add negative wound resistance to all parts when wounds is merged (zombies are physically weak in terms of limbs)
 
 // Your skin falls off
 /datum/species/krokodil_addict

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -324,7 +324,7 @@
 		/obj/item/crowbar/cyborg,
 		/obj/item/healthanalyzer,
 		/obj/item/reagent_containers/borghypo,
-		/obj/item/reagent_containers/glass/beaker/large,
+		/obj/item/weapon/gripper/medical,
 		/obj/item/reagent_containers/dropper,
 		/obj/item/reagent_containers/syringe,
 		/obj/item/surgical_drapes,

code/modules/photography/photos/photo.dm

@@ -51,6 +51,8 @@
 	user.examinate(src)
 
 /obj/item/photo/attackby(obj/item/P, mob/user, params)
+	if(try_burn(P, user))
+		return
 	if(istype(P, /obj/item/pen) || istype(P, /obj/item/toy/crayon))
 		if(!user.is_literate())
 			to_chat(user, "<span class='notice'>You scribble illegibly on [src]!</span>")
@@ -60,6 +62,26 @@
 			scribble = txt
 	..()
 
+/obj/item/photo/proc/try_burn(obj/item/I, mob/living/user)
+	var/ignition_message = I.ignition_effect(src, user)
+	if(!ignition_message)
+		return
+	. = TRUE
+	if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(10) && Adjacent(user))
+		user.visible_message("<span class='warning'>[user] accidentally ignites [user.p_them()]self!</span>", \
+							"<span class='userdanger'>You miss [src] and accidentally light yourself on fire!</span>")
+		if(user.is_holding(I)) //checking if they're holding it in case TK is involved
+			user.dropItemToGround(I)
+		user.adjust_fire_stacks(1)
+		user.IgniteMob()
+		return
+
+	if(user.is_holding(src)) //no TK shit here.
+		user.dropItemToGround(src)
+	user.visible_message(ignition_message)
+	add_fingerprint(user)
+	fire_act(I.get_temperature())
+
 /obj/item/photo/examine(mob/user)
 	. = ..()
 	if(in_range(src, user))

code/modules/zombie/items.dm

@@ -11,7 +11,8 @@
 	var/icon_left = "bloodhand_left"
 	var/icon_right = "bloodhand_right"
 	hitsound = 'sound/hallucinations/growl1.ogg'
-	force = 21 // Just enough to break airlocks with melee attacks
+	force = 18
+	sharpness = IS_SHARP_ACCURATE //it's a claw, they're sharp.
 	damtype = "brute"
 	total_mass = TOTAL_MASS_HAND_REPLACEMENT
 	sharpness = IS_SHARP
@@ -35,11 +36,15 @@
 	. = ..()
 	if(!proximity_flag)
 		return
-	else if(isliving(target))
-		if(ishuman(target))
-			try_to_zombie_infect(target)
+	else
+		if(istype(target, /obj/)) //do far more damage to non mobs so we can get through airlocks
+			var/obj/target_object = target
+			target_object.take_damage(force * 3, BRUTE, "melee", 0)
 		else
-			check_feast(target, user)
+			if(isliving(target) && ishuman(target))
+				try_to_zombie_infect(target)
+			else
+				check_feast(target, user)
 
 /proc/try_to_zombie_infect(mob/living/carbon/human/target)
 	CHECK_DNA_AND_SPECIES(target)
@@ -55,8 +60,6 @@
 		infection = new()
 		infection.Insert(target)
 
-
-
 /obj/item/zombie_hand/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is ripping [user.p_their()] brains out! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	if(isliving(user))