cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-28 15:47:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

More Cynosure fixes and tweaks

Browse Source 
Fixes air injector in incinerator room, multiple issues in toxins
Fixes conveyor belts at mining and incinerator
Fixes several tiles being set to outdoors inside xenoarch outpost, mining
Fixes Civilian SMES being mislabelled as Cargo SMES
Adds shut-off valve to engine cooling array
Adds employment laptop to RD's office
Adds railing to stairs missing railings
Adds missing telecomms equipment to centcomm
Fixes a few issues with several basement submaps, added new posters
Fixes airlocks getting doors stuck open
Dimitri Zadornov: banana
This commit is contained in:
PrismaticGynoid
2021-08-21 13:20:39 -07:00
parent 085680fb6f
commit f300b0b7ba
31 changed files with 31659 additions and 31539 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/embedded_controller/airlock_program.dm
+2
View File
@@ -122,6 +122,7 @@
if("cycle_ext")
//If airlock is already cycled in this direction, just toggle the doors.
if(!memory["purge"] && abs(memory["external_sensor_pressure"] - memory["chamber_sensor_pressure"]) <= SKIPCYCLE_MARGIN)
toggleDoor(memory["interior_status"], tag_interior_door, memory["secure"], "close")
toggleDoor(memory["exterior_status"], tag_exterior_door, memory["secure"], "toggle")
//only respond to these commands if the airlock isn't already doing something
//prevents the controller from getting confused and doing strange things
@@ -130,6 +131,7 @@
if("cycle_int")
if(!memory["purge"] && abs(memory["internal_sensor_pressure"] - memory["chamber_sensor_pressure"]) <= SKIPCYCLE_MARGIN)
toggleDoor(memory["exterior_status"], tag_exterior_door, memory["secure"], "close")
toggleDoor(memory["interior_status"], tag_interior_door, memory["secure"], "toggle")
else if(state == target_state)
begin_cycle_in()
maps/cynosure/cynosure-1.dmm
+28469 -28498
View File
File diff suppressed because it is too large Load Diff
maps/cynosure/cynosure-2.dmm
+347 -268
View File
File diff suppressed because it is too large Load Diff
maps/cynosure/cynosure-3.dmm
+77 -33
View File
@@ -3314,7 +3314,7 @@
/obj/structure/shuttle/engine/propulsion/burst{
dir = 4
},
/turf/simulated/floor/plating/sif/planetuse,
/turf/simulated/floor/plating,
/area/shuttle/large_escape_pod2/station)
"cht" = (
/obj/structure/cable/green{
@@ -4839,6 +4839,15 @@
},
/turf/simulated/floor/plating,
/area/surface/station/rnd/lab)
"djH" = (
/obj/structure/railing{
dir = 1
},
/obj/structure/railing{
dir = 4
},
/turf/simulated/open,
/area/surface/station/ai/upload_foyer)
"djP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/floor_decal/borderfloor{
@@ -7368,6 +7377,7 @@
/obj/structure/railing{
dir = 1
},
/obj/structure/railing,
/turf/simulated/open,
/area/surface/station/hallway/secondary/secondfloor/weststairwell)
"eUC" = (
@@ -9899,9 +9909,6 @@
id_tag = "roof_airlock_pump"
},
/obj/effect/map_helper/airlock/atmos/chamber_pump,
/obj/structure/sign/warning/cold{
pixel_y = -32
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/surface/station/hallway/primary/secondfloor/east)
"gAD" = (
@@ -13373,7 +13380,7 @@
/obj/structure/shuttle/engine/propulsion/burst/right{
dir = 4
},
/turf/simulated/floor/plating/sif/planetuse,
/turf/simulated/floor/plating,
/area/shuttle/large_escape_pod2/station)
"iFF" = (
/obj/machinery/alarm{
@@ -15659,7 +15666,7 @@
pixel_y = 7
},
/obj/effect/landmark/start{
name = "Colony Director"
name = "Site Manager"
},
/obj/machinery/button/remote/blast_door{
dir = 8;
@@ -17521,6 +17528,12 @@
},
/turf/simulated/floor/tiled,
/area/surface/station/hallway/primary/secondfloor/west)
"lki" = (
/obj/structure/railing{
dir = 4
},
/turf/simulated/open,
/area/surface/station/park/skybridge)
"lkp" = (
/obj/structure/sign/warning/nosmoking_2,
/turf/simulated/wall,
@@ -19611,27 +19624,9 @@
/area/surface/station/command/teleporter)
"mKt" = (
/obj/structure/table/reinforced,
/obj/machinery/button/remote/blast_door{
dir = 1;
id = "biohazard";
layer = 2.9;
name = "Biohazard Shutter Control";
pixel_x = 6;
pixel_y = 4;
req_one_access = list(47)
/obj/machinery/computer/skills{
dir = 1
},
/obj/machinery/button/remote/airlock{
dir = 1;
id = "researchdoor";
layer = 2.9;
name = "Office Door";
pixel_x = -4;
pixel_y = 4
},
/obj/item/weapon/folder/white_rd,
/obj/item/weapon/paper/monitorkey,
/obj/item/weapon/stamp/rd,
/obj/item/weapon/pen/multi,
/turf/simulated/floor/tiled/white,
/area/surface/station/crew_quarters/heads/rdoffice)
"mKY" = (
@@ -21418,6 +21413,15 @@
},
/turf/simulated/floor/tiled/old_tile/gray,
/area/surface/station/security/tactical)
"nZe" = (
/obj/structure/railing{
dir = 4
},
/obj/structure/railing{
dir = 1
},
/turf/simulated/open,
/area/surface/station/engineering/hallway/reactor)
"oao" = (
/obj/machinery/door/firedoor/border_only,
/obj/machinery/door/airlock/multi_tile/glass{
@@ -22886,6 +22890,27 @@
/area/surface/station/medical/lockerroom)
"pcD" = (
/obj/structure/table/reinforced,
/obj/machinery/button/remote/blast_door{
dir = 1;
id = "biohazard";
layer = 2.9;
name = "Biohazard Shutter Control";
pixel_x = 6;
pixel_y = 4;
req_one_access = list(47)
},
/obj/machinery/button/remote/airlock{
dir = 1;
id = "researchdoor";
layer = 2.9;
name = "Office Door";
pixel_x = -4;
pixel_y = 4
},
/obj/item/weapon/folder/white_rd,
/obj/item/weapon/paper/monitorkey,
/obj/item/weapon/stamp/rd,
/obj/item/weapon/pen/multi,
/obj/item/clothing/glasses/welding/superior,
/turf/simulated/floor/tiled/white,
/area/surface/station/crew_quarters/heads/rdoffice)
@@ -24305,6 +24330,9 @@
/obj/structure/railing{
dir = 1
},
/obj/structure/railing{
dir = 8
},
/turf/simulated/open,
/area/surface/station/ai/upload_foyer)
"pYb" = (
@@ -24836,7 +24864,7 @@
/obj/structure/shuttle/engine/propulsion/burst/left{
dir = 4
},
/turf/simulated/floor/plating/sif/planetuse,
/turf/simulated/floor/plating,
/area/shuttle/large_escape_pod2/station)
"qop" = (
/obj/structure/sign/directions/teleporter,
@@ -25667,6 +25695,9 @@
id_tag = "roof_airlock_pump"
},
/obj/effect/map_helper/airlock/atmos/chamber_pump,
/obj/structure/sign/warning/cold{
pixel_y = 32
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/surface/station/hallway/primary/secondfloor/east)
"qQt" = (
@@ -30095,6 +30126,13 @@
},
/turf/simulated/floor/carpet/sblucarpet,
/area/surface/station/medical/psych)
"tNl" = (
/obj/structure/railing{
dir = 8
},
/obj/structure/railing,
/turf/simulated/open,
/area/surface/station/rnd/research)
"tNt" = (
/obj/structure/cable/green{
d1 = 2;
@@ -30111,6 +30149,12 @@
},
/turf/simulated/floor/tiled/freezer,
/area/surface/station/engineering/engi_restroom)
"tNH" = (
/obj/structure/railing{
dir = 8
},
/turf/simulated/open,
/area/surface/station/park/skybridge)
"tNX" = (
/obj/machinery/computer/rdconsole,
/obj/effect/floor_decal/borderfloorblack{
@@ -31321,7 +31365,7 @@
/obj/structure/window/reinforced{
dir = 8
},
/turf/simulated/floor/plating/sif/planetuse,
/turf/simulated/shuttle/wall/dark/no_join,
/area/shuttle/large_escape_pod2/station)
"uDG" = (
/obj/machinery/door/firedoor/border_only,
@@ -63457,7 +63501,7 @@ sBb
sBb
cqp
xpQ
xpQ
tNl
riA
tXh
tmR
@@ -67838,7 +67882,7 @@ uwO
uwO
uwO
uwO
uwO
tNH
fWH
pkT
maE
@@ -71956,7 +72000,7 @@ xJA
gJr
qcX
hYU
uwO
lki
uwO
uwO
uwO
@@ -73286,7 +73330,7 @@ pJa
pJa
iEj
rry
pXG
djH
eJm
eJm
iEj
@@ -86349,7 +86393,7 @@ ddU
ddU
joP
njg
jjB
nZe
jjB
jjB
jjB
maps/cynosure/cynosure-4.dmm
+49 -47
View File
@@ -190,7 +190,7 @@
},
/obj/effect/map_helper/airlock/door/int_door,
/turf/simulated/floor/tiled/techfloor,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"cB" = (
/obj/structure/lattice,
/obj/structure/window/reinforced{
@@ -266,7 +266,7 @@
},
/obj/machinery/door/firedoor/border_only,
/turf/simulated/floor/tiled/steel_grid,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"de" = (
/obj/effect/floor_decal/borderfloor{
dir = 9
@@ -276,7 +276,7 @@
},
/obj/effect/floor_decal/rust/part_rusted3,
/turf/simulated/floor/tiled,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"dr" = (
/obj/structure/cable/yellow{
d2 = 8;
@@ -398,7 +398,7 @@
/obj/machinery/atmospherics/unary/vent_pump/on,
/obj/effect/floor_decal/rust/mono_rusted3,
/turf/simulated/floor/tiled/monotile,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"eF" = (
/obj/structure/cable/yellow{
d1 = 2;
@@ -509,7 +509,7 @@
dir = 10
},
/turf/simulated/floor/tiled,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"fH" = (
/obj/effect/floor_decal/industrial/warning/corner{
dir = 8
@@ -540,7 +540,7 @@
/area/tcommsat/cynosure/computer)
"gf" = (
/turf/simulated/floor/tiled,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"go" = (
/obj/structure/cable/yellow{
d1 = 2;
@@ -944,7 +944,7 @@
dir = 5
},
/turf/simulated/floor/tiled,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"kM" = (
/obj/structure/sign/warning/server_room{
name = "\improper TELECOMMUNICATIONS"
@@ -1074,7 +1074,7 @@
/obj/structure/grille,
/obj/structure/window/reinforced/full,
/turf/simulated/floor/plating,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"lM" = (
/obj/effect/floor_decal/industrial/outline/grey,
/obj/machinery/telecomms/server/presets/medical,
@@ -1318,7 +1318,7 @@
req_access = list(13)
},
/turf/simulated/floor/tiled/steel_grid,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"nU" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 1;
@@ -1334,7 +1334,7 @@
"nV" = (
/obj/structure/sign/warning/caution,
/turf/simulated/wall/r_wall,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"oe" = (
/turf/simulated/wall/r_wall,
/area/tcommsat/cynosure)
@@ -1377,7 +1377,7 @@
},
/obj/effect/map_helper/airlock/door/ext_door,
/turf/simulated/floor/tiled/techfloor,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"oP" = (
/turf/simulated/wall/r_wall,
/area/tcommsat/cynosure/foyer)
@@ -1594,7 +1594,7 @@
},
/obj/effect/map_helper/airlock/sensor/int_sensor,
/turf/simulated/floor/tiled/steel_dirty,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"re" = (
/obj/structure/cable{
d1 = 2;
@@ -1764,7 +1764,7 @@
dir = 8
},
/turf/simulated/floor/tiled,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"sw" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plating,
@@ -1792,7 +1792,8 @@
icon_state = "1-2"
},
/obj/machinery/computer/telecomms/server{
dir = 1
dir = 1;
network = "tcommsat"
},
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/blue/border,
@@ -1808,7 +1809,7 @@
/obj/effect/floor_decal/rust,
/obj/machinery/light/small,
/turf/simulated/floor/tiled/techfloor/grid,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"sQ" = (
/obj/machinery/bluespace_beacon,
/obj/structure/cable{
@@ -1934,19 +1935,19 @@
dir = 5
},
/obj/effect/floor_decal/rust,
/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
id_tag = "tcomdock_airlock";
pixel_y = 25;
req_one_access = list(13)
},
/obj/machinery/airlock_sensor{
id_tag = "tcomdock_airlock_sensor";
pixel_x = -11;
pixel_y = 25
},
/obj/effect/map_helper/airlock/sensor/chamber_sensor,
/obj/machinery/embedded_controller/radio/airlock/docking_port{
id_tag = "tcomdock_airlock";
pixel_y = 25;
req_one_access = list(13)
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"uM" = (
/obj/effect/floor_decal/spline/plain{
dir = 1
@@ -2167,7 +2168,7 @@
/obj/machinery/portable_atmospherics/canister/air/airlock,
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/dark,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"xc" = (
/obj/structure/table/standard,
/obj/item/weapon/paper_bin,
@@ -2625,7 +2626,7 @@
dir = 8
},
/turf/simulated/floor/tiled,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"CU" = (
/obj/structure/cable{
d2 = 8;
@@ -2667,7 +2668,7 @@
dir = 8
},
/turf/simulated/floor/tiled,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"Do" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden{
@@ -2683,7 +2684,7 @@
},
/obj/effect/map_helper/airlock/door/int_door,
/turf/simulated/floor/tiled/techfloor,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"DF" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -2732,7 +2733,7 @@
},
/obj/structure/closet/emcloset,
/turf/simulated/floor/tiled,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"El" = (
/obj/effect/floor_decal/techfloor{
dir = 5
@@ -2772,7 +2773,7 @@
},
/obj/effect/floor_decal/industrial/warning/corner,
/turf/simulated/floor/tiled,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"EL" = (
/turf/simulated/shuttle/wall/no_join{
base_state = "orange";
@@ -3101,7 +3102,7 @@
req_access = list(61)
},
/turf/simulated/floor/tiled/steel_grid,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"HO" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 8
@@ -3121,7 +3122,7 @@
dir = 1
},
/turf/simulated/floor/tiled,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"Ia" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -3157,7 +3158,7 @@
"Is" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/tiled/monotile,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"Iu" = (
/obj/effect/floor_decal/techfloor{
dir = 5
@@ -3177,7 +3178,7 @@
pixel_y = 30
},
/turf/simulated/floor/tiled,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"Iz" = (
/turf/simulated/floor/bluegrid,
/area/tcommsat/cynosure/chamber)
@@ -3392,7 +3393,7 @@
},
/obj/effect/map_helper/airlock/atmos/chamber_pump,
/turf/simulated/floor/tiled/techfloor/grid,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"Lb" = (
/obj/effect/floor_decal/industrial/warning/corner{
dir = 4
@@ -3407,7 +3408,7 @@
},
/obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/tiled,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"Lg" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -3473,7 +3474,7 @@
dir = 8
},
/turf/simulated/floor/tiled,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"LQ" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -3489,7 +3490,7 @@
dir = 1
},
/turf/simulated/floor/tiled,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"Mj" = (
/obj/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
@@ -3655,7 +3656,7 @@
"NK" = (
/obj/machinery/door/firedoor/border_only,
/turf/simulated/floor/tiled/steel_grid,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"NQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -3920,7 +3921,7 @@
},
/obj/machinery/light,
/turf/simulated/floor/tiled/steel_dirty,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"PU" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -4046,7 +4047,7 @@
/area/tcommsat/cynosure)
"QO" = (
/turf/simulated/floor/tiled/monotile,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"QP" = (
/obj/machinery/camera/network/telecom{
c_tag = "Tcoms - Port Bridge Aft";
@@ -4100,7 +4101,7 @@
},
/obj/effect/map_helper/airlock/door/ext_door,
/turf/simulated/floor/tiled/techfloor,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"Sf" = (
/obj/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/hidden/universal{
@@ -4152,7 +4153,7 @@
"Ss" = (
/obj/effect/floor_decal/rust/mono_rusted3,
/turf/simulated/floor/tiled/monotile,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"Sy" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -4370,7 +4371,8 @@
/area/tcommsat/cynosure)
"TL" = (
/obj/machinery/computer/telecomms/monitor{
dir = 1
dir = 1;
network = "tcommsat"
},
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/blue/border,
@@ -4391,10 +4393,10 @@
dir = 1
},
/turf/simulated/wall/r_wall,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"TZ" = (
/turf/simulated/wall/r_wall,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"Ub" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -4648,7 +4650,7 @@
c_tag = "Tcoms - Airlock"
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"We" = (
/obj/structure/disposalpipe/trunk{
dir = 8
@@ -4761,7 +4763,7 @@
pixel_y = 21
},
/turf/simulated/floor/tiled,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"Xy" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -4824,7 +4826,7 @@
dir = 4
},
/turf/simulated/floor/tiled/steel_dirty,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"Yd" = (
/turf/simulated/wall/r_wall,
/area/tcommsat/cynosure/computer)
@@ -4962,7 +4964,7 @@
/obj/structure/grille,
/obj/structure/window/reinforced/full,
/turf/simulated/floor/plating,
/area/tcommsat/cynosure/enterance)
/area/tcommsat/cynosure/entrance)
"Zp" = (
/obj/structure/cable{
d1 = 4;
maps/cynosure/cynosure-6.dmm
+33 -18
View File
@@ -2894,6 +2894,13 @@
},
/turf/simulated/floor/holofloor/tiled/dark,
/area/holodeck/source_boxingcourt)
"dzs" = (
/obj/machinery/r_n_d/server/centcom,
/turf/unsimulated/floor{
icon = 'icons/turf/flooring/tiles.dmi';
icon_state = "dark"
},
/area/centcom/main_hall)
"dzx" = (
/obj/structure/shuttle/engine/heater{
dir = 4;
@@ -12928,6 +12935,7 @@
/area/syndicate_station)
"oAb" = (
/obj/machinery/account_database{
dir = 8;
name = "CentComm Accounts database"
},
/turf/unsimulated/floor{
@@ -15210,6 +15218,13 @@
icon_state = "dark"
},
/area/centcom/security)
"qXU" = (
/obj/machinery/telecomms/receiver/preset_cent,
/turf/unsimulated/floor{
icon = 'icons/turf/flooring/tiles.dmi';
icon_state = "dark"
},
/area/centcom/main_hall)
"qYH" = (
/obj/structure/table/steel_reinforced,
/obj/item/clothing/glasses/meson,
@@ -15628,11 +15643,7 @@
/turf/simulated/floor/holofloor/bmarble,
/area/holodeck/source_chess)
"rsf" = (
/obj/machinery/computer/rdservercontrol{
badmin = 1;
dir = 8;
name = "Master R&amp;D Server Controller"
},
/obj/machinery/telecomms/broadcaster/preset_cent,
/turf/unsimulated/floor{
icon = 'icons/turf/flooring/tiles.dmi';
icon_state = "dark"
@@ -16727,7 +16738,7 @@
/turf/simulated/floor/holofloor/tiled/dark,
/area/holodeck/source_theatre)
"svl" = (
/obj/machinery/telecomms/receiver/preset_cent,
/obj/machinery/telecomms/hub/preset/cynosure/centcomm,
/turf/unsimulated/floor{
icon = 'icons/turf/flooring/tiles.dmi';
icon_state = "dark"
@@ -17629,7 +17640,7 @@
},
/area/centcom/command)
"tsP" = (
/obj/machinery/r_n_d/server/centcom,
/obj/machinery/telecomms/relay/preset/cynosure/centcomm,
/turf/unsimulated/floor{
icon = 'icons/turf/flooring/tiles.dmi';
icon_state = "dark"
@@ -20184,7 +20195,11 @@
/turf/simulated/floor/holofloor/wmarble,
/area/holodeck/source_chess)
"wiM" = (
/obj/machinery/telecomms/broadcaster/preset_cent,
/obj/machinery/computer/rdservercontrol{
badmin = 1;
dir = 8;
name = "Master R&amp;D Server Controller"
},
/turf/unsimulated/floor{
icon = 'icons/turf/flooring/tiles.dmi';
icon_state = "dark"
@@ -30577,7 +30592,7 @@ pAD
oCJ
ikS
uLV
mTz
qXU
svl
pAD
puk
@@ -31604,7 +31619,7 @@ gBA
gSq
oAb
wiM
mTz
dzs
rsf
tsP
pAD
@@ -36542,10 +36557,10 @@ nzU
gRE
kpG
kpG
kpG
kpG
kpG
kpG
qXg
qXg
qXg
qXg
kpG
kpG
kpG
@@ -38084,10 +38099,10 @@ jVR
pyX
kpG
kpG
kpG
kpG
kpG
kpG
qXg
qXg
qXg
qXg
kpG
kpG
kpG
maps/cynosure/cynosure-7.dmm
+2602 -2604
View File
File diff suppressed because it is too large Load Diff
maps/cynosure/cynosure_areas.dm
+6 -5
View File
@@ -767,6 +767,7 @@
/area/surface/station/construction
name = "\improper Engineering Construction Area"
icon_state = "yellow"
flags = AREA_FLAG_IS_NOT_PERSISTENT
/area/surface/station/construction/bar
name = "\improper Bar Basement"
@@ -1072,11 +1073,11 @@
/area/surface/outpost/research/xenoarcheology/isolation_c
name = "Xenoarcheology Isolation C"
/area/surface/outpost/research/xenoarcheology/enterance
name = "Xenoarcheology Research Enterance"
/area/surface/outpost/research/xenoarcheology/entrance
name = "Xenoarcheology Research Entrance"
/area/surface/outpost/research/xenoarcheology/surface
name = "Xenoarcheology Research Surface Enterance"
name = "Xenoarcheology Research Surface Entrance"
/area/surface/outpost/research/xenoarcheology/longtermstorage
name = "Xenoarcheology Long-Term Anomalous Storage"
@@ -1438,8 +1439,8 @@
icon_state = "tcomsatcham"
ambience = AMBIENCE_ENGINEERING
/area/tcommsat/cynosure/enterance
name = "\improper Telecomms Enterance"
/area/tcommsat/cynosure/entrance
name = "\improper Telecomms Entrance"
icon_state = "tcomsatentrance"
/area/tcommsat/cynosure/teleporter
maps/cynosure/cynosure_shuttles.dm
+1
View File
@@ -208,6 +208,7 @@ ESCAPE_POD(1)
/obj/effect/shuttle_landmark/cynosure/tcomms
name = "Telecommunications Satellite"
landmark_tag = "nav_telecomm_dockarm"
docking_controller = "tcomdock_airlock"
base_area = /area/space
base_turf = /turf/space
maps/cynosure/submaps/10x9/Shop.dmm
+2 -2
View File
@@ -23,7 +23,7 @@
"y" = (/obj/machinery/atmospherics/pipe/cap/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/cap/hidden/supply{dir = 4},/turf/simulated/wall,/area/template_noop)
"z" = (/obj/random/obstruction,/turf/simulated/floor/plating,/area/template_noop)
"A" = (/obj/effect/floor_decal/borderfloor{dir = 6},/obj/effect/floor_decal/corner/brown/border{dir = 6},/obj/structure/closet/crate/nanomed,/obj/random/medical,/obj/random/medical/lite,/obj/random/medical/lite,/turf/simulated/floor/tiled/steel_dirty,/area/template_noop)
"B" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/structure/table/steel,/obj/random/maintenance/cargo,/turf/simulated/floor/tiled/steel_dirty,/area/template_noop)
"B" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/structure/table/steel,/obj/random/maintenance/cargo,/obj/structure/sign/poster/custom{pixel_y = -32; poster_decl = /decl/poster/vore_75},/turf/simulated/floor/tiled/steel_dirty,/area/template_noop)
"C" = (/obj/machinery/firealarm{pixel_y = 24},/turf/simulated/floor/tiled,/area/template_noop)
"D" = (/obj/structure/table/reinforced,/obj/structure/windoor_assembly/secure,/obj/item/weapon/deskbell,/turf/simulated/floor/tiled/monotile,/area/template_noop)
"E" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/brown/border{dir = 8},/obj/machinery/light{dir = 8},/obj/structure/closet/crate/allico,/obj/random/plushie,/obj/random/plushie,/obj/random/toy,/obj/random/toy,/obj/random/toy,/turf/simulated/floor/tiled/steel_dirty,/area/template_noop)
@@ -33,7 +33,7 @@
"K" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/closet/wardrobe/black,/obj/random/contraband,/obj/random/cash/big,/obj/random/cash,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/template_noop)
"M" = (/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/turf/simulated/floor/tiled,/area/template_noop)
"N" = (/obj/effect/floor_decal/borderfloor/corner{dir = 1},/obj/effect/floor_decal/corner/brown/bordercorner{dir = 1},/turf/simulated/floor/tiled,/area/template_noop)
"O" = (/obj/effect/floor_decal/borderfloor/corner{dir = 4},/obj/effect/floor_decal/corner/brown/bordercorner{dir = 4},/obj/item/frame/light{dir = 1},/obj/structure/sign/poster/nanotrasen{pixel_y = 32; poster_decl = /decl/poster/pol_12},/turf/simulated/floor/tiled,/area/template_noop)
"O" = (/obj/effect/floor_decal/borderfloor/corner{dir = 4},/obj/effect/floor_decal/corner/brown/bordercorner{dir = 4},/obj/item/frame/light{dir = 1},/obj/structure/sign/poster/nanotrasen{dir = 1; pixel_y = 32; poster_decl = /decl/poster/pol_12},/turf/simulated/floor/tiled,/area/template_noop)
"P" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/structure/table/steel,/obj/random/maintenance/security,/turf/simulated/floor/tiled/steel_dirty,/area/template_noop)
"Q" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/turf/simulated/floor/tiled,/area/template_noop)
"R" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/item/weapon/paper_bin,/obj/item/weapon/pen/fountain,/obj/random/junk,/turf/simulated/floor/tiled/monotile,/area/template_noop)
maps/cynosure/submaps/16x11/LaserTag.dmm
+3 -2
View File
@@ -17,7 +17,7 @@
"t" = (/obj/machinery/deployable/barrier{anchored = 1; req_access = list()},/turf/simulated/floor/tiled/steel_dirty,/area/template_noop)
"v" = (/obj/effect/floor_decal/corner/blue{dir = 1},/obj/effect/floor_decal/corner/red{dir = 4},/obj/item/stack/tile/floor/steel_dirty{amount = 15},/turf/simulated/floor/tiled/steel_dirty,/area/template_noop)
"y" = (/obj/structure/closet/lasertag/blue,/turf/simulated/floor/tiled/steel_dirty,/area/template_noop)
"z" = (/obj/effect/floor_decal/corner/blue{dir = 5},/obj/item/stack/tile/floor/steel_dirty,/obj/structure/sign/poster/nanotrasen{pixel_y = 32; poster_decl = /decl/poster/nanotrasen/bay_21},/turf/simulated/floor/tiled/steel_dirty,/area/template_noop)
"z" = (/obj/effect/floor_decal/corner/blue{dir = 5},/obj/item/stack/tile/floor/steel_dirty,/obj/structure/sign/poster/nanotrasen{dir = 1; pixel_y = 32; poster_decl = /decl/poster/nanotrasen/bay_21},/turf/simulated/floor/tiled/steel_dirty,/area/template_noop)
"B" = (/obj/effect/floor_decal/corner/blue{dir = 9},/turf/simulated/floor/tiled/steel_dirty,/area/template_noop)
"C" = (/obj/random/toolbox,/turf/simulated/floor/tiled/steel_dirty,/area/template_noop)
"D" = (/obj/machinery/deployable/barrier{anchored = 1; req_access = list()},/obj/effect/floor_decal/corner/blue{dir = 10},/turf/simulated/floor/tiled/steel_dirty,/area/template_noop)
@@ -38,6 +38,7 @@
"V" = (/obj/effect/floor_decal/corner/red{dir = 6},/turf/simulated/floor/tiled/steel_dirty,/area/template_noop)
"W" = (/obj/item/stack/tile/floor/steel_dirty,/turf/simulated/floor/plating,/area/template_noop)
"X" = (/obj/item/stack/flag/blue,/obj/effect/floor_decal/industrial/outline{color = "#0000BB"},/turf/simulated/floor/tiled/steel_dirty,/area/template_noop)
"Y" = (/obj/effect/floor_decal/corner/red{dir = 10},/obj/structure/sign/poster/custom{pixel_y = -32; poster_decl = /decl/poster/vore_29},/turf/simulated/floor/tiled/steel_dirty,/area/template_noop)
"Z" = (/obj/item/stack/tile/floor/steel_dirty,/turf/simulated/floor/tiled/steel_dirty,/area/template_noop)
(1,1,1) = {"
@@ -50,6 +51,6 @@ gBXtSWSIZSWfiHkg
gBytZtWIStfSSOkg
gBttStfIftZSZVkg
glUSStSWWttttVkg
gglDGDGjKKKKKhgg
gglDGDGjYKKKKhgg
agggggggggggggga
"}
maps/cynosure/submaps/16x11/Nightclub.dmm
+3 -3
View File
@@ -11,7 +11,7 @@
"hS" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/railing,/turf/simulated/floor/tiled/dark,/area/template_noop)
"jD" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/dark,/area/template_noop)
"lq" = (/obj/machinery/floor_light/prebuilt,/obj/item/device/flashlight/glowstick,/turf/simulated/floor/wood,/area/template_noop)
"mE" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/structure/sign/poster/custom{pixel_x = 32; poster_decl = /decl/poster/nanotrasen/bay_52},/turf/simulated/floor/tiled/dark,/area/template_noop)
"mE" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/structure/sign/poster/custom{dir = 4; pixel_x = 32; poster_decl = /decl/poster/nanotrasen/bay_52},/turf/simulated/floor/tiled/dark,/area/template_noop)
"nt" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/dark,/area/template_noop)
"od" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/obj/structure/table/wooden_reinforced,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/obj/random/maintenance,/turf/simulated/floor/wood,/area/template_noop)
"pj" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/template_noop)
@@ -30,7 +30,7 @@
"AP" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/turf/simulated/floor/tiled/dark,/area/template_noop)
"Bj" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8},/turf/simulated/floor/lino,/area/template_noop)
"BD" = (/obj/structure/extinguisher_cabinet{dir = 8; pixel_x = -30},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/dark,/area/template_noop)
"BS" = (/obj/structure/cable{d2 = 4; icon_state = "0-4"},/obj/machinery/power/apc{dir = 1; name = "north bump"; operating = 0; pixel_y = 24},/obj/effect/floor_decal/steeldecal/steel_decals_central7{dir = 1},/obj/machinery/light_switch{pixel_x = 12; pixel_y = 24},/obj/item/weapon/stool{dir = 8},/turf/simulated/floor/tiled/dark,/area/template_noop)
"BS" = (/obj/structure/cable{d2 = 4; icon_state = "0-4"},/obj/effect/floor_decal/steeldecal/steel_decals_central7{dir = 1},/obj/machinery/light_switch{pixel_x = 12; pixel_y = 24},/obj/item/weapon/stool{dir = 8},/obj/machinery/power/apc{dir = 1; name = "north bump"; operating = 0; pixel_y = 24},/turf/simulated/floor/tiled/dark,/area/template_noop)
"Cb" = (/obj/structure/table/marble,/turf/simulated/floor/lino,/area/template_noop)
"Dj" = (/turf/simulated/floor/plating,/area/template_noop)
"DV" = (/turf/template_noop,/area/template_noop)
@@ -58,7 +58,7 @@
"Ru" = (/obj/machinery/light_construct{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/dark,/area/template_noop)
"Sj" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/tiled/dark,/area/template_noop)
"TQ" = (/turf/simulated/floor/lino,/area/template_noop)
"Uk" = (/obj/structure/table/marble,/obj/structure/sign/poster/nanotrasen{pixel_y = 32; poster_decl = /decl/poster/bay_44},/turf/simulated/floor/lino,/area/template_noop)
"Uk" = (/obj/structure/table/marble,/obj/structure/sign/poster/nanotrasen{dir = 1; pixel_y = 32; poster_decl = /decl/poster/bay_44},/obj/machinery/reagentgrinder,/turf/simulated/floor/lino,/area/template_noop)
"Ul" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/cap/hidden/supply,/turf/simulated/floor/plating,/area/template_noop)
"Ut" = (/obj/effect/floor_decal/spline/plain{dir = 4},/turf/simulated/floor/tiled/dark,/area/template_noop)
"Vt" = (/obj/machinery/floor_light/prebuilt,/obj/item/device/flashlight/glowstick/blue,/turf/simulated/floor/plating,/area/template_noop)
maps/cynosure/submaps/16x11/OldDorms.dmm
+3 -3
View File
@@ -15,7 +15,7 @@
"eO" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/wood,/area/template_noop)
"eQ" = (/turf/simulated/floor/tiled,/area/template_noop)
"fe" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/turf/simulated/floor/plating,/area/template_noop)
"fI" = (/obj/structure/closet/crate/engineering,/obj/random/contraband,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/structure/sign/poster{pixel_x = 32; poster_decl = /decl/poster/bay_29},/obj/item/frame/apc,/obj/item/frame/light,/turf/simulated/floor/tiled,/area/template_noop)
"fI" = (/obj/structure/closet/crate/engineering,/obj/random/contraband,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/structure/sign/poster{dir = 4; pixel_x = 32; poster_decl = /decl/poster/bay_29},/obj/item/frame/apc,/obj/item/frame/light,/turf/simulated/floor/tiled,/area/template_noop)
"if" = (/turf/simulated/floor/plating,/area/template_noop)
"iM" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/template_noop)
"jy" = (/obj/machinery/computer/guestpass{pixel_y = 30},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/plating,/area/template_noop)
@@ -28,7 +28,7 @@
"mQ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1},/obj/item/stack/cable_coil,/turf/simulated/floor/plating,/area/template_noop)
"nY" = (/obj/machinery/newscaster{pixel_y = -28},/turf/simulated/floor/plating,/area/template_noop)
"oR" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/obj/machinery/atmospherics/unary/vent_scrubber,/obj/item/poster/custom,/turf/simulated/floor/wood,/area/template_noop)
"pj" = (/obj/item/tape/engineering,/obj/structure/disposalpipe/broken,/obj/structure/cable{d2 = 2; icon_state = "0-2"},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/cap/hidden/scrubbers,/obj/machinery/atmospherics/pipe/cap/hidden/supply{dir = 8},/turf/simulated/floor/plating,/area/template_noop)
"pj" = (/obj/item/tape/engineering,/obj/structure/disposalpipe/broken,/obj/structure/cable{d2 = 2; icon_state = "0-2"},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/cap/hidden/scrubbers,/obj/machinery/atmospherics/pipe/cap/hidden/supply,/turf/simulated/floor/plating,/area/template_noop)
"qb" = (/obj/structure/closet/wardrobe/suit,/turf/simulated/floor/tiled/dark,/area/template_noop)
"qG" = (/obj/machinery/vending/fitness{dir = 4},/turf/simulated/floor/tiled/dark,/area/template_noop)
"su" = (/obj/structure/closet/wardrobe/mixed,/turf/simulated/floor/tiled/dark,/area/template_noop)
@@ -46,7 +46,7 @@
"zZ" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/turf/simulated/floor/plating,/area/template_noop)
"Ag" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/template_noop)
"Bj" = (/obj/machinery/newscaster{pixel_y = -28},/turf/simulated/floor/wood,/area/template_noop)
"BS" = (/obj/structure/cable{d2 = 4; icon_state = "0-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/power/apc{dir = 1; name = "north bump"; operating = 0; pixel_y = 24},/obj/machinery/light_switch{pixel_x = 12; pixel_y = 24},/turf/simulated/floor/plating,/area/template_noop)
"BS" = (/obj/structure/cable{d2 = 4; icon_state = "0-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/light_switch{pixel_x = 12; pixel_y = 24},/obj/machinery/power/apc{dir = 1; name = "north bump"; operating = 0; pixel_y = 24},/turf/simulated/floor/plating,/area/template_noop)
"Cb" = (/obj/structure/table/standard,/obj/random/toolbox,/turf/simulated/floor/plating,/area/template_noop)
"CK" = (/obj/machinery/door/airlock{name = "Restroom"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled/steel_grid,/area/template_noop)
"CQ" = (/obj/structure/table/standard,/obj/random/soap,/obj/item/weapon/towel/random,/turf/simulated/floor/tiled/freezer,/area/template_noop)
maps/cynosure/submaps/5x7/MedicalBreakRoom.dmm
+1 -1
View File
@@ -10,7 +10,7 @@
"w" = (/obj/random/obstruction,/turf/simulated/floor/tiled/steel_grid,/area/template_noop)
"y" = (/turf/simulated/wall/r_wall,/area/template_noop)
"z" = (/obj/structure/bed/chair/sofa/blue/left{dir = 1},/obj/random/contraband,/obj/machinery/newscaster{pixel_x = -28},/turf/simulated/floor/carpet/tealcarpet,/area/template_noop)
"E" = (/obj/structure/table/sifwoodentable,/obj/random/snack,/obj/random/drinksoft,/obj/structure/sign/poster/custom{pixel_y = 32; poster_decl = /decl/poster/nanotrasen/bay_25},/turf/simulated/floor/carpet/tealcarpet,/area/template_noop)
"E" = (/obj/structure/table/sifwoodentable,/obj/random/snack,/obj/random/drinksoft,/obj/structure/sign/poster/custom{dir = 1; pixel_y = 32; poster_decl = /decl/poster/nanotrasen/bay_25},/turf/simulated/floor/carpet/tealcarpet,/area/template_noop)
"H" = (/obj/structure/bed/chair/sofa/blue/left{dir = 8},/obj/random/maintenance/medical,/obj/item/device/radio/intercom{dir = 4; pixel_x = 21},/turf/simulated/floor/carpet/tealcarpet,/area/template_noop)
"J" = (/obj/item/device/radio/intercom/department/medbay{dir = 8; pixel_x = 21},/turf/simulated/floor/carpet/tealcarpet,/area/template_noop)
"K" = (/obj/structure/table/sifwoodentable,/obj/random/plushie,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/carpet/tealcarpet,/area/template_noop)
maps/cynosure/submaps/5x7/MedicalWasteStorage.dmm
+1 -1
View File
@@ -9,7 +9,7 @@
"u" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/item/weapon/ruinedvirusdish,/obj/structure/disposalpipe/segment,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/filth,/turf/simulated/floor/tiled/old_tile/white,/area/template_noop)
"w" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "exposed10-scrubbers"},/obj/structure/door_assembly/door_assembly_med,/obj/item/tape/medical,/turf/simulated/floor/plating,/area/template_noop)
"y" = (/turf/simulated/wall/r_wall,/area/template_noop)
"z" = (/obj/effect/floor_decal/borderfloorwhite{dir = 8},/obj/structure/table/standard,/obj/random/medical,/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/hypospray/autoinjector/used,/obj/item/weapon/reagent_containers/hypospray/autoinjector/used,/obj/effect/floor_decal/corner/lime/border{dir = 8},/obj/structure/sign/poster/custom{pixel_x = -32; poster_decl = /decl/poster/bay_39},/turf/simulated/floor/tiled/old_tile/white,/area/template_noop)
"z" = (/obj/effect/floor_decal/borderfloorwhite{dir = 8},/obj/structure/table/standard,/obj/random/medical,/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/hypospray/autoinjector/used,/obj/item/weapon/reagent_containers/hypospray/autoinjector/used,/obj/effect/floor_decal/corner/lime/border{dir = 8},/obj/structure/sign/poster/custom{dir = 8; pixel_x = -32; poster_decl = /decl/poster/bay_39},/turf/simulated/floor/tiled/old_tile/white,/area/template_noop)
"E" = (/obj/effect/floor_decal/borderfloorwhite{dir = 1},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/structure/closet/crate/trashcart,/obj/item/weapon/paper/crumpled/bloody,/obj/random/maintenance/medical,/obj/item/weapon/reagent_containers/hypospray/autoinjector/used,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/expired,/obj/effect/floor_decal/corner/lime/border{dir = 1},/obj/machinery/alarm{pixel_y = 22},/turf/simulated/floor/tiled/old_tile/white,/area/template_noop)
"H" = (/obj/effect/floor_decal/borderfloorwhite{dir = 4},/obj/machinery/atmospherics/unary/vent_pump{dir = 8},/obj/random/mouseremains,/obj/effect/floor_decal/corner/lime/border{dir = 4},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/tiled/old_tile/white,/area/template_noop)
"J" = (/obj/effect/floor_decal/borderfloorwhite{dir = 4},/obj/machinery/washing_machine,/obj/random/maintenance/medical,/obj/effect/floor_decal/corner/lime/border{dir = 4},/obj/item/device/radio/intercom{dir = 4; pixel_x = 21},/turf/simulated/floor/tiled/old_tile/white,/area/template_noop)
maps/cynosure/submaps/7x7/FightClub.dmm
+1 -1
View File
@@ -1,4 +1,4 @@
"a" = (/obj/structure/sign/poster/custom{pixel_x = 32; poster_decl = /decl/poster/pol_14},/turf/template_noop,/area/template_noop)
"a" = (/obj/structure/sign/poster/custom{dir = 1; pixel_y = 32; poster_decl = /decl/poster/pol_14},/turf/template_noop,/area/template_noop)
"i" = (/obj/machinery/power/apc{coverlocked = 0; locked = 0; name = "south bump"; operating = 0; pixel_y = -24},/obj/item/weapon/cell/high/empty,/turf/simulated/floor/plating,/area/template_noop)
"m" = (/obj/structure/railing,/obj/effect/decal/cleanable/blood,/turf/simulated/floor/plating,/area/template_noop)
"o" = (/turf/simulated/wall{can_open = 1},/area/template_noop)
maps/cynosure/submaps/7x7/JanitorCloset.dmm
+2 -2
View File
@@ -1,4 +1,4 @@
"a" = (/obj/structure/sign/poster/custom{pixel_x = 32; poster_decl = /decl/poster/nanotrasen/pol_6},/turf/template_noop,/area/template_noop)
"a" = (/obj/structure/sign/poster/custom{dir = 1; pixel_y = 32; poster_decl = /decl/poster/nanotrasen/pol_6},/turf/template_noop,/area/template_noop)
"e" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/purple/border{dir = 1},/obj/structure/table/steel,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/obj/random/maintenance/engineering,/obj/effect/spider/stickyweb,/obj/machinery/requests_console{department = "Janitorial"; departmentType = 1; name = "Janitorial RC"; pixel_y = 24},/turf/simulated/floor/tiled/steel_dirty,/area/template_noop)
"j" = (/obj/effect/floor_decal/borderfloor/corner,/obj/effect/floor_decal/corner/purple/bordercorner,/obj/machinery/light_construct{dir = 4},/obj/structure/mopbucket,/obj/item/weapon/mop,/obj/effect/spider/stickyweb,/turf/simulated/floor/tiled/steel_dirty,/area/template_noop)
"l" = (/obj/effect/floor_decal/borderfloor/corner{dir = 4},/obj/effect/floor_decal/corner/purple/bordercorner{dir = 4},/obj/structure/sink{dir = 4; pixel_x = 11},/obj/item/weapon/reagent_containers/glass/bucket,/obj/effect/spider/stickyweb,/turf/simulated/floor/tiled,/area/template_noop)
@@ -20,7 +20,7 @@
"L" = (/obj/effect/floor_decal/borderfloor{dir = 10},/obj/effect/floor_decal/corner/purple/border{dir = 10},/obj/structure/closet/jcloset,/obj/item/clothing/mask/gas/clear,/obj/random/soap,/obj/effect/spider/stickyweb,/turf/simulated/floor/tiled/steel_dirty,/area/template_noop)
"M" = (/obj/effect/floor_decal/steeldecal/steel_decals4,/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 10},/obj/effect/spider/stickyweb,/turf/simulated/floor/tiled/steel_dirty,/area/template_noop)
"N" = (/obj/effect/floor_decal/borderfloor{dir = 5},/obj/effect/floor_decal/corner/purple/border{dir = 5},/obj/machinery/disposal,/obj/effect/spider/stickyweb,/turf/simulated/floor/tiled/steel_dirty,/area/template_noop)
"O" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/purple/border,/obj/effect/floor_decal/steeldecal/steel_decals_central7,/obj/structure/cable,/obj/effect/spider/stickyweb,/obj/structure/sign/poster/nanotrasen{pixel_x = -32; poster_decl = /decl/poster/nanotrasen/pol_7},/obj/machinery/power/apc{name = "south bump"; operating = 0; pixel_y = -24},/obj/machinery/light_switch{dir = 1; pixel_x = -12; pixel_y = -24},/turf/simulated/floor/tiled/steel_dirty,/area/template_noop)
"O" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/purple/border,/obj/effect/floor_decal/steeldecal/steel_decals_central7,/obj/structure/cable,/obj/effect/spider/stickyweb,/obj/structure/sign/poster/nanotrasen{dir = 8; pixel_x = -32; poster_decl = /decl/poster/nanotrasen/pol_7},/obj/machinery/power/apc{name = "south bump"; operating = 0; pixel_y = -24},/obj/machinery/light_switch{dir = 1; pixel_x = -12; pixel_y = -24},/turf/simulated/floor/tiled/steel_dirty,/area/template_noop)
"P" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/purple/border{dir = 1},/obj/structure/table/steel,/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/obj/effect/decal/cleanable/cobweb2{icon_state = "spiderling"; name = "dead spider"},/obj/effect/spider/stickyweb,/obj/item/device/radio/intercom{dir = 1; pixel_y = 21},/turf/simulated/floor/tiled/steel_dirty,/area/template_noop)
"Q" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/purple/border,/obj/structure/closet/crate/trashcart,/obj/random/contraband,/obj/random/maintenance,/obj/random/maintenance,/obj/random/junk,/obj/effect/spider/stickyweb,/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/tiled/steel_dirty,/area/template_noop)
"W" = (/obj/random/trash,/obj/effect/spider/stickyweb,/turf/simulated/floor/tiled/steel_dirty,/area/template_noop)
maps/cynosure/submaps/7x7/PartyRoom.dmm
+4 -4
View File
@@ -1,9 +1,9 @@
"a" = (/obj/structure/sign/poster/custom{pixel_y = 32; poster_decl = /decl/poster/bay_2},/turf/template_noop,/area/template_noop)
"a" = (/obj/structure/sign/poster/custom{dir = 1; pixel_y = 32; poster_decl = /decl/poster/bay_2},/turf/template_noop,/area/template_noop)
"b" = (/obj/structure/table/standard,/obj/random/toy,/obj/item/toy/colorballoon{color = "#FF00BB"},/turf/simulated/floor/carpet/purcarpet,/area/template_noop)
"d" = (/turf/simulated/floor/plating,/area/template_noop)
"e" = (/obj/random/obstruction,/obj/structure/cable{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/plating,/area/template_noop)
"f" = (/obj/structure/table/standard,/obj/item/weapon/wrapping_paper,/obj/item/toy/colorballoon{color = "#FFCC00"},/turf/simulated/floor/carpet/purcarpet,/area/template_noop)
"j" = (/obj/machinery/power/apc{dir = 8; name = "west bump"; operating = 0; pixel_x = -24},/obj/structure/cable,/turf/simulated/floor/carpet/purcarpet,/area/template_noop)
"j" = (/obj/machinery/power/apc{dir = 8; name = "west bump"; operating = 0; pixel_x = -24},/obj/structure/cable,/obj/structure/sign/poster/custom{pixel_y = -32; poster_decl = /decl/poster/nanotrasen/nt_8},/turf/simulated/floor/carpet/purcarpet,/area/template_noop)
"o" = (/obj/item/stack/material/cardboard,/turf/simulated/floor/carpet/purcarpet,/area/template_noop)
"p" = (/turf/simulated/floor/carpet/purcarpet,/area/template_noop)
"v" = (/obj/machinery/light/small,/turf/simulated/floor/carpet/purcarpet,/area/template_noop)
@@ -11,13 +11,13 @@
"E" = (/obj/item/pizzabox/old,/obj/item/trash/plate{pixel_x = -9; pixel_y = 5},/obj/structure/table/standard,/turf/simulated/floor/carpet/purcarpet,/area/template_noop)
"F" = (/obj/structure/table/standard,/obj/item/trash/plate{pixel_y = -6},/obj/item/clothing/head/cakehat,/turf/simulated/floor/carpet/purcarpet,/area/template_noop)
"I" = (/obj/structure/bed/chair/comfy/lime{dir = 4},/turf/simulated/floor/carpet/purcarpet,/area/template_noop)
"K" = (/obj/random/trash,/obj/structure/sign/poster/custom{pixel_x = -32; pixel_y = -32; poster_decl = /decl/poster/nanotrasen/nt_8},/turf/simulated/floor/carpet/purcarpet,/area/template_noop)
"K" = (/obj/random/trash,/turf/simulated/floor/carpet/purcarpet,/area/template_noop)
"L" = (/turf/simulated/wall/r_wall,/area/template_noop)
"M" = (/obj/structure/bed/chair/comfy/red{dir = 4},/turf/simulated/floor/carpet/purcarpet,/area/template_noop)
"N" = (/obj/structure/bed/chair/comfy/orange{dir = 8},/turf/simulated/floor/carpet/purcarpet,/area/template_noop)
"Q" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/carpet/purcarpet,/area/template_noop)
"R" = (/obj/structure/bed/chair/comfy/purp{dir = 1},/turf/simulated/floor/carpet/purcarpet,/area/template_noop)
"S" = (/obj/structure/bed/chair/comfy/green{dir = 8},/obj/structure/sign/poster/custom{pixel_y = 32; poster_decl = /decl/poster/nt_5},/turf/simulated/floor/carpet/purcarpet,/area/template_noop)
"S" = (/obj/structure/bed/chair/comfy/green{dir = 8},/obj/structure/sign/poster/custom{dir = 1; pixel_y = 32; poster_decl = /decl/poster/nt_5},/turf/simulated/floor/carpet/purcarpet,/area/template_noop)
"V" = (/obj/structure/bed/chair/comfy/blue{dir = 8},/obj/item/trash/plate,/turf/simulated/floor/carpet/purcarpet,/area/template_noop)
"X" = (/obj/structure/bed/chair/comfy/teal{dir = 4},/obj/item/trash/plate{pixel_y = 5},/turf/simulated/floor/carpet/purcarpet,/area/template_noop)
"Y" = (/turf/simulated/wall,/area/template_noop)
maps/cynosure/submaps/8x5/DrugDen.dmm → maps/cynosure/submaps/8x5/GrowersDen.dmm
+25 -23
View File
@@ -1,23 +1,25 @@
"a" = (/turf/simulated/wall,/area/template_noop)
"c" = (/turf/simulated/wall{can_open = 1},/area/template_noop)
"e" = (/obj/item/weapon/reagent_containers/syringe{icon_state = "broken"},/obj/structure/bed/chair/comfy/brown{dir = 1},/turf/simulated/floor/plating,/area/template_noop)
"f" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/item/seeds/ambrosiavulgarisseed,/turf/simulated/floor/plating,/area/template_noop)
"l" = (/obj/random/mouseremains,/turf/simulated/floor/plating,/area/template_noop)
"m" = (/obj/random/crate,/obj/random/contraband,/obj/random/cash,/obj/random/cigarettes,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/cash,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/template_noop)
"t" = (/obj/structure/reagent_dispensers/watertank,/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor/plating,/area/template_noop)
"x" = (/obj/item/poster/custom,/turf/simulated/floor/plating,/area/template_noop)
"E" = (/obj/structure/closet/crate/hydroponics,/obj/random/contraband,/obj/item/weapon/material/knife/machete/hatchet,/obj/item/weapon/material/minihoe,/obj/item/weapon/tool/wirecutters/clippers/trimmers,/turf/simulated/floor/plating,/area/template_noop)
"G" = (/turf/simulated/floor/plating,/area/template_noop)
"K" = (/obj/structure/bed/chair/comfy/brown,/turf/simulated/floor/plating,/area/template_noop)
"L" = (/obj/item/weapon/reagent_containers/syringe{icon_state = "broken"},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating,/area/template_noop)
"V" = (/turf/simulated/wall/r_wall,/area/template_noop)
"W" = (/obj/machinery/portable_atmospherics/hydroponics,/turf/simulated/floor/plating,/area/template_noop)
"Y" = (/obj/structure/table/steel,/obj/random/contraband/nofail,/obj/random/contraband,/obj/random/medical,/obj/machinery/light_construct/small{dir = 4},/obj/item/device/flashlight/lamp/green{pixel_x = -6; pixel_y = -1},/turf/simulated/floor/plating,/area/template_noop)
(1,1,1) = {"
aaaaacaV
afWWWlKV
aLGGGGYV
GGtEmxeV
aaaaaaaV
"}
"a" = (/turf/simulated/wall,/area/template_noop)
"b" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/item/seeds/reishimycelium,/turf/simulated/floor/plating,/area/template_noop)
"c" = (/turf/simulated/wall{can_open = 1},/area/template_noop)
"e" = (/obj/item/weapon/reagent_containers/syringe{icon_state = "broken"},/obj/structure/bed/chair/comfy/brown{dir = 1},/turf/simulated/floor/plating,/area/template_noop)
"f" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/item/seeds/ambrosiavulgarisseed,/turf/simulated/floor/plating,/area/template_noop)
"l" = (/obj/random/mouseremains,/turf/simulated/floor/plating,/area/template_noop)
"m" = (/obj/random/crate,/obj/random/contraband,/obj/random/cash,/obj/random/cigarettes,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/cash,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/template_noop)
"t" = (/obj/structure/reagent_dispensers/watertank,/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor/plating,/area/template_noop)
"x" = (/obj/item/poster/custom,/turf/simulated/floor/plating,/area/template_noop)
"E" = (/obj/structure/closet/crate/hydroponics,/obj/random/contraband,/obj/item/weapon/material/knife/machete/hatchet,/obj/item/weapon/material/minihoe,/obj/item/weapon/tool/wirecutters/clippers/trimmers,/turf/simulated/floor/plating,/area/template_noop)
"G" = (/turf/simulated/floor/plating,/area/template_noop)
"K" = (/obj/structure/bed/chair/comfy/brown,/turf/simulated/floor/plating,/area/template_noop)
"L" = (/obj/item/weapon/reagent_containers/syringe{icon_state = "broken"},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating,/area/template_noop)
"U" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/item/seeds/poppyseed,/turf/simulated/floor/plating,/area/template_noop)
"V" = (/turf/simulated/wall/r_wall,/area/template_noop)
"W" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/item/seeds/tobaccoseed,/turf/simulated/floor/plating,/area/template_noop)
"Y" = (/obj/structure/table/steel,/obj/random/contraband/nofail,/obj/random/contraband,/obj/random/medical,/obj/machinery/light_construct/small{dir = 4},/obj/item/device/flashlight/lamp/green{pixel_x = -6; pixel_y = -1},/turf/simulated/floor/plating,/area/template_noop)
(1,1,1) = {"
aaaaacaV
afWUblKV
aLGGGGYV
GGtEmxeV
aaaaaaaV
"}
maps/cynosure/submaps/8x5/HiddenBar.dmm
+1 -1
View File
@@ -6,7 +6,7 @@
"m" = (/obj/item/weapon/stool/padded{dir = 8},/turf/simulated/floor/wood,/area/template_noop)
"p" = (/obj/structure/table/reinforced,/obj/random/drinkbottle,/obj/structure/sign/poster/custom{pixel_y = -32; poster_decl = /decl/poster/bay_37},/turf/simulated/floor/wood,/area/template_noop)
"t" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/food/drinks/glass2/square{pixel_x = 4; pixel_y = 5},/obj/item/weapon/reagent_containers/food/drinks/glass2/square,/turf/simulated/floor/wood,/area/template_noop)
"A" = (/obj/structure/table,/obj/item/stack/material/plastic,/obj/structure/sign/poster{pixel_y = 32; poster_decl = /decl/poster/bay_36},/turf/simulated/floor/wood,/area/template_noop)
"A" = (/obj/structure/table,/obj/item/stack/material/plastic,/obj/structure/sign/poster{dir = 1; pixel_y = 32; poster_decl = /decl/poster/bay_36},/turf/simulated/floor/wood,/area/template_noop)
"D" = (/obj/item/frame/light/small{dir = 8},/turf/simulated/floor/wood,/area/template_noop)
"J" = (/obj/structure/table/gamblingtable,/obj/item/weapon/reagent_containers/food/drinks/flask/barflask{pixel_x = -4; pixel_y = 8},/obj/item/device/flashlight/lamp/green{pixel_x = 10},/obj/machinery/light_construct/small{dir = 4},/turf/simulated/floor/wood,/area/template_noop)
"K" = (/obj/structure/bed/chair/comfy/brown,/turf/simulated/floor/wood,/area/template_noop)
maps/cynosure/submaps/8x5/SquattersDen.dmm
+3 -2
View File
@@ -1,7 +1,7 @@
"a" = (/turf/simulated/wall,/area/template_noop)
"c" = (/turf/simulated/wall{can_open = 1},/area/template_noop)
"e" = (/obj/structure/table/standard,/obj/machinery/microwave,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 13},/turf/simulated/floor/plating,/area/template_noop)
"f" = (/obj/structure/bed/padded,/obj/item/clothing/suit/ianshirt,/obj/item/weapon/bedsheet/ian,/obj/structure/sign/poster/custom{pixel_x = -32; poster_decl = /decl/poster/nanotrasen/bay_9},/turf/simulated/floor/plating,/area/template_noop)
"f" = (/obj/structure/bed/padded,/obj/item/clothing/suit/ianshirt,/obj/item/weapon/bedsheet/ian,/obj/structure/sign/poster/custom{dir = 8; pixel_x = -32; poster_decl = /decl/poster/vore_69},/turf/simulated/floor/plating,/area/template_noop)
"l" = (/obj/structure/barricade,/turf/simulated/floor/plating,/area/template_noop)
"m" = (/obj/machinery/light_construct/small,/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor/plating,/area/template_noop)
"A" = (/obj/structure/closet,/obj/item/clothing/suit/storage/hooded/ian_costume,/obj/item/clothing/under/color/grey,/obj/random/maintenance/cargo,/obj/random/maintenance/engineering,/obj/item/clothing/mask/gas/half,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/template_noop)
@@ -9,6 +9,7 @@
"G" = (/turf/simulated/floor/plating,/area/template_noop)
"K" = (/obj/structure/plushie/ian,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/plating,/area/template_noop)
"L" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle{pixel_x = 6; pixel_y = 12},/obj/item/device/flashlight/lamp/green{pixel_x = -6; pixel_y = 1},/obj/item/toy/plushie/girly_corgi,/turf/simulated/floor/plating,/area/template_noop)
"Q" = (/obj/structure/table/standard,/obj/machinery/reagentgrinder,/turf/simulated/floor/plating,/area/template_noop)
"V" = (/turf/simulated/wall/r_wall,/area/template_noop)
"W" = (/obj/structure/table/rack,/obj/random/toy,/obj/random/contraband,/obj/random/contraband,/obj/random/tank,/obj/random/toolbox,/obj/random/maintenance/engineering,/turf/simulated/floor/plating,/area/template_noop)
"Y" = (/obj/structure/table/standard,/obj/random/snack,/obj/item/weapon/reagent_containers/food/drinks/dry_ramen{pixel_x = -6; pixel_y = 6},/obj/random/drinkbottle,/turf/simulated/floor/plating,/area/template_noop)
@@ -16,7 +17,7 @@
(1,1,1) = {"
aaaaacaV
afDAWGKV
aLGGGGGV
aLGGGGQV
lGGGmYeV
aaaaaaaV
"}
maps/cynosure/submaps/8x9/MeetingRoom.dmm
+4 -3
View File
@@ -12,9 +12,10 @@
"q" = (/obj/structure/table/woodentable,/obj/item/device/paicard,/turf/simulated/floor/carpet,/area/template_noop)
"r" = (/obj/structure/bed/chair/sofa/brown/left{dir = 8},/obj/random/maintenance,/turf/simulated/floor/carpet,/area/template_noop)
"u" = (/obj/structure/reagent_dispensers/water_cooler/full{dir = 1},/turf/simulated/floor/wood,/area/template_noop)
"w" = (/obj/structure/sign/poster{pixel_y = 32; poster_decl = /decl/poster/nanotrasen/pol_10},/turf/simulated/floor/carpet,/area/template_noop)
"w" = (/obj/structure/sign/poster{dir = 1; pixel_y = 32; poster_decl = /decl/poster/nanotrasen/pol_10},/turf/simulated/floor/carpet,/area/template_noop)
"x" = (/obj/structure/bed/chair/sofa/brown/left{dir = 4},/turf/simulated/floor/carpet,/area/template_noop)
"z" = (/obj/structure/table/woodentable,/obj/random/mre,/obj/random/snack,/obj/random/snack,/turf/simulated/floor/wood,/area/template_noop)
"z" = (/obj/structure/table/woodentable,/obj/random/mre,/obj/random/snack,/obj/machinery/reagentgrinder,/turf/simulated/floor/wood,/area/template_noop)
"A" = (/obj/structure/sign/poster/custom{dir = 8; pixel_x = -32; poster_decl = /decl/poster/vore_43},/turf/simulated/floor/wood/broken,/area/template_noop)
"B" = (/turf/simulated/floor/carpet,/area/template_noop)
"C" = (/obj/effect/graffitispawner{color = "#FF9300"; color_secondary = "#A55403"; graffiti_type = "end"},/turf/simulated/floor/wood,/area/template_noop)
"D" = (/obj/effect/graffitispawner{color = "#FFF200"; color_secondary = "#886422"; graffiti_type = "guy"},/obj/machinery/light/flamp,/turf/simulated/floor/wood,/area/template_noop)
@@ -40,7 +41,7 @@ aDwngRVa
aGxXHQGa
aGSqdlGa
aGbLJrEa
aMTkoBGa
aATkoBGa
aZCGGMia
azWMOuaa
aaacaaam
maps/cynosure/submaps/8x9/MouseHouse.dmm
+3 -2
View File
@@ -18,12 +18,13 @@
"B" = (/obj/structure/dogbed,/obj/random/plushie,/turf/simulated/floor/carpet/bcarpet,/area/template_noop)
"F" = (/obj/structure/sink{dir = 8; pixel_x = -12; pixel_y = 2},/obj/item/weapon/reagent_containers/food/snacks/wishsoup{pixel_y = -6},/turf/simulated/floor/carpet/bcarpet,/area/template_noop)
"G" = (/obj/item/trash/semki,/turf/simulated/floor/carpet/bcarpet,/area/template_noop)
"H" = (/obj/structure/sign/poster{pixel_x = -32; poster_decl = /decl/poster/bay_49},/turf/simulated/floor/wood,/area/template_noop)
"H" = (/obj/structure/sign/poster{dir = 8; pixel_x = -32; poster_decl = /decl/poster/bay_49},/turf/simulated/floor/wood,/area/template_noop)
"J" = (/obj/item/weapon/beach_ball,/turf/simulated/floor/carpet/bcarpet,/area/template_noop)
"K" = (/obj/structure/bed/chair/office/dark{dir = 1},/turf/simulated/floor/wood,/area/template_noop)
"L" = (/obj/item/trash/candy,/turf/simulated/floor/carpet/bcarpet,/area/template_noop)
"M" = (/obj/structure/window/basic{dir = 1},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/wood,/area/template_noop)
"O" = (/obj/machinery/light/small,/turf/simulated/floor/wood,/area/template_noop)
"R" = (/obj/structure/dogbed,/mob/living/simple_mob/animal/passive/mouse,/obj/structure/sign/poster{pixel_y = 32; poster_decl = /decl/poster/vore_91},/turf/simulated/floor/carpet/bcarpet,/area/template_noop)
"S" = (/obj/item/weapon/shreddedp,/turf/simulated/floor/carpet/bcarpet,/area/template_noop)
"T" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/item/device/flashlight/lamp/green,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/turf/simulated/floor/wood,/area/template_noop)
"V" = (/obj/structure/dogbed,/mob/living/simple_mob/animal/passive/mouse,/turf/simulated/floor/carpet/bcarpet,/area/template_noop)
@@ -33,7 +34,7 @@
(1,1,1) = {"
aaaaaaaa
aVBnVfVa
aVBnRfVa
aGXXXXXa
aFSXXlXa
avbLJSta
maps/cynosure/submaps/8x9/ReptileRoom.dmm
+2 -2
View File
@@ -3,12 +3,12 @@
"h" = (/obj/effect/decal/remains/lizard,/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
"k" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/obj/random/powercell,/turf/simulated/floor/wood,/area/template_noop)
"m" = (/turf/template_noop,/area/template_noop)
"n" = (/obj/structure/dogbed,/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
"n" = (/obj/structure/dogbed,/obj/structure/sign/poster{pixel_y = 32; poster_decl = /decl/poster/vore_45},/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
"o" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/random/maintenance,/obj/random/drinksoft,/obj/random/snack,/obj/random/snack,/turf/simulated/floor/wood,/area/template_noop)
"p" = (/obj/structure/dogbed,/mob/living/simple_mob/animal/passive/lizard/large,/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
"u" = (/obj/structure/flora/pottedplant/overgrown,/turf/simulated/floor/wood,/area/template_noop)
"v" = (/obj/machinery/door/window/westright,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/template_noop)
"w" = (/obj/structure/sign/poster{pixel_x = -32; poster_decl = /decl/poster/bay_19},/turf/simulated/floor/wood/broken,/area/template_noop)
"w" = (/obj/structure/sign/poster{dir = 8; pixel_x = -32; poster_decl = /decl/poster/bay_19},/turf/simulated/floor/wood/broken,/area/template_noop)
"x" = (/obj/machinery/light/small{dir = 4},/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
"z" = (/obj/structure/loot_pile/maint/trash,/turf/simulated/floor/wood,/area/template_noop)
"B" = (/obj/structure/dogbed,/mob/living/simple_mob/animal/passive/lizard,/obj/item/trash/unajerky,/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop)
maps/cynosure/submaps/8x9/RitualRoom.dmm
+1 -1
View File
@@ -3,7 +3,7 @@
"f" = (/obj/structure/table/sifwoodentable,/obj/item/godfig{desc = "A holy figure of some kind of energy formation."; icon_state = "singularity"},/obj/random/maintenance/clean,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/turf/simulated/floor/tiled/dark,/area/template_noop)
"g" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/template_noop)
"m" = (/turf/template_noop,/area/template_noop)
"n" = (/obj/item/weapon/storage/backpack/cultpack,/obj/item/clothing/suit/storage/hooded/chaplain_hoodie,/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/clean,/turf/simulated/floor/tiled/dark,/area/template_noop)
"n" = (/obj/item/weapon/storage/backpack/cultpack,/obj/item/clothing/suit/storage/hooded/chaplain_hoodie,/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/clean,/obj/structure/sign/poster/custom{dir = 1; pixel_y = 32; poster_decl = /decl/poster/vore_100},/turf/simulated/floor/tiled/dark,/area/template_noop)
"q" = (/obj/effect/decal/cleanable/generic,/turf/simulated/floor/tiled/dark,/area/template_noop)
"r" = (/obj/effect/graffitispawner{color = "#DA0000"; color_secondary = "#810C0C"; graffiti_type = "rune4"},/turf/simulated/floor/tiled/dark,/area/template_noop)
"t" = (/obj/structure/flora/pottedplant/dead,/turf/simulated/floor/tiled/dark,/area/template_noop)
maps/cynosure/submaps/9x10/ShootingRange.dmm
+3 -2
View File
@@ -9,7 +9,8 @@
"o" = (/obj/item/frame/light{dir = 8},/turf/simulated/floor/tiled/steel_dirty,/area/template_noop)
"p" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/techmaint,/area/template_noop)
"s" = (/obj/machinery/door/airlock{name = "Construction Area"},/obj/item/tape/police,/turf/simulated/floor/tiled/steel_grid,/area/template_noop)
"t" = (/obj/machinery/magnetic_controller{autolink = 1; pixel_y = -30},/obj/structure/cable,/obj/machinery/power/apc{dir = 4; name = "east bump"; operating = 0; pixel_x = 24},/obj/effect/floor_decal/steeldecal/steel_decals_central7{dir = 4},/obj/machinery/light_switch{dir = 8; pixel_x = 24; pixel_y = -12},/turf/simulated/floor/tiled/techmaint,/area/template_noop)
"t" = (/obj/machinery/magnetic_controller{autolink = 1; density = 0; pixel_y = -30},/obj/structure/cable,/obj/machinery/power/apc{dir = 4; name = "east bump"; operating = 0; pixel_x = 24},/obj/effect/floor_decal/steeldecal/steel_decals_central7{dir = 4},/obj/machinery/light_switch{dir = 8; pixel_x = 24; pixel_y = -12},/turf/simulated/floor/tiled/techmaint,/area/template_noop)
"v" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/structure/sign/poster/custom{pixel_y = -32; poster_decl = /decl/poster/vore_37},/turf/simulated/floor/tiled/techmaint,/area/template_noop)
"w" = (/obj/machinery/magnetic_module,/obj/effect/catwalk_plated,/turf/simulated/floor/plating,/area/template_noop)
"x" = (/obj/random/crate,/obj/item/target/syndicate,/obj/item/target/syndicate,/obj/item/weapon/storage/box/practiceshells/large,/obj/item/ammo_magazine/m45/practice,/obj/item/ammo_magazine/m45/practice,/obj/item/ammo_magazine/s45/practice,/obj/item/ammo_magazine/s45/practice,/obj/item/ammo_magazine/m9mmt/practice,/turf/simulated/floor/plating,/area/template_noop)
"y" = (/turf/template_noop,/area/template_noop)
@@ -37,6 +38,6 @@ aNNNNOlay
aNINNOBmy
aUUUUZpay
aXkekfMay
aQYFFFtay
aQYFFvtay
aaaasaaay
"}
maps/cynosure/submaps/9x10/Theater.dmm
+1 -1
View File
@@ -11,7 +11,7 @@
"v" = (/obj/item/frame/light{dir = 4},/turf/simulated/floor/plating,/area/template_noop)
"x" = (/obj/random/obstruction,/turf/simulated/floor/plating,/area/template_noop)
"y" = (/obj/item/device/instrument/violin,/turf/simulated/floor/wood,/area/template_noop)
"z" = (/obj/item/stack/tile/carpet,/obj/structure/sign/poster{pixel_y = -32; poster_decl = /decl/poster/bay_16},/turf/simulated/floor/wood,/area/template_noop)
"z" = (/obj/item/stack/tile/carpet,/obj/structure/sign/poster{pixel_y = -32; poster_decl = /decl/poster/vore_96},/turf/simulated/floor/wood,/area/template_noop)
"A" = (/turf/simulated/floor/plating,/area/template_noop)
"B" = (/obj/machinery/light,/turf/simulated/floor/wood,/area/template_noop)
"F" = (/obj/structure/table/bench,/turf/simulated/floor/plating,/area/template_noop)
maps/cynosure/submaps/9x8/GamesRoom.dmm
+1 -1
View File
@@ -11,7 +11,7 @@
"q" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/template_noop,/area/template_noop)
"s" = (/obj/item/device/radio/intercom{dir = 1; pixel_y = 21},/turf/simulated/floor/wood,/area/template_noop)
"u" = (/obj/item/stack/tile/wood,/turf/simulated/floor/plating,/area/template_noop)
"v" = (/obj/structure/sign/poster/custom{pixel_y = 32; poster_decl = /decl/poster/pol_15},/turf/simulated/floor/wood,/area/template_noop)
"v" = (/obj/structure/sign/poster/custom{dir = 1; pixel_y = 32; poster_decl = /decl/poster/pol_15},/turf/simulated/floor/wood,/area/template_noop)
"x" = (/obj/structure/table/gamblingtable,/obj/item/weapon/storage/pill_bottle/dice,/obj/item/weapon/coin/silver{pixel_x = 7; pixel_y = 12},/obj/item/weapon/coin/silver{pixel_x = 12; pixel_y = 7},/turf/simulated/floor/wood,/area/template_noop)
"y" = (/obj/effect/graffitispawner{color = "#2D2D2D"; color_secondary = "#000000"; graffiti_type = "uboa"},/turf/simulated/floor/wood,/area/template_noop)
"A" = (/obj/structure/sign/poster{pixel_y = -32; poster_decl = /decl/poster/bay_13},/turf/simulated/floor/plating,/area/template_noop)
maps/cynosure/submaps/9x8/HotTub.dmm
+1 -1
View File
@@ -11,7 +11,7 @@
"n" = (/obj/structure/table/rack,/obj/item/weapon/towel/random,/obj/item/weapon/towel/random,/turf/simulated/floor/tiled/techfloor,/area/template_noop)
"o" = (/obj/machinery/door/airlock{name = "Construction Area"},/obj/machinery/atmospherics/pipe/cap/hidden/scrubbers{dir = 1},/turf/simulated/floor/tiled/steel_grid,/area/template_noop)
"q" = (/obj/machinery/pump,/turf/simulated/floor/tiled/techfloor,/area/template_noop)
"t" = (/obj/effect/floor_decal/techfloor/corner{dir = 6},/obj/effect/floor_decal/techfloor/orange/corner,/obj/structure/sign/poster/custom{pixel_y = 32; poster_decl = /decl/poster/bay_11},/turf/simulated/floor/tiled/techfloor,/area/template_noop)
"t" = (/obj/effect/floor_decal/techfloor/corner{dir = 6},/obj/effect/floor_decal/techfloor/orange/corner,/obj/structure/sign/poster/custom{dir = 1; pixel_y = 32; poster_decl = /decl/poster/bay_11},/turf/simulated/floor/tiled/techfloor,/area/template_noop)
"u" = (/obj/effect/floor_decal/techfloor/orange{dir = 1},/obj/item/stack/tile/floor/techgrey,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/techfloor,/area/template_noop)
"w" = (/obj/effect/floor_decal/techfloor/corner{dir = 10},/obj/effect/floor_decal/techfloor/orange/corner{dir = 8},/obj/item/clothing/suit/caution,/turf/simulated/floor/tiled/techfloor,/area/template_noop)
"x" = (/obj/effect/floor_decal/spline/plain{dir = 8},/turf/simulated/floor/water/pool{name = "hot tub"},/area/template_noop)
maps/cynosure/submaps/9x8/ServerRoom.dmm
+3 -3
View File
@@ -17,13 +17,13 @@
"H" = (/turf/simulated/floor/tiled/techfloor/grid,/area/template_noop)
"J" = (/obj/machinery/light_construct/small,/turf/simulated/floor/tiled/techfloor/grid,/area/template_noop)
"K" = (/obj/structure/salvageable/server,/turf/simulated/floor/tiled/techfloor/grid,/area/template_noop)
"N" = (/obj/structure/table/steel,/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/structure/salvageable/personal,/turf/simulated/floor/tiled/techfloor/grid,/area/template_noop)
"N" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/structure/salvageable/personal,/turf/simulated/floor/tiled/techfloor/grid,/area/template_noop)
"O" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/techfloor/grid,/area/template_noop)
"Q" = (/obj/structure/table/steel,/obj/random/tech_supply/component/nofail,/obj/random/tech_supply/nofail,/obj/random/tech_supply/component,/obj/random/tech_supply/component,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/maintenance,/obj/structure/sign/poster/custom{pixel_y = -32; poster_decl = /decl/poster/bay_38},/turf/simulated/floor/tiled/techfloor/grid,/area/template_noop)
"Q" = (/obj/random/tech_supply/component/nofail,/obj/random/tech_supply/nofail,/obj/random/tech_supply/component,/obj/random/tech_supply/component,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/maintenance,/obj/structure/sign/poster/custom{pixel_y = -32; poster_decl = /decl/poster/bay_38},/obj/structure/table/reinforced,/turf/simulated/floor/tiled/techfloor/grid,/area/template_noop)
"R" = (/obj/machinery/light_construct/small{dir = 1},/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/tiled/techfloor/grid,/area/template_noop)
"V" = (/obj/structure/salvageable/server,/obj/machinery/alarm{pixel_y = 24},/turf/simulated/floor/tiled/techfloor/grid,/area/template_noop)
"W" = (/obj/machinery/atmospherics/unary/vent_pump,/turf/simulated/floor/tiled/techfloor/grid,/area/template_noop)
"Z" = (/obj/structure/table/steel,/obj/structure/sign/poster{pixel_x = -32; poster_decl = /decl/poster/bay_3},/obj/item/device/radio/intercom{dir = 1; pixel_y = 21},/obj/random/technology_scanner,/obj/item/weapon/bikehorn/rubberducky,/turf/simulated/floor/tiled/techfloor/grid,/area/template_noop)
"Z" = (/obj/structure/sign/poster{dir = 8; pixel_x = -32; poster_decl = /decl/poster/bay_3},/obj/item/device/radio/intercom{dir = 1; pixel_y = 21},/obj/random/technology_scanner,/obj/item/weapon/bikehorn/rubberducky,/obj/structure/table/reinforced,/turf/simulated/floor/tiled/techfloor/grid,/area/template_noop)
(1,1,1) = {"
paaaaaaaa
maps/cynosure/submaps/_cynosure_submaps.dm
+5 -5
View File
@@ -13,7 +13,7 @@
#include "9x8/HotTub.dmm"
#endif
// The PoIs below, unlike other randomly placed Points of Interest, are placed in fixed positions inside the station,
// The PoIs below, unlike other randomly placed Points of Interest, are placed in fixed positions inside the station,
// in pre-determined locations. One PoI in each 'group' will always be spawned.
/datum/map_template/cynosure_fixed
@@ -66,9 +66,9 @@
/datum/map_template/cynosure_fixed/eight_by_five_maint
/datum/map_template/cynosure_fixed/eight_by_five_maint/drug_den
name = "Drug Den"
mappath = 'maps/cynosure/submaps/8x5/DrugDen.dmm'
/datum/map_template/cynosure_fixed/eight_by_five_maint/growers_den
name = "Grower's Den"
mappath = 'maps/cynosure/submaps/8x5/GrowersDen.dmm'
/datum/map_template/cynosure_fixed/eight_by_five_maint/hidden_bar
name = "Hidden Bar"
@@ -79,7 +79,7 @@
mappath = 'maps/cynosure/submaps/8x5/Restroom.dmm'
/datum/map_template/cynosure_fixed/eight_by_five_maint/squatters_den
name = "Squatters' Den"
name = "Squatter's Den"
mappath = 'maps/cynosure/submaps/8x5/SquattersDen.dmm'