Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise

.github/CONTRIBUTING.md

@@ -834,8 +834,10 @@ Each role inherits the lower role's responsibilities (IE: Headcoders also have c
 `Commit Access` members have write access to the repository and can merge your PRs. People included in this role are:
 
 - [AffectedArc07](https://github.com/AffectedArc07)
+- [Burzah](https://github.com/Burzah)
 - [Charliminator](https://github.com/hal9000PR)
 - [Contrabang](https://github.com/Contrabang)
+- [DGamerL](https://github.com/DGamerL)
 - [lewcc](https://github.com/lewcc)
 
 ---
@@ -846,6 +848,7 @@ Each role inherits the lower role's responsibilities (IE: Headcoders also have c
 - [Charliminator](https://github.com/hal9000PR)
 - [Contrabang](https://github.com/Contrabang)
 - [DGamerL](https://github.com/DGamerL)
+- [FunnyMan3595](https://github.com/FunnyMan3595)
 - [Henri215](https://github.com/Henri215)
 - [lewcc](https://github.com/lewcc)
 - [Sirryan2002](https://github.com/Sirryan2002)

code/game/objects/items/stacks/seaweed.dm

@@ -0,0 +1,19 @@
+/obj/item/stack/seaweed
+	name = "seaweed sheet"
+	desc = "Weed.. from the Sea!"
+	singular_name = "seaweed sheet"
+	icon = 'icons/obj/stacks/organic.dmi'
+	icon_state = "seaweed"
+	item_state = "seaweed"
+	w_class = WEIGHT_CLASS_TINY
+	attack_verb = list("slapped")
+	hitsound = 'sound/weapons/grenadelaunch.ogg'
+	usesound = 'sound/items/deconstruct.ogg'
+	merge_type = /obj/item/stack/seaweed
+
+/obj/item/stack/seaweed/attack_self(mob/user)
+	return
+
+/obj/item/stack/seaweed/attack_self_tk()
+	return
+

code/modules/food_and_drinks/food/foods/meat.dm

@@ -63,6 +63,11 @@
 	desc = "For when you need to go ham."
 	list_reagents = list("protein" = 3, "porktonium" = 10)
 
+/obj/item/food/snacks/meat/chicken
+	name = "chicken meat"
+	desc = "Cluck cluck!"
+	icon_state = "birdmeat"
+
 /obj/item/food/snacks/meat/meatwheat
 	name = "meatwheat clump"
 	desc = "This doesn't look like meat, but your standards aren't <i>that</i> high to begin with."
@@ -124,7 +129,7 @@
 	icon_state = "bearmeat"
 	filling_color = "#DB0000"
 	bitesize = 3
-	list_reagents = list("protein" = 12, "morphine" = 3, "vitamin" = 2)
+	list_reagents = list("protein" = 12, "methamphetamine" = 5, "vitamin" = 2)
 	tastes = list("meat" = 1, "salmon" = 1)
 
 /obj/item/food/snacks/monstermeat/xenomeat
@@ -203,6 +208,12 @@
 	tastes = list("meat" = 1)
 	goal_difficulty = FOOD_GOAL_NORMAL
 
+/obj/item/food/snacks/meatsteak/chicken
+	name = "cooked chicken"
+	desc = "Cluck cluck!"
+	icon_state = "birdsteak"
+	tastes = list("chicken" = 1, "meat" = 1)
+
 /obj/item/food/snacks/bacon
 	name = "bacon"
 	desc = "It looks crispy and tastes amazing! Mmm... Bacon."

code/modules/food_and_drinks/food/foods/sandwiches.dm

@@ -316,6 +316,14 @@
 	tastes = list("bun" = 1, "pork" = 1, "patty" = 1)
 	goal_difficulty = FOOD_GOAL_NORMAL
 
+/obj/item/food/snacks/burger/chicken
+	name = "chicken burger"
+	desc = "May I mayo?"
+	icon_state = "chickenburger"
+	bitesize = 3
+	list_reagents = list("nutriment" = 6, "vitamin" = 1)
+	tastes = list("bun" = 4, "chicken" = 2)
+
 /obj/item/food/snacks/burger/jelly
 	name = "jelly burger"
 	desc = "Culinary delight...?"

code/modules/food_and_drinks/food/foods/side_dishes.dm

@@ -117,6 +117,16 @@
 	tastes = list("rice" = 1)
 	goal_difficulty = FOOD_GOAL_NORMAL
 
+/obj/item/food/snacks/boiledrice/attackby(obj/item/I, mob/user, params)
+	if(!istype(I, /obj/item/stack/seaweed))
+		return ..()
+	var/obj/item/stack/seaweed/S = I
+	if(!S.use(1))
+		return ..()
+	var/obj/item/food/snacks/onigiri/O = new(get_turf(user))
+	reagents.trans_to(O, reagents.total_volume)
+	qdel(src)
+	user.put_in_active_hand(O)
 
 /obj/item/food/snacks/roastparsnip
 	name = "roast parsnip"
@@ -127,3 +137,12 @@
 	filling_color = "#FF5500"
 	tastes = list("parsnip" = 1)
 	goal_difficulty = FOOD_GOAL_NORMAL
+
+/obj/item/food/snacks/onigiri
+	name = "onigiri"
+	desc = "Rice and seaweed."
+	icon_state = "onigiri"
+	list_reagents = list("nutriment" = 5, "vitamin" = 2)
+	tastes = list("rice" = 3, "seaweed" = 2)
+	goal_difficulty = FOOD_GOAL_NORMAL
+

code/modules/food_and_drinks/recipes/recipes_grill.dm

@@ -29,6 +29,13 @@
 	)
 	result = /obj/item/food/snacks/friedegg
 
+/datum/recipe/grill/birdsteak
+	reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
+	items = list(
+		/obj/item/food/snacks/meat/chicken
+	)
+	result = /obj/item/food/snacks/meatsteak/chicken
+
 /datum/recipe/grill/meatsteak
 	reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
 	items = list(
@@ -170,6 +177,7 @@
 	items = list(
 		/obj/item/food/snacks/egg,
 		/obj/item/food/snacks/boiledrice,
+		/obj/item/stack/seaweed
 	)
 	result = /obj/item/food/snacks/sushi_Tamago
 
@@ -178,6 +186,7 @@
 	items = list(
 		/obj/item/fish/electric_eel,
 		/obj/item/food/snacks/boiledrice,
+		/obj/item/stack/seaweed
 	)
 	result = /obj/item/food/snacks/sushi_Unagi
 
@@ -185,6 +194,7 @@
 	items = list(
 		/obj/item/food/snacks/boiledrice,
 		/obj/item/food/snacks/boiled_shrimp,
+		/obj/item/stack/seaweed
 	)
 	result = /obj/item/food/snacks/sushi_Ebi
 
@@ -192,6 +202,7 @@
 	items = list(
 		/obj/item/food/snacks/boiledrice,
 		/obj/item/fish_eggs/salmon,
+		/obj/item/stack/seaweed
 	)
 	result = /obj/item/food/snacks/sushi_Ikura
 
@@ -199,6 +210,7 @@
 	items = list(
 		/obj/item/food/snacks/boiledrice,
 		/obj/item/food/snacks/fried_tofu,
+		/obj/item/stack/seaweed
 	)
 	result = /obj/item/food/snacks/sushi_Inari
 
@@ -206,6 +218,7 @@
 	items = list(
 		/obj/item/food/snacks/boiledrice,
 		/obj/item/food/snacks/salmonmeat,
+		/obj/item/stack/seaweed
 	)
 	result = /obj/item/food/snacks/sushi_Sake
 
@@ -213,6 +226,7 @@
 	items = list(
 		/obj/item/food/snacks/boiledrice,
 		/obj/item/food/snacks/salmonsteak,
+		/obj/item/stack/seaweed
 	)
 	result = /obj/item/food/snacks/sushi_SmokedSalmon
 
@@ -220,6 +234,7 @@
 	items = list(
 		/obj/item/food/snacks/boiledrice,
 		/obj/item/fish_eggs/goldfish,
+		/obj/item/stack/seaweed
 	)
 	result = /obj/item/food/snacks/sushi_Masago
 
@@ -227,6 +242,7 @@
 	items = list(
 		/obj/item/food/snacks/boiledrice,
 		/obj/item/fish_eggs/shark,
+		/obj/item/stack/seaweed
 	)
 	result = /obj/item/food/snacks/sushi_Tobiko
 
@@ -234,6 +250,7 @@
 	items = list(
 		/obj/item/food/snacks/sushi_Tobiko,
 		/obj/item/food/snacks/egg,
+		/obj/item/stack/seaweed
 	)
 	result = /obj/item/food/snacks/sushi_TobikoEgg
 
@@ -241,6 +258,7 @@
 	items = list(
 		/obj/item/food/snacks/boiledrice,
 		/obj/item/food/snacks/catfishmeat,
+		/obj/item/stack/seaweed
 	)
 	result = /obj/item/food/snacks/sushi_Tai
 

code/modules/food_and_drinks/recipes/recipes_microwave.dm

@@ -60,6 +60,13 @@
 	)
 	result = /obj/item/food/snacks/human/burger
 
+/datum/recipe/microwave/chickenburger
+	items = list(
+		/obj/item/food/snacks/bun,
+		/obj/item/food/snacks/meat/chicken
+	)
+	result = /obj/item/food/snacks/burger/chicken
+
 /datum/recipe/microwave/plainburger
 	items = list(
 		/obj/item/food/snacks/bun,
@@ -1465,3 +1472,4 @@
 		/obj/item/food/snacks/shrimp
 	)
 	result = /obj/item/food/snacks/boiled_shrimp
+

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

@@ -74,6 +74,7 @@
 	reqs = list(
 		/obj/item/food/snacks/boiledrice = 1,
 		/obj/item/food/snacks/boiled_shrimp = 1,
+		/obj/item/stack/seaweed = 1,
 	)
 	result = list(/obj/item/food/snacks/sushi_Ebi)
 	category = CAT_FOOD
@@ -84,6 +85,7 @@
 	reqs = list(
 		/obj/item/food/snacks/boiledrice = 1,
 		/obj/item/food/snacks/boiled_shrimp = 4,
+		/obj/item/stack/seaweed = 1,
 	)
 	pathtools = list(/obj/item/kitchen/sushimat)
 	result = list(/obj/item/food/snacks/sliceable/Ebi_maki)
@@ -95,6 +97,7 @@
 	reqs = list(
 		/obj/item/food/snacks/boiledrice = 1,
 		/obj/item/fish_eggs/salmon = 1,
+		/obj/item/stack/seaweed = 1,
 	)
 	result = list(/obj/item/food/snacks/sushi_Ikura)
 	category = CAT_FOOD
@@ -105,6 +108,7 @@
 	reqs = list(
 		/obj/item/food/snacks/boiledrice = 1,
 		/obj/item/fish_eggs/salmon = 4,
+		/obj/item/stack/seaweed = 1,
 	)
 	pathtools = list(/obj/item/kitchen/sushimat)
 	result = list(/obj/item/food/snacks/sliceable/Ikura_maki)
@@ -116,6 +120,7 @@
 	reqs = list(
 		/obj/item/food/snacks/boiledrice = 1,
 		/obj/item/food/snacks/fried_tofu = 1,
+		/obj/item/stack/seaweed = 1,
 	)
 	result = list(/obj/item/food/snacks/sushi_Inari)
 	category = CAT_FOOD
@@ -126,6 +131,7 @@
 	reqs = list(
 		/obj/item/food/snacks/boiledrice = 1,
 		/obj/item/food/snacks/fried_tofu = 4,
+		/obj/item/stack/seaweed = 1,
 	)
 	pathtools = list(/obj/item/kitchen/sushimat)
 	result = list(/obj/item/food/snacks/sliceable/Inari_maki)
@@ -137,6 +143,7 @@
 	reqs = list(
 		/obj/item/food/snacks/boiledrice = 1,
 		/obj/item/food/snacks/salmonmeat = 1,
+		/obj/item/stack/seaweed = 1,
 	)
 	result = list(/obj/item/food/snacks/sushi_Sake)
 	category = CAT_FOOD
@@ -147,6 +154,7 @@
 	reqs = list(
 		/obj/item/food/snacks/boiledrice = 1,
 		/obj/item/food/snacks/salmonmeat = 4,
+		/obj/item/stack/seaweed = 1,
 	)
 	pathtools = list(/obj/item/kitchen/sushimat)
 	result = list(/obj/item/food/snacks/sliceable/Sake_maki)
@@ -158,6 +166,7 @@
 	reqs = list(
 		/obj/item/food/snacks/boiledrice = 1,
 		/obj/item/food/snacks/salmonsteak = 1,
+		/obj/item/stack/seaweed = 1,
 	)
 	result = list(/obj/item/food/snacks/sushi_SmokedSalmon)
 	category = CAT_FOOD
@@ -168,6 +177,7 @@
 	reqs = list(
 		/obj/item/food/snacks/boiledrice = 1,
 		/obj/item/food/snacks/salmonsteak = 4,
+		/obj/item/stack/seaweed = 1,
 	)
 	pathtools = list(/obj/item/kitchen/sushimat)
 	result = list(/obj/item/food/snacks/sliceable/SmokedSalmon_maki)
@@ -179,6 +189,7 @@
 	reqs = list(
 		/obj/item/food/snacks/boiledrice = 1,
 		/obj/item/fish_eggs/goldfish = 1,
+		/obj/item/stack/seaweed = 1,
 	)
 	result = list(/obj/item/food/snacks/sushi_Masago)
 	category = CAT_FOOD
@@ -189,6 +200,7 @@
 	reqs = list(
 		/obj/item/food/snacks/boiledrice = 1,
 		/obj/item/fish_eggs/goldfish = 4,
+		/obj/item/stack/seaweed = 1,
 	)
 	pathtools = list(/obj/item/kitchen/sushimat)
 	result = list(/obj/item/food/snacks/sliceable/Masago_maki)
@@ -200,6 +212,7 @@
 	reqs = list(
 		/obj/item/food/snacks/boiledrice = 1,
 		/obj/item/fish_eggs/shark = 1,
+		/obj/item/stack/seaweed = 1,
 	)
 	result = list(/obj/item/food/snacks/sushi_Tobiko)
 	category = CAT_FOOD
@@ -210,6 +223,7 @@
 	reqs = list(
 		/obj/item/food/snacks/boiledrice = 1,
 		/obj/item/fish_eggs/shark = 4,
+		/obj/item/stack/seaweed = 1,
 	)
 	pathtools = list(/obj/item/kitchen/sushimat)
 	result = list(/obj/item/food/snacks/sliceable/Tobiko_maki)
@@ -221,6 +235,7 @@
 	reqs = list(
 		/obj/item/food/snacks/sushi_Tobiko = 1,
 		/obj/item/food/snacks/egg = 1,
+		/obj/item/stack/seaweed = 1,
 	)
 	result = list(/obj/item/food/snacks/sushi_TobikoEgg)
 	category = CAT_FOOD
@@ -231,6 +246,7 @@
 	reqs = list(
 		/obj/item/food/snacks/sushi_Tobiko = 4,
 		/obj/item/food/snacks/egg = 4,
+		/obj/item/stack/seaweed = 1,
 	)
 	pathtools = list(/obj/item/kitchen/sushimat)
 	result = list(/obj/item/food/snacks/sliceable/TobikoEgg_maki)
@@ -242,6 +258,7 @@
 	reqs = list(
 		/obj/item/food/snacks/boiledrice = 1,
 		/obj/item/food/snacks/catfishmeat = 1,
+		/obj/item/stack/seaweed = 1,
 	)
 	result = list(/obj/item/food/snacks/sushi_Tai)
 	category = CAT_FOOD
@@ -252,6 +269,7 @@
 	reqs = list(
 		/obj/item/food/snacks/boiledrice = 1,
 		/obj/item/food/snacks/catfishmeat = 4,
+		/obj/item/stack/seaweed = 1,
 	)
 	pathtools = list(/obj/item/kitchen/sushimat)
 	result = list(/obj/item/food/snacks/sliceable/Tai_maki)

code/modules/mob/living/simple_animal/friendly/farm_animals.dm

@@ -202,7 +202,7 @@
 	density = FALSE
 	speak_chance = 2
 	turns_per_move = 2
-	butcher_results = list(/obj/item/food/snacks/meat = 1)
+	butcher_results = list(/obj/item/food/snacks/meat/chicken = 1)
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm   = "kicks"
@@ -267,7 +267,7 @@ GLOBAL_VAR_INIT(chicken_count, 0)
 	density = FALSE
 	speak_chance = 2
 	turns_per_move = 3
-	butcher_results = list(/obj/item/food/snacks/meat = 2)
+	butcher_results = list(/obj/item/food/snacks/meat/chicken = 2)
 	var/egg_type = /obj/item/food/snacks/egg
 	var/food_type = /obj/item/food/snacks/grown/wheat
 	response_help  = "pets"

code/modules/research/designs/biogenerator_designs.dm

@@ -218,3 +218,12 @@
 	materials = list(MAT_BIOMASS = 400)
 	build_path = /obj/item/clothing/accessory/holster
 	category = list("initial","Leather and Cloth")
+
+/datum/design/seaweed
+	name = "Seaweed Sheet"
+	id = "seaweed"
+	build_type = BIOGENERATOR
+	materials = list(MAT_BIOMASS = 50)
+	build_path = /obj/item/stack/seaweed
+	category = list("initial", "Organic Materials")
+

paradise.dme

@@ -1074,6 +1074,7 @@
 #include "code\game\objects\items\stacks\medical_packs.dm"
 #include "code\game\objects\items\stacks\nanopaste.dm"
 #include "code\game\objects\items\stacks\rods.dm"
+#include "code\game\objects\items\stacks\seaweed.dm"
 #include "code\game\objects\items\stacks\stack.dm"
 #include "code\game\objects\items\stacks\stack_recipe.dm"
 #include "code\game\objects\items\stacks\telecrystal.dm"