Skip to content

OVERHAULED the Ads Small Ships and REDESIGNED Them #3269

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

Open
EldritchPineapple wants to merge 16 commits into
base: main
Choose a base branch
from
Open

OVERHAULED the Ads Small Ships and REDESIGNED Them #3269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3a67996
renewed the ads small ships
EldritchPineapple Feb 21, 2026
e8ad6c5
event shenanigans and fixes so it works
EldritchPineapple Feb 22, 2026
37d2fff
Merge branch 'main' into ads-small-ships
EldritchPineapple Feb 22, 2026
9e47e70
nuked apocalypse as it was deprecated
EldritchPineapple Feb 22, 2026
3770cf1
updated, added rooves, fixed the radar edge rework of the lancer, and…
EldritchPineapple Feb 22, 2026
8395359
bazinga
EldritchPineapple Feb 22, 2026
ffb0fef
remoived lancer's shield
EldritchPineapple Feb 22, 2026
a35c25b
Merge branch 'main' into ads-small-ships
EldritchPineapple Feb 22, 2026
b893d66
fixed cameras not being the working type
EldritchPineapple Feb 25, 2026
d0820a5
made changes to exterior hull to look better and make more sense
EldritchPineapple Feb 26, 2026
0c5dadb
Merge branch 'main' into ads-small-ships
EldritchPineapple Feb 26, 2026
2a1f1ca
Merge branch 'main' into ads-small-ships
Redrover1760 Mar 1, 2026
78d9ff6
Merge branch 'ads-small-ships' of https://github.com/EldritchPineappl…
EldritchPineapple Mar 5, 2026
338b8bb
fixed up gamerules and made sure they work
EldritchPineapple Mar 5, 2026
cfd7a00
Merge branch 'main' into ads-small-ships
UnicornOnLSD Mar 6, 2026
c1a4fed
Merge branch 'main' into ads-small-ships
EldritchPineapple Mar 12, 2026
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
1,280 changes: 593 additions & 687 deletions Resources/Maps/_Mono/ShuttleEvent/razorn.yml → Resources/Maps/_Mono/ShuttleEvent/fencer.yml
View file
Open in desktop

Large diffs are not rendered by default.

1,602 changes: 1,602 additions & 0 deletions Resources/Maps/_Mono/ShuttleEvent/lancer.yml
View file
Open in desktop

Large diffs are not rendered by default.

1,566 changes: 1,566 additions & 0 deletions Resources/Maps/_Mono/ShuttleEvent/lancern.yml
View file
Open in desktop

Large diffs are not rendered by default.

35 changes: 0 additions & 35 deletions Resources/Prototypes/_Mono/GameRules/Apoc/apocalypse_schedulers.yml
View file
Open in desktop

This file was deleted.

14 changes: 12 additions & 2 deletions Resources/Prototypes/_Mono/GameRules/Shuttles/ship_spawns.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,20 @@
copies: 6

- type: preloadedGrid
id: AIRazorN
path: /Maps/_Mono/ShuttleEvent/razorn.yml
id: AILancerN
path: /Maps/_Mono/ShuttleEvent/lancern.yml
copies: 2

- type: preloadedGrid
id: AILancer
path: /Maps/_Mono/ShuttleEvent/lancer.yml
copies: 4

- type: preloadedGrid
id: AIFencer
path: /Maps/_Mono/ShuttleEvent/fencer.yml
copies: 4

- type: preloadedGrid
id: AIWyvern
path: /Maps/_Mono/ShuttleEvent/wyvern.yml
Expand Down
38 changes: 35 additions & 3 deletions Resources/Prototypes/_Mono/GameRules/damaged_ai.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@
- id: UnknownShuttleZenith
- id: UnknownShuttleWyrm
- id: UnknownShuttleNebula
- id: UnknownShuttleFencer
- id: UnknownShuttleLancer

- type: entityTable
id: DamagedAIShipsTableT2
table: !type:AllSelector # we need to pass a list of rules, since rules have further restrictions to consider via StationEventComp
children:
- id: UnknownShuttleZenithE
- id: UnknownShuttleRazorN
- id: UnknownShuttleLancerN
- id: UnknownShuttleWyvern

- type: entity
Expand Down Expand Up @@ -76,7 +78,7 @@

- type: entity
parent: BaseRandomShuttleRule
id: UnknownShuttleRazorN
id: UnknownShuttleLancerN
components:
- type: StationEvent
startAnnouncement: station-event-ai-shuttle-detected
Expand All @@ -87,7 +89,37 @@
- type: GameRule
minPlayers: 15
- type: LoadMapRule
preloadedGrid: AIRazorN
preloadedGrid: AILancerN

- type: entity
parent: BaseRandomShuttleRule
id: UnknownShuttleLancer
components:
- type: StationEvent
startAnnouncement: station-event-ai-shuttle-detected
startAudio:
path: /Audio/Misc/notice1.ogg
weight: 3
maxOccurrences: 4
- type: GameRule
minPlayers: 15
- type: LoadMapRule
preloadedGrid: AILancer

- type: entity
parent: BaseRandomShuttleRule
id: UnknownShuttleFencer
components:
- type: StationEvent
startAnnouncement: station-event-ai-shuttle-detected
startAudio:
path: /Audio/Misc/notice1.ogg
weight: 3
maxOccurrences: 4
- type: GameRule
minPlayers: 15
- type: LoadMapRule
preloadedGrid: AIFencer

- type: entity
parent: BaseRandomShuttleRule
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/_Mono/game_presets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@
- BluespaceSalvageEventScheduler
- SmugglingEventScheduler
- FrontierRoundstartVariation
- MonoChimeraSTCShuttleSpawnerSchedulerApocalypse
- MonoAISTCShuttleSpawnerSchedulerApocalypse
- MonoAsakimSTCShuttleSpawnerSchedulerApocalypse
- MonoChimeraSTCShuttleSpawnerScheduler
- MonoAISTCShuttleSpawnerScheduler
- MonoAsakimSTCShuttleSpawnerScheduler
- MonoMonolithicEventsScheduler

Loading