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

Decals (and posters) #93

Merged
merged 29 commits into from
Aug 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
485df67
Increase decal preview size 1.5x
DEATHB4DEFEAT Apr 17, 2023
07fff6c
1/5 (237)
DEATHB4DEFEAT Apr 17, 2023
f27df0c
2/5 (17)
DEATHB4DEFEAT Apr 18, 2023
39cac7c
3/5 (17)
DEATHB4DEFEAT Apr 18, 2023
f446649
4/5 (45)
DEATHB4DEFEAT Apr 18, 2023
15b2c8c
reorganize (316)
DEATHB4DEFEAT Apr 18, 2023
bdfddc7
5/5 (31)
DEATHB4DEFEAT Apr 18, 2023
44ac5df
copyright
DEATHB4DEFEAT Apr 18, 2023
0fa0a13
copy even more rights
DEATHB4DEFEAT Apr 18, 2023
52a0122
signs
DEATHB4DEFEAT Apr 18, 2023
ede3763
fix UI size
DEATHB4DEFEAT Apr 18, 2023
ad87134
sandy decals
DEATHB4DEFEAT Apr 18, 2023
6334647
ast_warn decals
DEATHB4DEFEAT Apr 18, 2023
9ca5fa6
fancybox decals
DEATHB4DEFEAT Apr 18, 2023
a6955cf
dirt decals
DEATHB4DEFEAT Apr 18, 2023
e090b9b
neon decals
DEATHB4DEFEAT Apr 18, 2023
ca770a6
siding decals
DEATHB4DEFEAT Apr 18, 2023
eac0664
fulltile decals
DEATHB4DEFEAT Apr 18, 2023
7dab34b
trimline decals
DEATHB4DEFEAT Apr 18, 2023
41df6ac
move sign sprites
DEATHB4DEFEAT Apr 18, 2023
ed6bb57
salvage signs
DEATHB4DEFEAT Apr 18, 2023
98fa8d2
fix trimline decals
DEATHB4DEFEAT Apr 18, 2023
4b54b21
directional signs
DEATHB4DEFEAT Apr 18, 2023
3a861aa
dorm room signs
DEATHB4DEFEAT Apr 18, 2023
a52cd61
atmospherics label signs
DEATHB4DEFEAT Apr 18, 2023
9015405
numerical signs
DEATHB4DEFEAT Apr 18, 2023
f6c51a2
safety engineer poster
DEATHB4DEFEAT Apr 18, 2023
16a9f4d
Merge branch 'master' of https://github.com/Park-station/Parkstation …
DEATHB4DEFEAT Aug 25, 2023
53bc8e8
fix vector2 issue
DEATHB4DEFEAT Aug 25, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
20 changes: 15 additions & 5 deletions Content.Client/Decals/UI/DecalPlacerWindow.xaml
Original file line number Diff line number Diff line change
@@ -1,27 +1,37 @@
<DefaultWindow xmlns="https://spacestation14.io"
Title="{Loc 'decal-placer-window-title'}"
MinSize="250 500"
SetSize="250 500">
MinSize="338 600">
<BoxContainer Orientation="Vertical">
<LineEdit Name="Search" />
<LineEdit Name="Search" HorizontalExpand="True" />
Comment on lines -3 to +5
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hah, Nice.

<ScrollContainer VerticalExpand="True">
<GridContainer Name="Grid" Columns="6">
<!-- Decals get added here by code -->
</GridContainer>
</ScrollContainer>

<Control MinHeight="8" />

<BoxContainer Orientation="Vertical">
<ColorSelectorSliders Name="ColorPicker" IsAlphaVisible="True" />
<Button Name="PickerOpen" Text="{Loc 'decal-placer-window-palette'}" />
</BoxContainer>

<Control MinHeight="8" />

<CheckBox Name="EnableColor" Text="{Loc 'decal-placer-window-use-color'}" />
<CheckBox Name="EnableSnap" Text="{Loc 'decal-placer-window-enable-snap'}" />
<CheckBox Name="EnableCleanable" Text="{Loc 'decal-placer-window-enable-cleanable'}" />

<Control MinHeight="5" />

<BoxContainer Name="SpinBoxContainer" Orientation="Horizontal">
<Label Text="{Loc 'decal-placer-window-rotation'}" Margin="0 0 0 1" />
<Label Text="{Loc 'decal-placer-window-rotation'}" />
</BoxContainer>

<Control MinHeight="5" />

<BoxContainer Orientation="Horizontal">
<Label Text="{Loc 'decal-placer-window-zindex'}" Margin="0 0 0 1" />
<Label Text="{Loc 'decal-placer-window-zindex'}" />
<SpinBox Name="ZIndexSpinBox" HorizontalExpand ="True" />
</BoxContainer>
</BoxContainer>
Expand Down
4 changes: 3 additions & 1 deletion Content.Client/Decals/UI/DecalPlacerWindow.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Linq;
using System.Numerics;
using Content.Client.Stylesheets;
using Content.Shared.Decals;
using Robust.Client.AutoGenerated;
Expand Down Expand Up @@ -134,7 +135,8 @@ private void RefreshList()
TextureNormal = tex,
Name = decal,
ToolTip = decal,
Modulate = _useColor ? _color : Color.White
Modulate = _useColor ? _color : Color.White,
Scale = new Vector2(1.5f, 1.5f)
};
button.OnPressed += ButtonOnPressed;
if (_selected == decal)
Expand Down
129 changes: 129 additions & 0 deletions Resources/Prototypes/SimpleStation14/Decals/ast_warn.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
- type: decal
id: AstWarnBox
tags: ["station", "warning"]
sprite:
sprite: SimpleStation14/Decals/Flooring/ast.rsi
state: ast_warn_box

- type: decal
id: AstWarnFull
tags: ["station", "warning"]
sprite:
sprite: SimpleStation14/Decals/Flooring/ast.rsi
state: ast_warn_full


- type: decal
id: AstWarnCornerNE
tags: ["station", "warning"]
sprite:
sprite: SimpleStation14/Decals/Flooring/ast.rsi
state: ast_warn_corner_ne

- type: decal
id: AstWarnCornerSE
tags: ["station", "warning"]
sprite:
sprite: SimpleStation14/Decals/Flooring/ast.rsi
state: ast_warn_corner_se

- type: decal
id: AstWarnCornerSW
tags: ["station", "warning"]
sprite:
sprite: SimpleStation14/Decals/Flooring/ast.rsi
state: ast_warn_corner_sw

- type: decal
id: AstWarnCornerNW
tags: ["station", "warning"]
sprite:
sprite: SimpleStation14/Decals/Flooring/ast.rsi
state: ast_warn_corner_nw


- type: decal
id: AstWarnSideN
tags: ["station", "warning"]
sprite:
sprite: SimpleStation14/Decals/Flooring/ast.rsi
state: ast_warn_side_n

- type: decal
id: AstWarnSideE
tags: ["station", "warning"]
sprite:
sprite: SimpleStation14/Decals/Flooring/ast.rsi
state: ast_warn_side_e

- type: decal
id: AstWarnSideS
tags: ["station", "warning"]
sprite:
sprite: SimpleStation14/Decals/Flooring/ast.rsi
state: ast_warn_side_s

- type: decal
id: AstWarnSideW
tags: ["station", "warning"]
sprite:
sprite: SimpleStation14/Decals/Flooring/ast.rsi
state: ast_warn_side_w


- type: decal
id: AstWarnSideNE
tags: ["station", "warning"]
sprite:
sprite: SimpleStation14/Decals/Flooring/ast.rsi
state: ast_warn_side_ne

- type: decal
id: AstWarnSideSE
tags: ["station", "warning"]
sprite:
sprite: SimpleStation14/Decals/Flooring/ast.rsi
state: ast_warn_side_se

- type: decal
id: AstWarnSideSW
tags: ["station", "warning"]
sprite:
sprite: SimpleStation14/Decals/Flooring/ast.rsi
state: ast_warn_side_sw

- type: decal
id: AstWarnSideNW
tags: ["station", "warning"]
sprite:
sprite: SimpleStation14/Decals/Flooring/ast.rsi
state: ast_warn_side_nw


- type: decal
id: AstWarnEndN
tags: ["station", "warning"]
sprite:
sprite: SimpleStation14/Decals/Flooring/ast.rsi
state: ast_warn_end_n

- type: decal
id: AstWarnEndE
tags: ["station", "warning"]
sprite:
sprite: SimpleStation14/Decals/Flooring/ast.rsi
state: ast_warn_end_e

- type: decal
id: AstWarnEndS
tags: ["station", "warning"]
sprite:
sprite: SimpleStation14/Decals/Flooring/ast.rsi
state: ast_warn_end_s

- type: decal
id: AstWarnEndW
tags: ["station", "warning"]
sprite:
sprite: SimpleStation14/Decals/Flooring/ast.rsi
state: ast_warn_end_w
56 changes: 56 additions & 0 deletions Resources/Prototypes/SimpleStation14/Decals/dirt.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
- type: decal
id: DirtSideN
tags: ["markings", "dirt"]
sprite:
sprite: SimpleStation14/Decals/Flooring/dirt.rsi
state: dirt_side_n

- type: decal
id: DirtSideE
tags: ["markings", "dirt"]
sprite:
sprite: SimpleStation14/Decals/Flooring/dirt.rsi
state: dirt_side_e

- type: decal
id: DirtSideS
tags: ["markings", "dirt"]
sprite:
sprite: SimpleStation14/Decals/Flooring/dirt.rsi
state: dirt_side_s

- type: decal
id: DirtSideW
tags: ["markings", "dirt"]
sprite:
sprite: SimpleStation14/Decals/Flooring/dirt.rsi
state: dirt_side_w


- type: decal
id: DirtSideNE
tags: ["markings", "dirt"]
sprite:
sprite: SimpleStation14/Decals/Flooring/dirt.rsi
state: dirt_side_ne

- type: decal
id: DirtSideSE
tags: ["markings", "dirt"]
sprite:
sprite: SimpleStation14/Decals/Flooring/dirt.rsi
state: dirt_side_se

- type: decal
id: DirtSideSW
tags: ["markings", "dirt"]
sprite:
sprite: SimpleStation14/Decals/Flooring/dirt.rsi
state: dirt_side_sw

- type: decal
id: DirtSideNW
tags: ["markings", "dirt"]
sprite:
sprite: SimpleStation14/Decals/Flooring/dirt.rsi
state: dirt_side_nw
56 changes: 56 additions & 0 deletions Resources/Prototypes/SimpleStation14/Decals/fancybox.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
- type: decal
id: FancyBoxCornersWhiteNE
tags: ["station", "markings", "box"]
sprite:
sprite: SimpleStation14/Decals/Flooring/box.rsi
state: box_corners_white_ne

- type: decal
id: FancyBoxCornersWhiteNW
tags: ["station", "markings", "box"]
sprite:
sprite: SimpleStation14/Decals/Flooring/box.rsi
state: box_corners_white_nw

- type: decal
id: FancyBoxCornersWhiteSE
tags: ["station", "markings", "box"]
sprite:
sprite: SimpleStation14/Decals/Flooring/box.rsi
state: box_corners_white_se

- type: decal
id: FancyBoxCornersWhiteSW
tags: ["station", "markings", "box"]
sprite:
sprite: SimpleStation14/Decals/Flooring/box.rsi
state: box_corners_white_sw


- type: decal
id: FancyBoxCornersYellowNE
tags: ["station", "markings", "box"]
sprite:
sprite: SimpleStation14/Decals/Flooring/box.rsi
state: box_corners_yellow_ne

- type: decal
id: FancyBoxCornersYellowNW
tags: ["station", "markings", "box"]
sprite:
sprite: SimpleStation14/Decals/Flooring/box.rsi
state: box_corners_yellow_nw

- type: decal
id: FancyBoxCornersYellowSE
tags: ["station", "markings", "box"]
sprite:
sprite: SimpleStation14/Decals/Flooring/box.rsi
state: box_corners_yellow_se

- type: decal
id: FancyBoxCornersYellowSW
tags: ["station", "markings", "box"]
sprite:
sprite: SimpleStation14/Decals/Flooring/box.rsi
state: box_corners_yellow_sw
Loading
Loading