Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
6232935
Часть 1. Оно компилится
dageavtobusnick May 15, 2026
b6d10da
Merge branch 'master220' into vox_raider
dageavtobusnick May 16, 2026
8eee4bf
Карта логова и скипджека + тгуи + фиксы
dageavtobusnick May 18, 2026
d42ddb6
ребилд
dageavtobusnick May 18, 2026
e4443e9
Фиксы
dageavtobusnick May 18, 2026
626fc15
Merge branch 'master220' into vox_raider
dageavtobusnick May 18, 2026
2d35562
Update tgui.bundle.js
dageavtobusnick May 18, 2026
c7c5804
фиксы
dageavtobusnick May 18, 2026
22f6fc0
Фикс линтера
dageavtobusnick May 18, 2026
00b0ec8
фиксы 2
dageavtobusnick May 18, 2026
438e850
фикс
dageavtobusnick May 18, 2026
84ea5d2
фикс конфликта на тестмердже
dageavtobusnick May 19, 2026
1196527
Merge branch 'master220' into vox_raider
dageavtobusnick May 19, 2026
8ca8f8b
Фиксы оценщика и карты
dageavtobusnick May 19, 2026
67cf0f0
миксрофикс
dageavtobusnick May 19, 2026
25104fb
фикс
dageavtobusnick May 19, 2026
d84bc25
худы воксов рейдеров
dageavtobusnick May 19, 2026
509e6e7
иконка офера
dageavtobusnick May 19, 2026
ea81afe
Фиксы
dageavtobusnick May 19, 2026
936eebd
Фикс канала двубуквеных каналов
dageavtobusnick May 19, 2026
a9b225a
Фикс парсинга say
dageavtobusnick May 20, 2026
c2c0ade
Рефактор + продажа газов для воксов
dageavtobusnick May 21, 2026
e9a0192
фикс
dageavtobusnick May 21, 2026
7e840fc
Merge branch 'master220' into vox_raider
dageavtobusnick May 26, 2026
5a41dac
Update tgui.bundle.js
dageavtobusnick May 26, 2026
310595d
Merge branch 'master220' into vox_raider
dageavtobusnick Jun 1, 2026
6bcf41f
Update tgui.bundle.js
dageavtobusnick Jun 1, 2026
91a849c
Фикс префабных дефибов
dageavtobusnick Jun 1, 2026
def8e1b
Merge branch 'master220' into vox_raider
dageavtobusnick Jun 2, 2026
3861e1c
Фикс локализации
dageavtobusnick Jun 2, 2026
fb2cf5c
Merge branch 'master220' into vox_raider
dageavtobusnick Jun 18, 2026
74faa82
бандл
dageavtobusnick Jun 18, 2026
746bea4
Merge branch 'master220' into vox_raider
dageavtobusnick Jun 18, 2026
7ab0369
Фикс несуществующего пути
dageavtobusnick Jun 18, 2026
8bfc92c
Merge branch 'vox_raider' of https://github.com/dageavtobusnick/Parad…
dageavtobusnick Jun 18, 2026
f99a1ea
Merge branch 'master220' into vox_raider
dageavtobusnick Jun 19, 2026
68136f7
Дофикс конфликтов
dageavtobusnick Jun 19, 2026
45b9be5
new_line
dageavtobusnick Jun 19, 2026
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
3,101 changes: 1,528 additions & 1,573 deletions _maps/map_files/Delta/delta.dmm

Large diffs are not rendered by default.

56 changes: 26 additions & 30 deletions _maps/map_files/RandomZLevels/spacebattle.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3182,13 +3182,6 @@
icon_state = "neutral"
},
/area/awaymission/spacebattle/hallway6)
"jM" = (
/obj/machinery/optable,
/obj/machinery/defibrillator_mount/loaded/directional/south,
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/awaymission/spacebattle/syndicate2)
"jO" = (
/obj/structure/closet/secure_closet/engineering_welding,
/turf/simulated/floor/shuttle{
Expand Down Expand Up @@ -4168,6 +4161,14 @@
icon_state = "floor4"
},
/area/awaymission/spacebattle/syndicate1)
"mJ" = (
/obj/structure/closet/crate/secure/bin/anchored,
/obj/item/flashlight/seclite,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "neutral"
},
/area/awaymission/spacebattle/hallway8)
"mL" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/wall/shuttle/onlyselfsmooth,
Expand Down Expand Up @@ -6895,6 +6896,14 @@
},
/turf/simulated/floor/plasteel,
/area/awaymission/spacebattle/engine)
"vb" = (
/obj/structure/closet/crate/secure/bin/anchored,
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "neutral"
},
/area/awaymission/spacebattle/hallway1)
"vc" = (
/obj/structure/sign/securearea{
pixel_y = -32
Expand Down Expand Up @@ -7820,16 +7829,6 @@
/obj/structure/grille/broken,
/turf/space,
/area/space/nearstation)
"xI" = (
/obj/structure/closet/crate/secure/bin{
anchored = 1
},
/obj/item/flashlight/seclite,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "neutral"
},
/area/awaymission/spacebattle/hallway8)
"xJ" = (
/mob/living/simple_animal/hostile/hivebot/tele,
/turf/simulated/floor/plating/asteroid/airless,
Expand Down Expand Up @@ -9516,16 +9515,6 @@
},
/turf/simulated/floor/plating,
/area/awaymission/spacebattle/turret9)
"CI" = (
/obj/structure/closet/crate/secure/bin{
anchored = 1
},
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "neutral"
},
/area/awaymission/spacebattle/hallway1)
"CJ" = (
/obj/structure/closet/crate/secure/bin,
/obj/effect/spawner/lootdrop/maintenance,
Expand Down Expand Up @@ -15558,6 +15547,13 @@
},
/turf/simulated/floor/plasteel,
/area/awaymission/spacebattle/engineering)
"UC" = (
/obj/machinery/optable,
/obj/machinery/defibrillator_mount/loaded/directional/south,
/turf/simulated/floor/shuttle{
icon_state = "floor3"
},
/area/awaymission/spacebattle/syndicate2)
"UD" = (
/obj/effect/mapping_helpers/turfs/damage,
/obj/structure/inflatable,
Expand Down Expand Up @@ -40593,7 +40589,7 @@ Zh
EJ
IT
vY
CI
vb
eH
Ts
UE
Expand Down Expand Up @@ -52828,7 +52824,7 @@ at
bM
Xu
Ss
jM
UC
OD
be
em
Expand Down Expand Up @@ -59594,7 +59590,7 @@ Tf
eH
RF
yp
xI
mJ
eH
ab
ce
Expand Down
Loading
Loading