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

Дополнительная покраска Гигакс #821

Merged
merged 19 commits into from
Dec 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f8dbe48
Sunrise weapon: small rebalance
Nov 21, 2024
43596a8
Merge branch 'master' of https://github.com/KaiserMaus/space-station-…
KaiserMaus Nov 22, 2024
0597b7f
Merge branch 'space-sunrise:master' into master
KaiserMaus Nov 26, 2024
16b8217
Merge remote-tracking branch 'origin'
KaiserMaus Nov 27, 2024
772d828
Merge branch 'master' of https://github.com/space-sunrise/space-stati…
KaiserMaus Nov 28, 2024
16c6caa
Merge branch 'master' of https://github.com/space-sunrise/space-stati…
KaiserMaus Dec 1, 2024
5158d1d
Merge branch 'master' of https://github.com/space-sunrise/space-stati…
KaiserMaus Dec 2, 2024
c6d8b67
Merge branch 'master' of https://github.com/space-sunrise/space-stati…
KaiserMaus Dec 4, 2024
d323134
Merge branch 'master' of https://github.com/space-sunrise/space-stati…
KaiserMaus Dec 5, 2024
21bb614
Merge branch 'master' of https://github.com/space-sunrise/space-stati…
KaiserMaus Dec 6, 2024
298c595
Merge branch 'master' of https://github.com/space-sunrise/space-stati…
KaiserMaus Dec 8, 2024
604afd3
Merge branch 'master' of https://github.com/space-sunrise/space-stati…
KaiserMaus Dec 9, 2024
c849ace
Ripley mk2 painted
KaiserMaus Dec 10, 2024
8d5d83b
Merge branch 'space-sunrise:master' into Mech-Paint
KaiserMaus Dec 10, 2024
c47f4e3
Merge branch 'master' of https://github.com/space-sunrise/space-stati…
KaiserMaus Dec 10, 2024
ba06e0c
Merge branch 'master' into Mech-Paint
KaiserMaus Dec 10, 2024
16ab2da
Merge branch 'Mech-Paint' of https://github.com/KaiserMaus/space-stat…
KaiserMaus Dec 10, 2024
e06a381
Fix Pirate,Add White\Black Gygax
KaiserMaus Dec 10, 2024
83a3866
Locale
KaiserMaus Dec 10, 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
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@ ent-MechPaintGygaxMolot = { ent-MechPaintBase }
ent-MechPaintGygaxOld = { ent-MechPaintBase }
.suffix = DEBUG, Gygax, Old
.desc = { ent-MechPaintBase.desc }
ent-MechPaintGygaxBlack = { ent-MechPaintBase }
.suffix = DEBUG, Gygax, Black
.desc = { ent-MechPaintBase.desc }
ent-MechPaintGygaxWhite = { ent-MechPaintBase }
.suffix = DEBUG, Gygax, White
.desc = { ent-MechPaintBase.desc }
ent-MechPaintGygaxPirate = { ent-MechPaintBase }
.suffix = DEBUG, Gygax, Pirate
.desc = { ent-MechPaintBase.desc }
ent-MechPaintDurandUnathi = { ent-MechPaintBase }
.suffix = DEBUG, Durand, Unathi
.desc = { ent-MechPaintBase.desc }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@ ent-MechPaintGygaxMolot = { ent-MechPaintBase }
ent-MechPaintGygaxOld = { ent-MechPaintBase }
.suffix = ДЕБАГ, Гигакс, Old
.desc = { ent-MechPaintBase.desc }
ent-MechPaintGygaxBlack = { ent-MechPaintBase }
.suffix = ДЕБАГ, Гигакс, Черный
.desc = { ent-MechPaintBase.desc }
ent-MechPaintGygaxWhite = { ent-MechPaintBase }
.suffix = ДЕБАГ, Гигакс, Белый
.desc = { ent-MechPaintBase.desc }
ent-MechPaintGygaxPirate = { ent-MechPaintBase }
.suffix = ДЕБАГ, Гигакс, Пираты
.desc = { ent-MechPaintBase.desc }
ent-MechPaintDurandUnathi = { ent-MechPaintBase }
.suffix = ДЕБАГ, Дюранд, Unathi
.desc = { ent-MechPaintBase.desc }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,11 @@
soundOnReflect: /Audio/Weapons/block_metal1.ogg
reflects:
- NonEnergy
- type: Tag
tags:
- DoorBumpOpener
- FootstepSound
- Ripley
- type: MobThresholds
currentThresholdState : Alive
thresholds:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,67 @@
True: {state: "pobeda"}
False: {state: "pobeda-cap"}

#Gegax-Pirate
# Gygax-Black
- type: entity
parent: MechPaintBase
suffix: DEBUG, Gygax, Contraband
id: MechPaintGygaxBlack
components:
- type: Sprite
sprite: _Sunrise/Objects/Fun/mech_spraycans/gygax.rsi
state: syndiegax-cap
layers:
- state: syndiegax-cap
map: ["enum.OpenableVisuals.Layer"]
- type: Item
sprite: _Sunrise/Objects/Fun/mech_spraycans/gygax.rsi
heldPrefix: syndiegax
- type: MechPaint
used: false
whitelist:
tags:
- Gygax
baseState: gygax_black
openState: gygax_black-open
brokenState: gygax_black-broken
- type: GenericVisualizer
visuals:
enum.OpenableVisuals.Opened:
enum.OpenableVisuals.Layer:
True: {state: "syndiegax"}
False: {state: "syndiegax-cap"}

# Gygax-White
- type: entity
parent: MechPaintBase
suffix: DEBUG, Gygax, Legal
id: MechPaintGygaxWhite
components:
- type: Sprite
sprite: _Sunrise/Objects/Fun/mech_spraycans/gygax.rsi
state: gygax-white-cap
layers:
- state: gygax-white-cap
map: ["enum.OpenableVisuals.Layer"]
- type: Item
sprite: _Sunrise/Objects/Fun/mech_spraycans/gygax.rsi
heldPrefix: gygax-white
- type: MechPaint
used: false
whitelist:
tags:
- Gygax
baseState: gygax_white
openState: gygax_white-open
brokenState: gygax_white-broken
- type: GenericVisualizer
visuals:
enum.OpenableVisuals.Opened:
enum.OpenableVisuals.Layer:
True: {state: "gygax-white"}
False: {state: "gygax-white-cap"}

#Gygax-Pirate
- type: entity
parent: MechPaintBase
suffix: DEBUG, Gygax, Pirate
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
0.3,
0.4,
0.5,
0.3
0.3
]
]
},
Expand Down Expand Up @@ -183,8 +183,7 @@
0.5,
0.3,
0.5,
0.3,
0.5
0.3
]
]
},
Expand Down
Loading