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.
This commit is contained in:
Lohikar
2018-02-11 02:16:42 +02:00
committed by Erki
parent 7a0e0d6edb
commit 27f3df6929
8 changed files with 39 additions and 32 deletions
-2
View File
@@ -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"
+10 -6
View File
@@ -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
@@ -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."
Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

+10 -10
View File
@@ -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
+6 -6
View File
@@ -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"
+4 -4
View File
@@ -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{
+4 -4
View File
@@ -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