Merge pull request #355 from lmenvs/bee-fix

bee fixes
Monkestation · Sep 16, 2023 · 592f93e · 592f93e
2 parents aeb6392 + 5f328e9
commit 592f93e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/code/modules/mob/living/basic/farm_animals/bee/_bee.dm b/code/modules/mob/living/basic/farm_animals/bee/_bee.dm
@@ -25,6 +25,8 @@
 	response_harm_continuous = "squashes"
 	response_harm_simple = "squash"
 
+	guaranteed_butcher_results = list(/obj/item/stack/sheet/animalhide/bee = 1 )
+
 	mob_size = MOB_SIZE_LARGE
 	pixel_x = -16
 	base_pixel_x = -16
@@ -44,7 +46,6 @@
 	held_w_class = WEIGHT_CLASS_TINY
 	environment_smash  = ENVIRONMENT_SMASH_NONE
 	habitable_atmos = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
-	basic_mob_flags = DEL_ON_DEATH
 	ai_controller = /datum/ai_controller/basic_controller/bee
 	///the reagent the bee has
 	var/datum/reagent/beegent = null
@@ -99,6 +100,8 @@
 	if(beehome)
 		beehome.bees -= src
 		beehome = null
+	if(flags_1 & HOLOGRAM_1 || gibbed)
+		return ..()
 	var/obj/item/food/pollensac/sac = new(loc) //monkestation edit, bee update
 	sac.pixel_x = pixel_x
 	sac.pixel_y = pixel_y
@@ -109,9 +112,6 @@
 		sac.reagents.add_reagent(beegent.type, 5)
 		sac.color = beegent.color
 	sac.update_appearance()
-	if(flags_1 & HOLOGRAM_1 || gibbed)
-		return ..()
-	new /obj/item/trash/bee(loc, src)
 	return ..()
 
 /mob/living/basic/bee/proc/pre_attack(mob/living/puncher, atom/target)

diff --git a/monkestation/code/game/objects/items/choice_beacon.dm b/monkestation/code/game/objects/items/choice_beacon.dm
@@ -19,6 +19,7 @@
 			/mob/living/basic/mouse/rat,
 			/mob/living/simple_animal/parrot,
 			/mob/living/basic/butterfly,
+			/mob/living/basic/bee/friendly,
 			/mob/living/simple_animal/crab,
 			/mob/living/basic/pet/penguin/baby,
 			/mob/living/basic/pet/fox,

diff --git a/monkestation/code/modules/mob/living/simple_animal/pets/bees.dm b/monkestation/code/modules/mob/living/simple_animal/pets/bees.dm
@@ -1,7 +1,6 @@
 /mob/living/basic/bee/friendly
 	name = "friendly maintenance bee"
 	desc = "He wants to bee friends!"
-	faction = list(FACTION_NEUTRAL)
 	response_help_continuous = "hugs"
 	response_help_simple = "hug"
 	attack_verb_continuous = "nuzzles"
@@ -20,7 +19,7 @@
 /obj/item/stack/sheet/animalhide/bee
 	name = "bee fuzz"
 	desc = "How could you do this."
-	singular_name = "a piece of bee fuzz"
+	singular_name = "bee fuzz piece"
 	icon = 'monkestation/icons/mob/simple/bees.dmi'
 	icon_state = "sheet-bee_fuzz"
 	inhand_icon_state = null