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

Casualization #100

Merged
merged 2 commits into from
Nov 30, 2024
Merged

Casualization #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68660ae
Fix egg-laying cancellation
Nov 30, 2024
9b80201
Casualization
Nov 30, 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
2 changes: 2 additions & 0 deletions Content.Server/_Starlight/Antags/TerrorSpider/EggInjectSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ private void OnEggsLaying(EntityUid uid, TerrorPrincessComponent component, Eggs

private void EggInjectionDoAfter(Entity<SpiderComponent> ent, ref EggInjectionDoAfterEvent args)
{
if (args.Cancelled)
return;
if (args.Target.HasValue && !HasComp<HasEggHolderComponent>(args.Target.Value))
{
EnsureComp<EggHolderComponent>(args.Target.Value);
Expand Down
32 changes: 16 additions & 16 deletions Resources/Prototypes/GameRules/events.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,9 @@
id: DragonSpawn
components:
- type: StationEvent
weight: 6.5
earliestStart: 40
reoccurrenceDelay: 20
weight: 5.5 # 🌟Starlight🌟 Casualization
earliestStart: 50 # 🌟Starlight🌟 Casualization
reoccurrenceDelay: 45 # 🌟Starlight🌟 Casualization
minimumPlayers: 20
duration: null
- type: SpaceSpawnRule
Expand All @@ -186,10 +186,10 @@
id: NinjaSpawn
components:
- type: StationEvent
weight: 6
weight: 5 # 🌟Starlight🌟 Casualization
duration: null
earliestStart: 30
reoccurrenceDelay: 20
earliestStart: 45 # 🌟Starlight🌟 Casualization
reoccurrenceDelay: 45 # 🌟Starlight🌟 Casualization
minimumPlayers: 30
- type: SpaceSpawnRule
- type: AntagLoadProfileRule
Expand Down Expand Up @@ -341,9 +341,9 @@
startAnnouncement: station-event-vent-creatures-start-announcement
startAudio:
path: /Audio/_Starlight/Announcements/attention.ogg
earliestStart: 20
earliestStart: 40 # 🌟Starlight🌟 Casualization
minimumPlayers: 15
weight: 5
weight: 3.5 # 🌟Starlight🌟 Casualization
duration: 60
- type: VentCrittersRule
entries:
Expand All @@ -362,9 +362,9 @@
startAnnouncement: station-event-vent-creatures-start-announcement
startAudio:
path: /Audio/Announcements/attention.ogg
earliestStart: 20
earliestStart: 40 # 🌟Starlight🌟 Casualization
minimumPlayers: 15
weight: 5
weight: 3.5 # 🌟Starlight🌟 Casualization
duration: 60
- type: VentCrittersRule
entries:
Expand All @@ -383,9 +383,9 @@
startAnnouncement: station-event-vent-creatures-start-announcement
startAudio:
path: /Audio/_Starlight/Announcements/attention.ogg
earliestStart: 20
earliestStart: 40 # 🌟Starlight🌟 Casualization
minimumPlayers: 15
weight: 5
weight: 3.5 # 🌟Starlight🌟 Casualization
duration: 60
- type: VentCrittersRule
entries:
Expand Down Expand Up @@ -447,8 +447,8 @@
id: LoneOpsSpawn
components:
- type: StationEvent
earliestStart: 35
weight: 5.5
earliestStart: 55 # 🌟Starlight🌟 Casualization
weight: 4.5 # 🌟Starlight🌟 Casualization
minimumPlayers: 20
duration: 1
- type: RuleGrids
Expand Down Expand Up @@ -482,8 +482,8 @@
id: SleeperAgents
components:
- type: StationEvent
earliestStart: 30
weight: 8
earliestStart: 40 # 🌟Starlight🌟 Casualization
weight: 6 # 🌟Starlight🌟 Casualization
minimumPlayers: 15
maxOccurrences: 1 # can only happen once per round
startAnnouncement: station-event-communication-interception
Expand Down
Loading