Merge pull request #2691 from Citadel-Station-13/upstream-merge-30530

[MIRROR] Adds Gondoland and the rare Gondolas

code/datums/ruins/space.dm

@@ -18,6 +18,7 @@
 	name = "Asteroid 1"
 	description = "I-spy with my little eye, something beginning with R."
 
+
 /datum/map_template/ruin/space/asteroid2
 	id = "asteroid2"
 	suffix = "asteroid2.dmm"
@@ -247,4 +248,10 @@
 	id = "miracle"
 	suffix = "miracle.dmm"
 	name = "Ordinary Space Tile"
-	description = "Absolutely nothing strange going on here please move along, plenty more space to see right this way!"
+	description = "Absolutely nothing strange going on here please move along, plenty more space to see right this way!"
+
+/datum/map_template/ruin/space/gondoland
+	id = "gondolaasteroid"
+	suffix = "gondolaasteroid.dmm"
+	name = "Gondoland"
+	description = "Just an ordinary rock- wait, what's that thing?"

code/game/objects/items/stacks/sheets/leather.dm

@@ -32,6 +32,13 @@ GLOBAL_LIST_INIT(human_recipes, list( \
 	singular_name = "corgi hide piece"
 	icon_state = "sheet-corgi"
 
+/obj/item/stack/sheet/animalhide/gondola
+	name = "gondola hide"
+	desc = "The extremely valuable by-product of gondola hunting."
+	singular_name = "gondola hide piece"
+	icon_state = "sheet-gondola"
+
+
 GLOBAL_LIST_INIT(corgi_recipes, list ( \
 	new/datum/stack_recipe("corgi costume", /obj/item/clothing/suit/hooded/ian_costume, 3), \
 	))

code/modules/cargo/exports/sheets.dm

@@ -57,6 +57,12 @@
 	unit_name = "lizard hide"
 	export_types = list(/obj/item/stack/sheet/animalhide/lizard)
 
+// Gondola hide. Mindbogglingly expensive.
+/datum/export/stack/skin/gondola
+	cost = 10000
+	unit_name = "gondola hide"
+	export_types = list(/obj/item/stack/sheet/animalhide/gondola)
+
 // Alien hide. Extremely expensive.
 /datum/export/stack/skin/xeno
 	cost = 3000

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

@@ -0,0 +1,29 @@
+//Gondolas
+
+/mob/living/simple_animal/pet/gondola
+	name = "gondola"
+	real_name = "gondola"
+	desc = "Gondola is the silent walker. Having no hands he embodies the Taoist principle of wu-wei (non-action) while his smiling facial expression shows his utter and complete acceptance of the world as it is. Its hide is extremely valuable."
+	response_help  = "pets"
+	response_disarm = "bops"
+	response_harm   = "kicks"
+	emote_see = list("watches.", "stares off into the distance.","contemplates.")
+	faction = list("gondola")
+	turns_per_move = 10
+	icon = 'icons/mob/gondolas.dmi'
+	icon_state = "gondola"
+	icon_living = "gondola"
+	icon_dead = "gondola_dead"
+	butcher_results = list(/obj/item/stack/sheet/animalhide/gondola = 1)
+	//Gondolas aren't affected by cold.
+	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	minbodytemp = 0
+	maxbodytemp = 1500
+	maxHealth = 200
+	health = 200
+
+/mob/living/simple_animal/pet/gondola/IsVocal() //Gondolas are the silent walker.
+	return FALSE
+
+/mob/living/simple_animal/pet/gondola/emote()
+	return