Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-32860

_maps/map_files/PubbyStation/PubbyStation.dmm

@@ -51258,6 +51258,42 @@
 	},
 /turf/open/floor/plating/airless,
 /area/tcommsat/computer)
+"cCH" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plating/airless,
+/area/engine/engineering)
+"cCI" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plating/airless,
+/area/engine/engineering)
+"cCJ" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plating/airless,
+/area/engine/engineering)
+"cCK" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plating/airless,
+/area/engine/engineering)
+"cCL" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plating/airless,
+/area/engine/engineering)
+"cCM" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plating/airless,
+/area/engine/engineering)
 
 (1,1,1) = {"
 aaa
@@ -80986,8 +81022,8 @@ cam
 cam
 cdQ
 cet
-ceY
-cbX
+cCH
+cfV
 cfU
 cgu
 cgU
@@ -81243,8 +81279,8 @@ cam
 cam
 cdQ
 cet
-ceY
-cbX
+cCI
+cfV
 cfV
 cgv
 cfV
@@ -81500,8 +81536,8 @@ ccc
 ccV
 cdR
 cet
-ceY
-cbX
+cCJ
+cfV
 cfU
 cgv
 cgV
@@ -83556,8 +83592,8 @@ cch
 cdc
 cdX
 cet
-ceY
-cbX
+cCK
+cfV
 cfU
 cgv
 cgV
@@ -83813,8 +83849,8 @@ cam
 cam
 cdQ
 cet
-ceY
-cbX
+cCL
+cfV
 cfV
 cgv
 cfV
@@ -84070,8 +84106,8 @@ cci
 cam
 cdQ
 cet
-ceY
-cbX
+cCM
+cfV
 cfU
 cgx
 cgU

code/modules/food_and_drinks/food/snacks_meat.dm

@@ -271,3 +271,18 @@
 	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
 	filling_color = "#800000"
 	tastes = list("meat" = 1, "butter" = 1)
+
+/obj/item/reagent_containers/food/snacks/kebab/rat
+	name = "rat-kebab"
+	desc = "Not so delicious rat meat, on a stick."
+	icon_state = "ratkebab"
+	w_class = WEIGHT_CLASS_NORMAL
+	list_reagents = list("nutriment" = 6, "vitamin" = 2)
+	tastes = list("rat meat" = 1, "metal" = 1)
+	foodtype = MEAT | GROSS
+
+/obj/item/reagent_containers/food/snacks/kebab/rat/double
+	name = "double rat-kebab"
+	icon_state = "doubleratkebab"
+	tastes = list("rat meat" = 2, "metal" = 1)
+	bonus_reagents = list("nutriment" = 6, "vitamin" = 2)

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

@@ -170,3 +170,21 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/pigblanket
 	subcategory = CAT_MEAT
+
+/datum/crafting_recipe/food/ratkebab
+	name = "Rat Kebab"
+	reqs = list(
+		/obj/item/stack/rods = 1,
+		/obj/item/reagent_containers/food/snacks/deadmouse = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/kebab/rat
+	category = CAT_MEAT
+
+/datum/crafting_recipe/food/doubleratkebab
+	name = "Double Rat Kebab"
+	reqs = list(
+		/obj/item/stack/rods = 1,
+		/obj/item/reagent_containers/food/snacks/deadmouse = 2
+	)
+	result = /obj/item/reagent_containers/food/snacks/kebab/rat/double
+	category = CAT_MEAT

html/changelogs/AutoChangeLog-pr-4028.yml

@@ -0,0 +1,4 @@
+author: "Code by Pyko, Ported by Frozenguy5"
+delete-after: True
+changes: 
+  - rscadd: "Rat Kebabs and Double Rat Kebabs have been added!"