Tweaks the Holodeck (#14152)

code/modules/admin/topic.dm

@@ -166,9 +166,7 @@
 			if("corgi")				M.change_mob_type( /mob/living/simple_animal/corgi , null, null, delmob )
 			if("ian")				M.change_mob_type( /mob/living/simple_animal/corgi/Ian , null, null, delmob )
 			if("crab")				M.change_mob_type( /mob/living/simple_animal/crab , null, null, delmob )
-			if("coffee")			M.change_mob_type( /mob/living/simple_animal/crab/Coffee , null, null, delmob )
 			if("parrot")			M.change_mob_type( /mob/living/simple_animal/parrot , null, null, delmob )
-			if("polyparrot")		M.change_mob_type( /mob/living/simple_animal/parrot/Poly , null, null, delmob )
 			if("constructarmored")	M.change_mob_type( /mob/living/simple_animal/construct/armored , null, null, delmob )
 			if("constructbuilder")	M.change_mob_type( /mob/living/simple_animal/construct/builder , null, null, delmob )
 			if("constructwraith")	M.change_mob_type( /mob/living/simple_animal/construct/wraith , null, null, delmob )

code/modules/holodeck/HolodeckObjects.dm

@@ -20,6 +20,12 @@
 	initial_flooring = /decl/flooring/carpet
 	footstep_sound = /decl/sound_category/carpet_footstep
 
+/turf/simulated/floor/holofloor/carpet/rubber
+	name = "rubber carpet"
+	icon = 'icons/turf/flooring/carpet.dmi'
+	icon_state = "rub_carpet"
+	initial_flooring = /decl/flooring/carpet/rubber
+
 /turf/simulated/floor/holofloor/tiled
 	name = "floor"
 	icon = 'icons/turf/flooring/tiles.dmi'
@@ -62,6 +68,12 @@
 	initial_flooring = /decl/flooring/grass
 	footstep_sound = /decl/sound_category/grass_footstep
 
+/turf/simulated/floor/holofloor/grass/alt
+	name = "lush grass"
+	icon = 'icons/turf/total_floors.dmi'
+	icon_state = "grass_alt"
+	initial_flooring = /decl/flooring/grass/alt
+
 /turf/simulated/floor/holofloor/snow
 	name = "snow"
 	base_name = "snow"

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

@@ -33,14 +33,4 @@
 			if(turns_since_move >= turns_per_move)
 				Move(get_step(src,pick(4,8)))
 				turns_since_move = 0
-	regenerate_icons()
-
-//COFFEE! SQUEEEEEEEEE!
-/mob/living/simple_animal/crab/Coffee
-	name = "Coffee"
-	real_name = "Coffee"
-	desc = "It's Coffee, the other pet!"
-	named = TRUE
-	response_help  = "pets"
-	response_disarm = "gently pushes aside"
-	response_harm   = "stomps"
+	regenerate_icons()

code/modules/mob/living/simple_animal/parrot.dm

@@ -65,7 +65,6 @@
 	var/list/speech_buffer = list()
 	var/list/available_channels = list()
 
-	//Headset for Poly to yell at engineers :)
 	var/obj/item/device/radio/headset/ears = null
 
 	//The thing the parrot is currently interested in. This gets used for items the parrot wants to pick up, mobs it wants to steal from,
@@ -681,19 +680,6 @@
 	to_chat(src, "<span class='warning'>There is no perch nearby to sit on.</span>")
 	return
 
-/*
- * Sub-types
- */
-/mob/living/simple_animal/parrot/Poly
-	name = "Poly"
-	desc = "Poly the Parrot. An expert on quantum cracker theory."
-	speak = list("Poly wanna cracker!", ":e Check the singlo, you chucklefucks!",":e Wire the solars, you lazy bums!",":e WHO TOOK THE DAMN VOIDSUITS?",":e OH GOD ITS FREE CALL THE SHUTTLE")
-
-/mob/living/simple_animal/parrot/Poly/Initialize()
-	ears = new /obj/item/device/radio/headset/headset_eng(src)
-	available_channels = list(":e")
-	. = ..()
-
 /mob/living/simple_animal/parrot/say(var/message, var/datum/language/speaking = null, var/verb="says", var/alt_name="", var/ghost_hearing = GHOSTS_ALL_HEAR, var/whisper = FALSE)
 
 	if(stat)

code/modules/shareddream/area.dm

@@ -1,5 +1,4 @@
 /area/centcom/shared_dream
 	name = "\improper The Shared Dream"
 	icon_state = "dream"
-	ambience = AMBIENCE_OTHERWORLDLY
-	dynamic_lighting = 1
+	ambience = AMBIENCE_OTHERWORLDLY