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

Jump to bottom

make martyr module disarmable #1960

Merged
merged 4 commits into from
Oct 24, 2024
Merged

make martyr module disarmable #1960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fda3a51
add dud self destruct item
Oct 2, 2024
3fbd858
add ExplosivePayload tag to explosive payload
Oct 2, 2024
1db4c4a
make martyr module disarmable
Oct 2, 2024
9066100
Merge branch 'master' into martyr-ops
deltanedas Oct 24, 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
14 changes: 14 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,17 @@
- type: ItemBorgModule
items:
- WeaponEnergyGunMiniRecharging

# Syndicate modules
- type: entity
parent: BorgModuleMartyr
id: BorgModuleMartyrDud
name: unfinished martyr cyborg module
description: This unfinished module has a large space for an explosive payload, with "boom" helpfully scribbled under it.
components:
- type: ItemBorgModule
items:
- SelfDestructSeqDud
- type: Construction
node: start
defaultTarget: live
9 changes: 9 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Throwable/grenades.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# if you try to use an unfinished martyr module it does next to no damage, but still has a good scare
- type: entity
parent: SelfDestructSeq
id: SelfDestructSeqDud
components:
- type: Explosive
totalIntensity: 1
canCreateVacuum: false
deleteAfterExplosion: false # prevent borg having an empty hand
23 changes: 23 additions & 0 deletions Resources/Prototypes/DeltaV/Recipes/Construction/Graphs/utilities/borg_modules.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
- type: constructionGraph
id: BorgModuleMartyr
start: start
graph:
- node: start
entity: BorgModuleMartyrDud
edges:
- to: live
steps:
- tag: ExplosivePayload
name: explosive payload
- tool: Screwing
doAfter: 2
- node: live
entity: BorgModuleMartyr
edges:
- to: start
completed:
- !type:GivePrototype
prototype: ExplosivePayload
steps:
- tool: Prying
doAfter: 2
3 changes: 3 additions & 0 deletions Resources/Prototypes/DeltaV/tags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@
- type: Tag
id: DockShipyard

- type: Tag
id: ExplosivePayload

- type: Tag
id: ForensicBeltEquip

Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Entities/Objects/Devices/payload.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: Tag # DeltaV: add ExplosivePayload tag to it
tags:
- ExplosivePayload
- Payload

- type: entity
name: chemical payload
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,3 +634,6 @@
- SelfDestructSeq
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-martyr-module }
- type: Construction # DeltaV: construction for adding explosive payload to the dud version
graph: BorgModuleMartyr
node: live
Loading