Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

map: Перестановка в рнд и чуток меда на Коробке #6522

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
4596c15
Бикеры без карты
FlitchTime Feb 2, 2025
4da500c
rework
FlitchTime Feb 3, 2025
d32ee2c
Коробка
FlitchTime Feb 3, 2025
d4d6cc3
Фикс стола
FlitchTime Feb 3, 2025
4825355
Фикс трубы
FlitchTime Feb 3, 2025
222726d
Шатерсы брига, рнд и фикс трубы
FlitchTime Feb 3, 2025
576cfde
Трубы фикс
FlitchTime Feb 3, 2025
fc19f94
Трубы и пиксель для гранаток
FlitchTime Feb 3, 2025
35007de
Скрабер
FlitchTime Feb 3, 2025
e4ee2ef
Венты в рест руме и фикс почты
FlitchTime Feb 3, 2025
be22af3
Труба 8?
FlitchTime Feb 3, 2025
195bb4c
Фикс окна
FlitchTime Feb 3, 2025
d65ad28
Морг, раздевалка, токсины, химия, генетика
FlitchTime Feb 24, 2025
968d2b2
Откатываем лишнее
FlitchTime Feb 24, 2025
72b39ac
Забытая машинерия и фиксы
FlitchTime Feb 24, 2025
a7c4441
Merge branch 'rework-armory-and-rnd' of https://github.com/FlitchTime…
FlitchTime Feb 24, 2025
d79411a
Ящики
FlitchTime Feb 24, 2025
45ddeda
Фикс конфликтов, проводка для стойки, стена в техах
FlitchTime Feb 24, 2025
b73ed4a
Трубы, шатерсы стойки, свет
FlitchTime Feb 24, 2025
de1b8ee
Шатерсы химии, шатерсы рнд
FlitchTime Feb 24, 2025
126e93d
Кнопки
FlitchTime Feb 24, 2025
789a072
Merge branch 'rework-armory-and-rnd' of https://github.com/FlitchTime…
FlitchTime Feb 26, 2025
f4b8727
Да не трогал я другие карты
FlitchTime Feb 26, 2025
59d05f7
Чистим дельту
FlitchTime Feb 26, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions _maps/map_files/Delta/delta.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -16964,15 +16964,6 @@
/obj/effect/decal/warning_stripes/west,
/turf/simulated/floor/plasteel,
/area/engineering/controlroom)
"cag" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp/green,
/obj/item/storage/secure/briefcase/captian,
/obj/item/radio/intercom{
pixel_y = 28
},
/turf/simulated/floor/carpet,
/area/crew_quarters/captain/bedroom)
"cah" = (
/obj/structure/disposalpipe/segment{
dir = 4
Expand Down Expand Up @@ -74644,6 +74635,15 @@
/obj/effect/decal/warning_stripes/southwest,
/turf/simulated/floor/plasteel,
/area/engineering/engine)
"mrI" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp/green,
/obj/item/storage/secure/briefcase/captian,
/obj/item/radio/intercom{
pixel_y = 28
},
/turf/simulated/floor/carpet,
/area/crew_quarters/captain/bedroom)
"mrN" = (
/turf/simulated/floor/plasteel{
dir = 9;
Expand Down Expand Up @@ -109127,6 +109127,14 @@
icon_state = "neutralcorner"
},
/area/crew_quarters/fitness)
"uee" = (
/obj/structure/closet/sechammercabinet{
pixel_y = -30
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/security/securearmory)
"ueh" = (
/obj/structure/cable{
icon_state = "1-2"
Expand Down Expand Up @@ -119640,14 +119648,6 @@
/obj/item/trash/spentcasing,
/turf/simulated/floor/plating,
/area/maintenance/tourist)
"wCY" = (
/obj/structure/closet/sechammercabinet{
pixel_y = -30
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/security/securearmory)
"wDc" = (
/obj/effect/turf_decal/siding/green/corner{
color = "";
Expand Down Expand Up @@ -166576,7 +166576,7 @@ bwf
cai
oqr
bST
cag
mrI
bMN
lEy
poi
Expand Down Expand Up @@ -181216,7 +181216,7 @@ vNX
gRA
ePU
wCH
wCY
uee
lhS
tVr
iHp
Expand Down
42 changes: 21 additions & 21 deletions _maps/map_files/celestation/celestation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -19141,15 +19141,6 @@
icon_state = "brownfull"
},
/area/teleporter/quantum/engi)
"czI" = (
/obj/structure/closet/sechammercabinet{
pixel_x = 30
},
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkred"
},
/area/security/armory)
"czK" = (
/obj/structure/disposalpipe/segment{
dir = 4
Expand Down Expand Up @@ -39318,16 +39309,6 @@
icon_state = "blue"
},
/area/hallway/primary/fore)
"gfF" = (
/obj/structure/table/wood,
/obj/item/storage/secure/briefcase/captian,
/obj/machinery/atmospherics/pipe/simple/hidden/universal{
dir = 4
},
/turf/simulated/floor/wood/fancy/light{
color = "gray"
},
/area/crew_quarters/captain)
"gfP" = (
/obj/machinery/alarm{
pixel_y = 26
Expand Down Expand Up @@ -39504,6 +39485,16 @@
icon_state = "red"
},
/area/security/checkpoint/south)
"ghn" = (
/obj/structure/table/wood,
/obj/item/storage/secure/briefcase/captian,
/obj/machinery/atmospherics/pipe/simple/hidden/universal{
dir = 4
},
/turf/simulated/floor/wood/fancy/light{
color = "gray"
},
/area/crew_quarters/captain)
"ghr" = (
/obj/machinery/power/tracker,
/obj/structure/cable{
Expand Down Expand Up @@ -118262,6 +118253,15 @@
/obj/machinery/light/small,
/turf/simulated/floor/plating,
/area/hallway/spacebridge/engmed)
"vsD" = (
/obj/structure/closet/sechammercabinet{
pixel_x = 30
},
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkred"
},
/area/security/armory)
"vsJ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/grass,
Expand Down Expand Up @@ -235803,7 +235803,7 @@ aeM
aeM
dFy
pCJ
gfF
ghn
pMs
pMs
anB
Expand Down Expand Up @@ -285678,7 +285678,7 @@ rmd
puS
pus
nxd
czI
vsD
gRJ
pNG
aeM
Expand Down
38 changes: 19 additions & 19 deletions _maps/map_files/cerestation/cerestation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -5620,13 +5620,6 @@
icon_state = "darkblue"
},
/area/bridge)
"aVg" = (
/obj/item/storage/secure/briefcase/captian,
/obj/structure/table/wood,
/turf/simulated/floor/wood/fancy/light{
color = "gray"
},
/area/crew_quarters/captain)
"aVj" = (
/obj/machinery/door/airlock/glass{
id = "Courtroom";
Expand Down Expand Up @@ -24902,16 +24895,6 @@
},
/turf/simulated/floor/plating,
/area/security/prison/cell_block/A)
"dlB" = (
/obj/effect/decal/warning_stripes/red/hollow,
/obj/vehicle/ridden/secway,
/obj/structure/closet/sechammercabinet{
pixel_x = 30
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/security/armory)
"dlG" = (
/obj/effect/decal/cleanable/cobweb,
/obj/machinery/atmospherics/unary/portables_connector{
Expand Down Expand Up @@ -32374,6 +32357,16 @@
icon_state = "dark"
},
/area/security/podbay)
"fub" = (
/obj/effect/decal/warning_stripes/red/hollow,
/obj/vehicle/ridden/secway,
/obj/structure/closet/sechammercabinet{
pixel_x = 30
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/security/armory)
"fue" = (
/obj/machinery/status_display{
layer = 4
Expand Down Expand Up @@ -37304,6 +37297,13 @@
icon_state = "bcircuit"
},
/area/turret_protected/ai)
"gUz" = (
/obj/item/storage/secure/briefcase/captian,
/obj/structure/table/wood,
/turf/simulated/floor/wood/fancy/light{
color = "gray"
},
/area/crew_quarters/captain)
"gUG" = (
/obj/machinery/light/small,
/obj/structure/closet/toolcloset,
Expand Down Expand Up @@ -121390,7 +121390,7 @@ tSH
bBH
iEg
tVe
dlB
fub
fnb
kEg
alQ
Expand Down Expand Up @@ -130634,7 +130634,7 @@ lRM
eTm
vlV
aNu
aVg
gUz
aEU
aEU
rQw
Expand Down
Loading