forked from infinitystation/Baystation12
-
Notifications
You must be signed in to change notification settings - Fork 70
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
New ICCG-ship & related content (missiles, sensors tweaks) #350
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Zipliks
approved these changes
Sep 2, 2022
ImJustKisik
changed the title
Adds missiles and sensor tweaks
New ICCG-ship & related content (missiles, sensors tweaks)
Sep 21, 2022
ImJustKisik
force-pushed
the
pizdec
branch
3 times, most recently
from
September 23, 2022 09:24
cf4f734
to
b483c53
Compare
Den109G
reviewed
Sep 24, 2022
code/modules/overmap/projectiles/missiles/equipment/missile_equipment.dm
Outdated
Show resolved
Hide resolved
Closed
Pizdec ракеты мои ракеты overmap flags pt 1 Missiles, baby admin missiles and misc stuff Update thruster.dm sonar like sensors classes changes da skyrat connected computers disstres button Identify me, scanner-sempai~ я хочу умереть update update Feat: ship traits (ss220-space#337) ракетки мои ракетки Update sensors.dm апдейты фиксы да doors plus decor ракеты мои ракеты overmap flags pt 1 Missiles, baby admin missiles and misc stuff Update thruster.dm sonar like sensors classes changes da skyrat connected computers disstres button Identify me, scanner-sempai~ я хочу умереть update update Feat: ship traits (ss220-space#337) ракетки мои ракетки Update sensors.dm апдейты фиксы да doors plus decor cigs RPG missile launcher RPG for ICCG конфликты иконок обожаю Content cigs RPG for ICCG конфликты иконок обожаю Update missile_equipment.dm Update overmap.dmi Revert "Content" This reverts commit 106263e. desc's sensors updates another_portion_of_fixes desc's sensors updates Merge branch 'ship' into pizdec Merge pull request #10 from LordNest/pizdec Pizdec SNZ_fix Merge branch 'pizdec' of https://github.com/LordNest/Baystation12 into pizdec Minor_fixes Я_ЭТО_Починил Merge pull request #11 from LordNest/pizdec SNZ_teper'_rabotaet sexual perversions with smes Some emissive objects now have overlays that light over the lighting plane. da sexual perversions with smes Some emissive objects now have overlays that light over the lighting plane. da fix Merge pull request #6 from ImJustKisik/pizdec Pizdec-2 SNZ_fixes Merge pull request #12 from LordNest/pizdec SNZ_Incident TCOMS Merge pull request #7 from ImJustKisik/ship Ship clothing_fixes ICCGN faction Pulls terran stuff out of maps/torch, gives it a facelift and sets it up in the packs/faction_iccgn dir to help with multi map inclusion. Adds iccgn patches, badges, ranks, utility jacket Crew_and_hangar_fixes По причине того, что злоебучие шлюзы отказываются воспринимать шаттл, шаттл был убран в ангар, а над мостиком надстроена подстилка под ангар Merge pull request #13 from LordNest/pizdec SNZ_Hangar Update vending.dm
overmap flags pt 1 Missiles, baby admin missiles and misc stuff Update thruster.dm sonar like sensors classes changes da skyrat connected computers disstres button Identify me, scanner-sempai~ я хочу умереть update update Feat: ship traits (ss220-space#337) ракетки мои ракетки
This reverts commit 106263e.
Pulls terran stuff out of maps/torch, gives it a facelift and sets it up in the packs/faction_iccgn dir to help with multi map inclusion. Adds iccgn patches, badges, ranks, utility jacket
Pizdec ракеты мои ракеты overmap flags pt 1 Missiles, baby admin missiles and misc stuff Update thruster.dm sonar like sensors classes changes da skyrat connected computers disstres button Identify me, scanner-sempai~ я хочу умереть update update Feat: ship traits (ss220-space#337) ракетки мои ракетки Update sensors.dm апдейты фиксы да doors plus decor ракеты мои ракеты overmap flags pt 1 Missiles, baby admin missiles and misc stuff Update thruster.dm sonar like sensors classes changes da skyrat connected computers disstres button Identify me, scanner-sempai~ я хочу умереть update update Feat: ship traits (ss220-space#337) ракетки мои ракетки Update sensors.dm апдейты фиксы да doors plus decor cigs RPG missile launcher RPG for ICCG конфликты иконок обожаю Content cigs RPG for ICCG конфликты иконок обожаю Update missile_equipment.dm Update overmap.dmi Revert "Content" This reverts commit 106263e. desc's sensors updates another_portion_of_fixes desc's sensors updates Merge branch 'ship' into pizdec Merge pull request #10 from LordNest/pizdec Pizdec SNZ_fix Merge branch 'pizdec' of https://github.com/LordNest/Baystation12 into pizdec Minor_fixes Я_ЭТО_Починил Merge pull request #11 from LordNest/pizdec SNZ_teper'_rabotaet sexual perversions with smes Some emissive objects now have overlays that light over the lighting plane. da sexual perversions with smes Some emissive objects now have overlays that light over the lighting plane. da fix Merge pull request #6 from ImJustKisik/pizdec Pizdec-2 SNZ_fixes Merge pull request #12 from LordNest/pizdec SNZ_Incident TCOMS Merge pull request #7 from ImJustKisik/ship Ship clothing_fixes ICCGN faction Pulls terran stuff out of maps/torch, gives it a facelift and sets it up in the packs/faction_iccgn dir to help with multi map inclusion. Adds iccgn patches, badges, ranks, utility jacket Crew_and_hangar_fixes По причине того, что злоебучие шлюзы отказываются воспринимать шаттл, шаттл был убран в ангар, а над мостиком надстроена подстилка под ангар Merge pull request #13 from LordNest/pizdec SNZ_Hangar Update vending.dm
Update sierra_overmap.dm Update sierra_overmap.dm Update sierra_overmap.dm
RIG sprites fixed and vessel mass increased in order to lower it's speed RIG_Fixes Rig temporary icons+textes with lore of expedition Gagarin_class OFD_console_removal
Bizzonium
added a commit
that referenced
this pull request
Nov 19, 2022
Bizzonium
added a commit
that referenced
this pull request
Nov 19, 2022
Bizzonium
added a commit
that referenced
this pull request
Nov 19, 2022
Bizzonium
added a commit
that referenced
this pull request
Nov 21, 2022
Mapfixes
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Описание
Скриншоты
Content:
Добавляются ракеты которые могут взаимодействовать с овермапой, в том числе, могут перемещаться между различными Z-уровнями и овермапой.
Ракеты полностью модульные, можно устанавливать различные двигатели, боеголовки и другое оборудование по своему усмотрению.
Ракеты состоят из:
Переработка сенсоров
Сенсоры больше не используют освещение (туман войны) для скрытия объектов на овермапе.
Теперь для обнаружения другого корабля необходима идентификация, скорость идентификации зависит от:
мощности сенсоров, скорости идентифицируемого корабля и расстояния между кораблями.
После обнаружения, корабль можно просканировать. Теперь сканы выглядят таким образом, отображая больше информации о корабле:
Ивенты на овермапе, такие как ионные облака, требуют, чтобы они находились в зоне видимости сенсоров, но в остальном они также работают как и раньше.
Новый сигнал бедствия
Добавляется физическая кнопка сигнала бедствия, теперь она работает гораздо лучше!
На все корабли на овермапе передаётся сообщение:
Также на овермапе появляется специальный ивент, который видно даже с выключенными сенсорами!
Rig and ICCG sprites by ЭллГуд
Missiles code from Bay12/BoH-Bay
🆑
rscadd: Adds new away ship (w.i.p)
rscadd: Overmap capable missiles have been added:
rscadd: Armed missiles enter the overmap when they reach the edge of the map. They may or may not travel along the overmap based on what the installed equipment does. Upon entering a overmap tile, it may enter a random z level on the tile and travel through it (i.e. asteroid fields), or impact immediately (i.e. on planets)
rscadd: Missiles are usually fitted with automatic arming devices.
rscadd: Missiles detonate when they are armed and bump into a solid object (Note that you can still bump into the missile safely. It detonates upon bumping into something itself)
rscadd: Missiles are modular. By using a screwdriver on a missile you can open a maintenance panel to install equipment, or use a crowbar on an open missile to remove equipment. Depending on the specific equipment, you may be able to interact further with it
tweak: Sensors no longer uses lighting for obfuscation, but instead casts images of overmap objects to the client screen upon identification. Ships requiring scanning ships to remain within range until full identification is complete.
/:cl: