Halves the amount of slime ooze needed for crossbreeds (#1973)

* Halves the amount of slime ooze needed for crossbreeds * Bump regen extracts back to 500
Monkestation · Jun 6, 2024 · b481193 · b481193
1 parent 35c0a73
commit b481193
Show file tree

Hide file tree

Showing 13 changed files with 490 additions and 484 deletions.
diff --git a/code/__DEFINES/~monkestation/slimes.dm b/code/__DEFINES/~monkestation/slimes.dm
@@ -50,6 +50,12 @@
 #define SLIME_RANDOM_MODIFIER_MIN -0.0003
 #define SLIME_RANDOM_MODIFIER_MAX 0.0003
 
+/// How many units of slime ooze are required for a normal extract recipe.
+#define EXTRACT_RECIPE_OOZE_AMOUNT			20
+/// How many units of slime ooze (of each color) are required for a crossbreed recipe.
+#define CROSSBREED_RECIPE_OOZE_AMOUNT		250
+/// How many units of slime ooze (of each color) are required for an regenerative crossbreed recipe.
+#define REGEN_CROSSBREED_RECIPE_OOZE_AMOUNT	500
 
 #define EMOTION_HAPPY "happy"
 #define EMOTION_SAD "sad"

diff --git a/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/burning.dm b/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/burning.dm
@@ -2,8 +2,8 @@
 	output_item = /obj/item/slimecross/burning/grey
 /datum/compressor_recipe/crossbreed/burning/grey
 	required_oozes = list(
-		/datum/reagent/slime_ooze/grey = 500,
-		/datum/reagent/slime_ooze/orange = 500,
+		/datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/burning/grey
 
@@ -15,140 +15,140 @@
 
 /datum/compressor_recipe/crossbreed/burning/purple
 	required_oozes = list(
-		/datum/reagent/slime_ooze/purple = 500,
-		/datum/reagent/slime_ooze/orange = 500,
+		/datum/reagent/slime_ooze/purple = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/burning/purple
 
 /datum/compressor_recipe/crossbreed/burning/blue
 	required_oozes = list(
-		/datum/reagent/slime_ooze/blue = 500,
-		/datum/reagent/slime_ooze/orange = 500,
+		/datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/burning/blue
 
 /datum/compressor_recipe/crossbreed/burning/metal
 	required_oozes = list(
-		/datum/reagent/slime_ooze/metal = 500,
-		/datum/reagent/slime_ooze/orange = 500,
+		/datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/burning/metal
 
 /datum/compressor_recipe/crossbreed/burning/yellow
 	required_oozes = list(
-		/datum/reagent/slime_ooze/yellow = 500,
-		/datum/reagent/slime_ooze/orange = 500,
+		/datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/burning/yellow
 
 /datum/compressor_recipe/crossbreed/burning/darkpurple
 	required_oozes = list(
-		/datum/reagent/slime_ooze/darkpurple = 500,
-		/datum/reagent/slime_ooze/orange = 500,
+		/datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/burning/darkpurple
 
 /datum/compressor_recipe/crossbreed/burning/darkblue
 	required_oozes = list(
-		/datum/reagent/slime_ooze/darkblue = 500,
-		/datum/reagent/slime_ooze/orange = 500,
+		/datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/burning/darkblue
 
 /datum/compressor_recipe/crossbreed/burning/silver
 	required_oozes = list(
-		/datum/reagent/slime_ooze/silver = 500,
-		/datum/reagent/slime_ooze/orange = 500,
+		/datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/burning/silver
 
 /datum/compressor_recipe/crossbreed/burning/bluespace
 	required_oozes = list(
-		/datum/reagent/slime_ooze/bluespace = 500,
-		/datum/reagent/slime_ooze/orange = 500,
+		/datum/reagent/slime_ooze/bluespace = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/burning/bluespace
 
 /datum/compressor_recipe/crossbreed/burning/cerulean
 	required_oozes = list(
-		/datum/reagent/slime_ooze/cerulean = 500,
-		/datum/reagent/slime_ooze/orange = 500,
+		/datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/burning/cerulean
 
 /datum/compressor_recipe/crossbreed/burning/sepia
 	required_oozes = list(
-		/datum/reagent/slime_ooze/sepia = 500,
-		/datum/reagent/slime_ooze/orange = 500,
+		/datum/reagent/slime_ooze/sepia = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/burning/sepia
 
 /datum/compressor_recipe/crossbreed/burning/pyrite
 	required_oozes = list(
-		/datum/reagent/slime_ooze/pyrite = 500,
-		/datum/reagent/slime_ooze/orange = 500,
+		/datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/burning/pyrite
 
 /datum/compressor_recipe/crossbreed/burning/red
 	required_oozes = list(
-		/datum/reagent/slime_ooze/red = 500,
-		/datum/reagent/slime_ooze/orange = 500,
+		/datum/reagent/slime_ooze/red = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/burning/red
 
 /datum/compressor_recipe/crossbreed/burning/green
 	required_oozes = list(
-		/datum/reagent/slime_ooze/green = 500,
-		/datum/reagent/slime_ooze/orange = 500,
+		/datum/reagent/slime_ooze/green = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/burning/green
 
 /datum/compressor_recipe/crossbreed/burning/pink
 	required_oozes = list(
-		/datum/reagent/slime_ooze/pink = 500,
-		/datum/reagent/slime_ooze/orange = 500,
+		/datum/reagent/slime_ooze/pink = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/burning/pink
 
 /datum/compressor_recipe/crossbreed/burning/gold
 	required_oozes = list(
-		/datum/reagent/slime_ooze/gold = 500,
-		/datum/reagent/slime_ooze/orange = 500,
+		/datum/reagent/slime_ooze/gold = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/burning/gold
 
 /datum/compressor_recipe/crossbreed/burning/oil
 	required_oozes = list(
-		/datum/reagent/slime_ooze/oil = 500,
-		/datum/reagent/slime_ooze/orange = 500,
+		/datum/reagent/slime_ooze/oil = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/burning/oil
 
 /datum/compressor_recipe/crossbreed/burning/black
 	required_oozes = list(
-		/datum/reagent/slime_ooze/black = 500,
-		/datum/reagent/slime_ooze/orange = 500,
+		/datum/reagent/slime_ooze/black = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/burning/black
 
 /datum/compressor_recipe/crossbreed/burning/lightpink
 	required_oozes = list(
-		/datum/reagent/slime_ooze/lightpink = 500,
-		/datum/reagent/slime_ooze/orange = 500,
+		/datum/reagent/slime_ooze/lightpink = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/burning/lightpink
 
 /datum/compressor_recipe/crossbreed/burning/adamantine
 	required_oozes = list(
-		/datum/reagent/slime_ooze/adamantine = 500,
-		/datum/reagent/slime_ooze/orange = 500,
+		/datum/reagent/slime_ooze/adamantine = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/burning/adamantine
 
 /datum/compressor_recipe/crossbreed/burning/rainbow
 	required_oozes = list(
-		/datum/reagent/slime_ooze/rainbow = 500,
-		/datum/reagent/slime_ooze/orange = 500,
+		/datum/reagent/slime_ooze/rainbow = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/burning/rainbow
diff --git a/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/charged.dm b/monkestation/code/modules/slimecore/machines/ooze_compressor/recipes/charged.dm
@@ -3,36 +3,36 @@
 
 /datum/compressor_recipe/crossbreed/charged/grey
 	required_oozes = list(
-		/datum/reagent/slime_ooze/grey = 500,
-		/datum/reagent/slime_ooze/yellow = 500,
+		/datum/reagent/slime_ooze/grey = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/charged/grey
 
 /datum/compressor_recipe/crossbreed/charged/orange
 	required_oozes = list(
-		/datum/reagent/slime_ooze/yellow = 500,
-		/datum/reagent/slime_ooze/orange = 500,
+		/datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/orange = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/charged/orange
 
 /datum/compressor_recipe/crossbreed/charged/metal
 	required_oozes = list(
-		/datum/reagent/slime_ooze/yellow = 500,
-		/datum/reagent/slime_ooze/metal = 500,
+		/datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/metal = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/charged/metal
 
 /datum/compressor_recipe/crossbreed/charged/purple
 	required_oozes = list(
-		/datum/reagent/slime_ooze/purple = 500,
-		/datum/reagent/slime_ooze/yellow = 500,
+		/datum/reagent/slime_ooze/purple = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/charged/purple
 
 /datum/compressor_recipe/crossbreed/charged/blue
 	required_oozes = list(
-		/datum/reagent/slime_ooze/blue = 500,
-		/datum/reagent/slime_ooze/yellow = 500,
+		/datum/reagent/slime_ooze/blue = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/charged/blue
 
@@ -44,112 +44,112 @@
 
 /datum/compressor_recipe/crossbreed/charged/darkpurple
 	required_oozes = list(
-		/datum/reagent/slime_ooze/darkpurple = 500,
-		/datum/reagent/slime_ooze/yellow = 500,
+		/datum/reagent/slime_ooze/darkpurple = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/charged/darkpurple
 
 /datum/compressor_recipe/crossbreed/charged/darkblue
 	required_oozes = list(
-		/datum/reagent/slime_ooze/darkblue = 500,
-		/datum/reagent/slime_ooze/yellow = 500,
+		/datum/reagent/slime_ooze/darkblue = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/charged/darkblue
 
 /datum/compressor_recipe/crossbreed/charged/silver
 	required_oozes = list(
-		/datum/reagent/slime_ooze/silver = 500,
-		/datum/reagent/slime_ooze/yellow = 500,
+		/datum/reagent/slime_ooze/silver = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/charged/silver
 
 /datum/compressor_recipe/crossbreed/charged/bluespace
 	required_oozes = list(
-		/datum/reagent/slime_ooze/bluespace = 500,
-		/datum/reagent/slime_ooze/yellow = 500,
+		/datum/reagent/slime_ooze/bluespace = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/charged/bluespace
 
 /datum/compressor_recipe/crossbreed/charged/sepia
 	required_oozes = list(
-		/datum/reagent/slime_ooze/sepia = 500,
-		/datum/reagent/slime_ooze/yellow = 500,
+		/datum/reagent/slime_ooze/sepia = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/charged/sepia
 
 /datum/compressor_recipe/crossbreed/charged/pyrite
 	required_oozes = list(
-		/datum/reagent/slime_ooze/pyrite = 500,
-		/datum/reagent/slime_ooze/yellow = 500,
+		/datum/reagent/slime_ooze/pyrite = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/charged/pyrite
 
 /datum/compressor_recipe/crossbreed/charged/red
 	required_oozes = list(
-		/datum/reagent/slime_ooze/red = 500,
-		/datum/reagent/slime_ooze/yellow = 500,
+		/datum/reagent/slime_ooze/red = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/charged/red
 
 /datum/compressor_recipe/crossbreed/charged/green
 	required_oozes = list(
-		/datum/reagent/slime_ooze/green = 500,
-		/datum/reagent/slime_ooze/yellow = 500,
+		/datum/reagent/slime_ooze/green = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/charged/green
 
 /datum/compressor_recipe/crossbreed/charged/pink
 	required_oozes = list(
-		/datum/reagent/slime_ooze/pink = 500,
-		/datum/reagent/slime_ooze/yellow = 500,
+		/datum/reagent/slime_ooze/pink = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/charged/pink
 
 /datum/compressor_recipe/crossbreed/charged/gold
 	required_oozes = list(
-		/datum/reagent/slime_ooze/gold = 500,
-		/datum/reagent/slime_ooze/yellow = 500,
+		/datum/reagent/slime_ooze/gold = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/charged/gold
 
 /datum/compressor_recipe/crossbreed/charged/oil
 	required_oozes = list(
-		/datum/reagent/slime_ooze/oil = 500,
-		/datum/reagent/slime_ooze/yellow = 500,
+		/datum/reagent/slime_ooze/oil = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/charged/oil
 
 /datum/compressor_recipe/crossbreed/charged/black
 	required_oozes = list(
-		/datum/reagent/slime_ooze/black = 500,
-		/datum/reagent/slime_ooze/yellow = 500,
+		/datum/reagent/slime_ooze/black = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/charged/black
 
 /datum/compressor_recipe/crossbreed/charged/lightpink
 	required_oozes = list(
-		/datum/reagent/slime_ooze/lightpink = 500,
-		/datum/reagent/slime_ooze/yellow = 500,
+		/datum/reagent/slime_ooze/lightpink = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/charged/lightpink
 
 /datum/compressor_recipe/crossbreed/charged/adamantine
 	required_oozes = list(
-		/datum/reagent/slime_ooze/adamantine = 500,
-		/datum/reagent/slime_ooze/yellow = 500,
+		/datum/reagent/slime_ooze/adamantine = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/charged/adamantine
 
 /datum/compressor_recipe/crossbreed/charged/cerulean
 	required_oozes = list(
-		/datum/reagent/slime_ooze/cerulean = 500,
-		/datum/reagent/slime_ooze/yellow = 500,
+		/datum/reagent/slime_ooze/cerulean = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/charged/cerulean
 
 /datum/compressor_recipe/crossbreed/charged/rainbow
 	required_oozes = list(
-		/datum/reagent/slime_ooze/rainbow = 500,
-		/datum/reagent/slime_ooze/yellow = 500,
+		/datum/reagent/slime_ooze/rainbow = CROSSBREED_RECIPE_OOZE_AMOUNT,
+		/datum/reagent/slime_ooze/yellow = CROSSBREED_RECIPE_OOZE_AMOUNT,
 		)
 	output_item = /obj/item/slimecross/charged/rainbow