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.

Sign up for GitHub

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

Баллистические пистолеты в экстренный арсенал... [PREDATOR? - EDITION] #344

Merged
merged 19 commits into from
Feb 12, 2024
Merged

Баллистические пистолеты в экстренный арсенал... [PREDATOR? - EDITION] #344

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
c3212e9
Пистолеты
Exapsters Oct 27, 2023
09e81e5
Новые спрайты шоковой винтовки и карабина
Exapsters Oct 30, 2023
581095f
Чистка сборки от лишних спрайтов
Exapsters Nov 8, 2023
2913996
Незначительные изменения в спрайте продвинутого мачете
Exapsters Nov 8, 2023
afafb9e
Мерж с Бэя новых иконок для предохранителя
Exapsters Nov 8, 2023
f079bf6
Новый пистолет в арсенал ОСБ
Exapsters Dec 2, 2023
571e363
Merge branch 'remastered_new_dev_proxima_2022_gold_edition' into RND-…
Exapsters Dec 15, 2023
626b5d0
Перевод
Exapsters Dec 27, 2023
e879f2e
Исправления ошибок на карте
Exapsters Feb 12, 2024
87b0109
Добавление новых контейнеров
Exapsters Feb 12, 2024
ce6ff9d
Накопительное обновление
Exapsters Feb 12, 2024
26aac90
Merge branch 'remastered_new_dev_proxima_2022_gold_edition' into RND-…
Exapsters Feb 12, 2024
7233fd1
Исправления по оружию
Exapsters Feb 12, 2024
c1ef097
Исправление работы НТсети
Exapsters Feb 12, 2024
01a39cc
Merge remote-tracking branch 'upstream/remastered_new_dev_proxima_202…
Exapsters Feb 12, 2024
4ed8469
Delete icon_uni.dmi
Exapsters Feb 12, 2024
5e3f2e0
Delete hats.dmi
Exapsters Feb 12, 2024
ccc8001
Новые кейсы для дробовиков
Exapsters Feb 12, 2024
d3e60d9
Изменения в арсеналах
Exapsters Feb 12, 2024
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
Binary file modified icons/obj/guns/taser.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/guns/taser_carbine.dmi
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions maps/torch/torch5_deck1.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29301,9 +29301,9 @@
/obj/item/gun/energy/gun/secure,
/obj/item/gun/energy/gun/secure,
/obj/item/gun/energy/gun/secure,
/obj/item/gun/energy/k342/pistol/explo,
/obj/item/gun/energy/k342/pistol/explo,
/obj/item/gun/energy/gun/secure,
/obj/item/gun/projectile/pistol/goodman,
/obj/item/gun/projectile/pistol/goodman,
/obj/item/gun/projectile/pistol/goodman,
/turf/simulated/floor/tiled/techfloor/grid,
/area/command/armoury/tactical)
"vkW" = (
Expand Down