removes king goat

code/__DEFINES/achievements.dm

@@ -42,7 +42,6 @@
 #define BOSS_MEDAL_LEGION	  "Legion Killer"
 #define BOSS_MEDAL_TENDRIL	  "Tendril Exterminator"
 #define BOSS_MEDAL_SWARMERS   "Swarmer Beacon Killer"
-#define BOSS_MEDAL_KINGGOAT   "King Goat Killer"
 #define BOSS_MEDAL_WENDIGO    "Wendigo Killer"
 
 #define BOSS_MEDAL_MINER_CRUSHER	  	"Blood-drunk Miner Crusher"
@@ -53,7 +52,6 @@
 #define BOSS_MEDAL_HIEROPHANT_CRUSHER 	"Hierophant Crusher"
 #define BOSS_MEDAL_LEGION_CRUSHER	 	"Legion Crusher"
 #define BOSS_MEDAL_SWARMERS_CRUSHER		"Swarmer Beacon Crusher"
-#define BOSS_MEDAL_KINGGOAT_CRUSHER		"King Goat Crusher"
 #define BOSS_MEDAL_WENDIGO_CRUSHER		"Wendigo Crusher"
 
 // Medal hub IDs for boss-kill scores
@@ -66,7 +64,6 @@
 #define HIEROPHANT_SCORE 	 "Hierophants Killed"
 #define LEGION_SCORE 	     "Legion Killed"
 #define SWARMER_BEACON_SCORE "Swarmer Beacs Killed"
-#define KINGGOAT_SCORE 	     "King Goat Killed"
 #define WENDIGO_SCORE	 	 "Wendigos Killed"
 #define TENDRIL_CLEAR_SCORE	 "Tendrils Killed"
 

code/datums/achievements/boss_achievements.dm

@@ -61,12 +61,6 @@
 	database_id = BOSS_MEDAL_SWARMERS
 	icon = "swarmer"
 
-/datum/award/achievement/boss/king_goat_kill
-	name = "King Goat Killer"
-	desc = "The king is dead, long live the king!"
-	database_id = BOSS_MEDAL_KINGGOAT
-	icon = "goatboss"
-
 /datum/award/achievement/boss/wendigo_kill
 	name = "Wendigo Killer"
 	desc = "You've now ruined years of mythical storytelling."
@@ -117,12 +111,6 @@
 	desc = "GET THEM OFF OF ME!"
 	database_id = BOSS_MEDAL_SWARMERS_CRUSHER
 
-/datum/award/achievement/boss/king_goat_crusher
-	name = "King Goat Crusher"
-	desc = "The king is dead, long live the king!"
-	database_id = BOSS_MEDAL_KINGGOAT_CRUSHER
-	icon = "goatboss"
-
 /datum/award/achievement/boss/wendigo_crusher
 	name = "Wendigo Crusher"
 	desc = "You've now ruined years of mythical storytelling."

code/datums/ruins/lavaland.dm

@@ -256,12 +256,3 @@
 	suffix = "lavaland_surface_elephant_graveyard.dmm"
 	allow_duplicates = FALSE
 	cost = 10
-
-/datum/map_template/ruin/lavaland/king_goat_boss
-	name = "King Goat Boss Ruin"
-	id = "kinggoatboss"
-	description = "Abandon All Hope Ye Who Enter Here."
-	suffix = "kinggoatboss.dmm"
-	always_place = TRUE
-	allow_duplicates = FALSE
-	always_spawn_with = list(/datum/map_template/ruin/space/kinggoatarena = PLACE_ISOLATED)

code/datums/ruins/space.dm

@@ -288,14 +288,6 @@
 	name = "Cleric's Den"
 	description = "Once part of a larger monastery, this holy order of long dead clerics practiced far less non-violence than they preached. Appears to have been untouched by looters, however. Odd."
 
-/datum/map_template/ruin/space/kinggoatarena
-	id = "kinggoatarena"
-	suffix = "kinggoatarena.dmm"
-	name = "King Goat Arena"
-	description = "Well wish you luck."
-	allow_duplicates = FALSE
-	unpickable = TRUE
-
 /datum/map_template/ruin/space/forgottenship
 	id = "forgottenship"
 	suffix = "forgottenship.dmm"

code/game/area/areas/ruins/lavaland.dm

@@ -101,9 +101,3 @@
 //ash walker nest
 /area/ruin/unpowered/ash_walkers
 	icon_state = "red"
-
-/area/ruin/powered/kinggoat_arena
-	name = "King Goat Arena"
-	dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
-	noteleport = TRUE
-	icon_state = "dk_yellow"

code/game/machinery/computer/arcade.dm

@@ -47,7 +47,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
 		/obj/item/card/emagfake = 1,
 		/obj/item/clothing/shoes/wheelys = 2,
 		/obj/item/clothing/shoes/kindleKicks = 2,
-		/obj/item/toy/plush/goatplushie/angry/realgoat = 2,
+		/obj/item/toy/plush/goatplushie = 2,
 		/obj/item/toy/plush/moth = 2,
 		/obj/item/storage/belt/military/snack = 2,
 		/obj/item/toy/brokenradio = 2,

code/game/objects/items/plushes.dm

@@ -549,117 +549,7 @@
 	name = "strange goat plushie"
 	icon_state = "goat"
 	desc = "Despite its cuddly appearance and plush nature, it will beat you up all the same. Goats never change."
-
-/obj/item/toy/plush/goatplushie/angry
-	var/mob/living/carbon/target
-	throwforce = 6
-	var/cooldown = 0
-	var/cooldown_modifier = 20
-
-/obj/item/toy/plush/goatplushie/angry/Initialize()
-	. = ..()
-	START_PROCESSING(SSprocessing, src)
-
-/obj/item/toy/plush/goatplushie/angry/process()
-	if (prob(25) && !target)
-		var/list/targets_to_pick_from = list()
-		for(var/mob/living/carbon/C in view(7, src))
-			if(considered_alive(C.mind) && !faction_check(list("goat"), C.faction, FALSE))
-				targets_to_pick_from += C
-		if (!targets_to_pick_from.len)
-			return
-		target = pick(targets_to_pick_from)
-		visible_message("<span class='notice'>[src] stares at [target].</span>")
-	if (world.time > cooldown && target)
-		ram()
-
-/obj/item/toy/plush/goatplushie/angry/proc/ram()
-	if(prob(90) && isturf(loc) && considered_alive(target.mind) && !faction_check(list("goat"), target.faction, FALSE))
-		throw_at(target, 10, 10)
-		visible_message("<span class='danger'>[src] rams [target]!</span>")
-		cooldown = world.time + cooldown_modifier
-	target = null
-	visible_message("<span class='notice'>[src] looks disinterested.</span>")
-
-/obj/item/toy/plush/goatplushie/angry/Destroy()
-	STOP_PROCESSING(SSprocessing, src)
-	return ..()
-
-/obj/item/toy/plush/goatplushie
-	squeak_override = list('sound/items/goatsound.ogg'=1)
-
-/obj/item/toy/plush/goatplushie/angry/realgoat
-	name = "goat plushie"
-	icon_state = "realgoat"
-
-/obj/item/toy/plush/realgoat
-	name = "goat plushie"
-	desc = "Despite its cuddly appearance and plush nature, it will beat you up all the same... or at least it would if it wasn't a normal plushie."
-	icon_state = "realgoat"
-	squeak_override = list('sound/items/goatsound.ogg'=1)
-
-/obj/item/toy/plush/goatplushie/angry/kinggoat
-	name = "King Goat Plushie"
-	desc = "A plushie depicting the king of all goats."
-	icon_state = "kinggoat"
-	throwforce = 25
-	force = 25
-	attack_verb = list("chomped")
-	gender = MALE
-
-/obj/item/toy/plush/goatplushie/angry/kinggoat/ascendedkinggoat
-	name = "Ascended King Goat Plushie"
-	desc = "A plushie depicting the god of all goats."
-	icon_state = "ascendedkinggoat"
-	throwforce = 30
-	force = 30
-	divine = TRUE
-
-/obj/item/toy/plush/goatplushie/angry/kinggoat/ascendedkinggoat/attackby(obj/item/I,mob/living/user,params)
-	if(I.get_sharpness())
-		user.visible_message("<span class='notice'>[user] attempts to destroy [src]!</span>", "<span class='suicide'>[I] bounces off [src]'s back before breaking into millions of pieces... [src] glares at [user]!</span>") // You fucked up now son
-		I.play_tool_sound(src)
-		qdel(I)
-		user.gib()
-
-/obj/item/toy/plush/goatplushie/angry/kinggoat/attackby(obj/item/I,mob/living/user,params)
-	if(I.get_sharpness())
-		user.visible_message("<span class='notice'>[user] rips [src] to shreds!</span>", "<span class='notice'>[src]'s death has attracted the attention of the king goat plushie guards!</span>")
-		I.play_tool_sound(src)
-		qdel(src)
-		var/turf/location = get_turf(user)
-		new/obj/item/toy/plush/goatplushie/angry/guardgoat/masterguardgoat(location)
-		new/obj/item/toy/plush/goatplushie/angry/guardgoat/masterguardgoat(location)
-		new/obj/item/toy/plush/goatplushie/angry/guardgoat/masterguardgoat(location)
-		new/obj/item/toy/plush/goatplushie/angry/guardgoat/masterguardgoat(location)
-		new/obj/item/toy/plush/goatplushie/angry/guardgoat(location)
-		new/obj/item/toy/plush/goatplushie/angry/guardgoat(location)
-		new/obj/item/toy/plush/goatplushie/angry/guardgoat(location)
-		new/obj/item/toy/plush/goatplushie/angry/guardgoat(location)
-		new/obj/item/toy/plush/goatplushie/angry/guardgoat(location)
-		new/obj/item/toy/plush/goatplushie/angry/guardgoat(location)
-		new/obj/item/toy/plush/goatplushie/angry/guardgoat(location)
-		new/obj/item/toy/plush/goatplushie/angry/guardgoat(location)
-	if(istype(I, /obj/item/reagent_containers/food/snacks/grown/cabbage))
-		user.visible_message("<span class='notice'>[user] watches as [src] takes a bite out of the cabbage!</span>", "<span class='notice'>[src]'s fur starts glowing. It seems they have ascended!</span>")
-		playsound(src, 'sound/items/eatfood.ogg', 50, 1)
-		qdel(I)
-		qdel(src)
-		var/turf/location = get_turf(user)
-		new/obj/item/toy/plush/goatplushie/angry/kinggoat/ascendedkinggoat(location)
-
-
-/obj/item/toy/plush/goatplushie/angry/guardgoat
-	name = "guard goat plushie"
-	desc = "A plushie depicting one of the King Goat's guards, tasked to protect the king at all costs."
-	icon_state = "guardgoat"
-	throwforce = 10
-
-/obj/item/toy/plush/goatplushie/angry/guardgoat/masterguardgoat
-	name = "royal guard goat plushie"
-	desc = "A plushie depicting one of the royal King Goat's guards, tasked to protecting the king at all costs and training new goat guards."
-	icon_state = "royalguardgoat"
-	throwforce = 15
+	squeak_override = list('sound/weapons/punch1.ogg'=1)
 
 /obj/item/toy/plush/moth
 	name = "moth plushie"

code/game/turfs/open/_open.dm

@@ -78,22 +78,6 @@
 	heavyfootstep = FOOTSTEP_LAVA
 	tiled_dirt = FALSE
 
-/turf/open/indestructible/carpet
-	name = "carpet"
-	desc = "Soft velvet carpeting. Feels good between your toes."
-	icon = 'icons/turf/floors/carpet.dmi'
-	icon_state = "carpet"
-	smooth = SMOOTH_TRUE
-	canSmoothWith = list(/turf/open/indestructible/carpet)
-	flags_1 = NONE
-	bullet_bounce_sound = null
-	footstep = FOOTSTEP_CARPET
-	barefootstep = FOOTSTEP_CARPET_BAREFOOT
-	clawfootstep = FOOTSTEP_CARPET_BAREFOOT
-	heavyfootstep = FOOTSTEP_GENERIC_HEAVY
-	tiled_dirt = FALSE
-
-
 /turf/open/indestructible/necropolis/Initialize()
 	. = ..()
 	if(prob(12))

code/modules/cargo/packs.dm

@@ -2322,7 +2322,7 @@
 		if(prob(50))
 			the_toy = pickweight(GLOB.arcade_prize_pool)
 		else
-			the_toy = pick(subtypesof(/obj/item/toy/plush) - typesof(/obj/item/toy/plush/goatplushie/angry/kinggoat))
+			the_toy = pick(subtypesof(/obj/item/toy/plush))
 		new the_toy(.)
 
 /datum/supply_pack/costumes_toys/wizard

code/modules/clothing/head/misc.dm

@@ -1,4 +1,5 @@
 
+
 /obj/item/clothing/head/centhat
 	name = "\improper CentCom hat"
 	icon_state = "centcom"
@@ -466,51 +467,8 @@
 	inhand_icon_state = "that"
 	armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 
-/obj/item/clothing/head/goatpelt
-	name = "goat pelt hat"
-	desc = "Fuzzy and Warm!"
-	icon_state = "goatpelt"
-	inhand_icon_state = "goatpelt"
-
-/obj/item/clothing/head/goatpelt/king
-	name = "king goat pelt hat"
-	desc = "Fuzzy, Warm and Robust!"
-	icon_state = "goatpelt"
-	inhand_icon_state = "goatpelt"
-	color = "#ffd700"
-	body_parts_covered = HEAD
-	armor = list("melee" = 60, "bullet" = 55, "laser" = 55, "energy" = 45, "bomb" = 100, "bio" = 20, "rad" = 20, "fire" = 100, "acid" = 100)
-	dog_fashion = null
-	resistance_flags = FIRE_PROOF
-
-/obj/item/clothing/head/goatpelt/king/equipped(mob/living/carbon/human/user, slot)
-	..()
-	if (slot == ITEM_SLOT_HEAD)
-		user.faction |= "goat"
-
-/obj/item/clothing/head/goatpelt/king/dropped(mob/living/carbon/human/user)
-	..()
-	if (user.head == src)
-		user.faction -= "goat"
-
-/obj/item/clothing/head/goatpope
-	name = "goat pope hat"
-	desc = "And on the seventh day King Goat said there will be cabbage!"
-	worn_icon = 'icons/mob/large-worn-icons/64x64/head.dmi'
-	icon_state = "goatpope"
-	inhand_icon_state = "goatpope"
-	worn_x_dimension = 64
-	worn_y_dimension = 64
-	resistance_flags = FLAMMABLE
-
-/obj/item/clothing/head/goatpope/equipped(mob/living/carbon/human/user, slot)
-	..()
-	if (slot == ITEM_SLOT_HEAD)
-		user.faction |= "goat"
-
 /obj/item/clothing/head/jackbros
 	name = "frosty hat"
 	desc = "Hee-ho!"
 	icon_state = "JackFrostHat"
 	inhand_icon_state = "JackFrostHat"
-

code/modules/mining/equipment/kinetic_crusher.dm

@@ -436,11 +436,6 @@
 	return "mark detonation to create a barrier you can pass"
 
 /obj/item/crusher_trophy/vortex_talisman/on_mark_detonation(mob/living/target, mob/living/user)
-	var/turf/current_location = get_turf(user)
-	var/area/current_area = current_location.loc
-	if(current_area.noteleport)
-		to_chat(user, "[src] fizzles uselessly.")
-		return
 	var/turf/T = get_turf(user)
 	new /obj/effect/temp_visual/hierophant/wall/crusher(T, user) //a wall only you can pass!
 	var/turf/otherT = get_step(T, turn(user.dir, 90))
@@ -452,27 +447,3 @@
 
 /obj/effect/temp_visual/hierophant/wall/crusher
 	duration = 75
-
-/obj/item/crusher_trophy/king_goat
-	name = "king goat hoof"
-	desc = "A hoof from the king of all goats, it still glows with a fraction of its original power... Suitable as a trophy for a kinetic crusher."
-	icon_state = "goat_hoof" //needs a better sprite but I cant sprite .
-	denied_type = /obj/item/crusher_trophy/king_goat
-
-/obj/item/crusher_trophy/king_goat/effect_desc()
-	return "you also passively recharge markers 5x as fast while this is equipped and do a decent amount of damage at the cost of dulling the blade"
-
-/obj/item/crusher_trophy/king_goat/on_projectile_fire(obj/projectile/destabilizer/marker, mob/living/user)
-	marker.damage = 10 //in my testing only does damage to simple mobs so should be fine to have it high
-
-/obj/item/crusher_trophy/king_goat/add_to(obj/item/kinetic_crusher/H, mob/living/user)
-	. = ..()
-	if(.)
-		H.charge_time = 3
-		H.AddComponent(/datum/component/two_handed, force_wielded=5)
-
-/obj/item/crusher_trophy/king_goat/remove_from(obj/item/kinetic_crusher/H, mob/living/user)
-	. = ..()
-	if(.)
-		H.charge_time = 15
-		H.AddComponent(/datum/component/two_handed, force_wielded=20)

code/modules/mining/lavaland/necropolis_chests.dm

@@ -323,9 +323,7 @@
 	var/teleporting = FALSE
 
 /obj/item/warp_cube/attack_self(mob/user)
-	var/turf/current_location = get_turf(user)
-	var/area/current_area = current_location.loc
-	if(!linked || current_area.noteleport)
+	if(!linked)
 		to_chat(user, "<span class='warning'>[src] fizzles uselessly.</span>")
 		return
 	if(teleporting)

code/modules/mining/shelters.dm

@@ -41,7 +41,6 @@
 
 /datum/map_template/shelter/alpha/New()
 	. = ..()
-	blacklisted_turfs = typecacheof(/turf/open/indestructible)
 	whitelisted_turfs = typecacheof(/turf/closed/mineral)
 	banned_objects = typecacheof(/obj/structure/stone_tile)
 
@@ -57,7 +56,6 @@
 
 /datum/map_template/shelter/beta/New()
 	. = ..()
-	blacklisted_turfs = typecacheof(/turf/open/indestructible)
 	whitelisted_turfs = typecacheof(/turf/closed/mineral)
 	banned_objects = typecacheof(/obj/structure/stone_tile)
 
@@ -73,6 +71,5 @@
 
 /datum/map_template/shelter/charlie/New()
 	. = ..()
-	blacklisted_turfs = typecacheof(/turf/open/indestructible)
 	whitelisted_turfs = typecacheof(/turf/closed/mineral)
 	banned_objects = typecacheof(/obj/structure/stone_tile)

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

@@ -12,15 +12,16 @@
 	speak_chance = 1
 	turns_per_move = 5
 	see_in_dark = 6
-	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 4, /obj/item/clothing/head/goatpelt = 1)
+	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 4)
 	response_help_continuous = "pets"
 	response_help_simple = "pet"
 	response_disarm_continuous = "gently pushes aside"
 	response_disarm_simple = "gently push aside"
 	response_harm_continuous = "kicks"
 	response_harm_simple = "kick"
-	faction = list("goat")
+	faction = list("neutral")
 	mob_biotypes = MOB_ORGANIC|MOB_BEAST
+	attack_same = 1
 	attack_verb_continuous = "kicks"
 	attack_verb_simple = "kick"
 	attack_sound = 'sound/weapons/punch1.ogg'