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

add: lavaland rework 1.5 #3776

Merged
merged 66 commits into from
Nov 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
2c19b2c
Revert "that's all!"
NightDawnFox Jun 24, 2023
2ccfdeb
1
NightDawnFox Sep 17, 2023
c37ece1
2
NightDawnFox Sep 17, 2023
ce7a4e7
3
NightDawnFox Sep 27, 2023
fd4b186
Update lavaland_surface_pirateship.dmm
NightDawnFox Sep 27, 2023
3d0b9f8
sprites
NightDawnFox Sep 27, 2023
c416948
sprites2
NightDawnFox Sep 28, 2023
f772bc8
yesss
NightDawnFox Sep 28, 2023
81b5b17
mapping 2
NightDawnFox Sep 29, 2023
bb58e90
Закончил с украшениями и гемами.
NightDawnFox Oct 4, 2023
0710bb5
fix
NightDawnFox Oct 4, 2023
34285b4
Новые голиафы, часть 1
NightDawnFox Oct 5, 2023
afbbaaf
Новые голиафы, часть 2
NightDawnFox Oct 6, 2023
30f11a3
Небольшой нерф/бафф наблюдателей
NightDawnFox Oct 6, 2023
81d5900
Сильный бафф нестандартных вотчеров
NightDawnFox Oct 8, 2023
9d0edd5
Доработка Легионов
NightDawnFox Oct 8, 2023
9f9111a
Делаем легионов В РАЗЫ ОПАСНЕЕ
NightDawnFox Oct 8, 2023
0a5793e
Увы
NightDawnFox Oct 8, 2023
7157633
увы2
NightDawnFox Oct 8, 2023
88ff8df
Новый подтип мароу уивера - ледяной
NightDawnFox Oct 9, 2023
6ca4de5
Упс.
NightDawnFox Oct 9, 2023
bf76cdb
Рыбалка
NightDawnFox Oct 13, 2023
2e34fad
Баффы ручных шахтерских инструментов
NightDawnFox Oct 13, 2023
5ae6af1
fuck
NightDawnFox Oct 14, 2023
882d7c3
Набор багфиксов и балансных правок
NightDawnFox Oct 14, 2023
f2401b7
балансные правки 2
NightDawnFox Oct 14, 2023
29ae79a
Мне нельзя доверять баланс.
NightDawnFox Oct 14, 2023
ab634b2
Полировка рыбалки
NightDawnFox Oct 18, 2023
2b0bdf3
"реворк" колосса
NightDawnFox Oct 18, 2023
5900027
Шахтерские рации (работают)
NightDawnFox Oct 20, 2023
5b47023
map
NightDawnFox Oct 20, 2023
1c9c9ee
Кривые лапы
NightDawnFox Oct 20, 2023
b527325
да блядь.
NightDawnFox Oct 20, 2023
452297d
Пометка шпилей! Новые типы шпилей!
NightDawnFox Oct 21, 2023
7e3873c
огненный цветок
NightDawnFox Oct 21, 2023
f6ce43a
ээээ
NightDawnFox Oct 22, 2023
12ca8f5
fix 1
NightDawnFox Oct 22, 2023
2111e62
Казалось бы, одна лишняя скобка
NightDawnFox Oct 22, 2023
2d2a21d
фиксы маппинга
NightDawnFox Oct 22, 2023
9e34339
Оверрайдер подрывных зарядов
NightDawnFox Oct 24, 2023
8d43667
Набор портов с оффов и инфляции
NightDawnFox Oct 24, 2023
0089fa9
Revert: seed vault + shelter capsules tweak
NightDawnFox Oct 24, 2023
42af587
Я даже в реверте умудрился..
NightDawnFox Oct 24, 2023
ddc7aa8
Твики хардмода мегафауны
NightDawnFox Oct 24, 2023
b71309a
ТГУИ.
NightDawnFox Oct 24, 2023
b035843
чутка правим рантаймы и переносим карту
NightDawnFox Oct 24, 2023
e1b5db1
Фиксы багов
NightDawnFox Oct 24, 2023
f977233
Проверка для убирания рантаймов
NightDawnFox Oct 24, 2023
bea3a68
Небольшие приколы пеплоходцам ч.1
NightDawnFox Oct 25, 2023
0be73f1
Смешное добавление пеплоходцам
NightDawnFox Oct 25, 2023
eb5320b
обновляем названия карты
NightDawnFox Oct 26, 2023
a2ab711
Починка атмоса
NightDawnFox Oct 26, 2023
2815382
Update gems.dm
NightDawnFox Oct 27, 2023
f5eb29d
Исправление багов
NightDawnFox May 9, 2023
6052894
Update tgui.bundle.js
NightDawnFox Oct 28, 2023
1c0abbb
фиксы проблем..
NightDawnFox Oct 28, 2023
97e7686
фиксы ч.2
NightDawnFox Oct 28, 2023
3c12f05
ультра-балансная правка.
NightDawnFox Oct 28, 2023
c850996
хотфикс номер раз.
NightDawnFox Nov 5, 2023
ae357e0
Изменения по запросу администрации
NightDawnFox Nov 5, 2023
11967cb
ладно.
NightDawnFox Nov 16, 2023
4e9ff38
Фиксы карты + фиксы ДМИ + фиксы тгуи
NightDawnFox Nov 23, 2023
0193e36
posmerge fix
NightDawnFox Oct 22, 2023
7ed1701
split-off! screen fog
NightDawnFox Oct 22, 2023
085122d
Fix dmi
Dimach Nov 29, 2023
4f57b09
screen fog
Dimach Nov 29, 2023
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
113 changes: 56 additions & 57 deletions _maps/map_files/Delta/Lavaland.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -900,6 +900,9 @@
/obj/item/reagent_containers/iv_bag/bloodsynthetic/nitrogenis,
/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis,
/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis,
/obj/structure/closet/fishingrodcabinet{
pixel_x = 32
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -1195,16 +1198,6 @@
},
/turf/simulated/floor/plating,
/area/mine/production)
"dW" = (
/obj/machinery/atmospherics/meter,
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/obj/structure/cable{
icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/mine/production)
"dY" = (
/obj/structure/closet/secure_closet/personal,
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -2354,6 +2347,16 @@
},
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors/necropolis)
"jd" = (
/obj/machinery/atmospherics/meter,
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/obj/structure/cable{
icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/mine/production)
"jf" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/arrows,
Expand Down Expand Up @@ -2925,14 +2928,6 @@
},
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"lO" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
dir = 6
},
/obj/machinery/atmospherics/meter,
/turf/simulated/floor/plasteel,
/area/mine/laborcamp)
"lP" = (
/obj/structure/stone_tile/block/cracked{
dir = 4
Expand Down Expand Up @@ -3456,31 +3451,6 @@
icon_state = "barber"
},
/area/mine/laborcamp)
"nV" = (
/obj/structure/table,
/obj/item/storage/toolbox/mechanical{
pixel_x = -2;
pixel_y = -1
},
/obj/item/gps/mining,
/obj/item/gps/mining,
/obj/item/gps/mining,
/obj/item/gps/mining,
/obj/item/gps/mining,
/obj/item/gps/mining,
/obj/item/gps/mining,
/obj/item/gps/mining,
/obj/structure/cable{
icon_state = "0-2"
},
/obj/machinery/power/apc{
dir = 1;
name = "Mining EVA APC";
pixel_x = 1;
pixel_y = 24
},
/turf/simulated/floor/plasteel,
/area/mine/eva)
"nX" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
Expand Down Expand Up @@ -4880,6 +4850,23 @@
},
/turf/simulated/floor/indestructible/boss,
/area/mine/necropolis)
"zy" = (
/obj/structure/table,
/obj/item/storage/toolbox/mechanical{
pixel_x = -2;
pixel_y = -1
},
/obj/structure/cable{
icon_state = "0-2"
},
/obj/machinery/power/apc{
dir = 1;
name = "Mining EVA APC";
pixel_x = 1;
pixel_y = 24
},
/turf/simulated/floor/plasteel,
/area/mine/eva)
"zB" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/visible/universal,
Expand Down Expand Up @@ -6822,6 +6809,20 @@
icon_state = "browncorner"
},
/area/mine/living_quarters)
"PN" = (
/obj/structure/ore_box,
/obj/effect/decal/warning_stripes/yellow/partial{
dir = 1
},
/obj/item/gps/ruin{
pixel_y = 32;
gpstag = "OUTPOST"
},
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "brown"
},
/area/mine/eva)
"PQ" = (
/obj/structure/disposalpipe/segment{
dir = 4
Expand Down Expand Up @@ -7731,16 +7732,6 @@
},
/turf/simulated/floor/indestructible/boss,
/area/mine/necropolis)
"WZ" = (
/obj/structure/ore_box,
/obj/effect/decal/warning_stripes/yellow/partial{
dir = 1
},
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "brown"
},
/area/mine/eva)
"Xd" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
Expand Down Expand Up @@ -7768,6 +7759,14 @@
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
/turf/simulated/floor/indestructible/boss,
/area/mine/necropolis)
"Xm" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
dir = 6
},
/obj/machinery/atmospherics/meter,
/turf/simulated/floor/plasteel,
/area/mine/laborcamp)
"Xn" = (
/obj/structure/stone_tile/block{
dir = 4
Expand Down Expand Up @@ -14954,7 +14953,7 @@ an
an
an
qT
lO
Xm
HA
av
Ov
Expand Down Expand Up @@ -25000,7 +24999,7 @@ Ky
dM
sW
Wo
dW
jd
AB
TH
dt
Expand All @@ -25013,7 +25012,7 @@ QT
Zp
kG
kG
nV
zy
fx
ve
ZH
Expand Down Expand Up @@ -26812,7 +26811,7 @@ ab
ab
ab
ZH
WZ
PN
Mw
nr
ZH
Expand Down
Loading
Loading