Revert "DID I HEAR A ROCK AND STONE?!?!?!!?!"

This reverts commit 99b80d9784.

code/modules/antagonists/nukeop/equipment/nuclearbomb.dm

@@ -664,7 +664,6 @@ This is here to make the tiles around the station mininuke change when it's arme
 				loneop.weight += 1
 				if(loneop.weight % 5 == 0)
 					// message_admins("[src] is stationary in [ADMIN_VERBOSEJMP(newturf)]. The weight of Lone Operative is now [loneop.weight].") // Commenting this out because it's a fucking pain for the admins - Sono
-					return
 				log_game("[src] is stationary for too long in [loc_name(newturf)], and has increased the weight of the Lone Operative event to [loneop.weight].")
 	else
 		lastlocation = newturf

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

@@ -191,15 +191,15 @@
 	subcategory = CAT_CAKE
 
 /datum/crafting_recipe/food/cak
-	name = "Living cake person"
+	name = "Living cat/cake hybrid"
 	reqs = list(
 		/obj/item/organ/brain = 1,
 		/obj/item/organ/heart = 1,
-		/obj/item/reagent_containers/food/snacks/store/cake/birthday = 3, //the cake person is quite fat, so more cake is needed. good thing b-day cakes are in mealvendors
+		/obj/item/reagent_containers/food/snacks/store/cake/birthday = 1,
 		/obj/item/reagent_containers/food/snacks/meat/slab = 3,
 		/datum/reagent/blood = 30,
 		/datum/reagent/consumable/sprinkles = 5,
 		/datum/reagent/teslium = 1 //To shock the whole thing into life
 	)
-	result = /mob/living/simple_animal/cakegolem
+	result = /mob/living/simple_animal/pet/cat/cak
 	subcategory = CAT_CAKE //Cat! Haha, get it? CAT? GET IT? We get it - Love Catpeople

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

@@ -240,6 +240,55 @@
 				stop_automated_movement = 1
 				walk_to(src,movement_target,0,3)
 
+/mob/living/simple_animal/pet/cat/cak //I told you I'd do it, Remie
+	name = "Keeki"
+	desc = "It's a cat made out of cake."
+	icon_state = "cak"
+	icon_living = "cak"
+	icon_dead = "cak_dead"
+	health = 50
+	maxHealth = 50
+	gender = FEMALE
+	harm_intent_damage = 10
+	butcher_results = list(/obj/item/organ/brain = 1, /obj/item/organ/heart = 1, /obj/item/reagent_containers/food/snacks/cakeslice/birthday = 3,  \
+	/obj/item/reagent_containers/food/snacks/meat/slab = 2)
+	response_harm = "takes a bite out of"
+	attacked_sound = 'sound/items/eatfood.ogg'
+	deathmessage = "loses its false life and collapses!"
+	death_sound = "bodyfall"
+	held_icon = "cak"
+
+/mob/living/simple_animal/pet/cat/cak/CheckParts(list/parts)
+	..()
+	var/obj/item/organ/brain/B = locate(/obj/item/organ/brain) in contents
+	if(!B || !B.brainmob || !B.brainmob.mind)
+		return
+	B.brainmob.mind.transfer_to(src)
+	to_chat(src, "<span class='big bold'>You are a cak!</span><b> You're a harmless cat/cake hybrid that everyone loves. People can take bites out of you if they're hungry, but you regenerate health \
+	so quickly that it generally doesn't matter. You're remarkably resilient to any damage besides this and it's hard for you to really die at all. You should go around and bring happiness and \
+	free cake to the station!</b>")
+	var/new_name = stripped_input(src, "Enter your name, or press \"Cancel\" to stick with Keeki.", "Name Change")
+	if(new_name)
+		to_chat(src, "<span class='notice'>Your name is now <b>\"new_name\"</b>!</span>")
+		name = new_name
+
+/mob/living/simple_animal/pet/cat/cak/Life()
+	..()
+	if(stat)
+		return
+	if(health < maxHealth)
+		adjustBruteLoss(-8) //Fast life regen
+	for(var/obj/item/reagent_containers/food/snacks/donut/D in range(1, src)) //Frosts nearby donuts!
+		if(!D.is_decorated)
+			D.decorate_donut()
+
+/mob/living/simple_animal/pet/cat/cak/attack_hand(mob/living/L)
+	. = ..()
+	if(.) //the attack was blocked
+		return
+	if(L.a_intent == INTENT_HARM && L.reagents && !stat)
+		L.reagents.add_reagent(/datum/reagent/consumable/nutriment, 0.4)
+		L.reagents.add_reagent(/datum/reagent/consumable/nutriment/vitamin, 0.4)
 
 //Cat made
 /mob/living/simple_animal/pet/cat/custom_cat

code/modules/projectiles/projectile/magic.dm

@@ -209,7 +209,7 @@
 							/mob/living/simple_animal/hostile/lizard,
 							/mob/living/simple_animal/pet/fox,
 							/mob/living/simple_animal/butterfly,
-							/mob/living/simple_animal/cakegolem           //pet/cat/cak,
+							/mob/living/simple_animal/pet/cat/cak,
 							/mob/living/simple_animal/chick)
 			new_mob = new path(M.loc)
 

code/modules/reagents/chemistry/reagents/alcohol_reagents.dm

@@ -2438,19 +2438,3 @@ datum/reagent/consumable/ethanol/creme_de_coconut
 	boozepwr = 65
 	taste_description = "viscous cream"
 	glass_desc = "The name is probably exactly what it is."
-
-///GS13 drinks!
-
-/datum/reagent/consumable/ethanol/oily_oafs
-	name = "Oily oafs"
-	description = "The oily oaf. while it isn't as strong as some of the other drinks on station, Its buttery aftertaste and affordability make it a staple of any good miner's diet."
-	color = "#ffc75f"
-	boozepwr = 30
-	taste_description = "rich butter and red sugar"
-	quality = DRINK_NICE
-	glass_icon_state = "oily_oafs"
-	glass_name = "oily oafs"
-	glass_desc = "The oily oaf. A dwarvern classic beloved by miners around the cosmos."
-	shot_glass_icon_state = "shotglassbrown"
-	pH = 4.5
-	value = 0.1