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

Возврат кпб #185

Closed
wants to merge 32 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
1488d02
init
Rinary1 Jul 8, 2024
9ce2d85
Merge branch 'space-sunrise:master' into Synth
Rinary1 Jul 17, 2024
6648b82
Synth Reworked Charge System
Rinary1 Jul 17, 2024
e13e378
Icon, Sounds
Rinary1 Jul 17, 2024
895f08d
Merge branch 'space-sunrise:master' into Synth
Rinary1 Jul 18, 2024
985b7e5
upd
Rinary1 Jul 23, 2024
d7de0bc
Merge branch 'Synth' of https://github.com/Rinary1/space-sunrise into…
Rinary1 Jul 23, 2024
cc59cf1
Merge branch 'space-sunrise:master' into Synth
Rinary1 Jul 28, 2024
77b16e2
Merge branch 'space-sunrise:master' into Synth
Rinary1 Aug 2, 2024
0803644
Merge branch 'master' of https://github.com/space-sunrise/space-stati…
Rinary1 Oct 9, 2024
aaf76c6
synth parts
Rinary1 Oct 9, 2024
bbcf1d3
Fix Textures, Add Tags
Rinary1 Oct 9, 2024
3beaa57
add head and torso
Rinary1 Oct 9, 2024
34f5c20
fix
Rinary1 Oct 9, 2024
ef9478a
upd, add construction
Rinary1 Oct 9, 2024
85922d4
add construction layers, remove chest rot
Rinary1 Oct 9, 2024
b0a4f08
finally add construction
Rinary1 Oct 9, 2024
058d6f2
try fix
Rinary1 Oct 9, 2024
e50361c
fix synth id
Rinary1 Oct 9, 2024
149cdad
upd
Rinary1 Oct 9, 2024
78ab97c
Merge branch 'space-sunrise:master' into Synth
Rinary1 Oct 9, 2024
e98b1e3
Merge branch 'space-sunrise:master' into Synth
Rinary1 Oct 13, 2024
b17addc
upd
Rinary1 Oct 23, 2024
e8b3e42
Merge branch 'space-sunrise:master' into Synth
Rinary1 Oct 28, 2024
35ebcfb
Merge branch 'master' of https://github.com/space-sunrise/space-stati…
Rinary1 Nov 1, 2024
ddabab3
upd charge system
Rinary1 Nov 1, 2024
77e1967
upd
Rinary1 Nov 1, 2024
407339d
some fixes
Rinary1 Nov 1, 2024
99476e0
upd
Rinary1 Nov 1, 2024
690b250
fix
Rinary1 Nov 1, 2024
1727435
clear
Rinary1 Nov 1, 2024
16b7eaf
Merge branch 'space-sunrise:master' into Synth
Rinary1 Nov 2, 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
Prev Previous commit
Next Next commit
fix
Rinary1 committed Oct 9, 2024
commit 34f5c202dc8f140b39ed26085476d122af572af4
Original file line number Diff line number Diff line change
@@ -68,27 +68,12 @@
components:
- type: Sprite
sprite: _Sunrise/Objects/Specific/Robotics/synth_parts.rsi
state: borg_head
state: head
- type: Icon
sprite: _Sunrise/Objects/Specific/Robotics/synth_parts.rsi
state: borg_head
state: head
- type: Tag
tags:
- Trash
- SynthHead
- BaseSynthHead

- type: entity
id: TorsoSynth
parent: BaseSynthTorso
components:
- type: Sprite
sprite: _Sunrise/Objects/Specific/Robotics/synth_parts.rsi
state: borg_chest
- type: Icon
sprite: _Sunrise/Objects/Specific/Robotics/synth_parts.rsi
state: borg_chest
- type: Tag
tags:
- Trash
- BaseSynthTorso
- BaseSynthHead
5 changes: 1 addition & 4 deletions Resources/Prototypes/_Sunrise/tags.yml
Original file line number Diff line number Diff line change
@@ -163,7 +163,4 @@
id: SynthHead

- type: Tag
id: BaseSynthHead

- type: Tag
id: BaseSynthTorso
id: BaseSynthHead