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.

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

RCD can deconstruct the more common walls/window #1950

Merged
merged 23 commits into from
Oct 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
82bbf75
New destruction
VividPups Sep 7, 2024
df44c56
Merge branch 'master' into RCD-change
VividPups Sep 7, 2024
c85d806
Merge branch 'master' into RCD-change
VividPups Sep 7, 2024
12ed2fc
frontier tag
VividPups Sep 7, 2024
110c92c
Merge branch 'master' into RCD-change
VividPups Sep 10, 2024
0a2bc1b
Merge branch 'master' into RCD-change
VividPups Sep 12, 2024
41cbfbb
updates the reinforce to match closely
VividPups Sep 12, 2024
5104506
Merge branch 'RCD-change' of https://github.com/VividPups/frontier-st…
VividPups Sep 12, 2024
624408b
Merge branch 'master' into RCD-change
VividPups Sep 13, 2024
015fa24
Merge branch 'master' into RCD-change
VividPups Sep 21, 2024
9a0481e
Updates to the RCD
VividPups Sep 21, 2024
7b027aa
Merge branch 'RCD-change' of https://github.com/VividPups/frontier-st…
VividPups Sep 21, 2024
8d7da60
Merge branch 'master' into RCD-change
VividPups Sep 24, 2024
bc750fc
Merge branch 'master' of https://github.com/new-frontiers-14/frontier…
whatston3 Oct 3, 2024
d1b025d
Deconstructable walls
whatston3 Oct 3, 2024
32aa425
Remove duped RCDDeconstructable
whatston3 Oct 3, 2024
3214d11
Merge branch 'master' into RCD-change
VividPups Oct 3, 2024
f9de93c
Merge branch 'RCD-change-suggestions' of https://github.com/whatston3…
whatston3 Oct 5, 2024
1c31052
fix Deconstructable
whatston3 Oct 5, 2024
562faaf
Make shuttle windows deconstructable
whatston3 Oct 5, 2024
d7b512e
Reparent shuttle window
whatston3 Oct 5, 2024
7e91c32
Deconstructable
whatston3 Oct 5, 2024
89c014c
Merge branch 'master' into RCD-change
VividPups Oct 5, 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
4 changes: 4 additions & 0 deletions Resources/Prototypes/Entities/Structures/Walls/girders.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@
- type: StaticPrice
price: 10 # Frontier: 30<10
- type: Climbable # Frontier - Stop AI Abuse
- type: RCDDeconstructable # Frontier
cost: 4 # Frontier
delay: 4 # Frontier
fx: EffectRCDDeconstruct4 # Frontier

- type: entity
id: ReinforcedGirder
Expand Down
42 changes: 41 additions & 1 deletion Resources/Prototypes/Entities/Structures/Walls/walls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,10 @@
- type: IconSmooth
key: walls
base: clock
- type: RCDDeconstructable # Frontier
cost: 6 # Frontier
delay: 8 # Frontier
fx: EffectRCDDeconstruct8 # Frontier

- type: entity
parent: BaseWall
Expand Down Expand Up @@ -529,6 +533,8 @@
collection: MetalSlam
- !type:DoActsBehavior
acts: ["Destruction"]
- type: RCDDeconstructable # Frontier
deconstructable: false # Frontier

- type: entity
id: WallPlastitaniumDiagonalIndestructible
Expand Down Expand Up @@ -636,6 +642,10 @@
price: 50 # Frontier 250<50
- type: RadiationBlocker
resistance: 5
- type: RCDDeconstructable #Frontier
cost: 6 #Frontier
delay: 8 #Frontier
fx: EffectRCDDeconstruct8 #Frontier

- type: entity
parent: WallReinforced
Expand All @@ -654,6 +664,10 @@
- type: IconSmooth
key: walls
base: reinf_over
- type: RCDDeconstructable #Frontier
cost: 6 #Frontier
delay: 8 #Frontier
fx: EffectRCDDeconstruct8 #Frontier

- type: entity
parent: WallShuttleDiagonal
Expand Down Expand Up @@ -711,6 +725,10 @@
base: riveted
- type: StaticPrice
price: 50 # Frontier: 150<50 FRONTIER MERGE: may need review
- type: RCDDeconstructable #Frontier
cost: 6 #Frontier
delay: 8 #Frontier
fx: EffectRCDDeconstruct8 #Frontier

- type: entity
parent: BaseWall
Expand Down Expand Up @@ -869,6 +887,10 @@
- type: Construction
graph: Girder
node: diagonalshuttleWall
- type: RCDDeconstructable #Frontier
cost: 6 #Frontier
delay: 8 #Frontier
fx: EffectRCDDeconstruct8 #Frontier

- type: entity
parent: BaseWall
Expand Down Expand Up @@ -928,6 +950,10 @@
3: { state: shuttle_construct-3, visible: true}
4: { state: shuttle_construct-4, visible: true}
5: { state: shuttle_construct-5, visible: true}
- type: RCDDeconstructable #Frontier
cost: 6 #Frontier
delay: 8 #Frontier
fx: EffectRCDDeconstruct8 #Frontier
# - type: Reflect # Frontier
# reflectProb: 1 # Frontier

Expand Down Expand Up @@ -1101,6 +1127,10 @@
base: uranium
- type: RadiationBlocker
resistance: 6
- type: RCDDeconstructable #Frontier
cost: 6 #Frontier
delay: 8 #Frontier
fx: EffectRCDDeconstruct8 #Frontier

- type: entity
parent: BaseWall
Expand Down Expand Up @@ -1139,6 +1169,10 @@
- type: IconSmooth
key: woods
base: wood
- type: RCDDeconstructable #Frontier
cost: 6 #Frontier
delay: 8 #Frontier
fx: EffectRCDDeconstruct8 #Frontier

- type: entity
parent: BaseWall
Expand Down Expand Up @@ -1183,6 +1217,10 @@
- type: Construction
graph: WebStructures
node: wall
- type: RCDDeconstructable #Frontier
cost: 6 #Frontier
delay: 8 #Frontier
fx: EffectRCDDeconstruct8 #Frontier


# Lavalend Walls
Expand Down Expand Up @@ -1261,6 +1299,8 @@
- type: Icon
sprite: Structures/Walls/mining_diagonal.rsi
state: state0
- type: RCDDeconstructable # Frontier
deconstructable: false # Frontier


# Vault Walls
Expand Down Expand Up @@ -1470,4 +1510,4 @@
sprite: Structures/Walls/cobblebrick_andesite.rsi
- type: IconSmooth
key: cobblebricks
base: cobblebrick
base: cobblebrick
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: entity
id: ShuttleWindow
name: shuttle window
parent: WindowRCDResistant
parent: Window # Frontier: WindowRCDResistant<Window
components:
- type: Sprite
drawdepth: WallTops
Expand Down
Loading