mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-30 00:21:11 +01:00
3/4 Rapid-Fire Map Fixes Pt. 3 (#17213)
* rapid fire map fixes * changelog + shuttle changes
This commit is contained in:
naut
@@ -0,0 +1,41 @@
|
||||
################################
|
||||
# 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: nauticall
|
||||
|
||||
# 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:
|
||||
- maptweak: "Fixed several mapping issues including overlapping objects, wrong directional sprites, etc, on all decks, particularly with the Bridge and several nooks and crannies in the bar, hydro, and stairwells."
|
||||
@@ -2196,6 +2196,9 @@
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/effect/floor_decal/corner/dark_green/full,
|
||||
/obj/structure/railing/mapped{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/hallway/primary/aft)
|
||||
"bDQ" = (
|
||||
@@ -2360,6 +2363,7 @@
|
||||
/obj/item/modular_computer/console/preset/engineering{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/engineering/gravity_gen)
|
||||
"bHx" = (
|
||||
@@ -3742,6 +3746,10 @@
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/sign/crush{
|
||||
pixel_x = 16;
|
||||
pixel_y = 32
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/eva)
|
||||
"cIp" = (
|
||||
@@ -3897,6 +3905,9 @@
|
||||
/obj/machinery/computer/guestpass{
|
||||
pixel_y = -32
|
||||
},
|
||||
/obj/structure/railing/mapped{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/hallway/primary/aft)
|
||||
"cMu" = (
|
||||
@@ -4561,7 +4572,8 @@
|
||||
},
|
||||
/obj/machinery/light_switch{
|
||||
pixel_x = -12;
|
||||
pixel_y = 24
|
||||
pixel_y = 24;
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/carpet/rubber,
|
||||
/area/shuttle/intrepid/crew_compartment)
|
||||
@@ -4782,6 +4794,7 @@
|
||||
"drX" = (
|
||||
/obj/structure/cable/green,
|
||||
/obj/machinery/power/apc/critical/south,
|
||||
/obj/effect/floor_decal/industrial/warning,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/engineering/gravity_gen)
|
||||
"drY" = (
|
||||
@@ -5239,10 +5252,6 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 5
|
||||
},
|
||||
/obj/machinery/light_switch{
|
||||
pixel_x = 23;
|
||||
pixel_y = 24
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "1-4"
|
||||
},
|
||||
@@ -5514,6 +5523,9 @@
|
||||
/obj/machinery/meter,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/engineering/atmos)
|
||||
"dVM" = (
|
||||
/turf/simulated/wall,
|
||||
/area/hangar/intrepid/interstitial)
|
||||
"dWt" = (
|
||||
/obj/effect/floor_decal/industrial/hatch/yellow,
|
||||
/obj/machinery/door/firedoor,
|
||||
@@ -6122,6 +6134,12 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/rnd/xenoarch_atrium)
|
||||
"esK" = (
|
||||
/obj/structure/grille,
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/structure/window/shuttle/scc_space_ship,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/wing/starboard/deck1)
|
||||
"esS" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 10
|
||||
@@ -8525,14 +8543,14 @@
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning,
|
||||
/obj/machinery/door/airlock/multi_tile/glass{
|
||||
name = "Deck 1 Port Stairwell Auxiliary Hangar Elevator"
|
||||
},
|
||||
/obj/machinery/door/blast/shutters/open{
|
||||
dir = 2;
|
||||
id = "shutters_deck2_portstairwellsec";
|
||||
name = "Security Shutter"
|
||||
},
|
||||
/obj/machinery/door/airlock/multi_tile/glass{
|
||||
name = "Deck 1 Port Stairwell Auxiliary Hangar Elevator"
|
||||
},
|
||||
/turf/simulated/floor/tiled/full,
|
||||
/area/rnd/eva)
|
||||
"fUG" = (
|
||||
@@ -8819,6 +8837,15 @@
|
||||
/obj/structure/railing/mapped,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/horizon/custodial)
|
||||
"gdp" = (
|
||||
/obj/structure/window/shuttle/scc_space_ship,
|
||||
/obj/structure/grille,
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/structure/stairs_lower/stairs_upper{
|
||||
layer = 3
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/wing/starboard/deck1)
|
||||
"gds" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
|
||||
dir = 4
|
||||
@@ -9811,6 +9838,7 @@
|
||||
dir = 4;
|
||||
pixel_x = -32
|
||||
},
|
||||
/obj/structure/railing/mapped,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/hallway/primary/aft)
|
||||
"gPf" = (
|
||||
@@ -10906,6 +10934,16 @@
|
||||
"hAY" = (
|
||||
/obj/structure/table/standard,
|
||||
/obj/item/book/manual/gravitygenerator,
|
||||
/obj/effect/floor_decal/industrial/warning,
|
||||
/obj/machinery/button/remote/blast_door{
|
||||
desc = "A remote control-switch for the engine control room blast doors.";
|
||||
dir = 4;
|
||||
id = "gravgen";
|
||||
name = "Gravity Generator Blast Doors";
|
||||
pixel_x = 24;
|
||||
req_one_access = list(11,24);
|
||||
pixel_y = 11
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/engineering/gravity_gen)
|
||||
"hAZ" = (
|
||||
@@ -12110,20 +12148,20 @@
|
||||
frequency = 1385;
|
||||
master_tag = "intrepid_shuttle_cargo";
|
||||
name = "interior access button";
|
||||
pixel_x = -10;
|
||||
pixel_x = -5;
|
||||
pixel_y = 20
|
||||
},
|
||||
/obj/machinery/airlock_sensor/airlock_interior{
|
||||
frequency = 1385;
|
||||
id_tag = "intrepid_shuttle_cargo_interior_sensor";
|
||||
pixel_x = -10;
|
||||
pixel_x = -5;
|
||||
pixel_y = 25
|
||||
},
|
||||
/obj/machinery/button/remote/blast_door{
|
||||
dir = 1;
|
||||
id = "intrepid_bay_outer";
|
||||
name = "inner cargo hold blast doors";
|
||||
pixel_x = 10;
|
||||
pixel_x = 7;
|
||||
pixel_y = 25
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark/full,
|
||||
@@ -12999,6 +13037,7 @@
|
||||
/obj/machinery/light{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/railing/mapped,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/hallway/primary/aft)
|
||||
"jkq" = (
|
||||
@@ -14935,7 +14974,7 @@
|
||||
/obj/effect/floor_decal/corner/lime/diagonal,
|
||||
/obj/machinery/sleeper,
|
||||
/obj/machinery/vending/wallmed1{
|
||||
pixel_x = -8;
|
||||
pixel_x = -4;
|
||||
pixel_y = 26;
|
||||
req_access = null
|
||||
},
|
||||
@@ -17175,7 +17214,7 @@
|
||||
/obj/structure/bed/handrail{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/power/apc/canary/west,
|
||||
/obj/machinery/power/apc/canary/east,
|
||||
/turf/simulated/floor/tiled/dark/full,
|
||||
/area/shuttle/canary)
|
||||
"mhb" = (
|
||||
@@ -17456,12 +17495,11 @@
|
||||
/obj/machinery/light/small{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/power/apc/intrepid/north,
|
||||
/obj/machinery/vending/wallmed1{
|
||||
pixel_x = -11;
|
||||
pixel_y = 26;
|
||||
pixel_x = -23;
|
||||
req_access = null
|
||||
},
|
||||
/obj/machinery/power/apc/intrepid/north,
|
||||
/turf/simulated/floor/tiled/dark/full,
|
||||
/area/shuttle/intrepid/atmos_compartment)
|
||||
"moI" = (
|
||||
@@ -18585,6 +18623,10 @@
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/light_switch{
|
||||
pixel_x = 20;
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/shuttle/intrepid/quarters)
|
||||
"ndI" = (
|
||||
@@ -18695,15 +18737,12 @@
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/hangar/starboard)
|
||||
"nhf" = (
|
||||
/obj/structure/railing/mapped{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 1
|
||||
},
|
||||
/obj/random/loot,
|
||||
/obj/structure/table/standard{
|
||||
no_cargo = 1
|
||||
/obj/structure/stairs_lower{
|
||||
dir = 1;
|
||||
pixel_y = 9
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/wing/starboard/deck1)
|
||||
@@ -19482,6 +19521,12 @@
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/research_port)
|
||||
"nLc" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/wing/starboard/deck1)
|
||||
"nLh" = (
|
||||
/obj/machinery/light/small{
|
||||
dir = 8
|
||||
@@ -20955,12 +21000,6 @@
|
||||
"oQa" = (
|
||||
/obj/random/pottedplant,
|
||||
/obj/effect/floor_decal/spline/fancy/wood/full,
|
||||
/obj/structure/railing/mapped{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/railing/mapped{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/alarm/east,
|
||||
/turf/simulated/floor/grass,
|
||||
/area/hallway/primary/aft)
|
||||
@@ -21198,6 +21237,7 @@
|
||||
"pav" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/effect/floor_decal/industrial/warning,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/engineering/gravity_gen)
|
||||
"paB" = (
|
||||
@@ -21261,7 +21301,7 @@
|
||||
/area/engineering/atmos/air)
|
||||
"pcQ" = (
|
||||
/obj/item/device/gps/stationary/sccv_intrepid{
|
||||
pixel_x = 7;
|
||||
pixel_x = 3;
|
||||
pixel_y = 24
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning/corner{
|
||||
@@ -22118,6 +22158,7 @@
|
||||
/area/rnd/isolation_a)
|
||||
"pGC" = (
|
||||
/obj/structure/stairs/west,
|
||||
/obj/structure/railing/mapped,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/wing/starboard/deck1)
|
||||
"pGP" = (
|
||||
@@ -22457,6 +22498,7 @@
|
||||
/area/engineering/atmos/propulsion)
|
||||
"pSx" = (
|
||||
/obj/structure/table/standard,
|
||||
/obj/effect/floor_decal/industrial/warning,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/engineering/gravity_gen)
|
||||
"pSH" = (
|
||||
@@ -22547,9 +22589,13 @@
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/teleporter)
|
||||
"pTT" = (
|
||||
/turf/unsimulated/wall/fakepdoor{
|
||||
dir = 4
|
||||
/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor,
|
||||
/obj/machinery/door/blast/regular{
|
||||
dir = 4;
|
||||
name = "Gravity Generator Blast Doors";
|
||||
id = "gravgen"
|
||||
},
|
||||
/turf/simulated/floor/reinforced,
|
||||
/area/engineering/gravity_gen)
|
||||
"pUa" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
@@ -23072,12 +23118,6 @@
|
||||
/area/engineering/atmos/propulsion)
|
||||
"qnt" = (
|
||||
/obj/effect/floor_decal/spline/fancy/wood/full,
|
||||
/obj/structure/railing/mapped{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/railing/mapped{
|
||||
dir = 1
|
||||
},
|
||||
/obj/random/pottedplant,
|
||||
/turf/simulated/floor/grass,
|
||||
/area/hallway/primary/aft)
|
||||
@@ -23639,6 +23679,13 @@
|
||||
/obj/random/loot,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/wing/starboard/deck1)
|
||||
"qIx" = (
|
||||
/obj/structure/table/standard{
|
||||
no_cargo = 1
|
||||
},
|
||||
/obj/random/loot,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/wing/starboard/deck1)
|
||||
"qIR" = (
|
||||
/obj/machinery/door/window/northleft{
|
||||
name = "Animal Pen";
|
||||
@@ -24519,6 +24566,10 @@
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/wing/starboard/deck1)
|
||||
"roG" = (
|
||||
/obj/structure/railing/mapped,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/wing/starboard/deck1)
|
||||
"roX" = (
|
||||
/obj/effect/floor_decal/corner/yellow{
|
||||
dir = 5
|
||||
@@ -25393,7 +25444,9 @@
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/firealarm/north,
|
||||
/obj/machinery/firealarm/north{
|
||||
pixel_x = -20
|
||||
},
|
||||
/obj/effect/floor_decal/corner/lime/diagonal,
|
||||
/obj/item/reagent_containers/blood/OMinus,
|
||||
/obj/item/reagent_containers/blood/OMinus,
|
||||
@@ -25401,6 +25454,10 @@
|
||||
/obj/machinery/light/small{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/closet/walllocker/medical{
|
||||
pixel_y = 32;
|
||||
name = "Blood Locker"
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/shuttle/intrepid/crew_compartment)
|
||||
"rUd" = (
|
||||
@@ -27169,11 +27226,14 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/hangar/operations)
|
||||
"tiM" = (
|
||||
/obj/structure/sign/crush{
|
||||
pixel_x = 16;
|
||||
pixel_y = 32
|
||||
/obj/effect/floor_decal/industrial/hatch/yellow,
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/wall,
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled/full,
|
||||
/area/rnd/eva)
|
||||
"tiV" = (
|
||||
/obj/effect/floor_decal/industrial/outline/yellow,
|
||||
@@ -28476,7 +28536,9 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
|
||||
dir = 10
|
||||
},
|
||||
/obj/machinery/alarm/west,
|
||||
/obj/machinery/alarm/west{
|
||||
pixel_y = 14
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/shuttle/mining)
|
||||
"ucG" = (
|
||||
@@ -33394,7 +33456,8 @@
|
||||
id = "intrepid_inner";
|
||||
name = "inner cargo hold blast doors";
|
||||
pixel_x = -24;
|
||||
pixel_y = 26
|
||||
pixel_y = 26;
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/carpet/rubber,
|
||||
/area/shuttle/intrepid/crew_compartment)
|
||||
@@ -33557,7 +33620,6 @@
|
||||
/turf/simulated/floor/reinforced,
|
||||
/area/shuttle/mining)
|
||||
"xwA" = (
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/effect/floor_decal/industrial/hatch/yellow,
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 4
|
||||
@@ -33565,10 +33627,12 @@
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/door/airlock/glass_command{
|
||||
name = "Expedition EVA Storage";
|
||||
req_one_access = list(18,29,47);
|
||||
dir = 4
|
||||
/obj/machinery/door/firedoor/multi_tile{
|
||||
dir = 2
|
||||
},
|
||||
/obj/machinery/door/airlock/multi_tile/glass{
|
||||
name = "Deck 1 Port Stairwell Auxiliary Hangar Elevator";
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled/full,
|
||||
/area/rnd/eva)
|
||||
@@ -42541,10 +42605,10 @@ eSV
|
||||
eSV
|
||||
eSV
|
||||
eSV
|
||||
noz
|
||||
gdp
|
||||
pGC
|
||||
nhf
|
||||
sTw
|
||||
qIx
|
||||
hTk
|
||||
dEC
|
||||
hoV
|
||||
@@ -42744,9 +42808,9 @@ eSV
|
||||
eSV
|
||||
eSV
|
||||
eSV
|
||||
noz
|
||||
sTw
|
||||
hdK
|
||||
esK
|
||||
roG
|
||||
nLc
|
||||
gtE
|
||||
noz
|
||||
dEC
|
||||
@@ -55340,7 +55404,7 @@ vul
|
||||
vDj
|
||||
cNp
|
||||
wqd
|
||||
pYa
|
||||
dVM
|
||||
jcZ
|
||||
bzv
|
||||
txa
|
||||
|
||||
@@ -2046,9 +2046,6 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/horizon/security/warden)
|
||||
"aTO" = (
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/outline/yellow,
|
||||
/obj/machinery/seed_extractor,
|
||||
/obj/machinery/media/jukebox/audioconsole/wall{
|
||||
@@ -2380,6 +2377,13 @@
|
||||
/obj/effect/floor_decal/industrial/hatch/grey,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/horizon/security/brig)
|
||||
"baP" = (
|
||||
/obj/effect/floor_decal/corner/dark_green{
|
||||
dir = 6
|
||||
},
|
||||
/obj/machinery/alarm/east,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/hallway/primary/central_two)
|
||||
"bbI" = (
|
||||
/obj/effect/floor_decal/corner/dark_green{
|
||||
dir = 5
|
||||
@@ -7813,10 +7817,8 @@
|
||||
},
|
||||
/obj/machinery/orderterminal{
|
||||
dir = 1;
|
||||
pixel_y = 32
|
||||
},
|
||||
/obj/machinery/camera/network/service{
|
||||
c_tag = "Dinner - Kitchen Service"
|
||||
pixel_y = 32;
|
||||
pixel_x = -11
|
||||
},
|
||||
/turf/simulated/floor/lino,
|
||||
/area/horizon/crew_quarters/lounge/bar)
|
||||
@@ -10696,6 +10698,15 @@
|
||||
},
|
||||
/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
|
||||
/area/engineering/storage_hard)
|
||||
"fnY" = (
|
||||
/obj/effect/floor_decal/spline/plain{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/light/floor{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/horizon/hydroponics)
|
||||
"fol" = (
|
||||
/turf/simulated/wall,
|
||||
/area/chapel/office)
|
||||
@@ -17800,9 +17811,6 @@
|
||||
/obj/effect/floor_decal/corner/yellow{
|
||||
dir = 9
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/button/remote/blast_door{
|
||||
desc = "A remote control-switch for the engine control room blast doors.";
|
||||
dir = 8;
|
||||
@@ -20736,7 +20744,12 @@
|
||||
},
|
||||
/obj/machinery/vending/dinnerware/plastic{
|
||||
density = 0;
|
||||
pixel_y = 24
|
||||
pixel_y = 24;
|
||||
pixel_x = -19
|
||||
},
|
||||
/obj/machinery/camera/network/service{
|
||||
c_tag = "Dinner - Kitchen Service";
|
||||
pixel_x = 5
|
||||
},
|
||||
/turf/simulated/floor/lino,
|
||||
/area/horizon/crew_quarters/lounge/bar)
|
||||
@@ -25183,9 +25196,6 @@
|
||||
"mjl" = (
|
||||
/obj/effect/floor_decal/industrial/outline/yellow,
|
||||
/obj/machinery/alarm/north,
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/closet/crate/hydroponics{
|
||||
name = "beekeeping crate"
|
||||
},
|
||||
@@ -27751,6 +27761,9 @@
|
||||
/obj/effect/floor_decal/spline/plain{
|
||||
dir = 6
|
||||
},
|
||||
/obj/machinery/light/floor{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/horizon/hydroponics)
|
||||
"npF" = (
|
||||
@@ -27779,6 +27792,7 @@
|
||||
/area/horizon/hallway/deck_two/fore)
|
||||
"npL" = (
|
||||
/obj/structure/stairs/east,
|
||||
/obj/structure/railing/mapped,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/engineering/atmos/storage)
|
||||
"nqm" = (
|
||||
@@ -40665,7 +40679,6 @@
|
||||
},
|
||||
/obj/structure/disposalpipe/trunk,
|
||||
/obj/effect/floor_decal/industrial/warning/full,
|
||||
/obj/structure/railing/mapped,
|
||||
/obj/structure/plasticflaps/airtight,
|
||||
/turf/simulated/floor/tiled/dark/full,
|
||||
/area/operations/mail_room)
|
||||
@@ -40799,6 +40812,7 @@
|
||||
/turf/simulated/floor/tiled/full,
|
||||
/area/engineering/storage_hard)
|
||||
"tUR" = (
|
||||
/obj/structure/railing/mapped,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/engineering/atmos/storage)
|
||||
"tVu" = (
|
||||
@@ -41184,7 +41198,6 @@
|
||||
/obj/effect/floor_decal/corner/dark_green{
|
||||
dir = 5
|
||||
},
|
||||
/obj/machinery/alarm/north,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/hallway/primary/central_two)
|
||||
"ueC" = (
|
||||
@@ -42893,7 +42906,7 @@
|
||||
/obj/structure/disposalpipe/junction{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/light{
|
||||
/obj/machinery/light/floor{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/lino,
|
||||
@@ -45132,7 +45145,6 @@
|
||||
},
|
||||
/obj/structure/disposalpipe/trunk,
|
||||
/obj/effect/floor_decal/industrial/warning/full,
|
||||
/obj/structure/railing/mapped,
|
||||
/obj/structure/plasticflaps/airtight,
|
||||
/turf/simulated/floor/tiled/dark/full,
|
||||
/area/operations/mail_room)
|
||||
@@ -47512,7 +47524,7 @@
|
||||
/obj/machinery/atmospherics/portables_connector,
|
||||
/obj/effect/floor_decal/industrial/outline/blue,
|
||||
/obj/structure/stairs_lower{
|
||||
pixel_y = 3
|
||||
pixel_y = 9
|
||||
},
|
||||
/obj/machinery/portable_atmospherics/powered/pump/filled,
|
||||
/turf/simulated/floor/tiled/dark/full,
|
||||
@@ -47547,6 +47559,9 @@
|
||||
dir = 6
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/outline/yellow,
|
||||
/obj/machinery/light{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/engineering/engine_waste)
|
||||
"wYY" = (
|
||||
@@ -70785,7 +70800,7 @@ vqm
|
||||
kta
|
||||
pMN
|
||||
kta
|
||||
kta
|
||||
baP
|
||||
kta
|
||||
kta
|
||||
eZG
|
||||
@@ -72419,7 +72434,7 @@ xoL
|
||||
hPC
|
||||
gRr
|
||||
byh
|
||||
mQR
|
||||
fnY
|
||||
mQR
|
||||
acH
|
||||
bXR
|
||||
|
||||
@@ -648,11 +648,14 @@
|
||||
/area/horizon/longbow)
|
||||
"auq" = (
|
||||
/obj/structure/platform{
|
||||
dir = 4
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/corner/dark_blue{
|
||||
dir = 10
|
||||
},
|
||||
/obj/structure/railing/mapped{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/reinforced,
|
||||
/area/bridge/controlroom)
|
||||
"auK" = (
|
||||
@@ -3052,11 +3055,11 @@
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/horizon/exterior)
|
||||
"cBE" = (
|
||||
/obj/structure/table/reinforced/wood,
|
||||
/obj/effect/floor_decal/spline/plain{
|
||||
dir = 4
|
||||
},
|
||||
/obj/item/reagent_containers/food/drinks/shaker,
|
||||
/obj/structure/table/stone/marble,
|
||||
/turf/simulated/floor/marble/dark,
|
||||
/area/bridge/minibar)
|
||||
"cBU" = (
|
||||
@@ -3133,7 +3136,7 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/platform{
|
||||
dir = 4
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/bridge/controlroom)
|
||||
@@ -3950,11 +3953,14 @@
|
||||
/turf/simulated/floor/tiled/dark/full,
|
||||
/area/crew_quarters/heads/hop/xo)
|
||||
"dpE" = (
|
||||
/obj/structure/table/reinforced/wood,
|
||||
/obj/machinery/chemical_dispenser/bar_alc/full,
|
||||
/obj/machinery/chemical_dispenser/bar_alc/full{
|
||||
pixel_y = 6;
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/spline/plain{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/table/stone/marble,
|
||||
/turf/simulated/floor/marble/dark,
|
||||
/area/bridge/minibar)
|
||||
"dqe" = (
|
||||
@@ -4549,10 +4555,10 @@
|
||||
/turf/simulated/floor/wood,
|
||||
/area/bridge/meeting_room)
|
||||
"dRP" = (
|
||||
/obj/structure/table/reinforced/wood,
|
||||
/obj/effect/floor_decal/spline/plain{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/table/stone/marble,
|
||||
/turf/simulated/floor/marble/dark,
|
||||
/area/bridge/minibar)
|
||||
"dSb" = (
|
||||
@@ -4770,11 +4776,14 @@
|
||||
/turf/simulated/wall/r_wall,
|
||||
/area/lawoffice/consular)
|
||||
"edo" = (
|
||||
/obj/structure/table/reinforced/wood,
|
||||
/obj/machinery/chemical_dispenser/bar_soft/full,
|
||||
/obj/machinery/chemical_dispenser/bar_soft/full{
|
||||
dir = 1;
|
||||
pixel_y = 8
|
||||
},
|
||||
/obj/effect/floor_decal/spline/plain{
|
||||
dir = 6
|
||||
},
|
||||
/obj/structure/table/stone/marble,
|
||||
/turf/simulated/floor/marble/dark,
|
||||
/area/bridge/minibar)
|
||||
"edI" = (
|
||||
@@ -13063,10 +13072,10 @@
|
||||
/turf/simulated/floor/plating,
|
||||
/area/storage/shields)
|
||||
"kkw" = (
|
||||
/obj/structure/table/reinforced/wood,
|
||||
/obj/effect/floor_decal/spline/plain{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/table/stone/marble,
|
||||
/turf/simulated/floor/marble/dark,
|
||||
/area/bridge/minibar)
|
||||
"kkU" = (
|
||||
@@ -14794,17 +14803,16 @@
|
||||
/turf/simulated/floor/tiled/dark/full,
|
||||
/area/storage/shields)
|
||||
"ltH" = (
|
||||
/obj/structure/railing/mapped{
|
||||
dir = 1
|
||||
/obj/structure/platform{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/corner/dark_blue{
|
||||
dir = 10
|
||||
},
|
||||
/obj/structure/railing/mapped{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/spline/plain{
|
||||
dir = 9
|
||||
},
|
||||
/obj/structure/sign/flag/scc,
|
||||
/turf/simulated/floor/tiled,
|
||||
/turf/simulated/floor/reinforced,
|
||||
/area/bridge/controlroom)
|
||||
"ltM" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
@@ -16942,6 +16950,7 @@
|
||||
/obj/structure/platform{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/railing/mapped,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/bridge/controlroom)
|
||||
"nbl" = (
|
||||
@@ -18628,15 +18637,6 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/bridge/controlroom)
|
||||
"omA" = (
|
||||
/obj/structure/railing/mapped{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/railing/mapped{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/spline/plain{
|
||||
dir = 5
|
||||
},
|
||||
/obj/structure/sign/flag/scc,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/bridge/controlroom)
|
||||
@@ -18927,8 +18927,7 @@
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/obj/machinery/light/floor{
|
||||
dir = 1;
|
||||
pixel_y = 7
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/horizon/hallway/deck_three/primary/port)
|
||||
@@ -19854,9 +19853,6 @@
|
||||
/turf/simulated/floor/tiled/dark/full/airless,
|
||||
/area/bridge/controlroom)
|
||||
"plp" = (
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "0-2"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/effect/floor_decal/corner/dark_blue/full,
|
||||
/obj/machinery/camera/network/command{
|
||||
@@ -19866,6 +19862,9 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 6
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/horizon/stairwell/bridge)
|
||||
"pms" = (
|
||||
@@ -20533,6 +20532,9 @@
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/power/apc/low/west,
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "0-2"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/horizon/stairwell/bridge)
|
||||
"qaE" = (
|
||||
@@ -22100,6 +22102,7 @@
|
||||
/obj/structure/platform{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/railing/mapped,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/bridge/controlroom)
|
||||
"rrl" = (
|
||||
@@ -27249,10 +27252,10 @@
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/horizon/holodeck_control)
|
||||
"vfl" = (
|
||||
/obj/structure/table/reinforced/wood,
|
||||
/obj/effect/floor_decal/spline/plain{
|
||||
dir = 5
|
||||
},
|
||||
/obj/structure/table/stone/marble,
|
||||
/turf/simulated/floor/marble/dark,
|
||||
/area/bridge/minibar)
|
||||
"vfv" = (
|
||||
@@ -27794,7 +27797,7 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/platform{
|
||||
dir = 4
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/carpet/rubber,
|
||||
/area/bridge/controlroom)
|
||||
@@ -29595,7 +29598,7 @@
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/platform{
|
||||
dir = 4
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/platform,
|
||||
/obj/structure/platform_deco{
|
||||
@@ -50584,7 +50587,7 @@ dFS
|
||||
pRj
|
||||
hmu
|
||||
ltT
|
||||
auq
|
||||
ltH
|
||||
mrU
|
||||
wGH
|
||||
vkb
|
||||
@@ -52402,7 +52405,7 @@ asO
|
||||
kwe
|
||||
hhA
|
||||
rqU
|
||||
ltH
|
||||
omA
|
||||
mrU
|
||||
vkb
|
||||
slH
|
||||
|
||||
Reference in New Issue
Block a user