From 31769edf5f9fc023ac8891466c6565c0be125ed0 Mon Sep 17 00:00:00 2001 From: mirrorcult Date: Tue, 8 Feb 2022 13:54:41 -0700 Subject: [PATCH] Decal Placer + add new decals for mapping (#6548) * abomination * okay its less unabashedly garbage now * other UI changes * its britney bitch * proper greyscale full/half/quarter tiles * misc cleanup * rsi * Add a palette system. It's Kara's problem now. * oops * a * Departmental palette alpha tweaks * oopy * so true * Update Content.Shared/Decals/ColorPalettePrototype.cs Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * fixes for that * neutral light color and new warning lines * dirt * checkerboards * oop Co-authored-by: moonheart08 Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- .../UI/Tabs/AdminbusTab/AdminbusTab.xaml | 1 + .../UI/Tabs/AdminbusTab/AdminbusTab.xaml.cs | 15 +- Content.Client/Decals/DecalPlacementSystem.cs | 112 +++++++++ Content.Client/Decals/UI/AlphaColorPicker.cs | 98 ++++++++ .../Decals/UI/DecalPlacerWindow.xaml | 26 ++ .../Decals/UI/DecalPlacerWindow.xaml.cs | 167 ++++++++++++ .../Decals/UI/PaletteColorPicker.xaml | 12 + .../Decals/UI/PaletteColorPicker.xaml.cs | 54 ++++ .../EscapeMenu/UI/Tabs/KeyRebindTab.xaml.cs | 1 + Content.Client/Input/ContentContexts.cs | 1 + Content.Client/Sandbox/SandboxManager.cs | 33 +++ Content.Client/Stylesheets/StyleNano.cs | 7 + Content.Server/Decals/DecalSystem.cs | 67 ++++- .../Decals/ColorPalettePrototype.cs | 11 + Content.Shared/Decals/SharedDecalSystem.cs | 28 +++ Content.Shared/Input/ContentKeyFunctions.cs | 1 + .../Locale/en-US/decals/decal-window.ftl | 7 + .../en-US/escape-menu/ui/options-menu.ftl | 1 + .../Locale/en-US/sandbox/sandbox-manager.ftl | 3 +- .../Prototypes/Decals/Overlays/grayscale.yml | 76 ++++++ Resources/Prototypes/Decals/dirty.yml | 52 ++++ Resources/Prototypes/Decals/markings.yml | 237 ++++++++++++++++++ .../Prototypes/Palettes/departmental.yml | 13 + Resources/Prototypes/Palettes/sixteen.yml | 20 ++ .../Overlays/greyscale.rsi/checkerNESW.png | Bin 0 -> 185 bytes .../Overlays/greyscale.rsi/checkerNWSE.png | Bin 0 -> 185 bytes .../greyscale.rsi/fulltile_overlay.png | Bin 0 -> 191 bytes .../greyscale.rsi/halftile_overlay.png | Bin 0 -> 167 bytes .../greyscale.rsi/halftile_overlay_180.png | Bin 0 -> 168 bytes .../greyscale.rsi/halftile_overlay_270.png | Bin 0 -> 184 bytes .../greyscale.rsi/halftile_overlay_90.png | Bin 0 -> 185 bytes .../Decals/Overlays/greyscale.rsi/meta.json | 44 ++++ .../greyscale.rsi/quartertile_overlay.png | Bin 0 -> 163 bytes .../greyscale.rsi/quartertile_overlay_180.png | Bin 0 -> 167 bytes .../greyscale.rsi/quartertile_overlay_270.png | Bin 0 -> 166 bytes .../greyscale.rsi/quartertile_overlay_90.png | Bin 0 -> 163 bytes .../Textures/Decals/dirty.rsi/damaged.png | Bin 0 -> 1478 bytes Resources/Textures/Decals/dirty.rsi/dirt.png | Bin 0 -> 1176 bytes .../Textures/Decals/dirty.rsi/dirtheavy.png | Bin 0 -> 1251 bytes .../Textures/Decals/dirty.rsi/dirtlight.png | Bin 0 -> 1277 bytes .../Textures/Decals/dirty.rsi/dirtmedium.png | Bin 0 -> 1355 bytes Resources/Textures/Decals/dirty.rsi/meta.json | 32 +++ .../Textures/Decals/dirty.rsi/remains.png | Bin 0 -> 663 bytes Resources/Textures/Decals/dirty.rsi/rust.png | Bin 0 -> 3185 bytes .../Textures/Decals/markings.rsi/arrows.png | Bin 0 -> 213 bytes .../Decals/markings.rsi/arrows_greyscale.png | Bin 0 -> 196 bytes .../Textures/Decals/markings.rsi/bot.png | Bin 0 -> 200 bytes .../Decals/markings.rsi/bot_greyscale.png | Bin 0 -> 243 bytes .../Textures/Decals/markings.rsi/bot_left.png | Bin 0 -> 310 bytes .../markings.rsi/bot_left_greyscale.png | Bin 0 -> 264 bytes .../Decals/markings.rsi/bot_right.png | Bin 0 -> 310 bytes .../markings.rsi/bot_right_greyscale.png | Bin 0 -> 261 bytes .../Textures/Decals/markings.rsi/box.png | Bin 0 -> 339 bytes .../Decals/markings.rsi/box_greyscale.png | Bin 0 -> 265 bytes .../Textures/Decals/markings.rsi/caution.png | Bin 0 -> 246 bytes .../Decals/markings.rsi/caution_greyscale.png | Bin 0 -> 213 bytes .../Textures/Decals/markings.rsi/delivery.png | Bin 0 -> 215 bytes .../markings.rsi/delivery_greyscale.png | Bin 0 -> 270 bytes .../Decals/markings.rsi/loading_area.png | Bin 0 -> 255 bytes .../markings.rsi/loading_area_greyscale.png | Bin 0 -> 233 bytes .../Textures/Decals/markings.rsi/meta.json | 113 +++++++++ .../Decals/markings.rsi/standclear.png | Bin 0 -> 341 bytes .../markings.rsi/standclear_greyscale.png | Bin 0 -> 254 bytes .../Textures/Decals/markings.rsi/warn_box.png | Bin 0 -> 343 bytes .../markings.rsi/warn_box_greyscale.png | Bin 0 -> 286 bytes .../Decals/markings.rsi/warn_corner.png | Bin 0 -> 259 bytes .../markings.rsi/warn_corner_flipped.png | Bin 0 -> 260 bytes .../warn_corner_flipped_greyscale.png | Bin 0 -> 230 bytes .../markings.rsi/warn_corner_greyscale.png | Bin 0 -> 232 bytes .../Textures/Decals/markings.rsi/warn_end.png | Bin 0 -> 269 bytes .../markings.rsi/warn_end_greyscale.png | Bin 0 -> 247 bytes .../Decals/markings.rsi/warn_full.png | Bin 0 -> 248 bytes .../markings.rsi/warn_full_greyscale.png | Bin 0 -> 255 bytes .../Decals/markings.rsi/warningline.png | Bin 0 -> 217 bytes .../markings.rsi/warningline_greyscale.png | Bin 0 -> 202 bytes .../Decals/markings.rsi/warninglinecorner.png | Bin 0 -> 216 bytes .../warninglinecorner_flipped.png | Bin 0 -> 220 bytes .../warninglinecorner_flipped_greyscale.png | Bin 0 -> 196 bytes .../warninglinecorner_greyscale.png | Bin 0 -> 191 bytes Resources/keybinds.yml | 3 + 80 files changed, 1223 insertions(+), 12 deletions(-) create mode 100644 Content.Client/Decals/DecalPlacementSystem.cs create mode 100644 Content.Client/Decals/UI/AlphaColorPicker.cs create mode 100644 Content.Client/Decals/UI/DecalPlacerWindow.xaml create mode 100644 Content.Client/Decals/UI/DecalPlacerWindow.xaml.cs create mode 100644 Content.Client/Decals/UI/PaletteColorPicker.xaml create mode 100644 Content.Client/Decals/UI/PaletteColorPicker.xaml.cs create mode 100644 Content.Shared/Decals/ColorPalettePrototype.cs create mode 100644 Resources/Locale/en-US/decals/decal-window.ftl create mode 100644 Resources/Prototypes/Decals/Overlays/grayscale.yml create mode 100644 Resources/Prototypes/Decals/dirty.yml create mode 100644 Resources/Prototypes/Decals/markings.yml create mode 100644 Resources/Prototypes/Palettes/departmental.yml create mode 100644 Resources/Prototypes/Palettes/sixteen.yml create mode 100644 Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNESW.png create mode 100644 Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNWSE.png create mode 100644 Resources/Textures/Decals/Overlays/greyscale.rsi/fulltile_overlay.png create mode 100644 Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay.png create mode 100644 Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png create mode 100644 Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png create mode 100644 Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png create mode 100644 Resources/Textures/Decals/Overlays/greyscale.rsi/meta.json create mode 100644 Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay.png create mode 100644 Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png create mode 100644 Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png create mode 100644 Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png create mode 100644 Resources/Textures/Decals/dirty.rsi/damaged.png create mode 100644 Resources/Textures/Decals/dirty.rsi/dirt.png create mode 100644 Resources/Textures/Decals/dirty.rsi/dirtheavy.png create mode 100644 Resources/Textures/Decals/dirty.rsi/dirtlight.png create mode 100644 Resources/Textures/Decals/dirty.rsi/dirtmedium.png create mode 100644 Resources/Textures/Decals/dirty.rsi/meta.json create mode 100644 Resources/Textures/Decals/dirty.rsi/remains.png create mode 100644 Resources/Textures/Decals/dirty.rsi/rust.png create mode 100644 Resources/Textures/Decals/markings.rsi/arrows.png create mode 100644 Resources/Textures/Decals/markings.rsi/arrows_greyscale.png create mode 100644 Resources/Textures/Decals/markings.rsi/bot.png create mode 100644 Resources/Textures/Decals/markings.rsi/bot_greyscale.png create mode 100644 Resources/Textures/Decals/markings.rsi/bot_left.png create mode 100644 Resources/Textures/Decals/markings.rsi/bot_left_greyscale.png create mode 100644 Resources/Textures/Decals/markings.rsi/bot_right.png create mode 100644 Resources/Textures/Decals/markings.rsi/bot_right_greyscale.png create mode 100644 Resources/Textures/Decals/markings.rsi/box.png create mode 100644 Resources/Textures/Decals/markings.rsi/box_greyscale.png create mode 100644 Resources/Textures/Decals/markings.rsi/caution.png create mode 100644 Resources/Textures/Decals/markings.rsi/caution_greyscale.png create mode 100644 Resources/Textures/Decals/markings.rsi/delivery.png create mode 100644 Resources/Textures/Decals/markings.rsi/delivery_greyscale.png create mode 100644 Resources/Textures/Decals/markings.rsi/loading_area.png create mode 100644 Resources/Textures/Decals/markings.rsi/loading_area_greyscale.png create mode 100644 Resources/Textures/Decals/markings.rsi/meta.json create mode 100644 Resources/Textures/Decals/markings.rsi/standclear.png create mode 100644 Resources/Textures/Decals/markings.rsi/standclear_greyscale.png create mode 100644 Resources/Textures/Decals/markings.rsi/warn_box.png create mode 100644 Resources/Textures/Decals/markings.rsi/warn_box_greyscale.png create mode 100644 Resources/Textures/Decals/markings.rsi/warn_corner.png create mode 100644 Resources/Textures/Decals/markings.rsi/warn_corner_flipped.png create mode 100644 Resources/Textures/Decals/markings.rsi/warn_corner_flipped_greyscale.png create mode 100644 Resources/Textures/Decals/markings.rsi/warn_corner_greyscale.png create mode 100644 Resources/Textures/Decals/markings.rsi/warn_end.png create mode 100644 Resources/Textures/Decals/markings.rsi/warn_end_greyscale.png create mode 100644 Resources/Textures/Decals/markings.rsi/warn_full.png create mode 100644 Resources/Textures/Decals/markings.rsi/warn_full_greyscale.png create mode 100644 Resources/Textures/Decals/markings.rsi/warningline.png create mode 100644 Resources/Textures/Decals/markings.rsi/warningline_greyscale.png create mode 100644 Resources/Textures/Decals/markings.rsi/warninglinecorner.png create mode 100644 Resources/Textures/Decals/markings.rsi/warninglinecorner_flipped.png create mode 100644 Resources/Textures/Decals/markings.rsi/warninglinecorner_flipped_greyscale.png create mode 100644 Resources/Textures/Decals/markings.rsi/warninglinecorner_greyscale.png diff --git a/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml b/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml index 3fc51089d7..8822e5d60e 100644 --- a/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml +++ b/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml @@ -8,6 +8,7 @@