aaaaaaa

beestation.dme

@@ -715,6 +715,15 @@
 #include "code\datums\components\plumbing\filter.dm"
 #include "code\datums\components\plumbing\reaction_chamber.dm"
 #include "code\datums\components\plumbing\splitter.dm"
+#include "code\datums\components\slime\basic_scared_of_item.dm"
+#include "code\datums\components\slime\emotion_buffer.dm"
+#include "code\datums\components\slime\friendship_tracker.dm"
+#include "code\datums\components\slime\generic_mob_hunger.dm"
+#include "code\datums\components\slime\latch_feeding.dm"
+#include "code\datums\components\slime\liquid_secretion.dm"
+#include "code\datums\components\slime\mob_stacker.dm"
+#include "code\datums\components\slime\pollution_scrubber.dm"
+#include "code\datums\components\slime\vac_tagged.dm"
 #include "code\datums\components\storage\storage.dm"
 #include "code\datums\components\storage\concrete\_concrete.dm"
 #include "code\datums\components\storage\concrete\bag_of_holding.dm"
@@ -1080,6 +1089,7 @@
 #include "code\game\machinery\cell_charger.dm"
 #include "code\game\machinery\cloning.dm"
 #include "code\game\machinery\constructable_frame.dm"
+#include "code\game\machinery\corral_corner.dm"
 #include "code\game\machinery\cryopod.dm"
 #include "code\game\machinery\dance_machine.dm"
 #include "code\game\machinery\defibrillator_mount.dm"
@@ -3731,6 +3741,7 @@
 #include "code\modules\research\designs\misc_designs.dm"
 #include "code\modules\research\designs\nanite_designs.dm"
 #include "code\modules\research\designs\power_designs.dm"
+#include "code\modules\research\designs\slime_designs.dm"
 #include "code\modules\research\designs\smelting_designs.dm"
 #include "code\modules\research\designs\stock_parts_designs.dm"
 #include "code\modules\research\designs\telecomms_designs.dm"
@@ -3903,26 +3914,12 @@
 #include "code\modules\shuttle\super_cruise\shuttle_components\plasma_refiner.dm"
 #include "code\modules\shuttle\super_cruise\shuttle_components\shuttle_console.dm"
 #include "code\modules\shuttle\super_cruise\shuttle_components\shuttle_docking.dm"
-#include "code\modules\slimecore\research_and_recipes.dm"
-#include "code\modules\slimecore\animations\slime_effects.dm"
-#include "code\modules\slimecore\assets\xenobiology.dm"
-#include "code\modules\slimecore\components\basic_scared_of_item.dm"
-#include "code\modules\slimecore\components\emotion_buffer.dm"
-#include "code\modules\slimecore\components\friendship_tracker.dm"
-#include "code\modules\slimecore\components\generic_mob_hunger.dm"
-#include "code\modules\slimecore\components\latch_feeding.dm"
-#include "code\modules\slimecore\components\liquid_secretion.dm"
-#include "code\modules\slimecore\components\mob_stacker.dm"
-#include "code\modules\slimecore\components\pollution_scrubber.dm"
-#include "code\modules\slimecore\components\vac_tagged.dm"
+#include "code\modules\slimecore\slime_effects.dm"
+#include "code\modules\slimecore\xenobiology.dm"
 #include "code\modules\slimecore\corral\corral_data.dm"
-#include "code\modules\slimecore\corral\machines\corral_corner.dm"
 #include "code\modules\slimecore\corral\upgrades\_base_upgrade.dm"
 #include "code\modules\slimecore\corral\upgrades\human_docility_upgrade.dm"
 #include "code\modules\slimecore\corral\upgrades\obliteration_upgrade.dm"
-#include "code\modules\slimecore\items\crossbreeds.dm"
-#include "code\modules\slimecore\items\mutation_syringe.dm"
-#include "code\modules\slimecore\items\vacuum_pack.dm"
 #include "code\modules\slimecore\mobs\_base_slime.dm"
 #include "code\modules\slimecore\mobs\feeding_flora.dm"
 #include "code\modules\slimecore\mobs\ai_controller\controller.dm"
@@ -3938,7 +3935,6 @@
 #include "code\modules\slimecore\mobs\ai_controller\subtrees\flee_with_item.dm"
 #include "code\modules\slimecore\mobs\pet_commands\latch_feed.dm"
 #include "code\modules\slimecore\mobs\pet_commands\stop_feeding.dm"
-#include "code\modules\slimecore\reagents\_base_reagent.dm"
 #include "code\modules\slimecore\reagents\base_colors.dm"
 #include "code\modules\slimecore\slime_color_mutations\_base_color.dm"
 #include "code\modules\slimecore\slime_color_mutations\colors.dm"

code/modules/slimecore/corral/machines/corral_corner.dm → code/game/machinery/corral_corner.dm

@@ -187,3 +187,12 @@
 	if(pass_info.xenofauna_or_slime)
 		return FALSE
 	return TRUE //anything expect slimes can astar pass
+
+/obj/item/circuitboard/machine/corral_corner
+	name = "Corral Corner (Machine Board)"
+	greyscale_colors = CIRCUIT_COLOR_SCIENCE
+	build_path = /obj/machinery/corral_corner
+	req_components = list(
+		/datum/stock_part/matter_bin = 1,
+		/datum/stock_part/manipulator = 1)
+	needs_anchored = TRUE

code/modules/reagents/chemistry/reagents/other_reagents.dm

@@ -2299,3 +2299,133 @@ Basically, we fill the time between now and 2s from now with hands based off the
 		M.adjustOxyLoss(-5*REM, 0)
 		. = 1
 	M.losebreath = 0
+
+/datum/reagent/slime_ooze
+	name = "Generic Slime Ooze"
+	evaporation_rate = 0.01
+	opacity = 225
+	slippery = FALSE
+	var/obj/item/slime_extract/extract_path
+
+/datum/reagent/proc/add_to_member(obj/effect/abstract/liquid_turf/adder)
+	return
+
+/datum/reagent/proc/remove_from_member(obj/effect/abstract/liquid_turf/remover)
+	return
+
+
+/datum/reagent/slime_ooze/grey
+	name = "Grey Slime Ooze"
+	color = COLOR_GRAY
+	extract_path = /obj/item/slime_extract/grey
+
+/datum/reagent/slime_ooze/blue
+	name = "Light Blue Slime Ooze"
+	color = COLOR_CARP_LIGHT_BLUE
+	extract_path = /obj/item/slime_extract/blue
+
+/datum/reagent/slime_ooze/darkblue
+	name = "Dark Blue Slime Ooze"
+	color = COLOR_BLUE
+	extract_path = /obj/item/slime_extract/darkblue
+
+/datum/reagent/slime_ooze/green
+	name = "Green Slime Ooze"
+	color = "#D6F264"
+	extract_path = /obj/item/slime_extract/green
+
+/datum/reagent/slime_ooze/metal
+	name = "Metal Slime Ooze"
+	color = "#6D758D"
+	extract_path = /obj/item/slime_extract/metal
+
+/datum/reagent/slime_ooze/purple
+	name = "Purple Slime Ooze"
+	color = "#BC4A9B"
+	extract_path = /obj/item/slime_extract/purple
+
+/datum/reagent/slime_ooze/orange
+	name = "Orange Slime Ooze"
+	color = "#FA6A0A"
+	extract_path = /obj/item/slime_extract/orange
+
+/datum/reagent/slime_ooze/pink
+	name = "Pink Slime Ooze"
+	color = "#F5A097"
+	extract_path = /obj/item/slime_extract/pink
+
+/datum/reagent/slime_ooze/darkpurple
+	name = "Dark Purple Slime Ooze"
+	color = "#793A80"
+	extract_path = /obj/item/slime_extract/darkpurple
+
+/datum/reagent/slime_ooze/red
+	name = "Red Slime Ooze"
+	color = "#B4202A"
+	extract_path = /obj/item/slime_extract/red
+
+/datum/reagent/slime_ooze/yellow
+	name = "Yellow Slime Ooze"
+	color = "#F9A31B"
+	extract_path = /obj/item/slime_extract/yellow
+
+/datum/reagent/slime_ooze/gold
+	name = "Gold Slime Ooze"
+	color = "#BB7547"
+	extract_path = /obj/item/slime_extract/gold
+
+/datum/reagent/slime_ooze/silver
+	name = "Silver Slime Ooze"
+	color = "#8B93AF"
+	extract_path = /obj/item/slime_extract/silver
+
+/datum/reagent/slime_ooze/lightpink
+	name = "Light Pink Slime Ooze"
+	color = "#E9B5A3"
+	extract_path = /obj/item/slime_extract/lightpink
+
+/datum/reagent/slime_ooze/black
+	name = "Black Slime Ooze"
+	color = "#333941"
+	extract_path = /obj/item/slime_extract/black
+
+/datum/reagent/slime_ooze/rainbow
+	name = "Rainbow Slime Ooze"
+	color = "#ffffff"
+	extract_path = /obj/item/slime_extract/rainbow
+
+/datum/reagent/slime_ooze/rainbow/add_to_member(obj/effect/abstract/liquid_turf/adder)
+	adder.rainbow_effect()
+
+/datum/reagent/slime_ooze/rainbow/remove_from_member(obj/effect/abstract/liquid_turf/remover)
+	remover.remove_rainbow_effect()
+
+/datum/reagent/slime_ooze/oil
+	name = "Oil Slime Ooze"
+	color = "#242234"
+	extract_path = /obj/item/slime_extract/oil
+
+/datum/reagent/slime_ooze/adamantine
+	name = "Adamantine Slime Ooze"
+	color = "#5DAF8D"
+	extract_path = /obj/item/slime_extract/adamantine
+
+/datum/reagent/slime_ooze/bluespace
+	name = "Bluespace Slime Ooze"
+	color = "#C0E4FD"
+	extract_path = /obj/item/slime_extract/bluespace
+
+/datum/reagent/slime_ooze/pyrite
+	name = "Pyrite Slime Ooze"
+	color = "#FFD541"
+	extract_path = /obj/item/slime_extract/pyrite
+
+/datum/reagent/slime_ooze/sepia
+	name = "Sepia Slime Ooze"
+	color = "#A08662"
+	extract_path = /obj/item/slime_extract/sepia
+
+/datum/reagent/slime_ooze/cerulean
+	name = "Cerulean Slime Ooze"
+	color = "#285CC4"
+	extract_path = /obj/item/slime_extract/cerulean