indestructible schist, comments out nt_asteroid for TMing purposes --…

… REMEMBER TO UNCOMMENT THIS
shiptest-ss13 · Nov 25, 2023 · e793ffd · e793ffd
1 parent b0c3730
commit e793ffd
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 17 deletions.
diff --git a/_maps/outpost/hangar/nt_ice_20x20.dmm b/_maps/outpost/hangar/nt_ice_20x20.dmm
@@ -1,6 +1,6 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "ac" = (
-/turf/closed/mineral/random/snow,
+/turf/closed/indestructible/rock/schist,
 /area/hangar)
 "ad" = (
 /obj/machinery/light/floor,

diff --git a/_maps/outpost/hangar/nt_ice_40x20.dmm b/_maps/outpost/hangar/nt_ice_40x20.dmm
@@ -212,7 +212,7 @@
 	},
 /area/hangar)
 "aY" = (
-/turf/closed/mineral/random/snow,
+/turf/closed/indestructible/rock/schist,
 /area/hangar)
 "bj" = (
 /obj/effect/decal/fakelattice,

diff --git a/_maps/outpost/hangar/nt_ice_40x40.dmm b/_maps/outpost/hangar/nt_ice_40x40.dmm
@@ -197,7 +197,7 @@
 	},
 /area/hangar)
 "aT" = (
-/turf/closed/mineral/random/snow,
+/turf/closed/indestructible/rock/schist,
 /area/hangar)
 "aX" = (
 /obj/effect/turf_decal/borderfloor{
@@ -466,6 +466,9 @@
 "kq" = (
 /obj/effect/turf_decal/siding/white,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/borderfloor{
+	dir = 1
+	},
 /turf/open/floor/plasteel/patterned/ridged{
 	planetary_atmos = 1
 	},
@@ -545,10 +548,6 @@
 /area/hangar)
 "lM" = (
 /obj/effect/turf_decal/borderfloor/full,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/effect/turf_decal/industrial/warning,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/patterned{
 	planetary_atmos = 1
@@ -602,6 +601,9 @@
 /obj/effect/turf_decal/siding/white,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/borderfloor{
+	dir = 1
+	},
 /turf/open/floor/plasteel/patterned/ridged{
 	planetary_atmos = 1
 	},

diff --git a/_maps/outpost/hangar/nt_ice_56x20.dmm b/_maps/outpost/hangar/nt_ice_56x20.dmm
@@ -37,7 +37,7 @@
 	},
 /area/hangar)
 "al" = (
-/turf/closed/mineral/random/snow,
+/turf/closed/indestructible/rock/schist,
 /area/hangar)
 "am" = (
 /obj/effect/turf_decal/siding/white{

diff --git a/_maps/outpost/hangar/nt_ice_56x40.dmm b/_maps/outpost/hangar/nt_ice_56x40.dmm
@@ -150,7 +150,7 @@
 /turf/closed/indestructible/reinforced,
 /area/hangar)
 "aI" = (
-/turf/closed/mineral/random/snow,
+/turf/closed/indestructible/rock/schist,
 /area/hangar)
 "aK" = (
 /obj/effect/turf_decal/borderfloor{
@@ -863,10 +863,6 @@
 /area/hangar)
 "El" = (
 /obj/effect/turf_decal/borderfloor/full,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/effect/turf_decal/industrial/warning,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/patterned{
 	planetary_atmos = 1
@@ -1127,6 +1123,9 @@
 /obj/effect/turf_decal/siding/white,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/borderfloor{
+	dir = 1
+	},
 /turf/open/floor/plasteel/patterned/ridged{
 	planetary_atmos = 1
 	},
@@ -1189,6 +1188,9 @@
 "Qi" = (
 /obj/effect/turf_decal/siding/white,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/borderfloor{
+	dir = 1
+	},
 /turf/open/floor/plasteel/patterned/ridged{
 	planetary_atmos = 1
 	},

diff --git a/_maps/outpost/nanotrasen_ice.dmm b/_maps/outpost/nanotrasen_ice.dmm
@@ -237,7 +237,7 @@
 /turf/open/floor/plasteel/telecomms_floor,
 /area/outpost/security/checkpoint)
 "cC" = (
-/turf/closed/mineral/random/snow,
+/turf/closed/indestructible/rock/schist,
 /area/outpost/external)
 "cO" = (
 /obj/machinery/door/airlock/grunge{
@@ -1455,7 +1455,7 @@
 /area/outpost/exterior)
 "nL" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer2,
-/turf/closed/mineral/random/snow,
+/turf/closed/indestructible/rock/schist,
 /area/outpost/external)
 "nN" = (
 /obj/effect/turf_decal/trimline/transparent/neutral/warning,

diff --git a/code/game/turfs/closed/_closed.dm b/code/game/turfs/closed/_closed.dm
@@ -261,6 +261,13 @@
 	bullet_sizzle = TRUE
 	bullet_bounce_sound = null
 
+/turf/closed/indestructible/rock/schist
+	name = "schist"
+	desc = "Extremely densely-packed layers of schist. Say it ten times fast."
+	icon = 'icons/turf/walls/rockwall_icemoon.dmi'
+	icon_state = "rockwall_icemoon-0"
+	base_icon_state = "rockwall_icemoon"
+
 /turf/closed/indestructible/paper
 	name = "thick paper wall"
 	desc = "A wall layered with impenetrable sheets of paper."

diff --git a/code/modules/overmap/objects/outpost/outpost_types.dm b/code/modules/overmap/objects/outpost/outpost_types.dm
@@ -118,7 +118,7 @@
 	main_template = /datum/map_template/outpost/indie_space
 	elevator_template = /datum/map_template/outpost/elevator_indie
 	// Uses "default" hangars (indie_space).
-
+/*
 /datum/overmap/outpost/nanotrasen_asteroid
 	token_icon_state = "station_asteroid_0"
 	main_template = /datum/map_template/outpost/nt_asteroid
@@ -131,7 +131,7 @@
 		/datum/map_template/outpost/hangar/nt_asteroid_56x20,
 		/datum/map_template/outpost/hangar/nt_asteroid_56x40
 	)
-
+*/
 /datum/overmap/outpost/nanotrasen_ice
 	token_icon_state = "station_asteroid_0"
 	main_template = /datum/map_template/outpost/nanotrasen_ice