From 27f3df69296dd8bbdabbbf9a0875e5cf4f5817c0 Mon Sep 17 00:00:00 2001
From: Lohikar <lohikar@protonmail.com>
Date: Sat, 10 Feb 2018 18:16:42 -0600
Subject: [PATCH] Asteroid sprite fixes (#4276)

changes:

Replaced some bad references to the old asteroid turf type.
Fixed an issue where asteroid walls being mined down would always spawn the ash variant instead of rocky where appropriate.
Changed the abstract asteroid turf type to have a unique debug texture & description to make it more identifiable.
Debug tex (from TG):
2018-02-10_17-52-39

Fixes #4275.
---
 code/modules/mining/mine_turf_types.dm    |   2 --
 code/modules/mining/mine_turfs.dm         |  16 ++++++++++------
 html/changelogs/lohikar-asteroidagain.yml |   5 +++++
 icons/turf/map_placeholders.dmi           | Bin 2981 -> 2980 bytes
 maps/_common/areas/shuttles.dm            |  20 ++++++++++----------
 maps/_common/areas/special.dm             |  12 ++++++------
 maps/aurora/aurora-6_surface.dmm          |   8 ++++----
 maps/aurora/code/aurora.dm                |   8 ++++----
 8 files changed, 39 insertions(+), 32 deletions(-)
 create mode 100644 html/changelogs/lohikar-asteroidagain.yml

diff --git a/code/modules/mining/mine_turf_types.dm b/code/modules/mining/mine_turf_types.dm
index 9b86a651033..40e9c26027f 100644
--- a/code/modules/mining/mine_turf_types.dm
+++ b/code/modules/mining/mine_turf_types.dm
@@ -88,11 +88,9 @@
 
 /turf/simulated/floor/asteroid/ash
 	name = "ash"
-	icon = 'icons/turf/map_placeholders.dmi'
 	icon_state = "ash"
 	desc = "A fine grey ash. Looks pretty tightly packed."
 	smooth = SMOOTH_MORE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON
-	gender = PLURAL
 	base_icon = 'icons/turf/smooth/ash.dmi'
 	base_icon_state = "ash"
 	footstep_sound = "sandstep"
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index 99159de8384..baae359a057 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -15,6 +15,10 @@ var/list/mineral_can_smooth_with = list(
 	/turf/simulated/shuttle
 )
 
+// Some extra types for the surface to keep things pretty.
+/turf/simulated/mineral/surface
+	mined_turf = /turf/simulated/floor/asteroid/ash
+
 /turf/simulated/mineral //wall piece
 	name = "rock"
 	icon = 'icons/turf/map_placeholders.dmi'
@@ -34,7 +38,7 @@ var/list/mineral_can_smooth_with = list(
 	density = 1
 	blocks_air = 1
 	temperature = T0C
-	var/mined_turf = /turf/simulated/floor/asteroid
+	var/mined_turf = /turf/simulated/floor/asteroid/ash/rocky
 	var/ore/mineral
 	var/mined_ore = 0
 	var/last_act = 0
@@ -501,14 +505,14 @@ var/list/mineral_can_smooth_with = list(
 // Setting icon/icon_state initially will use these values when the turf is built on/replaced.
 // This means you can put grass on the asteroid etc.
 /turf/simulated/floor/asteroid
-	name = "ash"
+	name = "coder's blight"
 	icon = 'icons/turf/map_placeholders.dmi'
-	icon_state = "ash"
-	desc = "A fine grey ash. Looks pretty tightly packed."
-	smooth = SMOOTH_MORE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON
+	icon_state = ""
+	desc = "An exposed developer texture. Someone wasn't paying attention."
+	smooth = SMOOTH_FALSE
 	smoothing_hints = SMOOTHHINT_CUT_F | SMOOTHHINT_ONLY_MATCH_TURF | SMOOTHHINT_TARGETS_NOT_UNIQUE
 	gender = PLURAL
-	base_icon = 'icons/turf/smooth/ash.dmi'
+	base_icon = 'icons/turf/map_placeholders.dmi'
 	base_icon_state = "ash"
 
 	initial_flooring = null
diff --git a/html/changelogs/lohikar-asteroidagain.yml b/html/changelogs/lohikar-asteroidagain.yml
new file mode 100644
index 00000000000..a6082d1bfa8
--- /dev/null
+++ b/html/changelogs/lohikar-asteroidagain.yml
@@ -0,0 +1,5 @@
+author: Lohikar
+delete-after: True
+changes: 
+  - bugfix: "The asteroid's sprites should no longer get fucked up by shuttle movement, explosions, or mining."
+  - tweak: "Breaking asteroid floors on the lowest level will now break to openspace/space instead of more asteroid."
diff --git a/icons/turf/map_placeholders.dmi b/icons/turf/map_placeholders.dmi
index 1f10dbd656a3f8477faefe6049dc792bca8eaa00..8fdec8d22ec2900b0f2d606cbcce9a534b72e7a2 100644
GIT binary patch
delta 2308
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

delta 2309
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

diff --git a/maps/_common/areas/shuttles.dm b/maps/_common/areas/shuttles.dm
index bc50eff3a54..96cf4af643e 100644
--- a/maps/_common/areas/shuttles.dm
+++ b/maps/_common/areas/shuttles.dm
@@ -41,7 +41,7 @@
 
 /area/shuttle/arrival/station
 	icon_state = "shuttle"
-	base_turf = /turf/simulated/floor/asteroid
+	base_turf = /turf/simulated/floor/asteroid/ash
 	station_area = 1
 
 /area/shuttle/escape
@@ -51,7 +51,7 @@
 /area/shuttle/escape/station
 	name = "\improper Emergency Shuttle Station"
 	icon_state = "shuttle2"
-	base_turf = /turf/simulated/floor/asteroid
+	base_turf = /turf/simulated/floor/asteroid/ash
 	station_area = 1
 
 /area/shuttle/escape/centcom
@@ -71,7 +71,7 @@
 
 /area/shuttle/escape_pod1/station
 	icon_state = "shuttle2"
-	base_turf = /turf/simulated/floor/asteroid
+	base_turf = /turf/simulated/floor/asteroid/ash
 	station_area = 1
 
 /area/shuttle/escape_pod1/centcom
@@ -89,7 +89,7 @@
 
 /area/shuttle/escape_pod2/station
 	icon_state = "shuttle2"
-	base_turf = /turf/simulated/floor/asteroid
+	base_turf = /turf/simulated/floor/asteroid/ash
 	station_area = 1
 
 /area/shuttle/escape_pod2/centcom
@@ -107,7 +107,7 @@
 
 /area/shuttle/escape_pod3/station
 	icon_state = "shuttle2"
-	base_turf = /turf/simulated/floor/asteroid
+	base_turf = /turf/simulated/floor/asteroid/ash
 	station_area = 1
 
 /area/shuttle/escape_pod3/centcom
@@ -125,7 +125,7 @@
 
 /area/shuttle/escape_pod5/station
 	icon_state = "shuttle2"
-	base_turf = /turf/simulated/floor/asteroid
+	base_turf = /turf/simulated/floor/asteroid/ash
 	station_area = 1
 
 /area/shuttle/escape_pod5/centcom
@@ -157,7 +157,7 @@
 /area/shuttle/transport1/station
 	icon_state = "shuttle"
 	name = "\improper Transport Shuttle"
-	base_turf = /turf/simulated/floor/asteroid
+	base_turf = /turf/simulated/floor/asteroid/ash
 	station_area = 1
 
 /area/shuttle/specops/centcom
@@ -169,7 +169,7 @@
 
 /area/shuttle/specops/station
 	icon_state = "shuttlered2"
-	base_turf = /turf/simulated/floor/asteroid
+	base_turf = /turf/simulated/floor/asteroid/ash
 	station_area = 1
 
 /area/shuttle/syndicate_elite
@@ -182,7 +182,7 @@
 
 /area/shuttle/syndicate_elite/station
 	icon_state = "shuttlered2"
-	base_turf = /turf/simulated/floor/asteroid
+	base_turf = /turf/simulated/floor/asteroid/ash
 	station_area = 1
 
 /area/shuttle/administration
@@ -197,7 +197,7 @@
 /area/shuttle/administration/station
 	name = "\improper Administration Shuttle"
 	icon_state = "shuttlered2"
-	base_turf = /turf/simulated/floor/asteroid
+	base_turf = /turf/simulated/floor/asteroid/ash
 	station_area = 1
 
 /area/shuttle/research
diff --git a/maps/_common/areas/special.dm b/maps/_common/areas/special.dm
index 44ba048c521..8ad04594e80 100644
--- a/maps/_common/areas/special.dm
+++ b/maps/_common/areas/special.dm
@@ -134,7 +134,7 @@
 	name = "\improper Surface of the Station"
 	icon_state = "southwest"
 	station_area = 1
-	base_turf = /turf/simulated/floor/asteroid
+	base_turf = /turf/simulated/floor/asteroid/ash
 
 /area/syndicate_station/above
 	name = "\improper Above the Station"
@@ -147,13 +147,13 @@
 /area/syndicate_station/caverns
 	name = "\improper Caverns"
 	icon_state = "southeast"
-	base_turf = /turf/simulated/floor/asteroid
+	base_turf = /turf/simulated/floor/asteroid/ash
 
 /area/syndicate_station/arrivals_dock
 	name = "\improper Docked with Station"
 	icon_state = "shuttle"
 	station_area = 1
-	base_turf = /turf/simulated/floor/asteroid
+	base_turf = /turf/simulated/floor/asteroid/ash
 
 /area/syndicate_station/transit
 	name = "\improper Hyperspace"
@@ -190,7 +190,7 @@
 	name = "\improper Surface of the Station"
 	icon_state = "southwest"
 	station_area = 1
-	base_turf = /turf/simulated/floor/asteroid
+	base_turf = /turf/simulated/floor/asteroid/ash
 
 /area/skipjack_station/above
 	name = "\improper Above the Station"
@@ -203,7 +203,7 @@
 /area/skipjack_station/cavern
 	name = "\improper Caverns"
 	icon_state = "southeast"
-	base_turf = /turf/simulated/floor/asteroid
+	base_turf = /turf/simulated/floor/asteroid/ash
 
 //DJSTATION
 
@@ -249,7 +249,7 @@
 	name = "\improper Docked with station"
 	icon_state = "southwest"
 	station_area = 1
-	base_turf = /turf/simulated/floor/asteroid
+	base_turf = /turf/simulated/floor/asteroid/ash
 
 /area/beach
 	name = "Keelin's private beach"
diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm
index 1cbd0ac67e9..d483d1ae617 100644
--- a/maps/aurora/aurora-6_surface.dmm
+++ b/maps/aurora/aurora-6_surface.dmm
@@ -30,7 +30,7 @@
 /turf/simulated/floor/airless,
 /area/solar/fore)
 "ag" = (
-/turf/simulated/mineral,
+/turf/simulated/mineral/surface,
 /area/mine/unexplored)
 "ah" = (
 /obj/structure/cable/yellow,
@@ -7495,7 +7495,7 @@
 /turf/simulated/floor/tiled,
 /area/tcommsat/entrance)
 "nj" = (
-/turf/simulated/mineral,
+/turf/simulated/mineral/surface,
 /area/tcommsat/entrance)
 "nk" = (
 /obj/structure/extinguisher_cabinet{
@@ -15044,7 +15044,7 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/bedrooms)
 "BM" = (
-/turf/simulated/mineral,
+/turf/simulated/mineral/surface,
 /area/mine/explored)
 "BN" = (
 /obj/structure/disposalpipe/segment,
@@ -15180,7 +15180,7 @@
 /turf/simulated/floor/plating,
 /area/hallway/secondary/entry/aft)
 "BZ" = (
-/turf/simulated/mineral,
+/turf/simulated/mineral/surface,
 /area/bridge/levela)
 "Ca" = (
 /obj/structure/ladder/up{
diff --git a/maps/aurora/code/aurora.dm b/maps/aurora/code/aurora.dm
index 4b785211c1a..543533bf78f 100644
--- a/maps/aurora/code/aurora.dm
+++ b/maps/aurora/code/aurora.dm
@@ -13,10 +13,10 @@
 	base_turf_by_z = list(
 		"1" = /turf/space,
 		"2" = /turf/space,
-		"3" = /turf/simulated/floor/asteroid/ash,
-		"4" = /turf/simulated/floor/asteroid/ash,
-		"5" = /turf/simulated/floor/asteroid/ash,
-		"6" = /turf/space,
+		"3" = /turf/space,
+		"4" = /turf/simulated/floor/asteroid/ash/rocky,
+		"5" = /turf/simulated/floor/asteroid/ash/rocky,
+		"6" = /turf/simulated/floor/asteroid/ash,
 		"7" = /turf/space,
 		"8" = /turf/space,
 		"9" = /turf/space