diff --git a/_maps/outpost/hangar/nt_asteroid_20x20.dmm b/_maps/outpost/hangar/nt_asteroid_20x20.dmm index bbeb98d817ad..a2475b08f312 100644 --- a/_maps/outpost/hangar/nt_asteroid_20x20.dmm +++ b/_maps/outpost/hangar/nt_asteroid_20x20.dmm @@ -1088,7 +1088,7 @@ }, /area/hangar) "DD" = ( -/turf/closed/mineral/random/snow, +/turf/closed/indestructible/rock/snow/schist, /area/hangar) "DG" = ( /obj/structure/railing{ diff --git a/_maps/outpost/hangar/nt_asteroid_40x20.dmm b/_maps/outpost/hangar/nt_asteroid_40x20.dmm index 21867371f279..898854e83c99 100644 --- a/_maps/outpost/hangar/nt_asteroid_40x20.dmm +++ b/_maps/outpost/hangar/nt_asteroid_40x20.dmm @@ -10,7 +10,7 @@ }, /area/hangar) "au" = ( -/turf/closed/mineral/random/snow, +/turf/closed/indestructible/rock/snow/schist, /area/hangar) "ba" = ( /obj/effect/turf_decal/trimline/opaque/yellow/filled/arrow_cw, diff --git a/_maps/outpost/hangar/nt_asteroid_40x40.dmm b/_maps/outpost/hangar/nt_asteroid_40x40.dmm index a2c2f915da96..4070f3106b37 100644 --- a/_maps/outpost/hangar/nt_asteroid_40x40.dmm +++ b/_maps/outpost/hangar/nt_asteroid_40x40.dmm @@ -741,7 +741,7 @@ }, /area/hangar) "DK" = ( -/turf/closed/mineral/random/snow, +/turf/closed/indestructible/rock/snow/schist, /area/hangar) "DS" = ( /obj/structure/fence/door, diff --git a/_maps/outpost/hangar/nt_asteroid_56x20.dmm b/_maps/outpost/hangar/nt_asteroid_56x20.dmm index 19221a5de90a..63a01242bd7e 100644 --- a/_maps/outpost/hangar/nt_asteroid_56x20.dmm +++ b/_maps/outpost/hangar/nt_asteroid_56x20.dmm @@ -177,7 +177,7 @@ /area/hangar) "eW" = ( /obj/effect/decal/cleanable/dirt, -/turf/closed/mineral/random/snow, +/turf/closed/indestructible/rock/snow/schist, /area/hangar) "fb" = ( /obj/effect/turf_decal/trimline/opaque/yellow/filled/arrow_cw{ @@ -886,7 +886,7 @@ }, /area/hangar) "FQ" = ( -/turf/closed/mineral/random/snow, +/turf/closed/indestructible/rock/snow/schist, /area/hangar) "Gc" = ( /obj/effect/turf_decal/industrial/warning, diff --git a/_maps/outpost/hangar/nt_asteroid_56x40.dmm b/_maps/outpost/hangar/nt_asteroid_56x40.dmm index fd876e5844d1..25dbaae753a0 100644 --- a/_maps/outpost/hangar/nt_asteroid_56x40.dmm +++ b/_maps/outpost/hangar/nt_asteroid_56x40.dmm @@ -176,7 +176,7 @@ /area/hangar) "il" = ( /obj/effect/decal/cleanable/dirt, -/turf/closed/mineral/random/snow, +/turf/closed/indestructible/rock/snow/schist, /area/hangar) "iT" = ( /obj/effect/turf_decal/siding/wood{ @@ -1310,7 +1310,7 @@ /turf/open/floor/plasteel/tech, /area/hangar) "UY" = ( -/turf/closed/mineral/random/snow, +/turf/closed/indestructible/rock/snow/schist, /area/hangar) "VD" = ( /obj/effect/turf_decal/trimline/opaque/yellow/filled/arrow_cw{ diff --git a/_maps/outpost/nanotrasen_asteroid.dmm b/_maps/outpost/nanotrasen_asteroid.dmm index e127c600d71e..1415fdd4eb13 100644 --- a/_maps/outpost/nanotrasen_asteroid.dmm +++ b/_maps/outpost/nanotrasen_asteroid.dmm @@ -12,7 +12,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/rockvault, +/turf/open/floor/plasteel/patterned/brushed, /area/outpost/operations) "ae" = ( /obj/machinery/door/airlock/freezer, @@ -45,9 +45,6 @@ /obj/effect/turf_decal/techfloor/orange{ dir = 1 }, -/obj/structure/railing{ - dir = 1 - }, /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plasteel/tech, /area/outpost/engineering/atmospherics) @@ -177,7 +174,7 @@ }, /area/outpost/maintenance/fore) "aL" = ( -/turf/closed/mineral/random/snow, +/turf/closed/indestructible/rock/snow/schist, /area/outpost/maintenance/aft) "aN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -545,7 +542,7 @@ layer = 3.1 }, /obj/structure/railing/wood{ - layer = 3.1; + layer = 4.1; pixel_y = 24 }, /obj/effect/decal/cleanable/dirt, @@ -828,7 +825,7 @@ /turf/open/floor/plasteel, /area/outpost/vacant_rooms) "dj" = ( -/turf/closed/mineral/random/snow, +/turf/closed/indestructible/rock/snow/schist, /area/outpost/hallway/central) "do" = ( /obj/structure/dresser, @@ -1095,7 +1092,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/plasteel/rockvault, +/turf/open/floor/plasteel/patterned/brushed, /area/outpost/operations) "en" = ( /obj/structure/closet/firecloset/full{ @@ -1268,7 +1265,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 }, -/turf/open/floor/plasteel/rockvault, +/turf/open/floor/plasteel/patterned/brushed, /area/outpost/operations) "eQ" = ( /obj/effect/turf_decal/siding/wood{ @@ -1859,7 +1856,7 @@ pixel_y = 14 }, /obj/effect/decal/cleanable/cobweb, -/turf/closed/mineral/random/snow, +/turf/closed/indestructible/rock/snow/schist, /area/outpost/external) "gT" = ( /obj/machinery/vending/boozeomat/syndicate_access, @@ -1906,7 +1903,7 @@ /turf/open/floor/plating, /area/outpost/maintenance/fore) "hc" = ( -/turf/closed/mineral/random/snow, +/turf/closed/indestructible/rock/snow/schist, /area/outpost/crew/cryo) "hd" = ( /obj/effect/spawner/lootdrop/maintenance/three, @@ -1957,7 +1954,7 @@ /area/outpost/engineering) "hk" = ( /obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/drinks/beer/fullupgrade{ +/obj/machinery/chem_dispenser/drinks/beer{ dir = 8 }, /turf/open/floor/plasteel/tech, @@ -2227,7 +2224,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/rockvault, +/turf/open/floor/plasteel/patterned/brushed, /area/outpost/operations) "iB" = ( /obj/effect/turf_decal/techfloor{ @@ -2654,7 +2651,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel/rockvault, +/turf/open/floor/plasteel/patterned/brushed, /area/outpost/operations) "jT" = ( /obj/structure/railing{ @@ -2811,7 +2808,7 @@ /area/outpost/hallway/fore) "kx" = ( /obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/drinks/fullupgrade{ +/obj/machinery/chem_dispenser/drinks{ dir = 8 }, /turf/open/floor/plasteel/tech, @@ -2886,7 +2883,7 @@ /obj/structure/cable{ icon_state = "2-4" }, -/turf/open/floor/plasteel/rockvault, +/turf/open/floor/plasteel/patterned/brushed, /area/outpost/operations) "kN" = ( /obj/machinery/computer/secure_data{ @@ -2976,7 +2973,7 @@ layer = 3.1 }, /obj/structure/railing/wood{ - layer = 3.1; + layer = 4.1; pixel_y = 24 }, /obj/item/radio/intercom/directional/east, @@ -3597,7 +3594,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, -/turf/open/floor/plasteel/rockvault, +/turf/open/floor/plasteel/patterned/brushed, /area/outpost/operations) "ng" = ( /obj/structure/stone_tile/surrounding_tile/cracked{ @@ -3896,7 +3893,8 @@ }, /obj/structure/closet/secure_closet/freezer/wall{ dir = 8; - pixel_x = 28 + pixel_x = 28; + name = "Wall freezer" }, /turf/open/floor/wood, /area/outpost/hallway/central) @@ -4122,7 +4120,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, -/turf/open/floor/plasteel/rockvault, +/turf/open/floor/plasteel/patterned/brushed, /area/outpost/operations) "po" = ( /turf/closed/indestructible/reinforced, @@ -4530,7 +4528,6 @@ /turf/open/floor/concrete/slab_3, /area/outpost/hallway/central) "qC" = ( -/obj/machinery/light/directional/north, /obj/machinery/status_display/ai{ pixel_y = 32 }, @@ -4555,7 +4552,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/rockvault, +/turf/open/floor/plasteel/patterned/brushed, /area/outpost/operations) "qF" = ( /obj/effect/turf_decal/industrial/warning/corner{ @@ -6307,7 +6304,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/rockvault, +/turf/open/floor/plasteel/patterned/brushed, /area/outpost/operations) "we" = ( /obj/structure/railing/wood{ @@ -6510,10 +6507,6 @@ /area/outpost/operations) "wT" = ( /obj/structure/table/wood, -/obj/item/radio/intercom/directional/west{ - freerange = 1; - name = "Syndicate Radio Intercom" - }, /obj/item/folder/red{ pixel_x = 3 }, @@ -7390,8 +7383,8 @@ "zP" = ( /obj/structure/closet/wall/red{ dir = 8; - name = "Bartender's locker"; - pixel_x = 29 + pixel_x = 29; + name = "Storage locker" }, /obj/structure/cable{ icon_state = "1-8" @@ -7466,7 +7459,7 @@ /turf/open/floor/plasteel, /area/outpost/vacant_rooms) "Ad" = ( -/turf/closed/mineral/random/snow, +/turf/closed/indestructible/rock/snow/schist, /area/outpost/operations) "Af" = ( /obj/effect/turf_decal/industrial/warning{ @@ -7512,7 +7505,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, -/turf/open/floor/plasteel/rockvault, +/turf/open/floor/plasteel/patterned/brushed, /area/outpost/operations) "Aj" = ( /obj/structure/window/reinforced/spawner/east, @@ -7626,7 +7619,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, -/turf/open/floor/plasteel/rockvault, +/turf/open/floor/plasteel/patterned/brushed, /area/outpost/operations) "AA" = ( /turf/open/floor/plasteel/sepia, @@ -7921,7 +7914,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel/rockvault, +/turf/open/floor/plasteel/patterned/brushed, /area/outpost/operations) "BF" = ( /obj/effect/turf_decal/siding/wood, @@ -8069,7 +8062,7 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 }, -/turf/open/floor/plasteel/rockvault, +/turf/open/floor/plasteel/patterned/brushed, /area/outpost/operations) "Ci" = ( /obj/structure/showcase/perfect_employee, @@ -8139,7 +8132,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 }, -/turf/open/floor/plasteel/rockvault, +/turf/open/floor/plasteel/patterned/brushed, /area/outpost/operations) "Cv" = ( /obj/structure/railing{ @@ -8175,7 +8168,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/plasteel/rockvault, +/turf/open/floor/plasteel/patterned/brushed, /area/outpost/operations) "CA" = ( /obj/structure/table/wood, @@ -9133,7 +9126,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/rockvault, +/turf/open/floor/plasteel/patterned/brushed, /area/outpost/operations) "Gc" = ( /obj/effect/turf_decal/siding/wood/corner{ @@ -9407,7 +9400,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/plasteel/rockvault, +/turf/open/floor/plasteel/patterned/brushed, /area/outpost/operations) "GK" = ( /obj/effect/turf_decal/industrial/warning{ @@ -9426,7 +9419,12 @@ /turf/open/floor/plasteel/tech, /area/outpost/cargo) "GL" = ( -/obj/machinery/door/airlock/maintenance_hatch, +/obj/machinery/door/airlock/outpost{ + assemblytype = /obj/structure/door_assembly/door_assembly_mhatch; + icon = 'icons/obj/doors/airlocks/hatch/maintenance.dmi'; + overlays_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi'; + req_access_txt = "101" + }, /turf/open/floor/plasteel/tech, /area/outpost/hallway/starboard) "GN" = ( @@ -9626,7 +9624,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/rockvault, +/turf/open/floor/plasteel/patterned/brushed, /area/outpost/operations) "HD" = ( /obj/machinery/door/airlock, @@ -9744,7 +9742,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/plasteel/rockvault, +/turf/open/floor/plasteel/patterned/brushed, /area/outpost/operations) "Ia" = ( /obj/effect/turf_decal/siding/thinplating/dark{ @@ -9754,7 +9752,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/rockvault, +/turf/open/floor/plasteel/patterned/brushed, /area/outpost/operations) "Ib" = ( /obj/effect/turf_decal/siding/wood{ @@ -9969,7 +9967,7 @@ icon_state = "1-2" }, /obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/plasteel/rockvault, +/turf/open/floor/plasteel/patterned/brushed, /area/outpost/operations) "IN" = ( /obj/structure/filingcabinet/chestdrawer, @@ -10683,7 +10681,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel/rockvault, +/turf/open/floor/plasteel/patterned/brushed, /area/outpost/operations) "Lp" = ( /obj/machinery/pipedispenser, @@ -11770,7 +11768,7 @@ /turf/open/floor/wood, /area/outpost/crew/library) "OP" = ( -/turf/closed/mineral/random/snow, +/turf/closed/indestructible/rock/snow/schist, /area/outpost/maintenance/fore) "OQ" = ( /obj/effect/turf_decal/siding/wood{ @@ -12482,7 +12480,7 @@ /turf/closed/indestructible/reinforced, /area/outpost/hallway/fore) "Rq" = ( -/turf/closed/mineral/random/snow, +/turf/closed/indestructible/rock/snow/schist, /area/outpost/hallway/starboard) "Rr" = ( /obj/effect/turf_decal/siding/wood{ @@ -12842,6 +12840,10 @@ }, /turf/open/floor/concrete/tiles, /area/outpost/crew/lounge) +"SM" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/outpost/hallway/fore) "SN" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/pew/left{ @@ -13431,7 +13433,8 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel/rockvault, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/plasteel/patterned/brushed, /area/outpost/operations) "UP" = ( /obj/effect/turf_decal/techfloor/corner{ @@ -13595,7 +13598,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/turf/open/floor/plasteel/rockvault, +/turf/open/floor/plasteel/patterned/brushed, /area/outpost/operations) "Vm" = ( /obj/structure/window/plasma/reinforced/fulltile, @@ -14689,7 +14692,7 @@ /turf/open/floor/concrete/slab_3, /area/outpost/hallway/central) "Zp" = ( -/turf/closed/mineral/random/snow, +/turf/closed/indestructible/rock/snow/schist, /area/outpost/external) "Zr" = ( /obj/machinery/vending/security, @@ -20723,9 +20726,9 @@ uX Ex MD Gx +SM Gx -Gx -Gx +SM TJ gL gk @@ -20970,7 +20973,7 @@ Ug hh At Rp -Gx +SM Gx TJ qA diff --git a/code/game/turfs/closed/_closed.dm b/code/game/turfs/closed/_closed.dm index 74c351e04118..1932b52bafe5 100644 --- a/code/game/turfs/closed/_closed.dm +++ b/code/game/turfs/closed/_closed.dm @@ -261,6 +261,16 @@ bullet_sizzle = TRUE bullet_bounce_sound = null +/turf/closed/indestructible/rock/snow/schist + name = "schist" + desc = "You doubt you could break this" + icon = 'icons/turf/walls/rockwall_icemoon.dmi' + smooth_icon = 'icons/turf/walls/rockwall_icemoon.dmi' + icon_state = "rockwall_icemoon-0" + base_icon_state = "rockwall_icemoon" + pixel_x = null + pixel_y = null + /turf/closed/indestructible/paper name = "thick paper wall" desc = "A wall layered with impenetrable sheets of paper."