cleans stuff up

code/datums/mapgen/Cavegens/RockplanetCaves.dm

@@ -97,7 +97,7 @@
 /turf/open/floor/plating/asteroid/rockplanet
 	name = "iron sand"
 	icon_state = "ironsand0"
-	environment_type = "ironsand"
+	base_icon_state = "ironsand"
 	turf_type = /turf/open/floor/plating/asteroid/rockplanet
 	floor_variance = 45
 	initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
@@ -110,9 +110,7 @@
 /turf/open/floor/plating/asteroid/rockplanet/sand
 	name = "iron dirt"
 	icon_state = "irondirt0"
-	environment_type = "irondirt"
-	floor_variance = 0
+	base_icon_state = "irondirt"
+	floor_variance = 100
+	max_icon_states = 3
 
-/turf/open/floor/plating/asteroid/rockplanet/sand/Initialize(mapload, inherited_virtual_z)
-	. = ..()
-	icon_state = "[environment_type][rand(0,3)]"

code/datums/mapgen/Cavegens/WasteplanetCaves.dm

@@ -80,7 +80,7 @@
 /turf/open/floor/plating/asteroid/wasteplanet
 	name = "dry rock"
 	icon_state = "wasteplanet0"
-	environment_type = "wasteplanet"
+	base_icon_state = "wasteplanet"
 	turf_type = /turf/open/floor/plating/asteroid/wasteplanet
 	floor_variance = 45
 	initial_gas_mix = OPENTURF_DEFAULT_ATMOS

code/datums/mapgen/biomes/jungle_biomes.dm

@@ -31,7 +31,6 @@
 		/obj/structure/spacevine/dense = 20,
 	)
 	mob_spawn_chance = 0.6
-	//mob_spawn_list = list(/mob/living/simple_animal/hostile/gorilla/beach = 1, /mob/living/carbon/monkey = 3)
 	mob_spawn_list = list(/mob/living/simple_animal/hostile/gorilla = 1, /mob/living/carbon/monkey = 3)
 
 /datum/biome/jungle/plains
@@ -128,6 +127,8 @@
 	open_turf_types = list(/turf/open/floor/plating/grass/jungle/lit = 12, /turf/open/water/jungle/lit = 1)
 	flora_spawn_chance = 40
 	mob_spawn_chance = 1
-	mob_spawn_list = list(/mob/living/simple_animal/slime/random = 1, /mob/living/simple_animal/hostile/lightgeist = 1)
+	mob_spawn_list = list(
+		/mob/living/simple_animal/hostile/lightgeist = 1
+	)
 	feature_spawn_chance = 0.1
 	feature_spawn_list = list(/obj/item/rod_of_asclepius = 1)

code/game/turfs/open/floor/plating/asteroid.dm

@@ -13,13 +13,15 @@
 	barefootstep = FOOTSTEP_SAND
 	clawfootstep = FOOTSTEP_SAND
 	heavyfootstep = FOOTSTEP_GENERIC_HEAVY
+	attachment_holes = FALSE
 	/// the icon name to be used: for example, asteroid1 - asteroid12 in the icon file
-	var/environment_type = "asteroid"
+	base_icon_state  = "asteroid"
 	/// Base turf type to be created by the tunnel
-	var/turf_type = /turf/open/floor/plating/asteroid
+	var/turf_type = /turf/open/floor/plating/asteroid // is this unused?
 	/// Probability floor has a different icon state
 	var/floor_variance = 20
-	attachment_holes = FALSE
+	/// The max amount of unique icons, plus one
+	var/max_icon_states = 12
 	/// Itemstack to drop when dug by a shovel
 	var/obj/item/stack/digResult = /obj/item/stack/ore/glass/basalt
 	/// Whether the turf has been dug or not
@@ -29,24 +31,25 @@
 	var/proper_name = name
 	. = ..()
 	name = proper_name
+
 	if(prob(floor_variance))
-		icon_state = "[environment_type][rand(0,12)]"
+		icon_state = "[base_icon_state][rand(0,max_icon_states)]"
 
 /// Drops itemstack when dug and changes icon
 /turf/open/floor/plating/asteroid/proc/getDug()
 	new digResult(src, 5)
 	if(postdig_icon_change)
 		if(!postdig_icon)
-			icon_plating = "[environment_type]_dug"
-			icon_state = "[environment_type]_dug"
+			icon_plating = "[base_icon_state]_dug"
+			icon_state = "[base_icon_state]_dug"
 	dug = TRUE
 
 /// If the user can dig the turf
 /turf/open/floor/plating/asteroid/proc/can_dig(mob/user)
 	if(!dug)
 		return TRUE
 	if(user)
-		to_chat(user, "<span class='warning'>Looks like someone has dug here already!</span>")
+		to_chat(user, "<span class='warning'>You can't dig here!</span>")
 
 /turf/open/floor/plating/asteroid/try_replace_tile(obj/item/stack/tile/T, mob/user, params)
 	return

code/game/turfs/open/floor/plating/beach.dm

@@ -3,7 +3,6 @@
 	icon = 'icons/misc/beach.dmi'
 	icon_state = "sand"
 	base_icon_state = "sand"
-	environment_type = "sand"
 	baseturfs = /turf/open/floor/plating/asteroid/sand
 	initial_gas_mix = OPENTURF_DEFAULT_ATMOS //custom atmos? lots of oxygen, hot?
 	digResult = /obj/item/stack/ore/glass

code/game/turfs/open/floor/plating/icemoon.dm

@@ -8,7 +8,7 @@
 	icon_plating = "snow"
 	initial_gas_mix = ICEMOON_DEFAULT_ATMOS
 	slowdown = 1.5
-	environment_type = "snow"
+	base_icon_state = "snow"
 	flags_1 = NONE
 	planetary_atmos = TRUE
 	footstep = FOOTSTEP_SNOW
@@ -121,7 +121,7 @@
 	icon_state = "icemoon_ground_coarse1"
 	icon_plating = "icemoon_ground_coarse1"
 	initial_gas_mix = ICEMOON_DEFAULT_ATMOS
-	environment_type = "icemoon_ground_coarse"
+	base_icon_state = "icemoon_ground_coarse"
 	flags_1 = NONE
 	footstep = FOOTSTEP_ICE
 	barefootstep = FOOTSTEP_ICE
@@ -133,28 +133,22 @@
 	bullet_bounce_sound = null
 	digResult = /obj/item/stack/sheet/mineral/snow
 	floor_variance = 100
+	max_icon_states = 7
 	dug = TRUE
 
 /turf/open/floor/plating/asteroid/icerock/lit
 	light_range = 2
 	light_power = 1
 
-/turf/open/floor/plating/asteroid/icerock/Initialize(mapload, inherited_virtual_z)
-	. = ..()
-	if(prob(floor_variance))
-		icon_state = "[environment_type][rand(1,8)]"
-	else
-		icon_state = initial(icon_state) //ughhhhhhhhhhhhhhhhhhh
-
 /turf/open/floor/plating/asteroid/icerock/cracked
 	floor_variance = 0
 	icon_state = "icemoon_ground_cracked"
-	environment_type = "icemoon_ground_cracked"
+	base_icon_state = "icemoon_ground_cracked"
 
 /turf/open/floor/plating/asteroid/icerock/smooth
 	floor_variance = 0
 	icon_state = "icemoon_ground_smooth"
-	environment_type = "icemoon_ground_smooth"
+	base_icon_state = "icemoon_ground_smooth"
 
 /turf/open/floor/plating/asteroid/iceberg
 	gender = PLURAL
@@ -165,7 +159,7 @@
 	icon_state = "iceberg"
 	icon_plating = "iceberg"
 	initial_gas_mix = ICEMOON_DEFAULT_ATMOS
-	environment_type = "iceberg"
+	base_icon_state = "iceberg"
 	flags_1 = NONE
 	footstep = FOOTSTEP_ICE
 	barefootstep = FOOTSTEP_ICE
@@ -179,11 +173,6 @@
 	floor_variance = 100
 	dug = TRUE
 
-/turf/open/floor/plating/asteroid/iceberg/Initialize(mapload, inherited_virtual_z)
-	. = ..()
-	if(prob(floor_variance))
-		icon_state = "[environment_type][rand(1,8)]"
-
 /turf/open/floor/plating/asteroid/iceberg/lit
 	light_range = 2
 	light_power = 1
@@ -207,7 +196,7 @@
 	floor_variance = 0
 	icon_state = "snow-ice"
 	icon_plating = "snow-ice"
-	environment_type = "snow_cavern"
+	base_icon_state = "snow_cavern"
 	footstep = FOOTSTEP_FLOOR
 	barefootstep = FOOTSTEP_HARD_BAREFOOT
 	clawfootstep = FOOTSTEP_HARD_CLAW

code/game/turfs/open/floor/plating/lavaland.dm

@@ -4,7 +4,7 @@
 	icon = 'icons/turf/floors.dmi'
 	icon_state = "basalt"
 	icon_plating = "basalt"
-	environment_type = "basalt"
+	base_icon_state = "basalt"
 	floor_variance = 15
 	digResult = /obj/item/stack/ore/glass/basalt
 

code/game/turfs/open/floor/plating/whitesands.dm

@@ -5,7 +5,7 @@
 	icon_state = "sand"
 	icon_plating = "sand"
 	planetary_atmos = TRUE
-	environment_type = WHITESANDS_SAND_ENV
+	base_icon_state = WHITESANDS_SAND_ENV
 	initial_gas_mix = WHITESANDS_ATMOS //Fallback, and used to tell the AACs that this is the exterior
 	digResult = /obj/item/stack/ore/glass/whitesands
 
@@ -29,7 +29,7 @@
 	baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
 	icon_state = "dried_up"
 	icon_plating = "dried_up"
-	environment_type = WHITESANDS_DRIED_ENV
+	base_icon_state = WHITESANDS_DRIED_ENV
 	digResult = /obj/item/stack/ore/glass/whitesands
 
 /turf/open/floor/plating/asteroid/whitesands/remove_air(amount)

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

@@ -0,0 +1,65 @@
+/mob/living/simple_animal/beachcarp //im unsure if this is a good idea, ask mark or tmt
+	name = "carp"
+	desc = "A passive, fang-bearing creature that resembles a fish."
+	icon = 'icons/mob/fish.dmi'
+	icon_state = "base"
+	icon_living = "base"
+	icon_dead = "base_dead"
+	icon_gib = "carp_gib"
+	speak_emote = list("glubs")
+	emote_hear = list("glubs.")
+	emote_see = list("glubs.")
+	speak_chance = 1
+	faction = list("beach")
+	turns_per_move = 5
+	butcher_results = list(/obj/item/reagent_containers/food/snacks/carpmeat = 2)
+	response_help_continuous = "pets"
+	response_help_simple = "pet"
+	response_disarm_continuous = "gently pushes aside"
+	response_disarm_simple = "gently push aside"
+	response_harm_continuous = "punches"
+	response_harm_simple = "punch"
+	stop_automated_movement = 1
+	friendly_verb_continuous = "nibbles"
+	friendly_verb_simple = "nibble"
+	turns_per_move = 2
+
+
+/mob/living/simple_animal/beachcarp/Life()
+	..()
+	//CARP movement
+	if(!ckey && !stat)
+		if(isturf(loc) && !resting && !buckled) //This is so it only moves if it's not inside a closet, gentics machine, etc.
+			turns_since_move++
+			if(turns_since_move >= turns_per_move)
+				var/east_vs_west = pick(4,8)
+				if(Process_Spacemove(east_vs_west))
+					var/turf/step = get_step(src,east_vs_west)
+					if (istype(step, /turf/open/water)) //Only allow fish to move onto water tiles
+						Move(step, east_vs_west)
+					turns_since_move = 0
+	regenerate_icons()
+
+/mob/living/simple_animal/beachcarp/bass
+	name = "bass"
+	desc = "A largemouthed green bass."
+	icon_state = "bass-swim"
+	icon_dead = "bass-dead"
+
+/mob/living/simple_animal/beachcarp/trout
+	name = "trout"
+	desc = "A wild steelhead trout."
+	icon_state = "trout-swim"
+	icon_dead = "trout-dead"
+
+/mob/living/simple_animal/beachcarp/salmon
+	name = "salmon"
+	desc = "A large blue salmon."
+	icon_state = "salmon-swim"
+	icon_dead = "salmon-dead"
+
+/mob/living/simple_animal/beachcarp/perch
+	name = "perch"
+	desc = "A small yellow perch."
+	icon_state = "perch-swim"
+	icon_dead = "perch-dead"

code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm

@@ -73,10 +73,7 @@
 		var/mob/living/L = target
 		if(prob(80))
 			var/atom/throw_target = get_edge_target_turf(L, dir)
-			L.throw_at(throw_target, rand(1,2), 7, src)
-		else
-			L.Paralyze(20)
-			visible_message("<span class='danger'>[src] knocks [L] down!</span>")
+			L.throw_at(throw_target, rand(1,2), 7, src, gentle = TRUE)
 
 /mob/living/simple_animal/hostile/gorilla/CanAttack(atom/the_target)
 	var/list/parts = target_bodyparts(target)

code/modules/ruins/lavalandruin_code/elephantgraveyard.dm

@@ -32,17 +32,13 @@
 	name = "cracked earth"
 	icon = 'icons/turf/floors.dmi'
 	icon_state = "wasteland"
-	environment_type = "wasteland"
+	base_icon_state = "wasteland"
 	baseturfs = /turf/open/floor/plating/asteroid/basalt/wasteland
 	digResult = /obj/item/stack/ore/glass/basalt
 	initial_gas_mix = LAVALAND_DEFAULT_ATMOS
 	slowdown = 0.5
 	floor_variance = 30
-
-/turf/open/floor/plating/asteroid/basalt/wasteland/Initialize(mapload, inherited_virtual_z)
-	.=..()
-	if(prob(floor_variance))
-		icon_state = "[environment_type][rand(0,6)]"
+	max_icon_states = 6
 
 /turf/closed/mineral/strong/wasteland
 	name = "ancient dry rock"