does nich memes

_maps/yogstation/RandomRuins/StationRuins/BoxStation/bar_box.dmm

@@ -204,7 +204,6 @@
 /area/crew_quarters/bar)
 "aC" = (
 /obj/structure/closet/secure_closet/freezer/meat,
-/obj/item/storage/box/goatcubes,
 /turf/open/floor/plasteel/showroomfloor,
 /area/crew_quarters/kitchen)
 "aD" = (

_maps/yogstation/RandomRuins/StationRuins/BoxStation/bar_casino.dmm

@@ -180,7 +180,6 @@
 /area/crew_quarters/bar)
 "aA" = (
 /obj/structure/closet/secure_closet/freezer/meat,
-/obj/item/storage/box/goatcubes,
 /turf/open/floor/plasteel{
 	icon_state = "showroomfloor"
 	},

_maps/yogstation/RandomRuins/StationRuins/BoxStation/bar_conveyor.dmm

@@ -167,7 +167,6 @@
 /area/crew_quarters/bar)
 "az" = (
 /obj/structure/closet/secure_closet/freezer/meat,
-/obj/item/storage/box/goatcubes,
 /turf/open/floor/plasteel{
 	icon_state = "showroomfloor"
 	},

_maps/yogstation/RandomRuins/StationRuins/BoxStation/bar_diner.dmm

@@ -155,7 +155,6 @@
 /area/crew_quarters/bar)
 "aw" = (
 /obj/structure/closet/secure_closet/freezer/meat,
-/obj/item/storage/box/goatcubes,
 /turf/open/floor/plasteel{
 	icon_state = "showroomfloor"
 	},

_maps/yogstation/RandomRuins/StationRuins/BoxStation/bar_disco.dmm

@@ -155,7 +155,6 @@
 /area/crew_quarters/bar)
 "ax" = (
 /obj/structure/closet/secure_closet/freezer/meat,
-/obj/item/storage/box/goatcubes,
 /turf/open/floor/plasteel{
 	icon_state = "showroomfloor"
 	},

_maps/yogstation/RandomRuins/StationRuins/BoxStation/bar_purple.dmm

@@ -198,7 +198,6 @@
 	icon_state = "tile_corner";
 	dir = 8
 	},
-/obj/item/storage/box/goatcubes,
 /turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "az" = (

_maps/yogstation/RandomRuins/StationRuins/BoxStation/bar_spacious.dmm

@@ -179,7 +179,6 @@
 /area/crew_quarters/bar)
 "ax" = (
 /obj/structure/closet/secure_closet/freezer/meat,
-/obj/item/storage/box/goatcubes,
 /turf/open/floor/plasteel/showroomfloor,
 /area/crew_quarters/kitchen)
 "ay" = (

_maps/yogstation/RandomRuins/StationRuins/BoxStation/bar_trek.dmm

@@ -578,7 +578,6 @@
 	dir = 8
 	},
 /obj/structure/closet/secure_closet/freezer/meat,
-/obj/item/storage/box/goatcubes,
 /turf/open/floor/plasteel/showroomfloor,
 /area/crew_quarters/kitchen)
 "bh" = (

code/game/objects/structures/crates_lockers/closets/secure/freezer.dm

@@ -44,6 +44,7 @@
 	..()
 	for(var/i = 0, i < 4, i++)
 		new /obj/item/reagent_containers/food/snacks/meat/slab/monkey(src)
+	new /obj/item/storage/box/goatcubes(src) // yogs change added goat cubes to meat freezer
 
 /obj/structure/closet/secure_closet/freezer/fridge
 	name = "refrigerator"

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

@@ -18,7 +18,7 @@
 	response_harm   = "kicks"
 	faction = list("goat") // yogs change replaced neutrial faction with goat faction
 	mob_biotypes = list(MOB_ORGANIC, MOB_BEAST)
-	/*attack_same = 1*/ // No longer needed since goats got there own faction now
+	/*attack_same = 1*/ // yogs No longer needed since goats got there own faction now
 	attacktext = "kicks"
 	attack_sound = 'sound/weapons/punch1.ogg'
 	health = 40

code/modules/projectiles/guns/energy/special.dm

@@ -58,7 +58,7 @@
 	w_class = WEIGHT_CLASS_BULKY
 	ammo_type = list(/obj/item/ammo_casing/energy/meteor)
 	cell_type = "/obj/item/stock_parts/cell/potato"
-	clumsy_check = 0 //Might as well let clowns use it.
+	clumsy_check = 0 // Yogs Might as well let clowns use it.
 	/*selfcharge = 1*/ // Yogs Not admeme only anymore
 
 /obj/item/gun/energy/meteorgun/pen

yogstation/code/modules/cargo/cargo_packs.dm

@@ -53,7 +53,7 @@
 
 /datum/supply_pack/misc/goats
 	name = "Goat Crate"
-	desc = "We have recently bought out a company called Goat Tech Industries that have been experimenting with goat dna, since there are still a ton of goats left and we need to get rid of most of these goats we decided to sell some of them to you guys!"
+	desc = "Contains a bunch of genetically altered goats from Goat Tech Industries try to collect them all!"
 	cost = 1500
 	contains = list(/obj/structure/closet/crate/large/goats)
 	crate_name = "Exotic Goat Crate"

yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm

@@ -1,10 +1,10 @@
 /mob/living/simple_animal/hostile/retaliate/goat/clown
-	name = "Gary the Goat"
-	desc = "Rather kick your butt then tell jokes."
-	icon = 'yogstation/icons/mob/clownpets.dmi'
-	icon_state = "clown_goat"
-	icon_living = "clown_goat"
-	icon_dead = "clown_goat_dead"
+	name = "Clown Goat"
+	desc = "Rather kick your butt than tell jokes."
+	icon = 'yogstation/icons/mob/goats/clown_goat.dmi'
+	icon_state = "clowngoat"
+	icon_living = "clowngoat"
+	icon_dead = "clowngoat_dead"
 	gold_core_spawnable = NO_SPAWN
 	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 3, /obj/item/clothing/mask/gas/clown_hat = 1, /obj/item/clothing/head/yogs/goatpelt = 1)
 
@@ -21,7 +21,7 @@
 
 /mob/living/simple_animal/hostile/retaliate/goat/blue
 	name = "Blue Goat"
-	desc = "Im blue da da di da da bahhhh."
+	desc = "I'm blue da baah dee da baah daa."
 	icon = 'yogstation/icons/mob/goats/blue_goat.dmi'
 	icon_state = "bluegoat"
 	icon_living = "bluegoat"
@@ -30,7 +30,7 @@
 
 /mob/living/simple_animal/hostile/retaliate/goat/chocolate
 	name = "Chocolate Goat"
-	desc = "Actually just a goat with dark brown fur but I can see why you would think its made of chocolate though."
+	desc = "Actually just a goat with dark brown fur but I can see why you would think it's made of chocolate though."
 	icon = 'yogstation/icons/mob/goats/chocolate_goat.dmi'
 	icon_state = "chocolategoat"
 	icon_living = "chocolategoat"
@@ -56,8 +56,8 @@
 	gold_core_spawnable = NO_SPAWN
 
 /mob/living/simple_animal/hostile/retaliate/goat/cottoncandy
-	name = "Cottoncandy Goat"
-	desc = "Unlike the Chocolate Goat this goat is made of real cottoncandy."
+	name = "Cotton Candy Goat"
+	desc = "Unlike the Chocolate Goat this goat is made of real cotton candy."
 	icon = 'yogstation/icons/mob/goats/cottoncandy_goat.dmi'
 	icon_state = "cottoncandygoat"
 	icon_living = "cottoncandygoat"
@@ -211,7 +211,7 @@
 
 /mob/living/simple_animal/hostile/retaliate/goat/huge
 	name = "Huge Goat"
-	desc = "Jesus thats a big goat."
+	desc = "Jesus that's a big goat."
 	melee_damage_lower = 10
 	melee_damage_upper = 20
 	gold_core_spawnable = NO_SPAWN
@@ -221,7 +221,7 @@
 
 /mob/living/simple_animal/hostile/retaliate/goat/tiny
 	name = "Tiny Goat"
-	desc = "Awww what a tiny goat."
+	desc = "Awww, what a tiny goat."
 	melee_damage_lower = 1
 	melee_damage_upper = 1
 	gold_core_spawnable = NO_SPAWN
@@ -231,7 +231,7 @@
 
 /mob/living/simple_animal/hostile/retaliate/goat/ghost
 	name = "Ghost Goat"
-	desc = "Just cause he is a ghost does not mean he cant still kick butt."
+	desc = "Him being a ghost does not mean he can't still kick butt."
 	gold_core_spawnable = NO_SPAWN
 	color = "#FFFFFF77"
 	incorporeal_move = INCORPOREAL_MOVE_BASIC
@@ -271,7 +271,7 @@
 
 /mob/living/simple_animal/hostile/retaliate/goat/panda
 	name = "Panda Goat"
-	desc = "What happens when you cross panda dna with goat dna atleast 10% the time."
+	desc = "What happens when you cross panda dna with goat dna at least 10% the time."
 	icon = 'yogstation/icons/mob/goats/panda_goat.dmi'
 	icon_state = "pandagoat"
 	icon_living = "pandagoat"
@@ -284,7 +284,7 @@
 	icon = 'yogstation/icons/mob/goats/stack_goat.dmi'
 	icon_state = "goatstack"
 	icon_living = "goatstack"
-	del_on_death = 1
+	del_on_death = TRUE
 	loot = list(/mob/living/simple_animal/hostile/retaliate/goat,/mob/living/simple_animal/hostile/retaliate/goat/panda,/mob/living/simple_animal/hostile/retaliate/goat/brown)
 	health = 100
 	maxHealth = 100
@@ -330,7 +330,7 @@
 
 /mob/living/simple_animal/hostile/retaliate/goat/red
 	name = "Red Goat"
-	desc = "Seems to be slightly more angry then your average goat."
+	desc = "You would think there would be a joke involving red goats here but im getting red with frustration even trying to think of one." // its hecking hard man
 	icon = 'yogstation/icons/mob/goats/red_goat.dmi'
 	icon_state = "redgoat"
 	icon_living = "redgoat"
@@ -339,7 +339,7 @@
 
 /mob/living/simple_animal/hostile/retaliate/goat/yellow
 	name = "Yellow Goat"
-	desc = "MY EYES THEY BURN."
+	desc = "MY EYES, THEY BURN."
 	icon = 'yogstation/icons/mob/goats/goat_yellow.dmi'
 	icon_state = "yellowgoat"
 	icon_living = "yellowgoat"

yogstation/code/modules/mob/living/simple_animal/hostile/retaliate/king_of_goats.dm

@@ -5,8 +5,8 @@
 
 //the king and his court
 /mob/living/simple_animal/hostile/retaliate/goat/king
-	name = "king of goats"
-	desc = "The oldest and wisest of goats; king of his race, peerless in dignity and power. His golden fleece radiates nobility."
+	name = "king of the goats"
+	desc = "The oldest and wisest of the goats; king of his race, peerless in dignity and power. His golden fleece radiates nobility."
 	icon = 'yogstation/icons/mob/king_of_goats.dmi'
 	icon_state = "king_goat"
 	icon_living = "king_goat"
@@ -48,7 +48,7 @@
 	var/stun_chance = 5 //chance per attack to Weaken target
 
 /mob/living/simple_animal/hostile/retaliate/goat/king/phase2
-	name = "emperor of goats"
+	name = "emperor of the goats"
 	desc = "The King of Kings, God amongst men, and your superior in every way."
 	icon_state = "king_goat2"
 	icon_living = "king_goat2"
@@ -264,8 +264,8 @@
 		L.stop_sound_channel(CHANNEL_JUKEBOX)
 	if(phase3)
 		visible_message("<span class='cult'>\The [src] shrieks as the seal on his power breaks and he starts to break apart!</span>")
-		new /obj/structure/ladder/unbreakable/goat(src.loc)
-		new /obj/item/gun/energy/meteorgun(src.loc)
+		new /obj/structure/ladder/unbreakable/goat(loc)
+		new /obj/item/gun/energy/meteorgun(loc)
 
 /mob/living/simple_animal/hostile/retaliate/goat/king/death()
 	..()