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

Переезд на новую ветку #10

Merged
merged 196 commits into from
Oct 5, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
196 commits
Select commit Hold shift + click to select a range
d499cd8
Scarborough Arms (#3336)
rye-rice Sep 12, 2024
3b979f2
Fixes Centcom Ban DB erroring out with bad index (#3337)
ToasterBiome Sep 13, 2024
c1dc8db
fixes no emergency sprite for floor lights (#3349)
FalloutFalcon Sep 13, 2024
f6f5482
New items and rebalances for Outpost Cargo Exploration Tab + Undergro…
Gristlebee Sep 13, 2024
9aae255
Hotfix: Weapon change after merge
MysticalFaceLesS Sep 22, 2024
e0bb59d
Removes Emotes From Most Reagents (#3317)
MemeSnorfer Sep 13, 2024
0037258
useless vars (#3356)
FalloutFalcon Sep 14, 2024
e643291
Fixes double sandwich crafting category (#3357)
trazodont Sep 14, 2024
91cddbd
Fixes south-facing subshuttle prechargers (#3355)
Zevotech Sep 14, 2024
f33c818
Bump webpack from 5.75.0 to 5.94.0 in /tgui (#3314)
dependabot[bot] Sep 14, 2024
23c1bc1
Gun Safety PSA - Keep your gun safeties on to prevent accidental disc…
Gristlebee Sep 14, 2024
6b39c68
Fixes gun misfires always happening (#3363)
Gristlebee Sep 15, 2024
31df9bb
Concrete Mix @ Outpost (#3376)
Erikafox Sep 18, 2024
c576f63
CTF machines are only added to processing when CTF starts (#3360)
FalloutFalcon Sep 18, 2024
b915fd0
Temperature Feedback (#3358)
Gristlebee Sep 18, 2024
2a55090
Seperates goggles from the base ballistic helmet. (#3389)
Sadhorizon Sep 20, 2024
a935b22
PGF Turrets (#3381)
Erikafox Sep 20, 2024
089dc00
Adds Inteq wintercoats and hoodies to the uniform lockers on Inteq sh…
Gristlebee Sep 20, 2024
a1449be
.45-70 boxes hold 18 instead of 12, .45-70 specialty ammo black marke…
generalthrax Sep 20, 2024
ed3cd54
Add tgfont namespace (#3343)
ZephyrTFA Sep 20, 2024
7edbe19
Hardliner Rework DLC: Adds the Hardliner Elite Suit (#3394)
Imaginos16 Sep 20, 2024
172bda9
Ruin map template tags (#3077)
FalloutFalcon Sep 20, 2024
c5dae66
Gorlex DLC 2: Winter Coats! (#3400)
Imaginos16 Sep 21, 2024
bb4a37f
Makes Ship Turrets Connectable Without Areas (#3386)
Erikafox Sep 21, 2024
f18e79b
Panacea is no longer an indie ship. (#3404)
Sadhorizon Sep 21, 2024
6538a55
Angel statue icon update
MysticalFaceLesS Sep 23, 2024
767a525
Пернести в моуль
MrCat15352 Sep 23, 2024
9f16d79
Исправлено, теперь катер может сносить камень на растояние. До этого …
MrCat15352 Sep 23, 2024
4778dc7
the cook got access
Overteh Sep 25, 2024
4e0eb2e
Merge pull request #974 from Overteh/Cringus24
molnizz Sep 25, 2024
2a4ca66
tranquility rotate
Overteh Sep 25, 2024
70f1618
sunskipper added instead of a boyardee
Overteh Sep 25, 2024
960ed5f
Merge pull request #975 from Overteh/Cringus25
molnizz Sep 25, 2024
20c52eb
sunskipper description translate
Overteh Sep 25, 2024
02b4c8b
Merge pull request #976 from Overteh/Cringus26
molnizz Sep 25, 2024
c1cbb90
Переоформлено модульно
MrCat15352 Sep 26, 2024
56afce8
Изменение частоты Вайдбенд и возможности её использования
Deylasha Sep 26, 2024
0f9e93b
Merge branch 'beta-dev' of https://github.com/CeladonSS13/Shiptest in…
Deylasha Sep 26, 2024
9b55ce4
[Refactoring] Fit Viewport sizes game window to pixel scale (#973)
MrRomainzZ Sep 26, 2024
00bf80c
Merge pull request #978 from MrCat15352/rnd_1
MysticalFaceLesS Sep 26, 2024
981941f
Merge pull request #979 from Deylasha/beta-dev
MysticalFaceLesS Sep 26, 2024
454e34c
Merge branch 'beta-dev' into fix_cutter
MrCat15352 Sep 26, 2024
7cfd11c
Merge pull request #971 from MrCat15352/fix_cutter
MysticalFaceLesS Sep 26, 2024
28c65aa
Fix: Maps after merge
molnizz Sep 26, 2024
dc53d4e
Merge pull request #982 from molnizz/cringe24
MysticalFaceLesS Sep 26, 2024
d7cb9e3
Автомат теперь имеет шанс грохнуться при выплёвывании вещей в мобов
MrCat15352 Sep 27, 2024
a66bcc5
Чистим за разрабом
MrCat15352 Sep 27, 2024
60c4010
Смена цен на газы. Из-за того что монополистическое судно продало на …
MrCat15352 Sep 27, 2024
3ed939c
ADD: New pets & bots (#980)
MrCat15352 Sep 27, 2024
b02fdc2
Fix: shotgun/bulldog -> shotgun/automatic/bulldog
molnizz Sep 27, 2024
372e991
Merge pull request #985 from molnizz/cringe24
MrCat15352 Sep 27, 2024
2e4cfcd
Merge pull request #984 from MrCat15352/balance_economy_shatati
MrCat15352 Sep 27, 2024
9af411e
Merge pull request #983 from MrCat15352/anti_hack_vendor_mob
MrCat15352 Sep 27, 2024
31d92e9
Фиксы и правки
Burbonchik Sep 27, 2024
acc0451
Дробовик переехал
Burbonchik Sep 27, 2024
bb7ba2d
Merge pull request #989 from Burbonchik/Fixes
molnizz Sep 27, 2024
7f0b25d
Fixes the chat bubble
MrRomainzZ Sep 27, 2024
8411bba
Update: Plasma Planet
molnizz Sep 27, 2024
f40ae6a
Merge pull request #990 from MrRomainzZ/chat-indicator-fix
MrCat15352 Sep 27, 2024
2eea3a8
Merge pull request #991 from molnizz/cringe24
MrCat15352 Sep 27, 2024
e8c0e56
Добавлены новые зоны для шипов
MrCat15352 Sep 27, 2024
bc9de08
Merge pull request #992 from MrCat15352/new_area_1
MrCat15352 Sep 27, 2024
63a9e67
Update: Whoops i forgot somthing
molnizz Sep 27, 2024
08fa597
Merge branch 'CeladonSS13:beta-dev' into cringe24
molnizz Sep 27, 2024
362e70b
Merge pull request #993 from molnizz/cringe24
MrCat15352 Sep 27, 2024
251b072
Adds support for "drunk" cyrillic letters and ignores russian vowels …
MrRomainzZ Sep 28, 2024
68c938e
Adds one more variant for letter change in slur speech
MrRomainzZ Sep 28, 2024
13ca6e0
Adds UTF-8 charset to tele-monitor and tele-server consoles
MrRomainzZ Sep 28, 2024
847e937
Add: New ruin for plasma planet
molnizz Sep 28, 2024
9babb8e
Делаем руинку уникальной
molnizz Sep 28, 2024
dcedb71
amogus ship
Overteh Sep 28, 2024
b78ff83
Merge pull request #997 from Overteh/Cringus27
molnizz Sep 28, 2024
7f6fd54
Merge branch 'CeladonSS13:beta-dev' into cringe24
molnizz Sep 28, 2024
c7ca2c8
Merge pull request #996 from molnizz/cringe24
MysticalFaceLesS Sep 28, 2024
6c259f2
Новая руинка
RalseiDreemuurr Sep 28, 2024
56d730e
Палируем шетланд
molnizz Sep 28, 2024
94a2137
Small formatting changes
MrRomainzZ Sep 28, 2024
2f31843
Merge pull request #999 from molnizz/cringe24
MysticalFaceLesS Sep 28, 2024
92c85ad
Small formatting changes
MrRomainzZ Sep 28, 2024
90cd29a
Merge pull request #994 from MrRomainzZ/slur-and-stutter
MrCat15352 Sep 28, 2024
c7700d6
Merge pull request #995 from MrRomainzZ/telecoms-ru
MrCat15352 Sep 28, 2024
1ba0321
Добавляем Dark ERP на Shiptest
MysticalFaceLesS Sep 28, 2024
dcc7f25
Merge pull request #998 from RalseiDreemuurr/mapping
molnizz Sep 28, 2024
df09b47
Merge pull request #1000 from MysticalFaceLesS/beta-dev
MrCat15352 Sep 28, 2024
73ed087
garbage supply from syndicate to shetland
Overteh Sep 28, 2024
645623b
door stuck!
Overteh Sep 28, 2024
cd5ac79
Merge pull request #1002 from Overteh/Cringus28
molnizz Sep 28, 2024
9bdeec4
Adds Flares To Outpost (#3393)
Erikafox Sep 23, 2024
d63e2f9
Adds new wasteplanet cave type (#3374)
Erikafox Sep 23, 2024
8546147
removes the B.E.P.I.S. (#3414)
Thera-Pissed Sep 23, 2024
41f8fda
Turrets Now Actually Connect To Their Console Consistently (#3412)
Erikafox Sep 23, 2024
a5e7076
Changes the color of the text output of health analyzers to be readab…
zimon9 Sep 23, 2024
28960dd
Adds a bunch of kepori underwear (#3392)
thgvr Sep 23, 2024
6eab0ec
Concrete Bags (#3397)
Erikafox Sep 23, 2024
14dd116
Updates Balaclava Sprites (#3409)
Imaginos16 Sep 23, 2024
8973280
Miso Soup Spelling Error (#3370)
trazodont Sep 23, 2024
cc6b3de
Miskilamo Style Consistency (#3377)
Apogee-dev Sep 23, 2024
5afd597
removes did_fire variable (#3415)
Thera-Pissed Sep 23, 2024
890a906
Melee Code Cleanup (#2932)
FalloutFalcon Sep 23, 2024
694506a
reduces recruit slots on colossus to 2 (#3416)
thgvr Sep 23, 2024
56b5a8c
mudskipper and shetland window fix (#3426)
Jedi-Toothpaste Sep 24, 2024
106b438
Sawn variants for the illestren and improvised shotgun now properly h…
SomeguyManperson Sep 24, 2024
7097fd6
More Rust Reds (#3423)
generalthrax Sep 25, 2024
27bb74b
Makes Vegan rations actually Vegan (#3408)
zimon9 Sep 25, 2024
b085187
Fixes deconstructing walls causing runtimes (#3398)
Gristlebee Sep 25, 2024
a2e8323
Pants Accessories (#3418)
generalthrax Sep 25, 2024
9316c0e
Exosuit Recharger Equipment in Cargo (#3420)
generalthrax Sep 25, 2024
308d37b
Adds .38 Hearth and .38 Chilled ammo boxes, to the Black Market (#3425)
generalthrax Sep 25, 2024
41824d3
minimum recoil for ballistics (#3330)
FalloutFalcon Sep 25, 2024
54c63e6
Ship joining starts on locked (#3346)
FalloutFalcon Sep 25, 2024
0b7d5fd
blank ammo (#3352)
FalloutFalcon Sep 25, 2024
b8137c8
Partial port of tg points of intrest and improved orbit menu (#3320)
FalloutFalcon Sep 25, 2024
da1806f
kilo remap fixes (#3424)
Jedi-Toothpaste Sep 25, 2024
01ad149
Makes a Slight Cosmetic Edit to Normal Rabbit Ears (#3443)
Imaginos16 Sep 26, 2024
cab7c80
valor map fixes (#3440)
Jedi-Toothpaste Sep 26, 2024
38e5675
Adds a fax machine to the Dwayne. (#3402)
Sadhorizon Sep 27, 2024
8eecf5e
Fixes some stuff with legion infections (#3450)
SomeguyManperson Sep 27, 2024
394f745
FIX: Fixes paths after merges OFFS (#1004)
MrCat15352 Sep 28, 2024
25420ef
Adds cyrillic characters support of custom say emote
MrRomainzZ Sep 29, 2024
0ca74a5
Moves notifications of TGUI chat to the top
MrRomainzZ Sep 30, 2024
b7c80fc
Removes P16 as parent from G36 rifle
MrRomainzZ Sep 30, 2024
c80be61
Fix: Turret ship
molnizz Sep 30, 2024
f9f7f4d
Merge pull request #1008 from molnizz/cringe24
MysticalFaceLesS Sep 30, 2024
4b4aeff
Merge pull request #1005 from MrRomainzZ/custom_emote_fix
MrCat15352 Sep 30, 2024
dfd4cc4
Merge pull request #1007 from MrRomainzZ/G36-fix
MrCat15352 Sep 30, 2024
ba6f20a
Merge pull request #1006 from MrRomainzZ/top-notifications
MysticalFaceLesS Sep 30, 2024
3a78ede
no more nanomeds
Overteh Oct 1, 2024
bd7bf5d
inkwell with dropppod
Overteh Oct 1, 2024
53fc19d
Merge pull request #1010 from Overteh/Cringus30
molnizz Oct 1, 2024
a3794c1
energy system fixes
Overteh Oct 1, 2024
df743d6
Merge pull request #1011 from Overteh/Cringus31
MrCat15352 Oct 1, 2024
42ccbe2
Починены стены в лучшую сторону (да)
MrCat15352 Oct 1, 2024
c200354
Merge pull request #1012 from MrCat15352/fix_buff_wall
MrCat15352 Oct 1, 2024
6f352f1
projectile gun fix
Overteh Oct 1, 2024
1cf0176
Merge pull request #1013 from Overteh/Cringus31
molnizz Oct 1, 2024
2011826
Заменено на числовое значение отображение класса брони
MrCat15352 Oct 2, 2024
a41afc9
Рефактор модпака с тендрилами, вынесение в другое название
MrCat15352 Oct 2, 2024
d7a693f
Туда же
MrCat15352 Oct 2, 2024
bdbed80
Правим генерацию планет окончательно. Возвращаем астролут и спавны но…
MrCat15352 Oct 2, 2024
15cc5d6
Чистим кор код, все изменения сделаны модульно
MrCat15352 Oct 2, 2024
b871932
Обновление меток гитхаба
MrCat15352 Oct 2, 2024
2d8f40b
Merge pull request #1016 from CeladonSS13/MrCat15352-patch-1
MysticalFaceLesS Oct 2, 2024
0f91f3e
Merge pull request #1015 from MrCat15352/astroloot_return
MysticalFaceLesS Oct 2, 2024
bf83142
Фикс багов
MrCat15352 Oct 2, 2024
5ac0721
Merge pull request #1014 from MrCat15352/armor_chifri
MysticalFaceLesS Oct 2, 2024
04c3957
Merge pull request #1018 from MrCat15352/fix_outpost
MysticalFaceLesS Oct 2, 2024
68f5c5e
Ребаланс патронов
Deylasha Oct 2, 2024
dbbea44
Merge pull request #1019 from Deylasha/Ammo_Rebalance
MrCat15352 Oct 2, 2024
7731a33
Фикс стыковки к айрон мейден
SillyMoff Oct 3, 2024
1a4a8f3
Фикс аегиса и кондора
SillyMoff Oct 3, 2024
d11fbb7
Merge pull request #1021 from AshMoff/mofaf
molnizz Oct 3, 2024
a65209b
Players can now write in LOOC as a ghost
MysticalFaceLesS Oct 3, 2024
401ba29
Merge branch 'beta-dev' of https://github.com/MysticalFaceLesS/Shipte…
MysticalFaceLesS Oct 3, 2024
e94b1d6
Fix: Turf abductor ruin
molnizz Oct 3, 2024
2ef0bb9
Merge pull request #1022 from molnizz/cringe24
MysticalFaceLesS Oct 3, 2024
4c1f6f0
Фикс стыковки к лонеру. Теперь к лонеру можно стыковаться!!!!
SillyMoff Oct 3, 2024
7d220d0
Fix: Maps after merge
molnizz Sep 26, 2024
9036e2b
Fix: shotgun/bulldog -> shotgun/automatic/bulldog
molnizz Sep 27, 2024
97f640e
Фиксы и правки
Burbonchik Sep 27, 2024
930892d
Дробовик переехал
Burbonchik Sep 27, 2024
083b595
Fixes the chat bubble
MrRomainzZ Sep 27, 2024
75dad0c
Adds support for "drunk" cyrillic letters and ignores russian vowels …
MrRomainzZ Sep 28, 2024
ef87b4e
Small formatting changes
MrRomainzZ Sep 28, 2024
2e9e7af
Adds UTF-8 charset to tele-monitor and tele-server consoles
MrRomainzZ Sep 28, 2024
d8846f7
Small formatting changes
MrRomainzZ Sep 28, 2024
c755d5b
garbage supply from syndicate to shetland
Overteh Sep 28, 2024
c003105
door stuck!
Overteh Sep 28, 2024
8548efd
Miskilamo Style Consistency (#3377)
Apogee-dev Sep 23, 2024
ea737b3
FIX: Fixes paths after merges OFFS (#1004)
MrCat15352 Sep 28, 2024
6f4d379
Adds cyrillic characters support of custom say emote
MrRomainzZ Sep 29, 2024
910d87b
inkwell with dropppod
Overteh Oct 1, 2024
3f8fbd5
energy system fixes
Overteh Oct 1, 2024
9bb823a
projectile gun fix
Overteh Oct 1, 2024
1d9c284
Рефактор модпака с тендрилами, вынесение в другое название
MrCat15352 Oct 2, 2024
fc2c7af
Правим генерацию планет окончательно. Возвращаем астролут и спавны но…
MrCat15352 Oct 2, 2024
28a1c96
Чистим кор код, все изменения сделаны модульно
MrCat15352 Oct 2, 2024
8387ddf
Players can now write in LOOC as a ghost
MysticalFaceLesS Oct 3, 2024
f24ed16
Фикс аегиса и кондора
SillyMoff Oct 3, 2024
608a791
Убран копо из стены
MrCat15352 Oct 5, 2024
4aec145
Fix: g36 on shuttles
molnizz Oct 5, 2024
f391fe8
Merge pull request #1028 from MrCat15352/fix_map_6
molnizz Oct 5, 2024
a8a03e4
Merge pull request #1023 from SillyMoff/mofaf
molnizz Oct 5, 2024
4b7dd30
Merge pull request #1029 from molnizz/cringe24
MysticalFaceLesS Oct 5, 2024
3bab0fb
Update: Big Legion
molnizz Oct 5, 2024
8470a82
Merge pull request #1030 from molnizz/cringe24
MysticalFaceLesS Oct 5, 2024
2f7e510
Ужас
MrCat15352 Oct 5, 2024
4ba7874
Добавлены диги ноги для риолов. Кажется поломались части для сарати
MrCat15352 Oct 5, 2024
de79776
Обработка кривых ног
MrCat15352 Oct 5, 2024
cac228f
Генерация рандомных имен
MrCat15352 Oct 5, 2024
fd76b02
Добавлены переменные
MrCat15352 Oct 5, 2024
e353466
Поправлены пути к частям тела
MrCat15352 Oct 5, 2024
8d06ca9
Merge branch 'spacies_riol' of https://github.com/MrCat15352/MrCat in…
MrCat15352 Oct 5, 2024
7834713
Merge branch 'spacies_riol' of https://github.com/MrCat15352/MrCat in…
MrCat15352 Oct 5, 2024
54a8f1d
Revert "Пока отключена абилка. Её надо будет чинить и адаптировать"
MrCat15352 Oct 5, 2024
20a3d4f
Добавлены изменения
MrCat15352 Oct 5, 2024
f3b24f6
отключаем абилку
MrCat15352 Oct 5, 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
Prev Previous commit
Next Next commit
PGF Turrets (shiptest-ss13#3381)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

https://github.com/user-attachments/assets/a8715ea0-0721-4025-8a5a-74296290ae77

Defines some pgf flavored laser turrets. Maps the light variant onto the
Crying Sun as a replacement for the weak turrets currently installed
(shouldn't be a major upgrade).
The turrets are:
Standard - uses the pgf assault rifle laser
Light - uses the pgf pistol laser
Heavy - uses the pgf sniper laser and a heavier disabler beam.

Also organizes the file slightly and renames the faction define for
solcon (solgov -> solcon)

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->
More turret definitions is good. Also I need these for a ship.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

:cl:
add: The PGF now has it's own turret offerings. They come in light,
normal, and heavy flavor.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
  • Loading branch information
2 people authored and MysticalFaceLesS committed Sep 22, 2024
commit a935b225310f3c6d8547efde9e763dcf916af42e
60 changes: 25 additions & 35 deletions _maps/shuttles/pgf/pgf_crying_sun.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -425,13 +425,13 @@
/turf/open/floor/plating,
/area/ship/engineering/engines/starboard)
"du" = (
/obj/machinery/porta_turret/ship/weak{
dir = 6;
mode = 1
},
/obj/structure/cable{
icon_state = "0-8"
},
/obj/machinery/porta_turret/ship/pgf/light{
dir = 6;
mode = 1
},
/turf/open/floor/engine/hull,
/area/ship/external/dark)
"dv" = (
Expand Down Expand Up @@ -1050,11 +1050,11 @@
/obj/structure/cable{
icon_state = "0-8"
},
/obj/machinery/porta_turret/ship/weak{
/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/machinery/porta_turret/ship/pgf/light{
dir = 4;
mode = 1
},
/obj/structure/catwalk/over/plated_catwalk/dark,
/turf/open/floor/plating/airless,
/area/ship/external/dark)
"ih" = (
Expand Down Expand Up @@ -2335,16 +2335,6 @@
/obj/effect/turf_decal/floordetail/tiled,
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/bridge)
"tU" = (
/obj/machinery/porta_turret/ship/weak{
dir = 5;
mode = 1
},
/obj/structure/cable{
icon_state = "0-2"
},
/turf/open/floor/engine/hull,
/area/ship/external/dark)
"tY" = (
/obj/machinery/modular_computer/console/preset/command{
dir = 1
Expand Down Expand Up @@ -3452,13 +3442,13 @@
/turf/open/floor/plasteel/white,
/area/ship/crew/canteen)
"CF" = (
/obj/machinery/porta_turret/ship/weak{
dir = 10;
mode = 1
},
/obj/structure/cable{
icon_state = "0-4"
},
/obj/machinery/porta_turret/ship/pgf/light{
dir = 10;
mode = 1
},
/turf/open/floor/engine/hull,
/area/ship/external/dark)
"CO" = (
Expand Down Expand Up @@ -3732,11 +3722,11 @@
/turf/open/floor/plasteel,
/area/ship/hallway/central)
"Eu" = (
/obj/machinery/porta_turret/ship/weak{
/obj/structure/cable,
/obj/machinery/porta_turret/ship/pgf/light{
dir = 5;
mode = 1
},
/obj/structure/cable,
/turf/open/floor/engine/hull,
/area/ship/external/dark)
"EA" = (
Expand Down Expand Up @@ -3996,13 +3986,13 @@
/turf/open/floor/plasteel/mono/dark,
/area/ship/hallway/central)
"FJ" = (
/obj/machinery/porta_turret/ship/weak{
dir = 5;
mode = 1
},
/obj/structure/cable{
icon_state = "0-4"
},
/obj/machinery/porta_turret/ship/pgf/light{
dir = 5;
mode = 1
},
/turf/open/floor/engine/hull,
/area/ship/external/dark)
"FN" = (
Expand All @@ -4017,13 +4007,13 @@
/turf/open/floor/plating,
/area/ship/engineering/engines/starboard)
"FO" = (
/obj/machinery/porta_turret/ship/weak{
dir = 8;
mode = 1
},
/obj/structure/cable{
icon_state = "0-4"
},
/obj/machinery/porta_turret/ship/pgf/light{
dir = 8;
mode = 1
},
/turf/open/floor/engine/hull/reinforced,
/area/ship/external/dark)
"FU" = (
Expand Down Expand Up @@ -4253,13 +4243,13 @@
/turf/open/floor/vault,
/area/ship/security/armory)
"Hb" = (
/obj/machinery/porta_turret/ship/weak{
dir = 4;
mode = 1
},
/obj/structure/cable{
icon_state = "0-2"
},
/obj/machinery/porta_turret/ship/pgf/light{
dir = 5;
mode = 1
},
/turf/open/floor/engine/hull,
/area/ship/external/dark)
"Hf" = (
Expand Down Expand Up @@ -7804,7 +7794,7 @@ xz
xz
xz
xz
tU
Hb
xk
UE
pW
Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/factions.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
// #define FACTION_PLAYER_FRONTIERSMEN "playerFrontiersmen"
// #define FACTION_PLAYER_MINUTEMAN "playerMinuteman"
// #define FACTION_PLAYER_SOLGOV "playerSolgov"
// #define FACTION_PLAYER_SOLCON "playerSolcon"
// #define FACTION_PLAYER_INTEQ "playerInteq"
// #define FACTION_PLAYER_ROUMAIN "playerRoumain"
// #define FACTION_PLAYER_GEZENA "playerGezena"

// #define FACTION_SYNDICATE "Syndicate"
// #define FACTION_NGR "New Gorlex Republic"
// #define FACTION_CYBERSUN "CyberSun"
Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/~mod_celadon/names.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#define FACTION_PLAYER_FRONTIERSMEN "playerFrontiersmen"
#define FACTION_PLAYER_MINUTEMAN "playerMinuteman"
#define FACTION_PLAYER_SOLGOV "playerSolgov"
#define FACTION_PLAYER_SOLCON "playerSolcon"
#define FACTION_PLAYER_INTEQ "playerInteq"
#define FACTION_PLAYER_ROUMAIN "playerRoumain"
#define FACTION_PLAYER_GEZENA "playerGezena"
Expand Down
37 changes: 35 additions & 2 deletions code/game/machinery/porta_turret/portable_turret.dm
Original file line number Diff line number Diff line change
Expand Up @@ -832,8 +832,8 @@ DEFINE_BITFIELD(turret_flags, list(
stun_projectile_sound = 'sound/weapons/gun/smg/shot.ogg'
desc = "A ballistic machine gun auto-turret."

/obj/machinery/porta_turret/ship/solgov
faction = list("playerSolgov", "turret")

/* Syndicate Turrets */

/obj/machinery/porta_turret/ship/syndicate
faction = list(FACTION_PLAYER_SYNDICATE, "turret")
Expand All @@ -856,6 +856,39 @@ DEFINE_BITFIELD(turret_flags, list(
lethal_projectile = /obj/projectile/beam/laser/heavylaser
lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg'

/* Solcon Turrets */

/obj/machinery/porta_turret/ship/solgov
faction = list(FACTION_PLAYER_SOLCON, "turret")

/* Pan Gezena Federation Turrets */

/obj/machinery/porta_turret/ship/pgf
name = "Etherbor Defensive Mount"
desc = "A less portable Etherbor offering, the EDM is a self-directed linkage of energy weapons, designed to keep intruders away from Gezenan vessels."
faction = list(FACTION_PLAYER_GEZENA, "Turret")
stun_projectile = /obj/projectile/beam/hitscan/disabler
stun_projectile_sound = 'sound/weapons/gun/energy/kalixpistol.ogg'
lethal_projectile = /obj/projectile/beam/hitscan/kalix/pgf/assault
lethal_projectile_sound = 'sound/weapons/gun/energy/kalixsmg.ogg'
icon_state = "standard_lethal"
base_icon_state = "standard"

/obj/machinery/porta_turret/ship/pgf/light
name = "Etherbor Deterrent System"
desc = "A light turret manufactured by Etherbor. It offers a lightweight assembly of energy weapons to accost nearby foes."
lethal_projectile = /obj/projectile/beam/hitscan/kalix/pgf
lethal_projectile_sound = 'sound/weapons/gun/energy/kalixsmg.ogg'

/obj/machinery/porta_turret/ship/pgf/heavy
name = "Etherbor Point-Defense System"
desc = "A high-powered defensive turret manufactured by Etherbor. The EPDS contains heavy energy weapons linked in tandem."
scan_range = 10
stun_projectile = /obj/projectile/beam/hitscan/disabler/heavy
stun_projectile_sound = 'sound/weapons/gun/energy/kalixpistol.ogg'
lethal_projectile = /obj/projectile/beam/hitscan/kalix/pgf/sniper //fwoom
lethal_projectile_sound = 'sound/weapons/gun/laser/heavy_laser.ogg'

////////////////////////
//Turret Control Panel//
////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/outfits/factions/solgov.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
. = ..()
if(visualsOnly)
return
H.faction |= list(FACTION_PLAYER_SOLGOV)
H.faction |= list(FACTION_PLAYER_SOLCON)

/datum/outfit/job/solgov/assistant
name = "SolGov - Scribe"
Expand Down
5 changes: 5 additions & 0 deletions code/modules/projectiles/ammunition/energy/laser.dm
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,11 @@
impact_light_range = 2.5
impact_light_color_override = COLOR_CYAN

/obj/projectile/beam/hitscan/disabler/heavy
damage = 30
armour_penetration = -10


/obj/item/ammo_casing/energy/laser/minigun
select_name = "kill"
projectile_type = /obj/projectile/beam/weak/penetrator
Expand Down