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

temp #3926

Closed
wants to merge 89 commits into from
Closed

temp #3926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
6ff48ef
Revert "thats all!"
NightDawnFox May 9, 2023
7ea5cc7
Merge remote-tracking branch 'upstream/master220' into master220
NightDawnFox Jun 17, 2023
29c9ce4
that's all!
NightDawnFox Jun 24, 2023
ada3e72
Revert "that's all!"
NightDawnFox Jun 24, 2023
afecd84
1
NightDawnFox Sep 17, 2023
9077a8f
2
NightDawnFox Sep 17, 2023
cb2ab5e
3
NightDawnFox Sep 27, 2023
7b4fb21
new lavaruin - spaceship
NightDawnFox Sep 27, 2023
d1b0cfd
hotfix
NightDawnFox Sep 27, 2023
d084025
hotfix2
NightDawnFox Sep 27, 2023
5a7424d
господи блядь как я ненавижу ебаный мапинг убейте меня кто-нибудь
NightDawnFox Sep 27, 2023
8149b43
Update lavaland_surface_pirateship.dmm
NightDawnFox Sep 27, 2023
851535c
sprites
NightDawnFox Sep 27, 2023
87a5bfb
sprites2
NightDawnFox Sep 28, 2023
5693977
yesss
NightDawnFox Sep 28, 2023
490c018
mapping 2
NightDawnFox Sep 29, 2023
a576e5e
Закончил с украшениями и гемами.
NightDawnFox Oct 4, 2023
3ec2182
fix
NightDawnFox Oct 4, 2023
64b1dcc
Новые голиафы, часть 1
NightDawnFox Oct 5, 2023
3a1f105
Новые голиафы, часть 2
NightDawnFox Oct 6, 2023
578040a
Небольшой нерф/бафф наблюдателей
NightDawnFox Oct 6, 2023
ae3aa45
add: Colorful buckets and Cleanbots (#3597)
Vladisvell Oct 4, 2023
d68adbb
Сильный бафф нестандартных вотчеров
NightDawnFox Oct 8, 2023
a9b8f16
Доработка Легионов
NightDawnFox Oct 8, 2023
bd63bd5
Делаем легионов В РАЗЫ ОПАСНЕЕ
NightDawnFox Oct 8, 2023
784bf58
Увы
NightDawnFox Oct 8, 2023
69433cf
увы2
NightDawnFox Oct 8, 2023
8c6e7d7
Новый подтип мароу уивера - ледяной
NightDawnFox Oct 9, 2023
607440c
Упс.
NightDawnFox Oct 9, 2023
f8015c1
Рыбалка
NightDawnFox Oct 13, 2023
f9614d3
bugfix: sprite corrections by @piotrthetchaikowsky (#3692)
Daeberdir Oct 10, 2023
62ac041
Баффы ручных шахтерских инструментов
NightDawnFox Oct 13, 2023
f45b79e
Update lavaland_surface_seed_vault.dmm
NightDawnFox Oct 13, 2023
9d59635
ой.
NightDawnFox Oct 13, 2023
87a11db
ой-ёй.
NightDawnFox Oct 13, 2023
7941a16
Плюс декали, деревянные полы, грязь и мусор.
NightDawnFox Oct 13, 2023
e5a1fa7
ой...
NightDawnFox Oct 13, 2023
aff6499
fuck
NightDawnFox Oct 14, 2023
996adef
Набор багфиксов и балансных правок
NightDawnFox Oct 14, 2023
dafd333
балансные правки 2
NightDawnFox Oct 14, 2023
7985b78
Мне нельзя доверять баланс.
NightDawnFox Oct 14, 2023
b3cee05
Полировка рыбалки
NightDawnFox Oct 18, 2023
a56db95
"реворк" колосса
NightDawnFox Oct 18, 2023
1e0f9c2
Шахтерские рации (работают)
NightDawnFox Oct 20, 2023
3b4a115
bugfix: normal drake hood for vulps (#3721)
NightDawnFox Oct 17, 2023
dbdba96
map
NightDawnFox Oct 20, 2023
e78470a
Кривые лапы
NightDawnFox Oct 20, 2023
38c27d9
да блядь.
NightDawnFox Oct 20, 2023
88b28ae
Пометка шпилей! Новые типы шпилей!
NightDawnFox Oct 21, 2023
b4c7b18
огненный цветок
NightDawnFox Oct 21, 2023
9c6eba8
Порт режима "HRD-MDE" с оффов
NightDawnFox Oct 22, 2023
e176450
fix: wrong-mantisblades-sprite (#3741)
WolfLox Oct 21, 2023
7e40e56
fix 1
NightDawnFox Oct 22, 2023
b921923
Казалось бы, одна лишняя скобка
NightDawnFox Oct 22, 2023
a4eb734
фиксы маппинга
NightDawnFox Oct 22, 2023
c7f9b13
Оверрайдер подрывных зарядов
NightDawnFox Oct 24, 2023
d1ced90
Набор портов с оффов и инфляции
NightDawnFox Oct 24, 2023
7185823
Revert: seed vault + shelter capsules tweak
NightDawnFox Oct 24, 2023
5e507c0
Я даже в реверте умудрился..
NightDawnFox Oct 24, 2023
9ccc260
Твики хардмода мегафауны
NightDawnFox Oct 24, 2023
40ccf0d
ТГУИ.
NightDawnFox Oct 24, 2023
14fc59a
чутка правим рантаймы и переносим карту
NightDawnFox Oct 24, 2023
0004285
Фиксы багов
NightDawnFox Oct 24, 2023
e514c93
Проверка для убирания рантаймов
NightDawnFox Oct 24, 2023
328c1fd
Небольшие приколы пеплоходцам ч.1
NightDawnFox Oct 25, 2023
8e9353f
Смешное добавление пеплоходцам
NightDawnFox Oct 25, 2023
c09bdd5
обновляем названия карты
NightDawnFox Oct 26, 2023
558591c
Починка атмоса
NightDawnFox Oct 26, 2023
e5b4d02
Update gems.dm
NightDawnFox Oct 26, 2023
cb3e95d
Revert "Update gems.dm"
NightDawnFox Oct 26, 2023
c4e5405
Revert "Revert "Update gems.dm""
NightDawnFox Oct 26, 2023
c8495b4
Update gems.dm
NightDawnFox Oct 27, 2023
6094ab5
Merge remote-tracking branch 'upstream/master220' into rework2
NightDawnFox Oct 27, 2023
93fbb77
Исправление багов
NightDawnFox Oct 28, 2023
23a844c
Merge remote-tracking branch 'upstream/master220' into rework2
NightDawnFox Oct 28, 2023
beb651b
Update tgui.bundle.js
NightDawnFox Oct 28, 2023
50ad264
фиксы проблем..
NightDawnFox Oct 28, 2023
a69f4f8
фиксы ч.2
NightDawnFox Oct 28, 2023
762ba1f
ультра-балансная правка.
NightDawnFox Oct 28, 2023
83ae1bb
хотфикс номер раз.
NightDawnFox Nov 5, 2023
3f3508f
Изменения по запросу администрации
NightDawnFox Nov 5, 2023
f854792
Merge remote-tracking branch 'upstream/master220' into rework2
NightDawnFox Nov 16, 2023
d86502e
ладно.
NightDawnFox Nov 16, 2023
44f3577
Merge remote-tracking branch 'upstream/master220' into rework2
NightDawnFox Nov 23, 2023
9abe49b
Фиксы карты + фиксы ДМИ + фиксы тгуи
NightDawnFox Nov 23, 2023
278abbf
хмм
NightDawnFox Nov 23, 2023
781c181
мда
NightDawnFox Nov 23, 2023
e37dc44
46 попыток пофиксить
NightDawnFox Nov 23, 2023
c2a4076
ладно, плевать
NightDawnFox Nov 23, 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
15 changes: 7 additions & 8 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 @@ -3462,14 +3465,6 @@
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"
},
Expand Down Expand Up @@ -7736,6 +7731,10 @@
/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"
Expand Down
Loading