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

Возврат хайджека #1903

Merged
merged 3 commits into from
Mar 8, 2024
Merged

Возврат хайджека #1903

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4f83f0
Hijack
kerisargit Feb 28, 2024
ead3626
corvax
kerisargit Feb 29, 2024
55d2f16
Apply suggestions from code review
Morb0 Mar 8, 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: 1 addition & 1 deletion Resources/Prototypes/Objectives/objectiveGroups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
weights:
EscapeShuttleObjective: 1
DieObjective: 0.05
#HijackShuttleObjective: 0.02
HijackShuttleObjective: 0.02 #Corvax-MRP
Morb0 marked this conversation as resolved.
Show resolved Hide resolved

- type: weightedRandom
id: TraitorObjectiveGroupSocial
Expand Down
26 changes: 13 additions & 13 deletions Resources/Prototypes/Objectives/traitor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,19 +68,19 @@
- StealCondition
- type: DieCondition

#- type: entity
# noSpawn: true
# parent: [BaseTraitorObjective, BaseLivingObjective]
# id: HijackShuttleObjective
# name: Hijack emergency shuttle
# description: Leave on the shuttle free and clear of the loyal Nanotrasen crew on board. Use ANY methods available to you. Syndicate agents, Nanotrasen enemies, and handcuffed hostages may remain alive on the shuttle. Ignore assistance from anyone other than a support agent.
# components:
# - type: Objective
# difficulty: 5 # insane, default config max difficulty
# icon:
# sprite: Objects/Tools/emag.rsi
# state: icon
# - type: HijackShuttleCondition
- type: entity
noSpawn: true
parent: [BaseTraitorObjective, BaseLivingObjective]
id: HijackShuttleObjective #Corvax-MRP
name: Hijack emergency shuttle
description: Leave on the shuttle free and clear of the loyal Nanotrasen crew on board. Use ANY methods available to you. Syndicate agents, Nanotrasen enemies, and handcuffed hostages may remain alive on the shuttle. Ignore assistance from anyone other than a support agent.
components:
- type: Objective
difficulty: 5 # insane, default config max difficulty
icon:
sprite: Objects/Tools/emag.rsi
state: icon
- type: HijackShuttleCondition

# kill

Expand Down
Loading