Replaces all instances of /turf/simulated/shuttle with simulated/wall/shuttle or simulated/floor/shuttle counterparts. (#7315)

Replaced all the snowflakey shuttle turfs with either /turf/simulated/wall/shuttle or /turf/simulated/floor/shuttle where I could, meaning shuttles are no longer indestructible but they can still take a lot of punishment.
    Added a few unsimulated turf variants to use on the cc z-level rather than having to use their simulated counterparts.
    Added smooth dark shuttle wall icons and a few more shuttle floor variants by AmoryBlaine.
    Fixed the dark shuttle corner blocks from looking weird after transit.
    A side effect of removing these shuttle turf types, conjure spells will now work inside of shuttles that used these removed turfs. Could perhaps be readded using areas if needed.

This is part 1 of the stuff from #5771 which will be split up and added in smaller batches beginning with adding the turf types with this pr.
This commit is contained in:
fernerr
2019-11-04 21:59:28 +02:00
committed by Erki
parent 2142622885
commit 8ca8760c21
52 changed files with 3109 additions and 4527 deletions
+1
View File
@@ -1050,6 +1050,7 @@
#include "code\game\turfs\simulated\floor_icon.dm"
#include "code\game\turfs\simulated\floor_static.dm"
#include "code\game\turfs\simulated\floor_types.dm"
#include "code\game\turfs\simulated\shuttle_turfs.dm"
#include "code\game\turfs\simulated\wall_attacks.dm"
#include "code\game\turfs\simulated\wall_icon.dm"
#include "code\game\turfs\simulated\wall_types.dm"
+1 -1
View File
@@ -19,7 +19,7 @@
return -1
/obj/machinery/atmospherics/pipe/Initialize()
if(istype(get_turf(src), /turf/simulated/wall) || istype(get_turf(src), /turf/simulated/shuttle/wall) || istype(get_turf(src), /turf/unsimulated/wall))
if(istype(get_turf(src), /turf/simulated/wall) || istype(get_turf(src), /turf/unsimulated/wall))
level = 1
. = ..()
+3
View File
@@ -57,6 +57,9 @@
if (!ST) // Excluded turfs are null to keep the list ordered.
continue
if(istype(ST, /turf/unsimulated) || istype(ST, /turf/space))
ST.ChangeTurf(A.base_turf, 1, 0, 1)
var/turf/TT = ST.copy_turf(target_turfs[i])
for (var/thing in ST)
+2 -2
View File
@@ -65,7 +65,7 @@
var/list/fixed_underlay
var/smooth_underlays // Determines if we should attempt to generate turf underlays for this type.
/turf/simulated/shuttle/wall
/turf/simulated/wall/shuttle
smooth_underlays = TRUE
/turf/simulated/wall
@@ -88,7 +88,7 @@
if (!tcache)
tcache = typecacheof(canSmoothWith || type, FALSE, !(smooth & SMOOTH_MORE))
SSicon_smooth.typecachecache[type] = tcache
else
else
tcache = typecacheof(canSmoothWith || type, FALSE, !(smooth & SMOOTH_MORE))
if (smooth & SMOOTH_BORDER)
+2 -2
View File
@@ -7,10 +7,10 @@
return mloc
/proc/iswall(turf/T)
return (istype(T, /turf/simulated/wall) || istype(T, /turf/unsimulated/wall) || istype(T, /turf/simulated/shuttle/wall))
return (istype(T, /turf/simulated/wall) || istype(T, /turf/unsimulated/wall))
/proc/isfloor(turf/T)
return (istype(T, /turf/simulated/floor) || istype(T, /turf/unsimulated/floor) || istype(T, /turf/simulated/shuttle/floor))
return (istype(T, /turf/simulated/floor) || istype(T, /turf/unsimulated/floor))
//Edit by Nanako
-9
View File
@@ -6,15 +6,6 @@
//todo: flooring datum cultify check
cultify_floor()
/turf/simulated/shuttle/floor/cultify()
cultify_floor()
/turf/simulated/shuttle/floor4/cultify()
cultify_floor()
/turf/simulated/shuttle/wall/cultify()
cultify_wall()
/turf/simulated/wall/cultify()
cultify_wall()
+1 -4
View File
@@ -18,10 +18,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
Collide(atom/clong)
. = ..()
if(istype(clong, /turf/simulated/shuttle)) //Skip shuttles without actually deleting the rod
return
else if (istype(clong, /turf) && !istype(clong, /turf/unsimulated))
if (istype(clong, /turf) && !istype(clong, /turf/unsimulated))
if(clong.density)
clong.ex_act(2)
for (var/mob/O in hearers(src, null))
-7
View File
@@ -305,13 +305,6 @@ datum/objective/escape
if(!location)
return 0
if(istype(location, /turf/simulated/shuttle/floor4)) // Fails traitors if they are in the shuttle brig -- Polymorph
if(istype(owner.current, /mob/living/carbon))
var/mob/living/carbon/C = owner.current
if (!C.handcuffed)
return 1
return 0
var/area/check_area = location.loc
if(istype(check_area, /area/shuttle/escape/centcom))
return 1
-12
View File
@@ -51,17 +51,5 @@
/turf/simulated/mineral
explosion_resistance = 2
/turf/simulated/shuttle/floor
explosion_resistance = 1
/turf/simulated/shuttle/floor4
explosion_resistance = 1
/turf/simulated/shuttle/plating
explosion_resistance = 1
/turf/simulated/shuttle/wall
explosion_resistance = 10
/turf/simulated/wall
explosion_resistance = 10
-2
View File
@@ -174,8 +174,6 @@ move an amendment</a> to the drawing.</p>
/obj/item/blueprints/proc/check_tile_is_border(var/turf/T2,var/dir)
if (istype(T2, /turf/space))
return BORDER_SPACE //omg hull breach we all going to die here
if (istype(T2, /turf/simulated/shuttle))
return BORDER_SPACE
if (get_area_type(T2.loc)!=AREA_SPACE)
return BORDER_BETWEEN
if (istype(T2, /turf/simulated/wall))
@@ -43,7 +43,7 @@
/obj/item/weapon/plastique/afterattack(atom/movable/target, mob/user, flag)
if (!flag)
return
if (ismob(target) || istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle)|| isopenturf(target) || istype(target, /obj/item/weapon/storage/) || istype(target, /obj/item/clothing/accessory/storage/) || istype(target, /obj/item/clothing/under))
if (ismob(target) || istype(target, /turf/unsimulated) || isopenturf(target) || istype(target, /obj/item/weapon/storage/) || istype(target, /obj/item/clothing/accessory/storage/) || istype(target, /obj/item/clothing/under))
return
to_chat(user, "Planting explosives...")
user.do_attack_animation(target)
+2 -1
View File
@@ -17,7 +17,8 @@
/turf/simulated/mineral,
/turf/unsimulated/wall,
/turf/unsimulated/floor,
/obj/structure/grille
/obj/structure/grille,
/turf/unsimulated/mineral/asteroid
)
/obj/structure/lattice/Initialize()
+34 -1
View File
@@ -246,4 +246,37 @@ var/list/flooring_types
icon = 'icons/turf/flooring/tiles.dmi'
icon_base = "diamond"
flags = TURF_REMOVE_CROWBAR | TURF_CAN_BREAK
build_type = /obj/item/stack/tile/diamond
build_type = /obj/item/stack/tile/diamond
//Shuttle turfs
/decl/flooring/shuttle
name = "shuttle floor"
desc = "Typical shuttle flooring."
icon = 'icons/turf/shuttle.dmi'
icon_base = "floor"
flags = TURF_ACID_IMMUNE
apply_thermal_conductivity = 0.025
apply_heat_capacity = 325000
can_paint = 1
/decl/flooring/shuttle/yellow
icon_base = "floor2"
/decl/flooring/shuttle/white
icon_base = "floor3"
/decl/flooring/shuttle/red
icon_base = "floor4"
/decl/flooring/shuttle/dark_red
icon_base = "floor6"
/decl/flooring/shuttle/black
icon_base = "floor7"
/decl/flooring/shuttle/tan
icon_base = "floor8"
/decl/flooring/shuttle/dark_blue
icon_base = "floor9"
-77
View File
@@ -9,80 +9,3 @@
/turf/simulated/floor/diona/attackby()
return
/turf/simulated/shuttle
name = "shuttle"
icon = 'icons/turf/shuttle.dmi'
thermal_conductivity = 0.05
heat_capacity = 0
layer = 2
roof_flags = ROOF_CLEANUP
/turf/simulated/shuttle/wall
icon = 'icons/turf/smooth/shuttle_wall.dmi'
name = "wall"
icon_state = "map-shuttle"
opacity = 1
density = 1
blocks_air = 1
smooth = SMOOTH_MORE | SMOOTH_DIAGONAL
permit_ao = FALSE
canSmoothWith = list(
/turf/simulated/shuttle/wall,
/obj/structure/window/shuttle,
/obj/machinery/door/airlock,
/obj/machinery/door/unpowered/shuttle,
/obj/structure/shuttle/engine/propulsion
)
/turf/simulated/shuttle/wall/dark
icon = 'icons/turf/shuttle.dmi'
icon_state = "wall3"
smooth = SMOOTH_FALSE
canSmoothWith = null
permit_ao = TRUE
/turf/simulated/shuttle/floor
name = "floor"
icon_state = "floor"
footstep_sound = "concretestep"
permit_ao = FALSE
/turf/simulated/shuttle/plating
name = "plating"
icon = 'icons/turf/floors.dmi'
icon_state = "plating"
footstep_sound = "concretestep"
level = 1
/turf/simulated/shuttle/plating/is_plating()
return 1
/turf/simulated/shuttle/plating/vox //Skipjack plating
oxygen = 0
nitrogen = MOLES_N2STANDARD + MOLES_O2STANDARD
/turf/simulated/shuttle/floor4 // Added this floor tile so that I have a seperate turf to check in the shuttle -- Polymorph
name = "Brig floor" // Also added it into the 2x3 brig area of the shuttle.
icon_state = "floor4"
/turf/simulated/shuttle/floor4/vox //skipjack floors
name = "skipjack floor"
oxygen = 0
nitrogen = MOLES_N2STANDARD + MOLES_O2STANDARD
/turf/simulated/shuttle/roof
name = "shuttle roof"
icon_state = "roof_white"
smooth = SMOOTH_DIAGONAL|SMOOTH_TRUE
oxygen = 0
nitrogen = 0
roof_type = null
/turf/simulated/shuttle/roof/black
icon_state = "roof_black"
+173
View File
@@ -0,0 +1,173 @@
//--Walls--//
/turf/simulated/wall/shuttle
icon = 'icons/turf/smooth/shuttle_wall.dmi'
icon_state = "map-shuttle"
roof_flags = ROOF_CLEANUP
smooth = SMOOTH_MORE|SMOOTH_DIAGONAL
use_standard_smoothing = 1
canSmoothWith = list(
/turf/simulated/wall/shuttle,
/obj/structure/window/shuttle,
/obj/machinery/door/airlock,
/obj/machinery/door/unpowered/shuttle,
/obj/structure/shuttle/engine/propulsion
)
/turf/simulated/wall/shuttle/Initialize(mapload)
. = ..(mapload,"shuttle")
/turf/simulated/wall/shuttle/attackby(obj/item/weapon/W as obj, mob/user as mob)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
if (!user)
to_chat(user, "<span class='warning'>You don't have the dexterity to do this!</span>")
return
if(!istype(user.loc, /turf))
return
if(locate(/obj/effect/overlay/wallrot) in src)
if(W.iswelder() )
var/obj/item/weapon/weldingtool/WT = W
if( WT.remove_fuel(0,user) )
to_chat(user, "<span class='notice'>You burn away the fungi with \the [WT].</span>")
playsound(src, 'sound/items/Welder.ogg', 10, 1)
for(var/obj/effect/overlay/wallrot/WR in src)
qdel(WR)
return
else if(!is_sharp(W) && W.force >= 10 || W.force >= 20)
to_chat(user, "<span class='notice'>\The [src] crumbles away under the force of your [W.name].</span>")
src.dismantle_wall(1)
return
if(thermite)
if(W.iswelder() )
var/obj/item/weapon/weldingtool/WT = W
if( WT.remove_fuel(0,user) )
thermitemelt(user)
return
else if(istype(W, /obj/item/weapon/gun/energy/plasmacutter))
thermitemelt(user)
return
else if( istype(W, /obj/item/weapon/melee/energy/blade) )
var/obj/item/weapon/melee/energy/blade/EB = W
spark(EB, 5)
to_chat(user, "<span class='notice'>You slash \the [src] with \the [EB]; the thermite ignites!</span>")
playsound(src, "sparks", 50, 1)
playsound(src, 'sound/weapons/blade.ogg', 50, 1)
thermitemelt(user)
return
if(!istype(W, /obj/item/weapon/reagent_containers))
return attack_hand(user)
/turf/simulated/wall/shuttle/cardinal
smooth = SMOOTH_TRUE
/turf/simulated/wall/shuttle/dark
icon = 'icons/turf/smooth/shuttle_wall_dark.dmi'
canSmoothWith = null
/turf/simulated/wall/shuttle/dark/cardinal
smooth = SMOOTH_TRUE
canSmoothWith = null
/turf/simulated/wall/shuttle/dark/corner
icon = 'icons/turf/shuttle.dmi'
icon_state = "wall3"
use_set_icon_state = 1
smooth = null
canSmoothWith = null
/turf/simulated/wall/shuttle/dark/corner/underlay
var/underlay_dir
/turf/simulated/wall/shuttle/dark/corner/underlay/update_icon()
..()
underlays.Cut()
var/underlay_fetch_dir = dir
if(underlay_dir)
underlay_fetch_dir = underlay_dir
var/turf/T = get_step(src, underlay_fetch_dir)
var/mutable_appearance/underlay_appearance = new(layer = TURF_LAYER)
var/list/U = list(underlay_appearance)
if(T && !istype(T, /turf/simulated/open))
underlay_appearance.appearance = T
underlays = U
/turf/simulated/wall/shuttle/raider
icon = 'icons/turf/smooth/composite_metal.dmi'
icon_state = "composite_metal"
smooth = SMOOTH_TRUE
canSmoothWith = null
color = "#6C7364"
//--Floors--//
/turf/simulated/floor/shuttle
name = "shuttle floor"
icon = 'icons/turf/shuttle.dmi'
icon_state = "floor"
roof_flags = ROOF_CLEANUP
initial_flooring = /decl/flooring/shuttle
footstep_sound = "concretestep"
/turf/simulated/floor/shuttle/yellow
icon_state = "floor2"
initial_flooring = /decl/flooring/shuttle/yellow
/turf/simulated/floor/shuttle/white
icon_state = "floor3"
initial_flooring = /decl/flooring/shuttle/white
/turf/simulated/floor/shuttle/red
icon_state = "floor4"
initial_flooring = /decl/flooring/shuttle/red
/turf/simulated/floor/shuttle/dark_red
icon_state = "floor6"
initial_flooring = /decl/flooring/shuttle/dark_red
/turf/simulated/floor/shuttle/black
icon_state = "floor7"
initial_flooring = /decl/flooring/shuttle/black
/turf/simulated/floor/shuttle/tan
icon_state = "floor8"
initial_flooring = /decl/flooring/shuttle/tan
/turf/simulated/floor/shuttle/dark_blue
icon_state = "floor9"
initial_flooring = /decl/flooring/shuttle/dark_blue
//--Roofs--//
/turf/simulated/shuttle_roof
name = "shuttle roof"
icon = 'icons/turf/smooth/roof_white.dmi'
icon_state = "roof_white"
smooth = SMOOTH_DIAGONAL|SMOOTH_TRUE
smooth_underlays = TRUE
oxygen = 0
nitrogen = 0
roof_type = null
canSmoothWith = list(
/turf/simulated/shuttle_roof
)
/turf/simulated/shuttle_roof/dark
icon = 'icons/turf/smooth/roof_dark.dmi'
icon_state = "roof_dark"
canSmoothWith = list(
/turf/simulated/shuttle_roof/dark
)
/turf/simulated/shuttle_roof/ex_act(severity)
if(severity == 1)
src.ChangeTurf(baseturf)
return
+2
View File
@@ -110,6 +110,8 @@
damage_overlays[i] = img
/turf/simulated/wall/calculate_adjacencies()
if(use_standard_smoothing)
return ..()
. = 0
if (!loc || !material)
return
-7
View File
@@ -70,13 +70,6 @@
/turf/simulated/wall/sandstonediamond/Initialize(mapload)
. = ..(mapload,"sandstone","diamond")
// Kind of wondering if this is going to bite me in the butt.
/turf/simulated/wall/voxshuttle/Initialize(mapload)
. = ..(mapload,"voxalloy")
/turf/simulated/wall/voxshuttle/attackby()
return
/turf/simulated/wall/titanium/Initialize(mapload)
. = ..(mapload,"titanium")
+4 -1
View File
@@ -18,6 +18,8 @@
var/material/reinf_material
var/last_state
var/construction_stage
var/use_standard_smoothing
var/use_set_icon_state
var/tmp/list/image/reinforcement_images
var/tmp/image/damage_image
@@ -35,7 +37,8 @@
/turf/simulated/wall/Initialize(mapload, var/materialtype, var/rmaterialtype)
. = ..()
icon_state = "blank"
if(!use_set_icon_state)
icon_state = "blank"
if(!materialtype)
materialtype = DEFAULT_WALL_MATERIAL
material = get_material_by_name(materialtype)
+16 -3
View File
@@ -26,14 +26,14 @@
//Creates a new turf.
// N is the type of the turf.
/turf/proc/ChangeTurf(N, tell_universe = TRUE, force_lighting_update = FALSE)
/turf/proc/ChangeTurf(N, tell_universe = TRUE, force_lighting_update = FALSE, var/ignore_override)
if (!N)
return
if(!use_preloader && N == type) // Don't no-op if the map loader requires it to be reconstructed
return src
// This makes sure that turfs are not changed to space when there's a multi-z turf below
if(N == /turf/space && HasBelow(z))
if(N == /turf/space && HasBelow(z) && !ignore_override)
N = openspace_override_type || /turf/simulated/open/airless
var/obj/fire/old_fire = fire
@@ -66,7 +66,7 @@
if (lighting_overlay && lighting_overlay.loc != src)
// This is a hack, but I can't figure out why the fuck they're not on the correct turf in the first place.
lighting_overlay.forceMove(src, harderforce = TRUE)
affecting_lights = old_affecting_lights
corners = old_corners
@@ -142,6 +142,11 @@
other.icon = icon
other.icon_state = icon_state
other.underlays = underlays.Copy()
other.name = name
other.layer = layer
other.decals = decals
other.roof_flags = roof_flags
other.roof_type = roof_type
if (our_overlays)
other.our_overlays = our_overlays
@@ -165,3 +170,11 @@
SSair.mark_for_update(other)
other.update_icon()
/turf/simulated/wall/copy_turf(turf/simulated/wall/other, ignore_air = FALSE)
.=..()
other.damage = damage
/turf/simulated/wall/shuttle/dark/corner/underlay/copy_turf(turf/simulated/wall/shuttle/dark/corner/underlay/other, ignore_air = FALSE)
.=..()
other.underlay_dir = underlay_dir
+25
View File
@@ -32,3 +32,28 @@
icon_state = "pdoor1"
name = "blast door"
desc = "That looks like it doesn't open easily."
/turf/unsimulated/wall/steel
icon = 'icons/turf/smooth/composite_solid.dmi'
icon_state = "map_steel"
desc = "It's a wall. It appears to be composed of a highly durable alloy and plated with steel."
color = "#666666"
smooth = SMOOTH_TRUE
canSmoothWith = list(
/turf/unsimulated/wall/steel
)
/turf/unsimulated/wall/darkshuttlewall
icon = 'icons/turf/smooth/shuttle_wall_dark.dmi'
icon_state = "map-shuttle"
desc = "It's a wall. It appears to be composed of a highly durable alloy."
smooth = SMOOTH_TRUE
canSmoothWith = list(
/turf/unsimulated/wall/darkshuttlewall
)
/turf/unsimulated/wall/fakeairlock
icon = 'icons/obj/doors/Doorele.dmi'
icon_state = "door_closed"
name = "Airlock"
desc = "It opens and closes."
@@ -776,7 +776,7 @@
playsound(src,'sound/magic/lightningbolt.ogg',60,1)
var/turf/T = get_turf(holder.wearer)
if(istype(T, /turf/simulated))
if(istype(T, /turf/simulated/mineral) || istype(T, /turf/simulated/wall) || istype(T, /turf/simulated/shuttle))
if(istype(T, /turf/simulated/mineral) || istype(T, /turf/simulated/wall))
T.ChangeTurf(T.baseturf)
else
T.ChangeTurf(/turf/space)
-3
View File
@@ -61,9 +61,6 @@
/material/iron
value = 5
/material/voxalloy
value = 100
/material/wood
value = 3
+26 -16
View File
@@ -184,6 +184,8 @@ var/list/name_to_material
if ("vaurca")
wall_icon = 'icons/turf/smooth/vaurca_wall.dmi'
skip_blend = TRUE
if ("shuttle")
skip_blend = TRUE
else
world.log << "materials: [src] has unknown icon_base [icon_base]."
@@ -293,7 +295,7 @@ var/list/name_to_material
stack_type = /obj/item/stack/material/gold
icon_colour = "#EDD12F"
weight = 30
hardness = 15
hardness = 15
conductivity = 41
stack_origin_tech = list(TECH_MATERIAL = 4)
sheet_singular_name = "ingot"
@@ -665,22 +667,17 @@ var/list/name_to_material
hitsound = 'sound/weapons/smash.ogg'
// Adminspawn only, do not let anyone get this.
/material/voxalloy
name = "voxalloy"
display_name = "durable alloy"
stack_type = null
icon_colour = "#6C7364"
integrity = 1200
melting_point = 6000 // Hull plating.
explosion_resistance = 200 // Hull plating.
hardness = 500
weight = 500
protectiveness = 80 // 80%
/material/voxalloy/elevatorium
/material/elevatorium
name = "elevatorium"
display_name = "elevator panelling"
stack_type = null
icon_colour = "#666666"
integrity = 1200
melting_point = 6000
explosion_resistance = 200
hardness = 500
weight = 500
protectiveness = 80
/material/wood
name = "wood"
@@ -708,7 +705,7 @@ var/list/name_to_material
/material/wood/log //This is gonna replace wood planks in a way for NBT, leaving it here for now
name = "log"
stack_type = /obj/item/stack/material/woodlog
stack_type = /obj/item/stack/material/woodlog
icon_colour = "#824B28"
integrity = 50
icon_base = "solid"
@@ -731,7 +728,7 @@ var/list/name_to_material
explosion_resistance = 0
hardness = 0.1
weight = 7
melting_point = T0C+220
melting_point = T0C+220
ignition_point = T0C+218
sheet_singular_name = "branch"
sheet_plural_name = "branch"
@@ -1007,3 +1004,16 @@ var/list/name_to_material
weight = 23
protectiveness = 20 // 50%
conductivity = 10
/material/shuttle
name = "shuttle"
display_name = "spaceship alloy"
stack_type = null
icon_colour = "#6C7364"
icon_base = "shuttle"
integrity = 1200
melting_point = 6000 // Hull plating.
explosion_resistance = 200 // Hull plating.
hardness = 500
weight = 500
protectiveness = 80 // 80%
+47 -4
View File
@@ -11,8 +11,7 @@
var/list/mineral_can_smooth_with = list(
/turf/simulated/mineral,
/turf/simulated/wall,
/turf/unsimulated/wall,
/turf/simulated/shuttle
/turf/unsimulated/wall
)
// Some extra types for the surface to keep things pretty.
@@ -167,6 +166,51 @@ var/list/mineral_can_smooth_with = list(
if(istype(M.selected,/obj/item/mecha_parts/mecha_equipment/tool/drill))
M.selected.action(src)
//For use in non-station z-levels as decoration.
/turf/unsimulated/mineral/asteroid
name = "rock"
icon = 'icons/turf/map_placeholders.dmi'
icon_state = "rock"
desc = "It's a greyish rock. Exciting."
opacity = 1
var/icon/actual_icon = 'icons/turf/smooth/rock_wall.dmi'
layer = 2.01
var/list/asteroid_can_smooth_with = list(
/turf/unsimulated/mineral,
/turf/unsimulated/mineral/asteroid
)
smooth = SMOOTH_MORE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON
smoothing_hints = SMOOTHHINT_CUT_F | SMOOTHHINT_ONLY_MATCH_TURF | SMOOTHHINT_TARGETS_NOT_UNIQUE
/turf/unsimulated/mineral/asteroid/Initialize(mapload)
if (initialized)
crash_with("Warning: [src]([type]) initialized multiple times!")
if (icon != actual_icon)
icon = actual_icon
initialized = TRUE
turfs += src
if(dynamic_lighting)
luminosity = 0
else
luminosity = 1
has_opaque_atom = TRUE
if (smooth)
canSmoothWith = asteroid_can_smooth_with
pixel_x = -4
pixel_y = -4
queue_smooth(src)
if (!mapload)
queue_smooth_neighbors(src)
return INITIALIZE_HINT_NORMAL
#define SPREAD(the_dir) \
if (prob(mineral.spread_chance)) { \
var/turf/simulated/mineral/target = get_step(src, the_dir); \
@@ -554,8 +598,7 @@ var/list/mineral_can_smooth_with = list(
var/list/asteroid_floor_smooth = list(
/turf/unsimulated/floor/asteroid/ash,
/turf/simulated/mineral,
/turf/simulated/wall,
/turf/simulated/shuttle
/turf/simulated/wall
)
// Copypaste parent for performance.
@@ -200,7 +200,7 @@
/obj/item/projectile/energy/bee/on_impact(var/atom/A)
playsound(src.loc, pick('sound/effects/Buzz1.ogg','sound/effects/Buzz2.ogg'), 70, 1)
var/turf/T = get_turf(A)
if(!istype(T, /turf/simulated/wall) && !istype(T, /turf/simulated/shuttle/wall) && !istype(A, /obj/structure/window) && !istype(A, /obj/machinery/door))
if(!istype(T, /turf/simulated/wall) && !istype(A, /obj/structure/window) && !istype(A, /obj/machinery/door))
for(var/i=1, i<=8, i++)
var/atom/movable/x = new /mob/living/simple_animal/bee/beegun //hackmaster pro, butt fuck it
x.forceMove(T)
@@ -43,9 +43,6 @@ How they spawn stuff is decided by behaviour vars, which are explained below
var/atom/summoned_object
if(ispath(summoned_object_type,/turf))
if(istype(get_turf(user),/turf/simulated/shuttle) || istype(spawn_place, /turf/simulated/shuttle))
to_chat(user, "<span class='warning'>You can't build things on shuttles!</span>")
continue
spawn_place.ChangeTurf(summoned_object_type)
summoned_object = spawn_place
else
@@ -0,0 +1,43 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: Ferner
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- tweak: "Walls and floors of shuttles are no longer indestructible."
- imageadd: "Added smooth dark shuttle wall icons and some additional shuttle floor varieties by AmoryBlaine."
- rscdel: "Deleted the depreceated shuttle turfs and their subtypes."
Binary file not shown.

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

+7 -1
View File
@@ -37,6 +37,7 @@
/area/shuttle/arrival/transit
icon_state = "shuttle2"
base_turf = /turf/space/transit/east
centcomm_area = 1
/area/shuttle/arrival/station
@@ -63,6 +64,7 @@
/area/shuttle/escape/transit // the area to pass through for 3 minute transit
name = "\improper Emergency Shuttle Transit"
icon_state = "shuttle"
base_turf = /turf/space/transit/north
centcomm_area = 1
/area/shuttle/escape_pod1
@@ -81,6 +83,7 @@
/area/shuttle/escape_pod1/transit
icon_state = "shuttle"
base_turf = /turf/space/transit/north
centcomm_area = 1
/area/shuttle/escape_pod2
@@ -99,6 +102,7 @@
/area/shuttle/escape_pod2/transit
icon_state = "shuttle"
base_turf = /turf/space/transit/north
centcomm_area = 1
/area/shuttle/escape_pod3
@@ -117,6 +121,7 @@
/area/shuttle/escape_pod3/transit
icon_state = "shuttle"
base_turf = /turf/space/transit/north
centcomm_area = 1
/area/shuttle/escape_pod5 //Pod 4 was lost to meteors
@@ -135,6 +140,7 @@
/area/shuttle/escape_pod5/transit
icon_state = "shuttle"
base_turf = /turf/space/transit/north
centcomm_area = 1
/area/shuttle/mining
@@ -247,6 +253,6 @@
/area/shuttle/distress/transit
name = "\improper Unidentified Shuttle"
base_turf = /turf/space
base_turf = /turf/space/transit/east
icon_state = "shuttle"
centcomm_area = 1
+2
View File
@@ -170,6 +170,7 @@
/area/syndicate_station/transit
name = "\improper Hyperspace"
icon_state = "shuttle"
base_turf = /turf/space/transit/north
centcomm_area = 1
/area/wizard_station
@@ -196,6 +197,7 @@
/area/skipjack_station/transit
name = "\improper Hyperspace"
icon_state = "shuttle"
base_turf = /turf/space/transit/north
centcomm_area = 1
/area/skipjack_station/surface
File diff suppressed because it is too large Load Diff
+19 -28
View File
@@ -9582,28 +9582,28 @@
/turf/simulated/open,
/area/turbolift/main_arrivals_aux)
"rx" = (
/turf/simulated/shuttle/wall,
/turf/simulated/wall/shuttle,
/area/shuttle/escape_pod1/station)
"ry" = (
/obj/structure/window/shuttle,
/obj/structure/grille,
/turf/simulated/shuttle/plating,
/turf/simulated/floor/plating,
/area/shuttle/escape_pod1/station)
"rz" = (
/turf/simulated/shuttle/wall,
/turf/simulated/wall/shuttle,
/area/shuttle/escape_pod2/station)
"rA" = (
/obj/structure/window/shuttle,
/obj/structure/grille,
/turf/simulated/shuttle/plating,
/turf/simulated/floor/plating,
/area/shuttle/escape_pod2/station)
"rB" = (
/turf/simulated/shuttle/wall,
/turf/simulated/wall/shuttle,
/area/shuttle/escape_pod3/station)
"rC" = (
/obj/structure/window/shuttle,
/obj/structure/grille,
/turf/simulated/shuttle/plating,
/turf/simulated/floor/plating,
/area/shuttle/escape_pod3/station)
"rD" = (
/turf/unsimulated/floor/asteroid/ash,
@@ -9675,7 +9675,7 @@
pixel_y = 0;
tag_door = "escape_pod_1_hatch"
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/escape_pod1/station)
"rL" = (
/obj/structure/bed/chair{
@@ -9694,7 +9694,7 @@
pixel_y = 0;
tag_door = "escape_pod_2_hatch"
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/escape_pod2/station)
"rM" = (
/obj/structure/bed/chair{
@@ -9713,7 +9713,7 @@
pixel_y = 0;
tag_door = "escape_pod_3_hatch"
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/escape_pod3/station)
"rN" = (
/obj/structure/table/standard,
@@ -9786,7 +9786,7 @@
c_tag = "Bridge - Pod 1";
dir = 4
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/escape_pod1/station)
"rX" = (
/obj/structure/bed/chair{
@@ -9804,7 +9804,7 @@
c_tag = "Bridge - Pod 2";
dir = 4
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/escape_pod2/station)
"rY" = (
/obj/structure/bed/chair{
@@ -9822,7 +9822,7 @@
c_tag = "Bridge - Pod 3";
dir = 4
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/escape_pod3/station)
"rZ" = (
/obj/structure/grille,
@@ -9951,10 +9951,7 @@
/area/crew_quarters/sleep/cryo)
"so" = (
/obj/structure/shuttle/engine/propulsion/burst,
/turf/simulated/shuttle/wall{
icon_state = "swall";
dir = 1
},
/turf/simulated/wall/shuttle/cardinal,
/area/shuttle/escape_pod1/station)
"sp" = (
/obj/machinery/door/airlock/external{
@@ -9965,14 +9962,11 @@
name = "Escape Pod Hatch";
req_access = list(13)
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/escape_pod1/station)
"sq" = (
/obj/structure/shuttle/engine/propulsion/burst,
/turf/simulated/shuttle/wall{
icon_state = "swall";
dir = 1
},
/turf/simulated/wall/shuttle/cardinal,
/area/shuttle/escape_pod2/station)
"sr" = (
/obj/machinery/door/airlock/external{
@@ -9983,14 +9977,11 @@
name = "Escape Pod Hatch";
req_access = list(13)
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/escape_pod2/station)
"ss" = (
/obj/structure/shuttle/engine/propulsion/burst,
/turf/simulated/shuttle/wall{
icon_state = "swall";
dir = 1
},
/turf/simulated/wall/shuttle/cardinal,
/area/shuttle/escape_pod3/station)
"st" = (
/obj/machinery/door/airlock/external{
@@ -10001,7 +9992,7 @@
name = "Escape Pod Hatch";
req_access = list(13)
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/escape_pod3/station)
"su" = (
/obj/structure/grille,
@@ -20449,7 +20440,7 @@
/turf/simulated/floor/plating,
/area/bridge/levela)
"Qd" = (
/turf/simulated/shuttle/wall,
/turf/simulated/wall/shuttle,
/area/shuttle/research/station)
"Qf" = (
/obj/structure/table/standard,
+6 -9
View File
@@ -6,12 +6,12 @@
/turf/simulated/mineral/random,
/area/mine/unexplored)
"c" = (
/turf/simulated/shuttle/wall,
/turf/simulated/wall/shuttle,
/area/mine/unexplored)
"d" = (
/obj/structure/window/shuttle,
/obj/structure/grille,
/turf/simulated/shuttle/plating,
/turf/simulated/floor/plating,
/area/mine/unexplored)
"e" = (
/obj/structure/bed/chair{
@@ -22,22 +22,19 @@
/obj/random/energy_antag,
/obj/random/smalltank,
/obj/item/device/gps,
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/mine/unexplored)
"f" = (
/obj/item/weapon/archaeological_find,
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/mine/unexplored)
"g" = (
/obj/structure/shuttle/engine/propulsion/burst,
/turf/simulated/shuttle/wall{
icon_state = "swall";
dir = 1
},
/turf/simulated/wall/shuttle/cardinal,
/area/mine/unexplored)
"h" = (
/obj/machinery/door/airlock/external,
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/mine/unexplored)
"i" = (
/turf/unsimulated/floor/asteroid/ash/rocky,
+39 -34
View File
@@ -4,9 +4,9 @@
/area/mine/unexplored)
"ab" = (
/turf/unsimulated/floor/asteroid/ash/rocky,
/turf/simulated/shuttle/wall/dark{
dir = 8;
icon_state = "diagonalWall3"
/turf/simulated/wall/shuttle/dark/corner{
icon_state = "wall3";
dir = 9
},
/area/crashed_ship)
"ac" = (
@@ -23,31 +23,28 @@
icon_state = "rwindow";
dir = 1
},
/turf/simulated/floor/holofloor/tiled/dark,
/turf/simulated/floor/plating,
/area/crashed_ship)
"ad" = (
/turf/unsimulated/floor/asteroid/ash/rocky,
/turf/simulated/shuttle/wall/dark{
dir = 6;
icon_state = "diagonalWall3"
/turf/simulated/wall/shuttle/dark/corner{
icon_state = "wall3";
dir = 5
},
/area/crashed_ship)
"ae" = (
/turf/simulated/wall/voxshuttle,
/turf/simulated/wall/shuttle/raider,
/area/crashed_ship)
"af" = (
/obj/structure/computerframe,
/turf/simulated/floor/tiled/dark,
/area/crashed_ship)
"ag" = (
/obj/structure/bed/chair/office/bridge{
icon_state = "bridge";
dir = 1
},
/obj/machinery/button/remote/blast_door{
id = "crashed";
pixel_x = 32
},
/obj/structure/bed/chair/office/bridge,
/turf/simulated/floor/tiled/dark,
/area/crashed_ship)
"ah" = (
@@ -92,13 +89,15 @@
/turf/simulated/floor/holofloor/tiled/dark,
/area/crashed_ship)
"an" = (
/obj/structure/bed/chair{
/obj/structure/bed/chair/shuttle{
icon_state = "shuttlechair";
dir = 4
},
/turf/simulated/floor/tiled/dark,
/area/crashed_ship)
"ao" = (
/obj/structure/bed/chair{
/obj/structure/bed/chair/shuttle{
icon_state = "shuttlechair";
dir = 8
},
/turf/simulated/floor/tiled/dark,
@@ -108,21 +107,23 @@
/turf/simulated/floor/tiled/dark,
/area/crashed_ship)
"aq" = (
/obj/structure/bed/chair{
dir = 4
},
/obj/machinery/light/small{
dir = 8
},
/obj/structure/bed/chair/shuttle{
icon_state = "shuttlechair";
dir = 4
},
/turf/simulated/floor/tiled/dark,
/area/crashed_ship)
"ar" = (
/obj/structure/bed/chair{
dir = 8
},
/obj/machinery/light/small{
dir = 4
},
/obj/structure/bed/chair/shuttle{
icon_state = "shuttlechair";
dir = 8
},
/turf/simulated/floor/tiled/dark,
/area/crashed_ship)
"as" = (
@@ -379,14 +380,14 @@
/turf/simulated/floor/tiled/dark,
/area/crashed_ship)
"bd" = (
/obj/machinery/bodyscanner{
icon_state = "body_scanner_0";
dir = 4
},
/obj/effect/floor_decal/corner/green{
icon_state = "corner_white";
dir = 9
},
/obj/machinery/bodyscanner{
icon_state = "body_scanner";
dir = 4
},
/turf/simulated/floor/tiled/white,
/area/crashed_ship)
"be" = (
@@ -486,15 +487,16 @@
/area/crashed_ship)
"bt" = (
/turf/unsimulated/floor/asteroid/ash/rocky,
/turf/simulated/shuttle/wall/dark{
icon_state = "diagonalWall3"
/turf/simulated/wall/shuttle/dark/corner{
icon_state = "wall3";
dir = 10
},
/area/crashed_ship)
"bu" = (
/turf/unsimulated/floor/asteroid/ash/rocky,
/turf/simulated/shuttle/wall/dark{
dir = 4;
icon_state = "diagonalWall3"
/turf/simulated/wall/shuttle/dark/corner{
icon_state = "wall3";
dir = 6
},
/area/crashed_ship)
"bv" = (
@@ -531,23 +533,23 @@
/obj/structure/window/reinforced{
dir = 1
},
/turf/simulated/floor/tiled/dark,
/turf/simulated/floor/plating,
/area/crashed_ship)
"bC" = (
/obj/structure/shuttle/engine/propulsion{
icon_state = "propulsion_l"
},
/turf/unsimulated/chasm_mask,
/turf/simulated/floor/plating,
/area/crashed_ship)
"bD" = (
/obj/structure/shuttle/engine/propulsion,
/turf/unsimulated/chasm_mask,
/turf/simulated/floor/plating,
/area/crashed_ship)
"bE" = (
/obj/structure/shuttle/engine/propulsion{
icon_state = "propulsion_r"
},
/turf/unsimulated/chasm_mask,
/turf/simulated/floor/plating,
/area/crashed_ship)
"DG" = (
/obj/structure/cable/yellow{
@@ -562,6 +564,9 @@
},
/turf/simulated/floor/tiled/dark,
/area/crashed_ship)
"YQ" = (
/turf/unsimulated/floor/asteroid/ash/rocky,
/area/mine/unexplored)
(1,1,1) = {"
aa
@@ -1146,7 +1151,7 @@ aa
aa
aa
aa
aa
YQ
ad
ae
ae
+14 -14
View File
@@ -9,7 +9,7 @@
/turf/simulated/mineral/random,
/area/mine/unexplored)
"d" = (
/turf/simulated/shuttle/wall/dark,
/turf/simulated/wall/shuttle/dark,
/area/mine/unexplored)
"e" = (
/obj/item/weapon/archaeological_find,
@@ -17,18 +17,18 @@
/area/mine/unexplored)
"f" = (
/obj/structure/closet/crate/secure/loot,
/turf/simulated/shuttle/floor4/vox,
/turf/simulated/floor/shuttle/dark_red,
/area/mine/unexplored)
"g" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/shuttle/floor4/vox,
/turf/simulated/floor/shuttle/dark_red,
/area/mine/unexplored)
"h" = (
/turf/simulated/shuttle/floor4/vox,
/turf/simulated/floor/shuttle/dark_red,
/area/mine/unexplored)
"i" = (
/obj/effect/decal/cleanable/generic,
/turf/simulated/shuttle/floor4/vox,
/turf/simulated/floor/shuttle/dark_red,
/area/mine/unexplored)
"j" = (
/obj/effect/decal/cleanable/generic,
@@ -39,18 +39,18 @@
icon_state = "warning";
dir = 4
},
/turf/simulated/shuttle/floor4/vox,
/turf/simulated/floor/shuttle/dark_red,
/area/mine/unexplored)
"l" = (
/obj/random/energy_antag,
/turf/simulated/shuttle/floor4/vox,
/turf/simulated/floor/shuttle/dark_red,
/area/mine/unexplored)
"p" = (
/turf/simulated/wall/r_wall,
/area/mine/unexplored)
"r" = (
/obj/machinery/door/airlock/vault/bolted,
/turf/simulated/shuttle/floor4/vox,
/turf/simulated/floor/shuttle,
/area/mine/unexplored)
"s" = (
/obj/effect/decal/cleanable/generic,
@@ -58,7 +58,7 @@
icon_state = "warning";
dir = 4
},
/turf/simulated/shuttle/floor4/vox,
/turf/simulated/floor/shuttle/dark_red,
/area/mine/unexplored)
"t" = (
/obj/structure/sign/securearea,
@@ -68,20 +68,20 @@
/obj/effect/floor_decal/industrial/warning/corner{
dir = 4
},
/turf/simulated/shuttle/floor4/vox,
/turf/simulated/floor/shuttle/dark_red,
/area/mine/unexplored)
"v" = (
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
/turf/simulated/shuttle/floor4/vox,
/turf/simulated/floor/shuttle/dark_red,
/area/mine/unexplored)
"w" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
/turf/simulated/shuttle/floor4/vox,
/turf/simulated/floor/shuttle/dark_red,
/area/mine/unexplored)
"x" = (
/obj/effect/decal/cleanable/dirt,
@@ -89,14 +89,14 @@
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
/turf/simulated/shuttle/floor4/vox,
/turf/simulated/floor/shuttle/dark_red,
/area/mine/unexplored)
"y" = (
/obj/effect/floor_decal/industrial/warning/corner{
icon_state = "warningcorner";
dir = 1
},
/turf/simulated/shuttle/floor4/vox,
/turf/simulated/floor/shuttle/dark_red,
/area/mine/unexplored)
"z" = (
/turf/simulated/open/airless,
+1 -5
View File
@@ -21,10 +21,6 @@
/obj/structure/alien/weeds/node,
/turf/simulated/floor/cult,
/area/mine/unexplored)
"h" = (
/obj/structure/simple_door/gold,
/turf/unsimulated/chasm_mask,
/area/mine/unexplored)
"i" = (
/obj/structure/simple_door/gold,
/turf/simulated/floor/cult,
@@ -562,7 +558,7 @@ i
d
d
m
h
i
d
d
b
+81 -111
View File
@@ -2891,10 +2891,10 @@
/obj/structure/shuttle/engine/propulsion/burst{
dir = 8
},
/turf/simulated/shuttle/wall,
/turf/simulated/wall/shuttle/cardinal,
/area/shuttle/escape_pod3/station)
"afs" = (
/turf/simulated/shuttle/wall,
/turf/simulated/wall/shuttle,
/area/shuttle/escape_pod3/station)
"aft" = (
/obj/item/weapon/stool{
@@ -3155,7 +3155,7 @@
name = "Escape Pod Hatch";
req_access = list(13)
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/escape_pod3/station)
"afQ" = (
/obj/structure/bed/chair{
@@ -3170,7 +3170,7 @@
/obj/machinery/light/small/emergency{
dir = 1
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/escape_pod3/station)
"afR" = (
/obj/structure/bed/chair{
@@ -3189,12 +3189,12 @@
pixel_y = -25;
tag_door = "escape_pod_3_hatch"
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/escape_pod3/station)
"afS" = (
/obj/structure/window/shuttle,
/obj/structure/grille,
/turf/simulated/shuttle/plating,
/turf/simulated/floor/plating,
/area/shuttle/escape_pod3/station)
"afT" = (
/obj/structure/grille,
@@ -10818,12 +10818,12 @@
/turf/simulated/floor/plating,
/area/crew_quarters/fitness)
"atu" = (
/turf/simulated/shuttle/wall,
/turf/simulated/wall/shuttle,
/area/shuttle/escape_pod1/station)
"atv" = (
/obj/structure/window/shuttle,
/obj/structure/grille,
/turf/simulated/shuttle/plating,
/turf/simulated/floor/plating,
/area/shuttle/escape_pod1/station)
"atw" = (
/obj/structure/grille,
@@ -10859,12 +10859,12 @@
/turf/simulated/floor/plating,
/area/hallway/primary/central_two)
"atx" = (
/turf/simulated/shuttle/wall,
/turf/simulated/wall/shuttle,
/area/shuttle/escape_pod2/station)
"aty" = (
/obj/structure/window/shuttle,
/obj/structure/grille,
/turf/simulated/shuttle/plating,
/turf/simulated/floor/plating,
/area/shuttle/escape_pod2/station)
"atz" = (
/obj/machinery/chemical_dispenser/full,
@@ -11096,7 +11096,7 @@
pixel_y = 0;
tag_door = "escape_pod_1_hatch"
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/escape_pod1/station)
"aud" = (
/obj/structure/grille,
@@ -11145,7 +11145,7 @@
pixel_y = 0;
tag_door = "escape_pod_2_hatch"
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/escape_pod2/station)
"auh" = (
/turf/simulated/floor/plating,
@@ -11468,7 +11468,7 @@
/obj/machinery/light/small/emergency{
dir = 8
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/escape_pod1/station)
"auY" = (
/obj/structure/bed/chair{
@@ -11482,7 +11482,7 @@
/obj/machinery/light/small/emergency{
dir = 8
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/escape_pod2/station)
"auZ" = (
/turf/simulated/wall,
@@ -11746,7 +11746,7 @@
/area/crew_quarters/fitness)
"avI" = (
/obj/structure/shuttle/engine/propulsion/burst,
/turf/simulated/shuttle/wall,
/turf/simulated/wall/shuttle/cardinal,
/area/shuttle/escape_pod1/station)
"avJ" = (
/obj/machinery/door/airlock/external{
@@ -11757,7 +11757,7 @@
name = "Escape Pod Hatch";
req_access = list(13)
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/escape_pod1/station)
"avK" = (
/obj/machinery/door/firedoor{
@@ -11789,7 +11789,7 @@
/area/medical/pharmacy)
"avL" = (
/obj/structure/shuttle/engine/propulsion/burst,
/turf/simulated/shuttle/wall,
/turf/simulated/wall/shuttle/cardinal,
/area/shuttle/escape_pod2/station)
"avM" = (
/obj/machinery/door/airlock/external{
@@ -11800,7 +11800,7 @@
name = "Escape Pod Hatch";
req_access = list(13)
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/escape_pod2/station)
"avN" = (
/obj/item/device/mass_spectrometer/adv,
@@ -15771,7 +15771,7 @@
/turf/template_noop,
/area/syndicate_station/arrivals_dock)
"aDq" = (
/turf/simulated/shuttle/wall,
/turf/simulated/wall/shuttle,
/area/shuttle/arrival/station)
"aDr" = (
/obj/machinery/door/firedoor{
@@ -15786,11 +15786,12 @@
/area/medical/exam_room)
"aDs" = (
/obj/machinery/door/unpowered/shuttle,
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/arrival/station)
"aDt" = (
/obj/structure/window/shuttle,
/turf/simulated/shuttle/plating,
/obj/structure/grille,
/turf/simulated/floor/plating,
/area/shuttle/arrival/station)
"aDu" = (
/obj/structure/grille,
@@ -16622,42 +16623,42 @@
icon_state = "tube1";
pixel_y = 0
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/arrival/station)
"aEP" = (
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/arrival/station)
"aEQ" = (
/obj/machinery/computer/arcade,
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/arrival/station)
"aER" = (
/obj/structure/closet/wardrobe/black,
/obj/machinery/light{
dir = 1
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/arrival/station)
"aES" = (
/obj/structure/closet/wardrobe/xenos,
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/arrival/station)
"aET" = (
/obj/structure/closet/wardrobe/mixed,
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/arrival/station)
"aEU" = (
/obj/structure/closet/wardrobe/grey,
/obj/machinery/light{
dir = 1
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/arrival/station)
"aEV" = (
/obj/machinery/light{
dir = 4
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/arrival/station)
"aEW" = (
/obj/machinery/button/remote/blast_door{
@@ -16683,7 +16684,7 @@
icon_state = "burst_r";
dir = 4
},
/turf/template_noop,
/turf/simulated/floor/plating,
/area/shuttle/arrival/station)
"aEY" = (
/obj/structure/grille,
@@ -17374,7 +17375,7 @@
icon_state = "tube1";
dir = 4
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/arrival/station)
"aGl" = (
/obj/structure/window/reinforced{
@@ -17393,7 +17394,7 @@
/obj/effect/landmark{
name = "JoinLate"
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/arrival/station)
"aGn" = (
/obj/structure/shuttle/engine/heater{
@@ -17410,7 +17411,7 @@
icon_state = "propulsion";
dir = 4
},
/turf/template_noop,
/turf/simulated/floor/plating,
/area/shuttle/arrival/station)
"aGp" = (
/obj/structure/grille,
@@ -18364,20 +18365,15 @@
},
/turf/template_noop,
/area/template_noop)
"aHV" = (
/obj/structure/window/shuttle,
/obj/structure/grille,
/turf/simulated/shuttle/plating,
/area/shuttle/arrival/station)
"aHW" = (
/obj/effect/landmark{
name = "Observer-Start"
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/arrival/station)
"aHX" = (
/obj/machinery/hologram/holopad,
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/arrival/station)
"aHY" = (
/obj/machinery/alarm{
@@ -19923,7 +19919,7 @@
pixel_y = -29
},
/obj/machinery/light,
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/arrival/station)
"aLd" = (
/obj/machinery/requests_console{
@@ -19931,14 +19927,14 @@
pixel_y = -30
},
/obj/machinery/light,
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/arrival/station)
"aLe" = (
/obj/structure/shuttle/engine/propulsion{
icon_state = "burst_l";
dir = 4
},
/turf/template_noop,
/turf/simulated/floor/plating,
/area/shuttle/arrival/station)
"aLf" = (
/obj/structure/grille,
@@ -40597,7 +40593,7 @@
/turf/simulated/floor/plating,
/area/storage/emergency)
"bwJ" = (
/turf/simulated/shuttle/wall,
/turf/simulated/wall/shuttle,
/area/shuttle/research/station)
"bwK" = (
/obj/structure/grille,
@@ -40613,7 +40609,7 @@
"bwL" = (
/obj/structure/window/shuttle,
/obj/structure/grille,
/turf/simulated/shuttle/plating,
/turf/simulated/floor/plating,
/area/shuttle/research/station)
"bwM" = (
/obj/machinery/chakraconsole{
@@ -41537,26 +41533,26 @@
/area/medical/genetics_cloning)
"byp" = (
/obj/structure/closet/crate,
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/research/station)
"byq" = (
/obj/structure/bed/chair{
dir = 4
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/research/station)
"byr" = (
/obj/machinery/light{
dir = 1
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/research/station)
"bys" = (
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/research/station)
"byt" = (
/obj/structure/table/reinforced,
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/research/station)
"byu" = (
/obj/machinery/conveyor{
@@ -42456,7 +42452,7 @@
/obj/structure/shuttle/engine/propulsion/burst{
dir = 8
},
/turf/template_noop,
/turf/simulated/floor/plating,
/area/shuttle/research/station)
"bzS" = (
/obj/structure/window/reinforced{
@@ -42473,7 +42469,7 @@
/area/shuttle/research/station)
"bzT" = (
/obj/machinery/computer/shuttle_control/research,
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/research/station)
"bzU" = (
/obj/machinery/door/firedoor{
@@ -43588,7 +43584,7 @@
/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/shuttle/plating,
/turf/simulated/floor/plating,
/area/rnd/docking)
"bBJ" = (
/obj/machinery/embedded_controller/radio/simple_docking_controller{
@@ -43600,7 +43596,7 @@
tag_door = "research_shuttle_hatch"
},
/obj/structure/table/reinforced,
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/research/station)
"bBK" = (
/obj/structure/window/reinforced{
@@ -44321,7 +44317,7 @@
/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/shuttle/plating,
/turf/simulated/floor/plating,
/area/rnd/docking)
"bCW" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -44338,7 +44334,7 @@
name = "Shuttle Hatch";
req_access = list(13)
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/research/station)
"bCY" = (
/obj/machinery/alarm{
@@ -46952,7 +46948,7 @@
/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/shuttle/plating,
/turf/simulated/floor/plating,
/area/rnd/docking)
"bHD" = (
/obj/machinery/airlock_sensor{
@@ -47897,21 +47893,7 @@
/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/shuttle/plating,
/area/rnd/docking)
"bJj" = (
/obj/structure/grille,
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 4
},
/obj/structure/window/reinforced{
dir = 1
},
/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/shuttle/plating,
/turf/simulated/floor/plating,
/area/rnd/docking)
"bJk" = (
/obj/structure/lattice,
@@ -48990,7 +48972,7 @@
/turf/simulated/wall/r_wall,
/area/rnd/test_area)
"bKQ" = (
/turf/simulated/shuttle/wall,
/turf/simulated/wall/shuttle,
/area/shuttle/mining/station)
"bKR" = (
/obj/machinery/vending/medical{
@@ -49002,7 +48984,7 @@
"bKS" = (
/obj/structure/window/shuttle,
/obj/structure/grille,
/turf/simulated/shuttle/plating,
/turf/simulated/floor/plating,
/area/shuttle/mining/station)
"bKT" = (
/obj/item/device/radio/intercom{
@@ -49803,11 +49785,11 @@
pixel_y = 0
},
/obj/structure/table/reinforced,
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/mining/station)
"bMs" = (
/obj/machinery/computer/shuttle_control/mining,
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/mining/station)
"bMt" = (
/obj/machinery/embedded_controller/radio/simple_docking_controller{
@@ -49822,7 +49804,7 @@
dir = 4
},
/obj/structure/table/reinforced,
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/mining/station)
"bMu" = (
/obj/structure/grille,
@@ -50448,13 +50430,13 @@
/turf/simulated/floor/reinforced/airless,
/area/rnd/test_area)
"bNy" = (
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/mining/station)
"bNz" = (
/obj/structure/bed/chair{
dir = 1
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/mining/station)
"bNA" = (
/obj/structure/grille,
@@ -51213,7 +51195,7 @@
name = "Shuttle Hatch";
req_access = list(13)
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/mining/station)
"bPg" = (
/obj/machinery/door/airlock/external{
@@ -52883,7 +52865,7 @@
icon_state = "tube1";
pixel_y = 0
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/mining/station)
"bSe" = (
/obj/structure/window/reinforced{
@@ -52903,7 +52885,7 @@
/obj/machinery/light{
dir = 4
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/mining/station)
"bSg" = (
/obj/structure/grille,
@@ -53574,7 +53556,7 @@
/area/medical/psych)
"bTw" = (
/obj/structure/shuttle/engine/propulsion/burst,
/turf/template_noop,
/turf/simulated/floor/plating,
/area/shuttle/mining/station)
"bTx" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -55268,13 +55250,13 @@
/turf/simulated/floor/reinforced/airless,
/area/rnd/test_area)
"bWm" = (
/turf/simulated/shuttle/wall,
/turf/simulated/wall/shuttle,
/area/shuttle/escape_pod5/station)
"bWo" = (
/obj/structure/shuttle/engine/propulsion/burst{
dir = 4
},
/turf/simulated/shuttle/wall,
/turf/simulated/wall/shuttle/cardinal,
/area/shuttle/escape_pod5/station)
"bWp" = (
/obj/structure/closet/emcloset,
@@ -55905,7 +55887,7 @@
"bXG" = (
/obj/structure/window/shuttle,
/obj/structure/grille,
/turf/simulated/shuttle/plating,
/turf/simulated/floor/plating,
/area/shuttle/escape_pod5/station)
"bXH" = (
/obj/structure/bed/chair{
@@ -55924,7 +55906,7 @@
pixel_y = -25;
tag_door = "escape_pod_5_hatch"
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/escape_pod5/station)
"bXI" = (
/obj/structure/bed/chair{
@@ -55937,7 +55919,7 @@
pixel_y = 20
},
/obj/machinery/light/small/emergency,
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/escape_pod5/station)
"bXJ" = (
/obj/machinery/door/airlock/external{
@@ -55948,7 +55930,7 @@
name = "Escape Pod Hatch";
req_access = list(13)
},
/turf/simulated/shuttle/floor,
/turf/simulated/floor/shuttle,
/area/shuttle/escape_pod5/station)
"bXK" = (
/obj/machinery/door/airlock/external{
@@ -75600,10 +75582,10 @@
/obj/structure/shuttle/engine/propulsion/burst{
dir = 8
},
/turf/simulated/shuttle/wall,
/turf/simulated/wall/shuttle,
/area/shuttle/constructionsite/station)
"cHp" = (
/turf/simulated/shuttle/wall,
/turf/simulated/wall/shuttle,
/area/shuttle/constructionsite/station)
"cHq" = (
/obj/structure/cable{
@@ -75631,15 +75613,11 @@
/obj/machinery/light{
dir = 1
},
/turf/simulated/shuttle/floor{
icon_state = "floor2"
},
/turf/simulated/floor/shuttle/yellow,
/area/shuttle/constructionsite/station)
"cHt" = (
/obj/machinery/computer/station_alert,
/turf/simulated/shuttle/floor{
icon_state = "floor2"
},
/turf/simulated/floor/shuttle/yellow,
/area/shuttle/constructionsite/station)
"cHv" = (
/obj/structure/sign/securearea{
@@ -75816,15 +75794,11 @@
/obj/structure/bed/chair{
dir = 4
},
/turf/simulated/shuttle/floor{
icon_state = "floor2"
},
/turf/simulated/floor/shuttle/yellow,
/area/shuttle/constructionsite/station)
"cHL" = (
/obj/machinery/computer/shuttle_control/engineering,
/turf/simulated/shuttle/floor{
icon_state = "floor2"
},
/turf/simulated/floor/shuttle/yellow,
/area/shuttle/constructionsite/station)
"cHM" = (
/obj/structure/grille,
@@ -76113,15 +76087,11 @@
dir = 4
},
/obj/machinery/light,
/turf/simulated/shuttle/floor{
icon_state = "floor2"
},
/turf/simulated/floor/shuttle/yellow,
/area/shuttle/constructionsite/station)
"cIn" = (
/obj/machinery/computer/atmos_alert,
/turf/simulated/shuttle/floor{
icon_state = "floor2"
},
/turf/simulated/floor/shuttle/yellow,
/area/shuttle/constructionsite/station)
"cIo" = (
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
@@ -88783,7 +88753,7 @@ aaa
aaa
aDq
aDq
aHV
aDt
aDq
aDq
aaa
@@ -131477,7 +131447,7 @@ bwJ
bzN
bGm
bBG
bJj
bzP
aaf
aaa
bMm
File diff suppressed because it is too large Load Diff
+63 -63
View File
@@ -3,10 +3,10 @@
/turf/template_noop,
/area/template_noop)
"ab" = (
/turf/simulated/shuttle/wall,
/turf/simulated/wall/shuttle,
/area/derelict/ship)
"ag" = (
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
@@ -16,7 +16,7 @@
dir = 1
},
/obj/effect/decal/remains/human,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
@@ -29,7 +29,7 @@
/area/derelict/ship)
"an" = (
/obj/machinery/computer/records/medical,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
@@ -39,7 +39,7 @@
pixel_x = 6;
pixel_y = -5
},
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
@@ -62,18 +62,18 @@
/area/derelict/ship)
"at" = (
/obj/item/weapon/scalpel,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
"av" = (
/turf/simulated/shuttle/plating,
/turf/simulated/floor/plating,
/area/derelict/ship)
"aw" = (
/obj/structure/computerframe{
anchored = 1
},
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
@@ -86,7 +86,7 @@
dir = 1
},
/obj/structure/window/reinforced,
/turf/simulated/shuttle/plating,
/turf/simulated/floor/plating,
/area/derelict/ship)
"ay" = (
/obj/structure/grille,
@@ -94,7 +94,7 @@
dir = 1
},
/obj/structure/window/reinforced,
/turf/simulated/shuttle/plating,
/turf/simulated/floor/plating,
/area/derelict/ship)
"az" = (
/obj/structure/grille,
@@ -105,13 +105,13 @@
dir = 4
},
/obj/structure/window/reinforced,
/turf/simulated/shuttle/plating,
/turf/simulated/floor/plating,
/area/derelict/ship)
"aA" = (
/obj/machinery/door/airlock/glass{
name = "Hibernation Pods"
},
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
@@ -119,19 +119,19 @@
/obj/structure/bed/chair{
dir = 1
},
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
"aC" = (
/obj/structure/table/standard,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
"aE" = (
/obj/item/device/multitool,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
@@ -140,7 +140,7 @@
charge = 100;
maxcharge = 15000
},
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
@@ -166,20 +166,20 @@
/obj/structure/window/reinforced{
dir = 4
},
/turf/simulated/shuttle/plating,
/turf/simulated/floor/plating,
/area/derelict/ship)
"aL" = (
/obj/structure/table/standard,
/obj/machinery/light{
dir = 4
},
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
"aN" = (
/obj/machinery/door/airlock/glass,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
@@ -187,13 +187,13 @@
/obj/machinery/light_switch{
pixel_x = 27
},
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
"aP" = (
/obj/machinery/portable_atmospherics/powered/scrubber,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
@@ -205,7 +205,7 @@
/obj/structure/window/reinforced{
dir = 4
},
/turf/simulated/shuttle/plating,
/turf/simulated/floor/plating,
/area/derelict/ship)
"aR" = (
/obj/structure/bed,
@@ -214,13 +214,13 @@
dir = 8
},
/obj/structure/window/reinforced,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
"aS" = (
/obj/machinery/door/window,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
@@ -229,7 +229,7 @@
icon_state = "tube1";
dir = 8
},
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
@@ -240,7 +240,7 @@
"aV" = (
/obj/structure/table/standard,
/obj/item/weapon/gun/energy/retro,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
@@ -256,20 +256,20 @@
/obj/structure/window/reinforced{
dir = 8
},
/turf/simulated/shuttle/plating,
/turf/simulated/floor/plating,
/area/derelict/ship)
"aX" = (
/obj/machinery/light/small{
dir = 8
},
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
"aY" = (
/obj/structure/table/standard,
/obj/item/weapon/tank/oxygen,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
@@ -285,23 +285,23 @@
dir = 4
},
/obj/structure/window/reinforced,
/turf/simulated/shuttle/plating,
/turf/simulated/floor/plating,
/area/derelict/ship)
"ba" = (
/obj/machinery/light{
dir = 1
},
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
"bb" = (
/turf/simulated/shuttle/wall,
/turf/simulated/wall/shuttle,
/area/template_noop)
"bf" = (
/obj/structure/table/standard,
/obj/item/device/analyzer,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
@@ -310,7 +310,7 @@
dir = 8
},
/obj/effect/decal/remains/human,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
@@ -318,25 +318,25 @@
/obj/machinery/door/airlock/glass{
name = "Living Module"
},
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
"bi" = (
/obj/machinery/door/unpowered/shuttle,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
"bl" = (
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/template_noop)
"bo" = (
/obj/machinery/door/window/northright,
/obj/effect/decal/remains/human,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
@@ -349,25 +349,25 @@
/obj/structure/window/reinforced{
dir = 4
},
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
"bq" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
"br" = (
/obj/machinery/door/unpowered/shuttle,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/template_noop)
"bu" = (
/obj/structure/table,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/template_noop)
@@ -380,7 +380,7 @@
/obj/structure/window/reinforced{
dir = 4
},
/turf/simulated/shuttle/plating,
/turf/simulated/floor/plating,
/area/derelict/ship)
"bx" = (
/obj/machinery/light_switch{
@@ -389,7 +389,7 @@
/obj/machinery/light{
dir = 4
},
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
@@ -397,20 +397,20 @@
/obj/item/weapon/material/shard{
icon_state = "medium"
},
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
"bC" = (
/obj/item/weapon/material/shard,
/obj/structure/bed/chair,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
"bD" = (
/obj/structure/bed/chair,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
@@ -419,7 +419,7 @@
/obj/structure/computerframe{
anchored = 1
},
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
@@ -429,7 +429,7 @@
anchored = 1
},
/obj/item/stack/cable_coil/cut,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
@@ -439,7 +439,7 @@
/obj/item/weapon/tank/emergency_oxygen,
/obj/item/weapon/tank/emergency_oxygen,
/obj/item/weapon/tank/emergency_oxygen,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
@@ -448,14 +448,14 @@
/obj/item/clothing/suit/space/syndicate,
/obj/item/clothing/head/helmet/space/syndicate,
/obj/item/clothing/mask/breath,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
"bI" = (
/obj/structure/table/rack,
/obj/item/weapon/storage/toolbox/syndicate,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
@@ -470,7 +470,7 @@
icon_state = "0-4";
d2 = 4
},
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
@@ -479,13 +479,13 @@
d2 = 8;
icon_state = "0-8"
},
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
"bL" = (
/obj/machinery/light/small,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
@@ -498,7 +498,7 @@
id = "oldship_gun";
name = "Pod Bay Door"
},
/turf/simulated/shuttle/plating,
/turf/simulated/floor/plating,
/area/derelict/ship)
"bP" = (
/obj/machinery/mass_driver{
@@ -506,23 +506,23 @@
icon_state = "mass_driver";
id = "oldship_gun"
},
/turf/simulated/shuttle/plating,
/turf/simulated/floor/plating,
/area/derelict/ship)
"bQ" = (
/obj/machinery/door/airlock/glass,
/turf/simulated/shuttle/plating,
/turf/simulated/floor/plating,
/area/derelict/ship)
"bR" = (
/obj/machinery/door/airlock/glass{
name = "Pod Bay"
},
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
"bS" = (
/obj/effect/decal/remains/human,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
@@ -530,7 +530,7 @@
/obj/machinery/computer/pod{
id = "oldship_gun"
},
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
@@ -538,14 +538,14 @@
/obj/structure/table/standard,
/obj/item/weapon/screwdriver,
/obj/machinery/light,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
"bX" = (
/obj/structure/table/standard,
/obj/item/device/radio/off,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/derelict/ship)
+4 -4
View File
@@ -1039,7 +1039,7 @@
/turf/simulated/floor/tiled,
/area/outpost/research/kitchen)
"cp" = (
/turf/simulated/shuttle/wall,
/turf/simulated/wall/shuttle,
/area/shuttle/alien/mine)
"cq" = (
/obj/item/stack/rods,
@@ -1295,16 +1295,16 @@
icon_state = "propulsion";
dir = 8
},
/turf/simulated/shuttle/wall,
/turf/simulated/wall/shuttle,
/area/shuttle/alien/mine)
"cN" = (
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor2"
},
/area/shuttle/alien/mine)
"cO" = (
/obj/machinery/door/airlock/hatch,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor2"
},
/area/shuttle/alien/mine)
+27 -42
View File
@@ -4039,9 +4039,6 @@
},
/turf/template_noop,
/area/derelict/hallway/southeast)
"mD" = (
/turf/simulated/shuttle/plating,
/area/derelict/hallway/southeast)
"mE" = (
/obj/machinery/door/firedoor{
dir = 2
@@ -7524,18 +7521,17 @@
/turf/simulated/floor/tiled/white,
/area/derelict/hallway/southeast)
"vL" = (
/turf/template_noop,
/turf/simulated/shuttle/wall/dark{
dir = 8;
icon_state = "diagonalWall3"
/turf/simulated/wall/shuttle/dark/corner/underlay{
icon_state = "wall3";
dir = 9
},
/area/derelict/hallway/southwest)
"vM" = (
/turf/simulated/shuttle/wall/dark,
/turf/simulated/wall/shuttle/dark/cardinal,
/area/derelict/hallway/southwest)
"vN" = (
/turf/simulated/floor/airless,
/turf/simulated/shuttle/wall/dark{
/turf/simulated/wall/shuttle/dark/cardinal{
dir = 6;
icon_state = "diagonalWall3"
},
@@ -7561,47 +7557,39 @@
/turf/template_noop,
/area/derelict/hallway/southeast)
"vQ" = (
/turf/simulated/shuttle/floor{
icon_state = "floor2"
},
/turf/simulated/shuttle/wall/dark{
dir = 4;
icon_state = "diagonalWall3"
/turf/simulated/floor/shuttle/yellow,
/turf/simulated/wall/shuttle/dark/corner{
icon_state = "wall3";
dir = 6
},
/area/derelict/hallway/southwest)
"vR" = (
/obj/machinery/artifact,
/turf/simulated/shuttle/floor{
icon_state = "floor2"
},
/turf/simulated/floor/shuttle/yellow,
/area/derelict/hallway/southwest)
"vS" = (
/turf/simulated/floor/airless,
/turf/simulated/shuttle/wall/dark{
/turf/simulated/wall/shuttle/dark/cardinal{
dir = 4;
icon_state = "diagonalWall3"
},
/area/derelict/hallway/southwest)
"vT" = (
/obj/structure/window/phoronreinforced{
icon_state = "phoronrwindow";
dir = 4
icon_state = "phoronwindow0"
},
/turf/simulated/shuttle/wall/dark,
/obj/structure/grille,
/turf/simulated/floor/airless,
/area/derelict/hallway/southwest)
"vU" = (
/turf/simulated/shuttle/floor{
icon_state = "floor2"
},
/turf/simulated/floor/shuttle/yellow,
/area/derelict/hallway/southwest)
"vV" = (
/obj/machinery/door/airlock/hatch{
autoclose = 0;
icon_state = "door_open"
},
/turf/simulated/shuttle/floor{
icon_state = "floor2"
},
/turf/simulated/floor/shuttle/yellow,
/area/derelict/hallway/southwest)
"vW" = (
/obj/machinery/power/emitter{
@@ -7628,19 +7616,16 @@
/turf/simulated/floor/airless,
/area/derelict/hallway/southeast)
"wa" = (
/turf/template_noop,
/turf/simulated/shuttle/wall/dark{
dir = 5;
icon_state = "diagonalWall3"
/turf/simulated/wall/shuttle/dark/corner/underlay{
icon_state = "wall3";
dir = 10
},
/area/derelict/hallway/southwest)
"wb" = (
/turf/simulated/shuttle/floor{
icon_state = "floor2"
},
/turf/simulated/shuttle/wall/dark{
dir = 6;
icon_state = "diagonalWall3"
/turf/simulated/floor/shuttle/yellow,
/turf/simulated/wall/shuttle/dark/corner{
icon_state = "wall3";
dir = 5
},
/area/derelict/hallway/southwest)
"wc" = (
@@ -57409,7 +57394,7 @@ aa
aa
aa
ij
mD
rn
ij
ik
iw
@@ -57670,7 +57655,7 @@ aa
aa
iu
iw
mD
rn
aa
aa
aa
@@ -57926,7 +57911,7 @@ aa
aa
aa
ni
mD
rn
ij
aa
aa
@@ -58441,7 +58426,7 @@ aa
mT
iu
iu
mD
rn
aa
aa
aa
+120 -121
View File
@@ -70,27 +70,23 @@
/turf/simulated/floor/diona,
/area/derelict)
"at" = (
/turf/simulated/shuttle/wall/dark,
/turf/simulated/wall/shuttle/dark/corner/underlay{
icon_state = "wall3";
dir = 9
},
/area/derelict)
"au" = (
/obj/structure/ore_box,
/turf/simulated/floor/diona,
/area/derelict)
"av" = (
/turf/space,
/turf/simulated/shuttle/wall/dark{
dir = 8;
icon_state = "diagonalWall3"
},
/area/derelict)
"aw" = (
/obj/random/junk,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor7"
},
/area/derelict)
"ax" = (
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor7"
},
/area/derelict)
@@ -106,59 +102,52 @@
/obj/machinery/light/small{
dir = 8
},
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor7"
},
/area/derelict)
"aB" = (
/obj/effect/decal/cleanable/flour,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor7"
},
/area/derelict)
"aC" = (
/obj/structure/table/steel,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor7"
},
/area/derelict)
"aD" = (
/turf/space,
/turf/simulated/shuttle/wall/dark{
dir = 6;
icon_state = "diagonalWall3"
},
/area/derelict)
"aE" = (
/obj/item/weapon/stool/padded,
/obj/structure/noose,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor7"
},
/area/derelict)
"aF" = (
/obj/structure/table/steel,
/obj/random/loot,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor7"
},
/area/derelict)
"aG" = (
/obj/machinery/door/airlock/hatch,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor7"
},
/area/derelict)
"aH" = (
/obj/structure/computerframe,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor7"
},
/area/derelict)
"aI" = (
/obj/structure/table/steel,
/obj/item/weapon/gun/energy/retro,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor7"
},
/area/derelict)
@@ -168,7 +157,7 @@
/area/derelict)
"aK" = (
/obj/effect/decal/cleanable/greenglow,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor7"
},
/area/derelict)
@@ -176,13 +165,13 @@
/obj/machinery/light/small{
dir = 1
},
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor7"
},
/area/derelict)
"aM" = (
/obj/random/coin,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor7"
},
/area/derelict)
@@ -192,7 +181,7 @@
pixel_y = 8
},
/obj/structure/closet/crate/loot,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor7"
},
/area/derelict)
@@ -201,13 +190,13 @@
icon_state = "bridge";
dir = 1
},
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor7"
},
/area/derelict)
"aP" = (
/obj/effect/decal/cleanable/vomit,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor7"
},
/area/derelict)
@@ -217,7 +206,7 @@
pixel_y = 8
},
/obj/structure/table/steel,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor7"
},
/area/derelict)
@@ -225,7 +214,7 @@
/obj/structure/bed/chair/office/bridge{
dir = 4
},
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor7"
},
/area/derelict)
@@ -243,7 +232,7 @@
dir = 1
},
/obj/structure/grille,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor7"
},
/area/derelict)
@@ -261,7 +250,7 @@
brightness_power = 1;
brightness_range = 5
},
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor7"
},
/area/derelict)
@@ -272,13 +261,13 @@
brightness_range = 5
},
/obj/random/contraband,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor7"
},
/area/derelict)
"aX" = (
/obj/effect/decal/cleanable/mucus,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor7"
},
/area/derelict)
@@ -287,13 +276,13 @@
dir = 4;
pixel_y = 8
},
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor7"
},
/area/derelict)
"aZ" = (
/obj/structure/bed/chair/office/bridge,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor7"
},
/area/derelict)
@@ -304,7 +293,7 @@
},
/obj/structure/table/steel,
/obj/random/backpack,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor7"
},
/area/derelict)
@@ -317,22 +306,20 @@
/turf/simulated/floor/diona,
/area/derelict)
"bd" = (
/turf/space,
/turf/simulated/shuttle/wall/dark{
dir = 4;
icon_state = "diagonalWall3"
/turf/simulated/wall/shuttle/dark/corner/underlay{
icon_state = "wall3";
dir = 6
},
/area/derelict)
"be" = (
/turf/space,
/turf/simulated/shuttle/wall/dark{
dir = 5;
icon_state = "diagonalWall3"
/turf/simulated/wall/shuttle/dark/corner/underlay{
icon_state = "wall3";
dir = 10
},
/area/derelict)
"bf" = (
/obj/effect/decal/remains,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor7"
},
/area/derelict)
@@ -341,13 +328,13 @@
dir = 8
},
/obj/structure/table/steel,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor7"
},
/area/derelict)
"bh" = (
/obj/item/weapon/stool/padded,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor7"
},
/area/derelict)
@@ -362,7 +349,7 @@
"bk" = (
/obj/structure/table/steel,
/obj/random/junk,
/turf/simulated/shuttle/floor{
/turf/simulated/floor/shuttle{
icon_state = "floor7"
},
/area/derelict)
@@ -385,6 +372,18 @@
/obj/item/toy/plushie/squid,
/turf/simulated/floor/diona,
/area/derelict)
"so" = (
/turf/simulated/wall/shuttle/dark/cardinal,
/area/derelict)
"vl" = (
/turf/simulated/wall/shuttle/dark/corner/underlay{
icon_state = "wall3";
dir = 5
},
/area/derelict)
"yy" = (
/turf/simulated/wall/shuttle/dark,
/area/derelict)
(1,1,1) = {"
aa
@@ -52934,7 +52933,7 @@ ag
ax
bm
bm
at
so
bm
bm
bm
@@ -53187,11 +53186,11 @@ bm
bm
bm
bm
at
so
ax
ax
bm
at
so
bm
ab
bm
@@ -53444,11 +53443,11 @@ bm
bm
ag
bm
at
so
aK
ax
bm
at
so
bm
ab
bm
@@ -53701,11 +53700,11 @@ ab
ab
ab
ab
at
so
aL
ax
aV
at
so
ab
ab
ab
@@ -53958,11 +53957,11 @@ aa
aa
aa
ab
at
so
ax
aw
ax
at
so
ab
aa
aa
@@ -54214,12 +54213,12 @@ aa
aa
aa
aa
av
at
so
ax
ax
ax
at
so
be
aa
aa
@@ -54469,16 +54468,16 @@ aa
aa
aa
aa
av
at
at
at
so
so
so
aL
ax
aW
at
at
at
so
so
so
be
aa
ab
@@ -54726,18 +54725,18 @@ aa
aa
aa
at
at
at
so
so
aE
at
at
so
so
aG
at
at
so
so
ax
at
at
at
so
so
be
ab
aa
aa
@@ -54982,19 +54981,19 @@ aa
aa
aa
aa
at
so
aw
aA
ax
at
so
aM
ax
aX
at
so
ax
bg
bk
at
so
aa
aa
aa
@@ -55239,7 +55238,7 @@ aa
aa
aa
aa
at
so
ax
aB
ax
@@ -55251,7 +55250,7 @@ aG
ax
bh
aC
at
so
aa
aa
aa
@@ -55496,19 +55495,19 @@ aa
aa
aa
aa
at
so
ax
ax
aC
at
yy
ax
ax
ax
at
so
ax
ax
ax
at
so
aa
aa
aa
@@ -55753,19 +55752,19 @@ aa
aa
aa
aa
at
so
ax
aC
aF
at
yy
aN
ax
aY
at
so
bf
ax
aK
at
so
aa
aa
aa
@@ -56010,19 +56009,19 @@ aa
aa
aa
aa
at
at
at
at
at
at
vl
so
so
so
so
so
aG
at
at
at
at
at
at
so
so
so
so
so
bd
aa
aa
aa
@@ -56269,14 +56268,14 @@ aa
aa
aa
aa
aD
at
vl
so
aH
aO
ax
aZ
aH
at
so
bd
aa
aa
@@ -56527,13 +56526,13 @@ aa
aa
aa
aa
at
so
aI
aP
aw
ax
aF
at
so
aa
aa
aa
@@ -56784,13 +56783,13 @@ aa
aa
aa
aa
at
at
so
so
aQ
aR
ba
at
at
so
so
aa
aa
aa
@@ -57041,12 +57040,12 @@ aa
aa
aa
aa
aD
at
at
vl
so
so
aH
at
at
so
so
bd
aa
aa
@@ -57299,10 +57298,10 @@ aa
aa
aa
aa
aD
at
vl
so
aS
at
so
bd
aa
aa
+22 -8
View File
@@ -111,7 +111,7 @@
/turf/template_noop,
/area/template_noop)
"aA" = (
/turf/simulated/wall/voxshuttle,
/turf/simulated/wall/shuttle/raider,
/area/derelict/ship)
"aB" = (
/obj/structure/boulder,
@@ -150,15 +150,21 @@
},
/area/derelict/ship)
"aH" = (
/turf/simulated/shuttle/floor4/vox,
/turf/simulated/floor/shuttle{
icon_state = "floor6"
},
/area/derelict/ship)
"aI" = (
/obj/item/clothing/shoes/magboots/vox,
/turf/simulated/shuttle/floor4/vox,
/turf/simulated/floor/shuttle{
icon_state = "floor6"
},
/area/derelict/ship)
"aJ" = (
/obj/item/weapon/material/shard,
/turf/simulated/shuttle/floor4/vox,
/turf/simulated/floor/shuttle{
icon_state = "floor6"
},
/area/derelict/ship)
"aK" = (
/obj/item/weapon/material/shard{
@@ -175,13 +181,17 @@
/area/derelict/ship)
"aN" = (
/obj/item/organ/stack/vox,
/turf/simulated/shuttle/floor4/vox,
/turf/simulated/floor/shuttle{
icon_state = "floor6"
},
/area/derelict/ship)
"aO" = (
/obj/item/weapon/material/shard{
icon_state = "medium"
},
/turf/simulated/shuttle/floor4/vox,
/turf/simulated/floor/shuttle{
icon_state = "floor6"
},
/area/derelict/ship)
"aP" = (
/obj/structure/alien/weeds,
@@ -200,11 +210,15 @@
/area/derelict/ship)
"aV" = (
/obj/item/clothing/mask/gas/swat/vox,
/turf/simulated/shuttle/floor4/vox,
/turf/simulated/floor/shuttle{
icon_state = "floor6"
},
/area/derelict/ship)
"aW" = (
/obj/item/weapon/gun/launcher/spikethrower,
/turf/simulated/shuttle/floor4/vox,
/turf/simulated/floor/shuttle{
icon_state = "floor6"
},
/area/derelict/ship)
"aX" = (
/obj/structure/alien/weeds,
+54 -162
View File
@@ -29,16 +29,12 @@
"ah" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/steel,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"ai" = (
/obj/structure/computerframe,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"aj" = (
/obj/structure/grille,
@@ -53,9 +49,7 @@
/area/derelict/ship)
"ak" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"al" = (
/obj/effect/decal/cleanable/dirt,
@@ -63,9 +57,7 @@
icon_state = "bridge";
dir = 1
},
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"am" = (
/obj/structure/window/reinforced,
@@ -84,9 +76,7 @@
/obj/structure/table/steel,
/obj/machinery/light/small/built,
/obj/item/weapon/gun/projectile/pistol/adhomai,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"ao" = (
/obj/structure/window/reinforced,
@@ -130,44 +120,32 @@
anchored = 1;
deployed = 1
},
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"av" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate/bin,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"aw" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/firealarm/north,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"ax" = (
/obj/machinery/door/firedoor,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"ay" = (
/obj/effect/decal/cleanable/dirt,
/obj/random/junk,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"aA" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"aB" = (
/obj/structure/flora/ausbushes/fullgrass,
@@ -388,9 +366,7 @@
"ba" = (
/obj/structure/flora/pottedplant/random,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"bb" = (
/obj/effect/floor_decal/spline/fancy/wood{
@@ -450,9 +426,7 @@
/obj/machinery/door/firedoor,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock/hatch,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"bn" = (
/obj/machinery/door/airlock/vault/bolted,
@@ -460,9 +434,7 @@
anchored = 1;
deployed = 1
},
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"bp" = (
/obj/effect/floor_decal/spline/fancy/wood{
@@ -494,9 +466,7 @@
/turf/simulated/floor/wood,
/area/derelict/ship)
"bs" = (
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"bt" = (
/obj/effect/floor_decal/corner/black/diagonal,
@@ -556,9 +526,7 @@
"bA" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/recharge_station,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"bB" = (
/obj/effect/decal/cleanable/dirt,
@@ -643,16 +611,12 @@
/area/derelict/ship)
"bN" = (
/obj/machinery/door/airlock/vault/bolted,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"bO" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/firealarm/east,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"bP" = (
/obj/effect/decal/cleanable/dirt,
@@ -1040,9 +1004,7 @@
/obj/machinery/light/small/built{
dir = 1
},
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"db" = (
/obj/machinery/vending/cigarette,
@@ -1050,23 +1012,17 @@
/obj/machinery/light/small/built{
dir = 1
},
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"dc" = (
/obj/machinery/vending/cola,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"dd" = (
/obj/structure/closet/emcloset,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"de" = (
/obj/effect/decal/cleanable/dirt,
@@ -1087,16 +1043,12 @@
id_tag = "RobMechBay";
req_access = list(29)
},
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"dh" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/weapon/material/shard/shrapnel,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"dl" = (
/obj/effect/decal/cleanable/dirt,
@@ -1104,17 +1056,13 @@
/obj/machinery/light/small/built{
dir = 4
},
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"dm" = (
/obj/structure/flora/pottedplant/random,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/firealarm/east,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"dn" = (
/obj/machinery/door/firedoor,
@@ -1125,9 +1073,7 @@
/obj/structure/closet/emcloset,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/firealarm/east,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"dp" = (
/obj/machinery/door/firedoor,
@@ -1141,18 +1087,14 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"ds" = (
/obj/structure/bed/chair{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"dt" = (
/obj/structure/table/standard,
@@ -1322,9 +1264,7 @@
"ef" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/generic,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"eg" = (
/obj/effect/decal/cleanable/dirt,
@@ -1357,9 +1297,7 @@
},
/obj/machinery/door/firedoor,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"ep" = (
/obj/effect/decal/cleanable/dirt,
@@ -1393,9 +1331,7 @@
"ev" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/flasher/portable,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"ew" = (
/obj/structure/window/reinforced{
@@ -1495,9 +1431,7 @@
"eL" = (
/obj/machinery/door/airlock/maintenance_hatch,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"eM" = (
/obj/structure/bed/roller,
@@ -1642,41 +1576,31 @@
"fk" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/standard,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"fl" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock/external,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"fm" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/bed/chair{
dir = 8
},
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"fn" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/bed/chair{
dir = 4
},
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"fq" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/flora/pottedplant/random,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"hJ" = (
/obj/effect/decal/cleanable/dirt,
@@ -1690,16 +1614,12 @@
/obj/machinery/light/small/built{
dir = 1
},
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"kr" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/hostile/republicon,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"ln" = (
/obj/effect/decal/cleanable/dirt,
@@ -1712,9 +1632,7 @@
/obj/machinery/light/small/built{
dir = 8
},
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"oH" = (
/obj/item/weapon/landmine{
@@ -1728,26 +1646,20 @@
/obj/machinery/light/small/built{
dir = 8
},
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"uP" = (
/obj/machinery/light/small/built{
dir = 1
},
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"vW" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/built{
dir = 4
},
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"wE" = (
/obj/effect/decal/cleanable/dirt,
@@ -1780,9 +1692,7 @@
/obj/machinery/light/small/built{
dir = 4
},
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"Bg" = (
/obj/structure/flora/pottedplant/random,
@@ -1790,9 +1700,7 @@
/obj/machinery/light/small/built{
dir = 4
},
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"Cc" = (
/obj/machinery/porta_turret/ballistic,
@@ -1807,9 +1715,7 @@
/area/derelict/ship)
"CH" = (
/mob/living/simple_animal/hostile/republicon/ranged,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"DX" = (
/obj/effect/decal/cleanable/dirt,
@@ -1821,9 +1727,7 @@
/obj/structure/table/steel,
/obj/item/weapon/storage/field_ration,
/obj/machinery/light/small/built,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"HX" = (
/obj/effect/decal/cleanable/dirt,
@@ -1879,9 +1783,7 @@
/obj/machinery/light/small/built{
dir = 8
},
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"LO" = (
/obj/effect/decal/cleanable/dirt,
@@ -1890,9 +1792,7 @@
/area/derelict/ship)
"Mu" = (
/mob/living/simple_animal/hostile/republicon,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"OC" = (
/obj/effect/floor_decal/corner/orange/diagonal,
@@ -1922,9 +1822,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/steel,
/obj/item/weapon/reagent_containers/food/snacks/tajaran_bread,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"Qk" = (
/obj/effect/decal/cleanable/dirt,
@@ -1939,9 +1837,7 @@
anchored = 1;
deployed = 1
},
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"RJ" = (
/obj/effect/decal/cleanable/dirt,
@@ -1969,16 +1865,12 @@
/obj/machinery/light/small/built{
dir = 4
},
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"Zh" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/hostile/republicon/ranged,
/turf/simulated/shuttle/floor{
icon_state = "floor7"
},
/turf/simulated/floor/shuttle/black,
/area/derelict/ship)
"ZU" = (
/obj/structure/window/reinforced,
File diff suppressed because it is too large Load Diff
+15 -29
View File
@@ -119,7 +119,7 @@
/turf/simulated/floor/tiled/dark,
/area/derelict/ship)
"aq" = (
/turf/simulated/shuttle/wall/dark,
/turf/simulated/wall/shuttle/dark/cardinal,
/area/derelict/ship)
"ar" = (
/obj/machinery/light{
@@ -155,7 +155,7 @@
/area/derelict/ship)
"aw" = (
/obj/structure/sign/flag/sol,
/turf/simulated/shuttle/wall/dark,
/turf/simulated/wall/shuttle/dark/cardinal,
/area/derelict/ship)
"ax" = (
/obj/machinery/light{
@@ -183,7 +183,7 @@
/area/derelict/ship)
"aA" = (
/obj/machinery/computer/cryopod,
/turf/simulated/shuttle/wall/dark,
/turf/simulated/wall/shuttle/dark/cardinal,
/area/derelict/ship)
"aB" = (
/obj/structure/closet/sol/marine,
@@ -668,7 +668,7 @@
/area/derelict/ship)
"cn" = (
/obj/machinery/firealarm,
/turf/simulated/shuttle/wall/dark,
/turf/simulated/wall/shuttle/dark/cardinal,
/area/derelict/ship)
"co" = (
/obj/machinery/door/firedoor,
@@ -922,30 +922,28 @@
/turf/template_noop,
/area/derelict/ship)
"th" = (
/turf/space,
/turf/simulated/shuttle/wall/dark{
dir = 5;
icon_state = "diagonalWall3"
/turf/simulated/wall/shuttle/dark/corner/underlay{
icon_state = "wall3";
dir = 10
},
/area/derelict/ship)
"wQ" = (
/turf/space,
/turf/simulated/shuttle/wall/dark{
dir = 4;
icon_state = "diagonalWall3"
/turf/simulated/wall/shuttle/dark/corner/underlay{
icon_state = "wall3";
dir = 6
},
/area/derelict/ship)
"zm" = (
/obj/structure/shuttle/engine/propulsion{
icon_state = "propulsion_r"
},
/turf/simulated/shuttle/wall/dark,
/turf/simulated/wall/shuttle/dark/cardinal,
/area/derelict/ship)
"BR" = (
/obj/structure/shuttle/engine/propulsion{
icon_state = "propulsion_l"
},
/turf/simulated/shuttle/wall/dark,
/turf/simulated/wall/shuttle/dark/cardinal,
/area/derelict/ship)
"Ii" = (
/obj/structure/shuttle/engine/heater,
@@ -955,18 +953,6 @@
/obj/structure/shuttle/engine/propulsion,
/turf/template_noop,
/area/derelict/ship)
"Yo" = (
/turf/simulated/shuttle/wall/dark{
dir = 4;
icon_state = "diagonalWall3"
},
/area/derelict/ship)
"Zj" = (
/turf/simulated/shuttle/wall/dark{
dir = 5;
icon_state = "diagonalWall3"
},
/area/derelict/ship)
"ZG" = (
/obj/structure/shuttle/engine/propulsion{
icon_state = "propulsion_r"
@@ -975,7 +961,7 @@
/area/derelict/ship)
"ZJ" = (
/obj/structure/shuttle/engine/propulsion,
/turf/simulated/shuttle/wall/dark,
/turf/simulated/wall/shuttle/dark/cardinal,
/area/derelict/ship)
(1,1,1) = {"
@@ -27598,7 +27584,7 @@ aq
aq
aq
aq
Zj
th
ab
ab
ab
@@ -29654,7 +29640,7 @@ aq
aq
aq
aq
Yo
wQ
ab
ab
ab
File diff suppressed because it is too large Load Diff