From 6ce0d4d76c109ed5c053fa557491abe3fbce2e2d Mon Sep 17 00:00:00 2001
From: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
Date: Thu, 14 Nov 2024 15:47:07 -0800
Subject: [PATCH] bubber edits

---
 code/datums/station_traits/neutral_traits.dm  |  4 +-
 .../code/modules/~donator/mothdonator.dm      | 41 +------------------
 2 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/code/datums/station_traits/neutral_traits.dm b/code/datums/station_traits/neutral_traits.dm
index 2fb7072f55d..5a94a478bcd 100644
--- a/code/datums/station_traits/neutral_traits.dm
+++ b/code/datums/station_traits/neutral_traits.dm
@@ -545,7 +545,7 @@
 	threat_reduction = 15
 	dynamic_threat_id = "Background Checks"
 
-
+/* BUBBER EDIT REMOVAL BEGIN - Lobby buttons
 /datum/station_trait/pet_day
 	name = "Bring Your Pet To Work Day"
 	trait_type = STATION_TRAIT_NEUTRAL
@@ -588,3 +588,5 @@
 
 /datum/station_trait/pet_day/proc/on_lobby_button_update_overlays(atom/movable/screen/lobby/button/sign_up/lobby_button, list/overlays)
 	overlays += "select_pet"
+
+*/// BUBBER EDIT REMOVAL END
diff --git a/modular_zubbers/code/modules/~donator/mothdonator.dm b/modular_zubbers/code/modules/~donator/mothdonator.dm
index 41aec317dcb..d4b4cafe82b 100644
--- a/modular_zubbers/code/modules/~donator/mothdonator.dm
+++ b/modular_zubbers/code/modules/~donator/mothdonator.dm
@@ -32,45 +32,8 @@
 	if(held_mob != null)
 		held_mob.desc = desc
 
-/mob/living/basic/mothroach/pet
-	name = "pet mothroach"
-	desc = "A domestic mothroach that has learnt commands."
-
-	ai_controller = /datum/ai_controller/basic_controller/mothroach/pet
-
-	// doesn't include attack bc mothroaches are prolly too weak for that
-	var/static/list/pet_commands = list(
-		/datum/pet_command/idle,
-		/datum/pet_command/free,
-		/datum/pet_command/good_boy,
-		/datum/pet_command/follow,
-		/datum/pet_command/point_targeting/fetch,
-		/datum/pet_command/play_dead,
-	)
-
-/mob/living/basic/mothroach/pet/Initialize(mapload)
-	. = ..()
-	AddComponent(/datum/component/obeys_commands, pet_commands)
-
-/mob/living/basic/mothroach/pet/gib()
-	// Peoples' bespoke pets probably shouldn't be gibbable.
-	// This is both for RP reasons (don't force people to RP permanent pet death) and to prevent griefing.
-	return
-
-/datum/ai_controller/basic_controller/mothroach/pet
-	blackboard = list(
-		BB_VISION_RANGE = AI_DOG_VISION_RANGE,
-		BB_PET_TARGETING_STRATEGY = /datum/targeting_strategy/basic/not_friends,
-	)
-	planning_subtrees = list(
-		/datum/ai_planning_subtree/random_speech/mothroach,
-		/datum/ai_planning_subtree/pet_planning,
-	)
-
-
-
 /// == DONATOR PET: Mr. Fluff, Central's Mothroach, ckey centralsmith ==
-/mob/living/basic/mothroach/pet/mr_fluff
+/mob/living/basic/mothroach/mr_fluff
 	name = "Mr. Fluff"
 	desc = "Central's beloved pet mothroach, Mr. Fluff. He looks so happy to be here!"
 	gender = MALE
@@ -84,8 +47,8 @@
 	desc = "Central's beloved pet mothroach, Mr. Fluff. He looks so happy to be here!"
 	icon = 'modular_zubbers/icons/mob/donator_pets.dmi'
 	icon_state = "mr_fluff"
+	starting_pet = /mob/living/basic/mothroach/mr_fluff
 
-	starting_pet = /mob/living/basic/mothroach/pet/mr_fluff
 //FIND A BETTER SPOT FOR THIS
 /datum/preference/choiced/pet_gender
 	category = PREFERENCE_CATEGORY_MANUALLY_RENDERED