From f4c0a21b7b4d2ecc0ece88b2d83db6ad31a5ecf0 Mon Sep 17 00:00:00 2001 From: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Date: Sun, 7 Apr 2024 11:34:29 +1000 Subject: [PATCH 01/11] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B8=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=D0=BB=20=D0=BF=D0=B0=D0=BF=D0=BA?= =?UTF-8?q?=D1=83=20=D1=81=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=BC=20=D0=B8=D0=BD?= =?UTF-8?q?=D1=82=D0=B5=D1=80=D1=84=D0=B5=D0=B9=D1=81=D0=BE=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SlotBackground.png | Bin .../{FantasySlotStyle => Default}/Slots/back.png | Bin .../{FantasySlotStyle => Default}/Slots/belt.png | Bin .../{FantasySlotStyle => Default}/Slots/cloak.png | Bin .../{FantasySlotStyle => Default}/Slots/eyes.png | Bin .../{FantasySlotStyle => Default}/Slots/gloves.png | Bin .../{FantasySlotStyle => Default}/Slots/hand_l.png | Bin .../{FantasySlotStyle => Default}/Slots/hand_m.png | Bin .../{FantasySlotStyle => Default}/Slots/hand_r.png | Bin .../Slots/hand_r_no_letter.png | Bin .../{FantasySlotStyle => Default}/Slots/head.png | Bin .../{FantasySlotStyle => Default}/Slots/keys.png | Bin .../{FantasySlotStyle => Default}/Slots/mask.png | Bin .../{FantasySlotStyle => Default}/Slots/neck.png | Bin .../{FantasySlotStyle => Default}/Slots/pants.png | Bin .../{FantasySlotStyle => Default}/Slots/pocket.png | Bin .../{FantasySlotStyle => Default}/Slots/ring.png | Bin .../{FantasySlotStyle => Default}/Slots/shirt.png | Bin .../{FantasySlotStyle => Default}/Slots/shoes.png | Bin .../{FantasySlotStyle => Default}/Slots/toggle.png | Bin .../Storage/piece_bottom.png | Bin .../Storage/piece_bottomLeft.png | Bin .../Storage/piece_bottomRight.png | Bin .../Storage/piece_center.png | Bin .../Storage/piece_left.png | Bin .../Storage/piece_right.png | Bin .../Storage/piece_top.png | Bin .../Storage/piece_topLeft.png | Bin .../Storage/piece_topRight.png | Bin .../Storage/sidebar_bottom.png | Bin .../Storage/sidebar_mid.png | Bin .../Storage/sidebar_top.png | Bin .../slot_highlight.png | Bin 33 files changed, 0 insertions(+), 0 deletions(-) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/SlotBackground.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Slots/back.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Slots/belt.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Slots/cloak.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Slots/eyes.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Slots/gloves.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Slots/hand_l.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Slots/hand_m.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Slots/hand_r.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Slots/hand_r_no_letter.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Slots/head.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Slots/keys.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Slots/mask.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Slots/neck.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Slots/pants.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Slots/pocket.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Slots/ring.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Slots/shirt.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Slots/shoes.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Slots/toggle.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Storage/piece_bottom.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Storage/piece_bottomLeft.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Storage/piece_bottomRight.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Storage/piece_center.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Storage/piece_left.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Storage/piece_right.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Storage/piece_top.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Storage/piece_topLeft.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Storage/piece_topRight.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Storage/sidebar_bottom.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Storage/sidebar_mid.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/Storage/sidebar_top.png (100%) rename Resources/Textures/_CP14/Interface/{FantasySlotStyle => Default}/slot_highlight.png (100%) diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/SlotBackground.png b/Resources/Textures/_CP14/Interface/Default/SlotBackground.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/SlotBackground.png rename to Resources/Textures/_CP14/Interface/Default/SlotBackground.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/back.png b/Resources/Textures/_CP14/Interface/Default/Slots/back.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/back.png rename to Resources/Textures/_CP14/Interface/Default/Slots/back.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/belt.png b/Resources/Textures/_CP14/Interface/Default/Slots/belt.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/belt.png rename to Resources/Textures/_CP14/Interface/Default/Slots/belt.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/cloak.png b/Resources/Textures/_CP14/Interface/Default/Slots/cloak.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/cloak.png rename to Resources/Textures/_CP14/Interface/Default/Slots/cloak.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/eyes.png b/Resources/Textures/_CP14/Interface/Default/Slots/eyes.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/eyes.png rename to Resources/Textures/_CP14/Interface/Default/Slots/eyes.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/gloves.png b/Resources/Textures/_CP14/Interface/Default/Slots/gloves.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/gloves.png rename to Resources/Textures/_CP14/Interface/Default/Slots/gloves.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/hand_l.png b/Resources/Textures/_CP14/Interface/Default/Slots/hand_l.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/hand_l.png rename to Resources/Textures/_CP14/Interface/Default/Slots/hand_l.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/hand_m.png b/Resources/Textures/_CP14/Interface/Default/Slots/hand_m.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/hand_m.png rename to Resources/Textures/_CP14/Interface/Default/Slots/hand_m.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/hand_r.png b/Resources/Textures/_CP14/Interface/Default/Slots/hand_r.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/hand_r.png rename to Resources/Textures/_CP14/Interface/Default/Slots/hand_r.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/hand_r_no_letter.png b/Resources/Textures/_CP14/Interface/Default/Slots/hand_r_no_letter.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/hand_r_no_letter.png rename to Resources/Textures/_CP14/Interface/Default/Slots/hand_r_no_letter.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/head.png b/Resources/Textures/_CP14/Interface/Default/Slots/head.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/head.png rename to Resources/Textures/_CP14/Interface/Default/Slots/head.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/keys.png b/Resources/Textures/_CP14/Interface/Default/Slots/keys.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/keys.png rename to Resources/Textures/_CP14/Interface/Default/Slots/keys.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/mask.png b/Resources/Textures/_CP14/Interface/Default/Slots/mask.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/mask.png rename to Resources/Textures/_CP14/Interface/Default/Slots/mask.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/neck.png b/Resources/Textures/_CP14/Interface/Default/Slots/neck.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/neck.png rename to Resources/Textures/_CP14/Interface/Default/Slots/neck.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/pants.png b/Resources/Textures/_CP14/Interface/Default/Slots/pants.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/pants.png rename to Resources/Textures/_CP14/Interface/Default/Slots/pants.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/pocket.png b/Resources/Textures/_CP14/Interface/Default/Slots/pocket.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/pocket.png rename to Resources/Textures/_CP14/Interface/Default/Slots/pocket.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/ring.png b/Resources/Textures/_CP14/Interface/Default/Slots/ring.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/ring.png rename to Resources/Textures/_CP14/Interface/Default/Slots/ring.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/shirt.png b/Resources/Textures/_CP14/Interface/Default/Slots/shirt.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/shirt.png rename to Resources/Textures/_CP14/Interface/Default/Slots/shirt.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/shoes.png b/Resources/Textures/_CP14/Interface/Default/Slots/shoes.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/shoes.png rename to Resources/Textures/_CP14/Interface/Default/Slots/shoes.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/toggle.png b/Resources/Textures/_CP14/Interface/Default/Slots/toggle.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Slots/toggle.png rename to Resources/Textures/_CP14/Interface/Default/Slots/toggle.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Storage/piece_bottom.png b/Resources/Textures/_CP14/Interface/Default/Storage/piece_bottom.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Storage/piece_bottom.png rename to Resources/Textures/_CP14/Interface/Default/Storage/piece_bottom.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Storage/piece_bottomLeft.png b/Resources/Textures/_CP14/Interface/Default/Storage/piece_bottomLeft.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Storage/piece_bottomLeft.png rename to Resources/Textures/_CP14/Interface/Default/Storage/piece_bottomLeft.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Storage/piece_bottomRight.png b/Resources/Textures/_CP14/Interface/Default/Storage/piece_bottomRight.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Storage/piece_bottomRight.png rename to Resources/Textures/_CP14/Interface/Default/Storage/piece_bottomRight.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Storage/piece_center.png b/Resources/Textures/_CP14/Interface/Default/Storage/piece_center.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Storage/piece_center.png rename to Resources/Textures/_CP14/Interface/Default/Storage/piece_center.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Storage/piece_left.png b/Resources/Textures/_CP14/Interface/Default/Storage/piece_left.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Storage/piece_left.png rename to Resources/Textures/_CP14/Interface/Default/Storage/piece_left.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Storage/piece_right.png b/Resources/Textures/_CP14/Interface/Default/Storage/piece_right.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Storage/piece_right.png rename to Resources/Textures/_CP14/Interface/Default/Storage/piece_right.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Storage/piece_top.png b/Resources/Textures/_CP14/Interface/Default/Storage/piece_top.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Storage/piece_top.png rename to Resources/Textures/_CP14/Interface/Default/Storage/piece_top.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Storage/piece_topLeft.png b/Resources/Textures/_CP14/Interface/Default/Storage/piece_topLeft.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Storage/piece_topLeft.png rename to Resources/Textures/_CP14/Interface/Default/Storage/piece_topLeft.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Storage/piece_topRight.png b/Resources/Textures/_CP14/Interface/Default/Storage/piece_topRight.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Storage/piece_topRight.png rename to Resources/Textures/_CP14/Interface/Default/Storage/piece_topRight.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Storage/sidebar_bottom.png b/Resources/Textures/_CP14/Interface/Default/Storage/sidebar_bottom.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Storage/sidebar_bottom.png rename to Resources/Textures/_CP14/Interface/Default/Storage/sidebar_bottom.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Storage/sidebar_mid.png b/Resources/Textures/_CP14/Interface/Default/Storage/sidebar_mid.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Storage/sidebar_mid.png rename to Resources/Textures/_CP14/Interface/Default/Storage/sidebar_mid.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/Storage/sidebar_top.png b/Resources/Textures/_CP14/Interface/Default/Storage/sidebar_top.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/Storage/sidebar_top.png rename to Resources/Textures/_CP14/Interface/Default/Storage/sidebar_top.png diff --git a/Resources/Textures/_CP14/Interface/FantasySlotStyle/slot_highlight.png b/Resources/Textures/_CP14/Interface/Default/slot_highlight.png similarity index 100% rename from Resources/Textures/_CP14/Interface/FantasySlotStyle/slot_highlight.png rename to Resources/Textures/_CP14/Interface/Default/slot_highlight.png From 0dea6f5c9c2a0c192d04896158cba1e80c3b7dad Mon Sep 17 00:00:00 2001 From: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Date: Sun, 7 Apr 2024 11:35:55 +1000 Subject: [PATCH 02/11] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BD=D0=BE=D0=B2=D1=83=D1=8E=20=D1=82=D0=B5=D0=BC?= =?UTF-8?q?=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Client/Entry/EntryPoint.cs | 3 +- Content.Shared/CCVar/CCVars.cs | 7 ++- Resources/Prototypes/_CP14/hud.yml | 5 ++ Resources/Prototypes/_CP14/themes.yml | 14 +++++ Resources/Prototypes/hud.yml | 73 ++++++++++++++------------- 5 files changed, 64 insertions(+), 38 deletions(-) create mode 100644 Resources/Prototypes/_CP14/hud.yml create mode 100644 Resources/Prototypes/_CP14/themes.yml diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs index 47f11ee161..88f5bb82ab 100644 --- a/Content.Client/Entry/EntryPoint.cs +++ b/Content.Client/Entry/EntryPoint.cs @@ -22,6 +22,7 @@ using Content.Client.Stylesheets; using Content.Client.Viewport; using Content.Client.Voting; using Content.Shared.Ame.Components; +using Content.Shared.CCVar; using Content.Shared.Gravity; using Content.Shared.Localizations; using Robust.Client; @@ -157,7 +158,7 @@ namespace Content.Client.Entry _clientPreferencesManager.Initialize(); _euiManager.Initialize(); _voteManager.Initialize(); - _userInterfaceManager.SetDefaultTheme("SS14DefaultTheme"); + _userInterfaceManager.SetDefaultTheme(_configManager.GetCVar(CCVars.UIDefaultInterfaceTheme)); _userInterfaceManager.SetActiveTheme(_configManager.GetCVar(CVars.InterfaceTheme)); _documentParsingManager.Initialize(); diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index 1300a3dc98..72f7526651 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -631,6 +631,9 @@ namespace Content.Shared.CCVar * Interface */ + public static readonly CVarDef UIDefaultInterfaceTheme = + CVarDef.Create("interface.default_theme", "CP14DefaultTheme", CVar.CLIENTONLY); + public static readonly CVarDef UIClickSound = CVarDef.Create("interface.click_sound", "/Audio/UserInterface/click.ogg", CVar.REPLICATED); @@ -726,7 +729,7 @@ namespace Content.Shared.CCVar public static readonly CVarDef CombatModeIndicatorsPointShow = CVarDef.Create("hud.combat_mode_indicators_point_show", true, CVar.ARCHIVE | CVar.CLIENTONLY); - + public static readonly CVarDef LoocAboveHeadShow = CVarDef.Create("hud.show_looc_above_head", true, CVar.ARCHIVE | CVar.CLIENTONLY); @@ -1225,7 +1228,7 @@ namespace Content.Shared.CCVar /// public static readonly CVarDef OocEnableDuringRound = CVarDef.Create("ooc.enable_during_round", false, CVar.NOTIFY | CVar.REPLICATED | CVar.SERVER); - + public static readonly CVarDef ShowOocPatronColor = CVarDef.Create("ooc.show_ooc_patron_color", true, CVar.ARCHIVE | CVar.REPLICATED | CVar.CLIENT); diff --git a/Resources/Prototypes/_CP14/hud.yml b/Resources/Prototypes/_CP14/hud.yml new file mode 100644 index 0000000000..f13082d24e --- /dev/null +++ b/Resources/Prototypes/_CP14/hud.yml @@ -0,0 +1,5 @@ +- type: hudTheme + id: CP14DefaultTheme + name: ui-options-hud-theme-default + path: Default + order: -1 diff --git a/Resources/Prototypes/_CP14/themes.yml b/Resources/Prototypes/_CP14/themes.yml new file mode 100644 index 0000000000..6bb4f9b957 --- /dev/null +++ b/Resources/Prototypes/_CP14/themes.yml @@ -0,0 +1,14 @@ +- type: uiTheme + id: CP14DefaultTheme + path: /Textures/_CP14/Interface/Default/ + colors: + whiteText: "#FFF5EE" + slotSelectedGold: "#e6b812" + slotColor: "#0f1215" + slotOutline: "#333850" + slotText: "#333850" + nanoGold: "#A88B5E" + goodGreenFore: "#31843E" + concerningOrangeFore: "#A5762F" + dangerousRedFore: "#BB3232" + disabledFore: "#5A5A5A" \ No newline at end of file diff --git a/Resources/Prototypes/hud.yml b/Resources/Prototypes/hud.yml index 637fbe2e6f..16780b2a01 100644 --- a/Resources/Prototypes/hud.yml +++ b/Resources/Prototypes/hud.yml @@ -1,41 +1,44 @@ -- type: hudTheme - id: SS14DefaultTheme - name: ui-options-hud-theme-default - path: Default - order: -1 +# Они не будут работать с новыми слотами +# А так же они не подходят под нашу атмосферу -- type: hudTheme - id: SS14PlasmafireTheme - name: ui-options-hud-theme-plasmafire - path: Plasmafire - order: 3 +# - type: hudTheme +# id: SS14DefaultTheme +# name: ui-options-hud-theme-default +# path: Default +# order: -1 -- type: hudTheme - id: SS14SlimecoreTheme - name: ui-options-hud-theme-slimecore - path: Slimecore - order: 2 +# - type: hudTheme +# id: SS14PlasmafireTheme +# name: ui-options-hud-theme-plasmafire +# path: Plasmafire +# order: 3 -- type: hudTheme - id: SS14ClockworkTheme - name: ui-options-hud-theme-clockwork - path: Clockwork - order: 4 +# - type: hudTheme +# id: SS14SlimecoreTheme +# name: ui-options-hud-theme-slimecore +# path: Slimecore +# order: 2 -- type: hudTheme - id: SS14RetroTheme - name: ui-options-hud-theme-retro - path: Retro - order: 6 +# - type: hudTheme +# id: SS14ClockworkTheme +# name: ui-options-hud-theme-clockwork +# path: Clockwork +# order: 4 -- type: hudTheme - id: SS14MinimalistTheme - name: ui-options-hud-theme-minimalist - path: Minimalist - order: 1 +# - type: hudTheme +# id: SS14RetroTheme +# name: ui-options-hud-theme-retro +# path: Retro +# order: 6 -- type: hudTheme - id: SS14AshenTheme - name: ui-options-hud-theme-ashen - path: Ashen - order: 5 +# - type: hudTheme +# id: SS14MinimalistTheme +# name: ui-options-hud-theme-minimalist +# path: Minimalist +# order: 1 + +# - type: hudTheme +# id: SS14AshenTheme +# name: ui-options-hud-theme-ashen +# path: Ashen +# order: 5 From daf300af2809c10cda04fe83243217685f4322ec Mon Sep 17 00:00:00 2001 From: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Date: Sun, 7 Apr 2024 11:37:22 +1000 Subject: [PATCH 03/11] =?UTF-8?q?=D0=9D=D0=BE=D0=B2=D1=8B=D0=B9=20=D1=88?= =?UTF-8?q?=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D1=87=D0=B8=D0=BA=20=D0=B8=D0=BD?= =?UTF-8?q?=D0=B2=D0=B5=D0=BD=D1=82=D0=B0=D1=80=D1=8F=20=D0=B4=D0=BB=D1=8F?= =?UTF-8?q?=20=D0=BD=D0=B0=D1=88=D0=B5=D0=B3=D0=BE=20=D1=87=D0=B5=D0=BB?= =?UTF-8?q?=D0=BE=D0=B2=D0=B5=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_CP14/Entities/Mobs/Species/human.yml | 2 + .../human_inventory_template.yml | 107 ++++++++++++++++++ 2 files changed, 109 insertions(+) create mode 100644 Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml index e2153d7356..00559c0848 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml @@ -20,3 +20,5 @@ - type: Body prototype: CPHuman requiredLegs: 2 + - type: Inventory + templateId: CPHuman diff --git a/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml b/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml new file mode 100644 index 0000000000..4b3becb6a8 --- /dev/null +++ b/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml @@ -0,0 +1,107 @@ +- type: inventoryTemplate + id: CPHuman + slots: + - name: shoes + slotTexture: shoes + slotFlags: FEET + stripTime: 3 + uiWindowPos: 1,0 + strippingWindowPos: 1,3 + displayName: Shoes + - name: jumpsuit + slotTexture: uniform + slotFlags: INNERCLOTHING + stripTime: 6 + uiWindowPos: 0,1 + strippingWindowPos: 0,2 + displayName: Jumpsuit + - name: outerClothing + slotTexture: suit + slotFlags: OUTERCLOTHING + stripTime: 6 + uiWindowPos: 1,1 + strippingWindowPos: 1,2 + displayName: Suit + - name: gloves + slotTexture: gloves + slotFlags: GLOVES + uiWindowPos: 2,1 + strippingWindowPos: 2,2 + displayName: Gloves + - name: neck + slotTexture: neck + slotFlags: NECK + uiWindowPos: 0,2 + strippingWindowPos: 0,1 + displayName: Neck + - name: mask + slotTexture: mask + slotFlags: MASK + uiWindowPos: 1,2 + strippingWindowPos: 1,1 + displayName: Mask + - name: eyes + slotTexture: glasses + slotFlags: EYES + stripTime: 3 + uiWindowPos: 0,3 + strippingWindowPos: 0,0 + displayName: Eyes + - name: ears + slotTexture: ears + slotFlags: EARS + stripTime: 3 + uiWindowPos: 2,2 + strippingWindowPos: 2,0 + displayName: Ears + - name: head + slotTexture: head + slotFlags: HEAD + uiWindowPos: 1,3 + strippingWindowPos: 1,0 + displayName: Head + - name: pocket1 + slotTexture: pocket + slotFlags: POCKET + slotGroup: MainHotbar + stripTime: 3 + uiWindowPos: 0,3 + strippingWindowPos: 0,4 + dependsOn: jumpsuit + displayName: Pocket 1 + stripHidden: true + - name: pocket2 + slotTexture: pocket + slotFlags: POCKET + slotGroup: MainHotbar + stripTime: 3 + uiWindowPos: 2,3 + strippingWindowPos: 1,4 + dependsOn: jumpsuit + displayName: Pocket 2 + stripHidden: true + - name: suitstorage + slotTexture: suit_storage + slotFlags: SUITSTORAGE + slotGroup: MainHotbar + stripTime: 3 + uiWindowPos: 2,0 + strippingWindowPos: 2,5 + dependsOn: outerClothing + displayName: Suit Storage + - name: belt + slotTexture: belt + slotFlags: BELT + slotGroup: SecondHotbar + stripTime: 6 + uiWindowPos: 3,1 + strippingWindowPos: 1,5 + displayName: Belt + - name: back + slotTexture: back + slotFlags: BACK + slotGroup: SecondHotbar + stripTime: 6 + uiWindowPos: 3,0 + strippingWindowPos: 0,5 + displayName: Back From fc9596a101a64d1afaa582daa0cf21b1a0ba4ebb Mon Sep 17 00:00:00 2001 From: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Date: Sun, 7 Apr 2024 12:13:58 +1000 Subject: [PATCH 04/11] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=BD=D0=BE=D1=80=D0=BC=D0=B0=D0=BB=D1=8C=D0=BD=D0=B0?= =?UTF-8?q?=D1=8F=20=D1=80=D0=B0=D1=81=D0=BA=D0=BB=D0=B0=D0=B4=D0=BA=D0=B0?= =?UTF-8?q?=20=D1=81=D0=BB=D0=BE=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../human_inventory_template.yml | 168 ++++++++++-------- 1 file changed, 92 insertions(+), 76 deletions(-) diff --git a/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml b/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml index 4b3becb6a8..d3d64fa006 100644 --- a/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml +++ b/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml @@ -1,107 +1,123 @@ - type: inventoryTemplate id: CPHuman slots: - - name: shoes - slotTexture: shoes - slotFlags: FEET - stripTime: 3 - uiWindowPos: 1,0 - strippingWindowPos: 1,3 - displayName: Shoes - - name: jumpsuit - slotTexture: uniform - slotFlags: INNERCLOTHING - stripTime: 6 - uiWindowPos: 0,1 - strippingWindowPos: 0,2 - displayName: Jumpsuit - - name: outerClothing - slotTexture: suit - slotFlags: OUTERCLOTHING - stripTime: 6 - uiWindowPos: 1,1 - strippingWindowPos: 1,2 - displayName: Suit - - name: gloves - slotTexture: gloves + # Left hotbar + # 0, y + - name: ring1 + slotTexture: ring slotFlags: GLOVES - uiWindowPos: 2,1 - strippingWindowPos: 2,2 - displayName: Gloves + uiWindowPos: 0,1 + strippingWindowPos: 0,0 + displayName: Ring - name: neck slotTexture: neck slotFlags: NECK uiWindowPos: 0,2 - strippingWindowPos: 0,1 + strippingWindowPos: 0,0 displayName: Neck - - name: mask - slotTexture: mask - slotFlags: MASK - uiWindowPos: 1,2 - strippingWindowPos: 1,1 - displayName: Mask - name: eyes - slotTexture: glasses + slotTexture: eyes slotFlags: EYES - stripTime: 3 uiWindowPos: 0,3 strippingWindowPos: 0,0 displayName: Eyes - - name: ears - slotTexture: ears - slotFlags: EARS - stripTime: 3 - uiWindowPos: 2,2 - strippingWindowPos: 2,0 - displayName: Ears + # 1, y + - name: shoes + slotTexture: shoes + slotFlags: FEET + uiWindowPos: 1,0 + strippingWindowPos: 0,0 + displayName: Shoes + - name: pants + slotTexture: pants + slotFlags: GLOVES + uiWindowPos: 1,1 + strippingWindowPos: 0,0 + displayName: Pants + - name: shirt + slotTexture: shirt + slotFlags: GLOVES + uiWindowPos: 1,2 + strippingWindowPos: 0,0 + displayName: Shirt - name: head slotTexture: head slotFlags: HEAD uiWindowPos: 1,3 - strippingWindowPos: 1,0 + strippingWindowPos: 0,0 displayName: Head + # 2, y + - name: gloves + slotTexture: gloves + slotFlags: GLOVES + uiWindowPos: 2,0 + strippingWindowPos: 0,0 + displayName: Gloves + - name: ring2 + slotTexture: ring + slotFlags: GLOVES + uiWindowPos: 2,1 + strippingWindowPos: 0,0 + displayName: Ring + - name: cloak + slotTexture: cloak + slotFlags: GLOVES + uiWindowPos: 2,2 + strippingWindowPos: 0,0 + displayName: Cloak + - name: mask + slotTexture: mask + slotFlags: MASK + uiWindowPos: 2,3 + strippingWindowPos: 0,0 + displayName: Mask + # Main hotbar + - name: belt1 + slotTexture: belt + slotFlags: BELT + slotGroup: SecondHotbar + uiWindowPos: 0,0 + strippingWindowPos: 0,0 + displayName: Belt + - name: keys + slotTexture: keys + slotFlags: GLOVES + slotGroup: SecondHotbar + uiWindowPos: 0,0 + strippingWindowPos: 0,0 + displayName: Keys + stripHidden: true + - name: back + slotTexture: back + slotFlags: BACK + slotGroup: SecondHotbar + uiWindowPos: 0,0 + strippingWindowPos: 0,0 + displayName: Back + # Right hand + # Left hand - name: pocket1 slotTexture: pocket slotFlags: POCKET slotGroup: MainHotbar - stripTime: 3 - uiWindowPos: 0,3 - strippingWindowPos: 0,4 - dependsOn: jumpsuit - displayName: Pocket 1 + uiWindowPos: 0,0 + strippingWindowPos: 0,0 + dependsOn: pants + displayName: Pocket stripHidden: true - name: pocket2 slotTexture: pocket slotFlags: POCKET slotGroup: MainHotbar - stripTime: 3 - uiWindowPos: 2,3 - strippingWindowPos: 1,4 - dependsOn: jumpsuit - displayName: Pocket 2 + uiWindowPos: 1,0 + strippingWindowPos: 0,0 + dependsOn: pants + displayName: Pocket stripHidden: true - - name: suitstorage - slotTexture: suit_storage - slotFlags: SUITSTORAGE - slotGroup: MainHotbar - stripTime: 3 - uiWindowPos: 2,0 - strippingWindowPos: 2,5 - dependsOn: outerClothing - displayName: Suit Storage - - name: belt + - name: belt2 slotTexture: belt slotFlags: BELT - slotGroup: SecondHotbar - stripTime: 6 - uiWindowPos: 3,1 - strippingWindowPos: 1,5 - displayName: Belt - - name: back - slotTexture: back - slotFlags: BACK - slotGroup: SecondHotbar - stripTime: 6 - uiWindowPos: 3,0 - strippingWindowPos: 0,5 - displayName: Back + slotGroup: MainHotbar + uiWindowPos: 2,0 + strippingWindowPos: 0,0 + displayName: Belt \ No newline at end of file From a78b9103a7d9fb03ee45a4c5e323b7d536a882f7 Mon Sep 17 00:00:00 2001 From: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Date: Sun, 7 Apr 2024 12:25:55 +1000 Subject: [PATCH 05/11] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=BD=D0=BE=D1=80=D0=BC=D0=B0=D0=BB=D1=8C=D0=BD=D0=B0?= =?UTF-8?q?=D1=8F=20=D1=80=D0=B0=D1=81=D0=BA=D0=BB=D0=B0=D0=B4=D0=BA=D0=B0?= =?UTF-8?q?=20=D1=81=D0=BB=D0=BE=D1=82=D0=BE=D0=B2=20=D0=BA=D1=80=D0=B0?= =?UTF-8?q?=D0=B6=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../human_inventory_template.yml | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml b/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml index d3d64fa006..0690c190a9 100644 --- a/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml +++ b/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml @@ -7,69 +7,69 @@ slotTexture: ring slotFlags: GLOVES uiWindowPos: 0,1 - strippingWindowPos: 0,0 + strippingWindowPos: 0,3 displayName: Ring - name: neck slotTexture: neck slotFlags: NECK uiWindowPos: 0,2 - strippingWindowPos: 0,0 + strippingWindowPos: 1,2 displayName: Neck - name: eyes slotTexture: eyes slotFlags: EYES uiWindowPos: 0,3 - strippingWindowPos: 0,0 + strippingWindowPos: 0,1 displayName: Eyes # 1, y - name: shoes slotTexture: shoes slotFlags: FEET uiWindowPos: 1,0 - strippingWindowPos: 0,0 + strippingWindowPos: 1,5 displayName: Shoes - name: pants slotTexture: pants slotFlags: GLOVES uiWindowPos: 1,1 - strippingWindowPos: 0,0 + strippingWindowPos: 1,4 displayName: Pants - name: shirt slotTexture: shirt slotFlags: GLOVES uiWindowPos: 1,2 - strippingWindowPos: 0,0 + strippingWindowPos: 1,3 displayName: Shirt - name: head slotTexture: head slotFlags: HEAD uiWindowPos: 1,3 - strippingWindowPos: 0,0 + strippingWindowPos: 1,1 displayName: Head # 2, y - name: gloves slotTexture: gloves slotFlags: GLOVES uiWindowPos: 2,0 - strippingWindowPos: 0,0 + strippingWindowPos: 0,2 displayName: Gloves - name: ring2 slotTexture: ring slotFlags: GLOVES uiWindowPos: 2,1 - strippingWindowPos: 0,0 + strippingWindowPos: 2,3 displayName: Ring - name: cloak slotTexture: cloak slotFlags: GLOVES uiWindowPos: 2,2 - strippingWindowPos: 0,0 + strippingWindowPos: 2,2 displayName: Cloak - name: mask slotTexture: mask slotFlags: MASK uiWindowPos: 2,3 - strippingWindowPos: 0,0 + strippingWindowPos: 2,1 displayName: Mask # Main hotbar - name: belt1 @@ -77,14 +77,14 @@ slotFlags: BELT slotGroup: SecondHotbar uiWindowPos: 0,0 - strippingWindowPos: 0,0 + strippingWindowPos: 0,4 displayName: Belt - name: keys slotTexture: keys slotFlags: GLOVES slotGroup: SecondHotbar uiWindowPos: 0,0 - strippingWindowPos: 0,0 + strippingWindowPos: 2,5 displayName: Keys stripHidden: true - name: back @@ -92,7 +92,7 @@ slotFlags: BACK slotGroup: SecondHotbar uiWindowPos: 0,0 - strippingWindowPos: 0,0 + strippingWindowPos: 0,5 displayName: Back # Right hand # Left hand @@ -110,7 +110,7 @@ slotFlags: POCKET slotGroup: MainHotbar uiWindowPos: 1,0 - strippingWindowPos: 0,0 + strippingWindowPos: 1,0 dependsOn: pants displayName: Pocket stripHidden: true @@ -119,5 +119,5 @@ slotFlags: BELT slotGroup: MainHotbar uiWindowPos: 2,0 - strippingWindowPos: 0,0 + strippingWindowPos: 2,4 displayName: Belt \ No newline at end of file From 4f0d11144c6b5949d551264aa6aa15c7c42375fc Mon Sep 17 00:00:00 2001 From: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Date: Wed, 10 Apr 2024 13:28:06 +1000 Subject: [PATCH 06/11] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D1=84=D0=BB=D0=B0=D0=B3=D0=B8=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D1=81=D0=BB=D0=BE=D1=82=D0=BE=D0=B2=20=D0=B8=20?= =?UTF-8?q?=D0=B8=D1=85=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Shared/Inventory/SlotFlags.cs | 5 + .../Prototypes/Entities/Mobs/Species/base.yml | 9 +- .../_CP14/Entities/Mobs/Species/base.yml | 307 ++++++++++++++++++ .../_CP14/Entities/Mobs/Species/human.yml | 6 +- .../human_inventory_template.yml | 12 +- 5 files changed, 329 insertions(+), 10 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml diff --git a/Content.Shared/Inventory/SlotFlags.cs b/Content.Shared/Inventory/SlotFlags.cs index 8d5e33e348..ce3d85faa8 100644 --- a/Content.Shared/Inventory/SlotFlags.cs +++ b/Content.Shared/Inventory/SlotFlags.cs @@ -26,5 +26,10 @@ public enum SlotFlags LEGS = 1 << 13, FEET = 1 << 14, SUITSTORAGE = 1 << 15, + RING = 1 << 16, + PANTS = 1 << 17, + SHIRT = 1 << 18, + CLOAK = 1 << 19, + KEYS = 1 << 20, All = ~NONE, } diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index cf04d82b50..fec1d43325 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -28,6 +28,8 @@ state: unisex_full visible: false - map: ["jumpsuit"] + - map: [ "pants" ] + - map: [ "shirt" ] - map: ["enum.HumanoidVisualLayers.LFoot"] - map: ["enum.HumanoidVisualLayers.RFoot"] - map: ["enum.HumanoidVisualLayers.LHand"] @@ -40,6 +42,7 @@ - map: [ "belt" ] - map: [ "id" ] - map: [ "neck" ] + - map: [ "cloak" ] - map: [ "back" ] - map: [ "enum.HumanoidVisualLayers.FacialHair" ] - map: [ "enum.HumanoidVisualLayers.Hair" ] @@ -347,12 +350,16 @@ state: body-overlay-2 visible: false - map: [ "gloves" ] + - map: [ "ring1" ] + - map: [ "ring2" ] - map: [ "shoes" ] - map: [ "ears" ] - map: [ "outerClothing" ] - map: [ "eyes" ] - - map: [ "belt" ] + - map: [ "belt1" ] + - map: [ "belt2" ] - map: [ "id" ] + - map: [ "keys" ] - map: [ "neck" ] - map: [ "back" ] - map: [ "enum.HumanoidVisualLayers.FacialHair" ] diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml new file mode 100644 index 0000000000..6b2d39853b --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml @@ -0,0 +1,307 @@ +- type: entity + parent: + - BaseMob + - MobDamageable + - MobCombat + id: CPBaseMobSpecies + save: false + abstract: true + components: + - type: Sprite + layers: + - map: [ "enum.HumanoidVisualLayers.Chest" ] + - map: [ "enum.HumanoidVisualLayers.Head" ] + - map: [ "enum.HumanoidVisualLayers.Snout" ] + - map: [ "enum.HumanoidVisualLayers.Eyes" ] + - map: [ "enum.HumanoidVisualLayers.RArm" ] + - map: [ "enum.HumanoidVisualLayers.LArm" ] + - map: [ "enum.HumanoidVisualLayers.RLeg" ] + - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - shader: StencilClear + sprite: Mobs/Species/Human/parts.rsi #PJB on stencil clear being on the left leg: "...this is 'fine'" -https://github.com/space-wizards/space-station-14/pull/12217#issuecomment-1291677115 + # its fine, but its still very stupid that it has to be done like this instead of allowing sprites to just directly insert a stencil clear. + # sprite refactor when + state: l_leg + - shader: StencilMask + map: [ "enum.HumanoidVisualLayers.StencilMask" ] + sprite: Mobs/Customization/masking_helpers.rsi + state: unisex_full + visible: false + - map: [ "jumpsuit" ] + - map: [ "pants" ] + - map: [ "shirt" ] + - map: [ "enum.HumanoidVisualLayers.LFoot" ] + - map: [ "enum.HumanoidVisualLayers.RFoot" ] + - map: [ "enum.HumanoidVisualLayers.LHand" ] + - map: [ "enum.HumanoidVisualLayers.RHand" ] + - map: [ "gloves" ] + - map: [ "shoes" ] + - map: [ "ears" ] + - map: [ "outerClothing" ] + - map: [ "eyes" ] + - map: [ "belt" ] + - map: [ "id" ] + - map: [ "neck" ] + - map: [ "cloak" ] + - map: [ "back" ] + - map: [ "enum.HumanoidVisualLayers.FacialHair" ] + - map: [ "enum.HumanoidVisualLayers.Hair" ] + - map: [ "enum.HumanoidVisualLayers.HeadSide" ] + - map: [ "enum.HumanoidVisualLayers.HeadTop" ] + - map: [ "enum.HumanoidVisualLayers.Tail" ] + - map: [ "mask" ] + - map: [ "head" ] + - map: [ "pocket1" ] + - map: [ "pocket2" ] + - map: ["enum.HumanoidVisualLayers.Handcuffs"] + color: "#ffffff" + sprite: Objects/Misc/handcuffs.rsi + state: body-overlay-2 + visible: false + - map: [ "clownedon" ] # Dynamically generated + sprite: "Effects/creampie.rsi" + state: "creampie_human" + visible: false + - type: DamageVisuals + thresholds: [ 10, 20, 30, 50, 70, 100 ] + targetLayers: + - "enum.HumanoidVisualLayers.Chest" + - "enum.HumanoidVisualLayers.Head" + - "enum.HumanoidVisualLayers.LArm" + - "enum.HumanoidVisualLayers.LLeg" + - "enum.HumanoidVisualLayers.RArm" + - "enum.HumanoidVisualLayers.RLeg" + damageOverlayGroups: + Brute: + sprite: Mobs/Effects/brute_damage.rsi + color: "#FF0000" + Burn: + sprite: Mobs/Effects/burn_damage.rsi + - type: GenericVisualizer + visuals: + enum.CreamPiedVisuals.Creamed: + clownedon: # Not 'creampied' bc I can already see Skyrat complaining about conflicts. + True: { visible: true } + False: { visible: false } + - type: StatusIcon + bounds: -0.5,-0.5,0.5,0.5 + - type: RotationVisuals + defaultRotation: 90 + horizontalRotation: 90 + - type: HumanoidAppearance + species: Human + - type: SlowOnDamage + speedModifierThresholds: + 60: 0.7 + 80: 0.5 + - type: Fixtures + fixtures: # TODO: This needs a second fixture just for mob collisions. + fix1: + shape: + !type:PhysShapeCircle + radius: 0.35 + density: 185 + restitution: 0.0 + mask: + - MobMask + layer: + - MobLayer + - type: FloorOcclusion + - type: RangedDamageSound + soundGroups: + Brute: + collection: + MeatBulletImpact + soundTypes: + Heat: + collection: + MeatLaserImpact + - type: Reactive + groups: + Flammable: [ Touch ] + Extinguish: [ Touch ] + Acidic: [ Touch, Ingestion ] + reactions: + - reagents: [ Water, SpaceCleaner ] + methods: [ Touch ] + effects: + - !type:WashCreamPieReaction + - type: StatusEffects + allowed: + - Stun + - KnockedDown + - SlowedDown + - Stutter + - SeeingRainbows + - Electrocution + - Drunk + - SlurredSpeech + - RatvarianLanguage + - PressureImmunity + - Muted + - ForcedSleep + - TemporaryBlindness + - Pacified + - StaminaModifier + - type: Reflect + enabled: false + reflectProb: 0 + - type: Body + prototype: Human + requiredLegs: 2 + - type: Identity + - type: IdExaminable + - type: Hands + - type: Internals + - type: Inventory + - type: InventorySlots + - type: FloatingVisuals + - type: Climbing + - type: Cuffable + - type: Ensnareable + sprite: Objects/Misc/ensnare.rsi + state: icon + - type: AnimationPlayer + - type: Buckle + - type: CombatMode + canDisarm: true + - type: MeleeWeapon + soundHit: + collection: Punch + angle: 30 + animation: WeaponArcFist + attackRate: 1 + damage: + types: + Blunt: 5 + - type: SleepEmitSound + - type: SSDIndicator + - type: StandingState + - type: Fingerprint + - type: Dna + - type: MindContainer + showExamineInfo: true + - type: InteractionPopup + successChance: 1 + interactSuccessString: hugging-success-generic + interactSuccessSound: /Audio/Effects/thudswoosh.ogg + messagePerceivedByOthers: hugging-success-generic-others + - type: CanHostGuardian + - type: NpcFactionMember + factions: + - NanoTrasen + - type: CreamPied + - type: Stripping + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.VoiceMaskUIKey.Key + type: VoiceMaskBoundUserInterface + - key: enum.HumanoidMarkingModifierKey.Key + type: HumanoidMarkingModifierBoundUserInterface + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface + - type: Puller + - type: Speech + speechSounds: Alto + - type: DamageForceSay + - type: Vocal + sounds: + Male: MaleHuman + Female: FemaleHuman + Unsexed: MaleHuman + - type: Emoting + - type: BodyEmotes + soundsId: GeneralBodyEmotes + - type: Grammar + attributes: + proper: true + - type: MobPrice + price: 1500 # Kidnapping a living person and selling them for cred is a good move. + deathPenalty: 0.01 # However they really ought to be living and intact, otherwise they're worth 100x less. + - type: Tag + tags: + - CanPilot + - FootstepSound + - DoorBumpOpener + +- type: entity + parent: + - MobBloodstream + - MobRespirator + - MobAtmosStandard + - MobFlammable + - CPBaseMobSpecies + id: CPBaseMobSpeciesOrganic + save: false + abstract: true + components: + - type: Flashable + - type: Barotrauma + damage: + types: + Blunt: 0.50 #per second, scales with pressure and other constants. + Heat: 0.1 + - type: PassiveDamage # Slight passive regen. Assuming one damage type, comes out to about 4 damage a minute. + allowedStates: + - Alive + damageCap: 20 + damage: + types: + Heat: -0.07 + groups: + Brute: -0.07 + # Organs + - type: StatusEffects + allowed: + - Stun + - KnockedDown + - SlowedDown + - Stutter + - SeeingRainbows + - Electrocution + - ForcedSleep + - TemporaryBlindness + - Drunk + - SlurredSpeech + - RatvarianLanguage + - PressureImmunity + - Muted + - Pacified + - StaminaModifier + - type: Blindable + # Other + - type: Temperature + heatDamageThreshold: 325 + coldDamageThreshold: 260 + currentTemperature: 310.15 + specificHeat: 42 + coldDamage: + types: + Cold: 0.1 #per second, scales with temperature & other constants + heatDamage: + types: + Heat: 1.5 #per second, scales with temperature & other constants + - type: ThermalRegulator + metabolismHeat: 800 + radiatedHeat: 100 + implicitHeatRegulation: 500 + sweatHeatRegulation: 2000 + shiveringHeatRegulation: 2000 + normalBodyTemperature: 310.15 + thermalRegulationTemperatureThreshold: 25 + - type: Perishable + - type: Butcherable + butcheringType: Spike # TODO human. + spawned: + - id: FoodMeat + amount: 5 + - type: Respirator + damage: + types: + Asphyxiation: 1.0 + damageRecovery: + types: + Asphyxiation: -1.0 + - type: FireVisuals + alternateState: Standing \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml index 00559c0848..5d7e68e217 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml @@ -1,6 +1,6 @@ # Anything human specific (e.g. UI, input) goes under MobHuman - type: entity - parent: BaseMobSpeciesOrganic + parent: CPBaseMobSpeciesOrganic id: CPBaseMobHuman name: человеческая оболочка abstract: true @@ -15,8 +15,8 @@ - type: Butcherable butcheringType: Spike spawned: - - id: FoodMeatHuman - amount: 5 + - id: FoodMeatHuman + amount: 5 - type: Body prototype: CPHuman requiredLegs: 2 diff --git a/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml b/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml index 0690c190a9..07344274e1 100644 --- a/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml +++ b/Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml @@ -5,7 +5,7 @@ # 0, y - name: ring1 slotTexture: ring - slotFlags: GLOVES + slotFlags: RING uiWindowPos: 0,1 strippingWindowPos: 0,3 displayName: Ring @@ -30,13 +30,13 @@ displayName: Shoes - name: pants slotTexture: pants - slotFlags: GLOVES + slotFlags: PANTS uiWindowPos: 1,1 strippingWindowPos: 1,4 displayName: Pants - name: shirt slotTexture: shirt - slotFlags: GLOVES + slotFlags: SHIRT uiWindowPos: 1,2 strippingWindowPos: 1,3 displayName: Shirt @@ -55,13 +55,13 @@ displayName: Gloves - name: ring2 slotTexture: ring - slotFlags: GLOVES + slotFlags: RING uiWindowPos: 2,1 strippingWindowPos: 2,3 displayName: Ring - name: cloak slotTexture: cloak - slotFlags: GLOVES + slotFlags: CLOAK uiWindowPos: 2,2 strippingWindowPos: 2,2 displayName: Cloak @@ -81,7 +81,7 @@ displayName: Belt - name: keys slotTexture: keys - slotFlags: GLOVES + slotFlags: KEYS slotGroup: SecondHotbar uiWindowPos: 0,0 strippingWindowPos: 2,5 From 685f85b1ad28aa77e6ff258045ef57edb823b29f Mon Sep 17 00:00:00 2001 From: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Date: Wed, 10 Apr 2024 13:33:39 +1000 Subject: [PATCH 07/11] =?UTF-8?q?=D0=A4=D0=BB=D0=B0=D0=B3=D0=B8=20=D0=B2?= =?UTF-8?q?=20=D1=81=D0=B8=D1=81=D1=82=D0=B5=D0=BC=D1=83=20=D0=BE=D0=B4?= =?UTF-8?q?=D0=B5=D0=B6=D0=B4=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Client/Clothing/ClientClothingSystem.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs index 7e78ac7d70..377bd3f2a7 100644 --- a/Content.Client/Clothing/ClientClothingSystem.cs +++ b/Content.Client/Clothing/ClientClothingSystem.cs @@ -36,13 +36,20 @@ public sealed class ClientClothingSystem : ClothingSystem {Jumpsuit, "INNERCLOTHING"}, {"neck", "NECK"}, {"back", "BACKPACK"}, - {"belt", "BELT"}, + {"belt1", "BELT1"}, + {"belt2", "BELT2"}, {"gloves", "HAND"}, {"shoes", "FEET"}, {"id", "IDCARD"}, {"pocket1", "POCKET1"}, {"pocket2", "POCKET2"}, {"suitstorage", "SUITSTORAGE"}, + {"ring1", "RING1"}, + {"ring2", "RING2"}, + {"pants", "PANTS"}, + {"shirt", "SHIRT"}, + {"cloak", "CLOAK"}, + {"keys", "KEYS"}, }; [Dependency] private readonly IResourceCache _cache = default!; From b65c8d4e6516ec7ad02d11deab1688574cc98354 Mon Sep 17 00:00:00 2001 From: Ed Date: Wed, 10 Apr 2024 23:05:33 +0300 Subject: [PATCH 08/11] tiefling + ui update --- Content.Client/Stylesheets/StyleNano.cs | 8 ++++---- .../_CP14/Entities/Mobs/Species/tiefling.yml | 6 ++++-- .../Interface/Nano/button.svg.96dpi.png | Bin 237 -> 194 bytes .../Interface/Nano/button_small.svg.96dpi.png | Bin 278 -> 214 bytes .../Nano/item_status_left.svg.96dpi.png | Bin 453 -> 273 bytes .../Nano/item_status_middle.svg.96dpi.png | Bin 458 -> 345 bytes .../Nano/item_status_right.svg.96dpi.png | Bin 431 -> 249 bytes .../Interface/Nano/slider_fill.svg.96dpi.png | Bin 267 -> 254 bytes .../Interface/Nano/slider_grabber.svg.96dpi.png | Bin 285 -> 327 bytes .../Interface/Nano/slider_outline.svg.96dpi.png | Bin 284 -> 258 bytes .../Interface/Nano/stripeback.svg.96dpi.png | Bin 322 -> 621 bytes 11 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs index a589abb83a..0ed1d0f488 100644 --- a/Content.Client/Stylesheets/StyleNano.cs +++ b/Content.Client/Stylesheets/StyleNano.cs @@ -93,12 +93,12 @@ namespace Content.Client.Stylesheets public static readonly Color DangerousRedFore = Color.FromHex("#BB3232"); public static readonly Color DisabledFore = Color.FromHex("#5A5A5A"); - public static readonly Color ButtonColorDefault = Color.FromHex("#464966"); + public static readonly Color ButtonColorDefault = Color.FromHex("#664e46"); public static readonly Color ButtonColorDefaultRed = Color.FromHex("#D43B3B"); - public static readonly Color ButtonColorHovered = Color.FromHex("#575b7f"); + public static readonly Color ButtonColorHovered = Color.FromHex("#7f6357"); public static readonly Color ButtonColorHoveredRed = Color.FromHex("#DF6B6B"); - public static readonly Color ButtonColorPressed = Color.FromHex("#3e6c45"); - public static readonly Color ButtonColorDisabled = Color.FromHex("#30313c"); + public static readonly Color ButtonColorPressed = Color.FromHex("#6c4a3e"); + public static readonly Color ButtonColorDisabled = Color.FromHex("#3c3330"); public static readonly Color ButtonColorCautionDefault = Color.FromHex("#ab3232"); public static readonly Color ButtonColorCautionHovered = Color.FromHex("#cf2f2f"); diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml index c6cb9a0fc1..d0515d0aaa 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseMobSpeciesOrganic + parent: CPBaseMobSpeciesOrganic id: CPBaseMobTiefling name: Mr. Tiefling abstract: true @@ -14,7 +14,9 @@ sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi state: full - type: Thirst - - type: Wagging + - type: Wagging + - type: Inventory + templateId: CPHuman - type: entity parent: BaseSpeciesDummy diff --git a/Resources/Textures/Interface/Nano/button.svg.96dpi.png b/Resources/Textures/Interface/Nano/button.svg.96dpi.png index b391378bb08603dacba7306076741a968328d62d..8bcd6c739f5842c57785c42f6ade0dff6b5fd644 100644 GIT binary patch delta 166 zcmV;X09pU-0m1>0B!2;OQb$4nuFf3k0001dNklv zfVCpvbOZbq{R40~0RinkasfWuz*bZAgR7={Mb@zakhHIUc^~W$cbf9gV+NK07vF+u Ub4x`6b^rhX07*qoM6N<$g5(@NasU7T delta 209 zcmX@a_?B^kNUOmgO zC<%3{NqPatZY8To#A!Dm&Qchp-2ztgPw3Z)aw!ZF-?JeM)-wVMlTx3dbE}GlbVCn< owBEesGX71~+sD_+K)Hx2qFc?JPFBTVNk+=j219b^EgNqOOOBJG*x^o&i1eADki8XEpQYAN( zSQ$u_-cVwtABwP0hY&2Gi7`IZaeAoddJ48+b_BhNPBp2!AI+aKb z|4@hHTtRX%9)(unQlD0?#cApwx%f8QJB3QU0MsTM2~zBRt^fc407*qoM6N<$f-!|; A2><{9 diff --git a/Resources/Textures/Interface/Nano/item_status_left.svg.96dpi.png b/Resources/Textures/Interface/Nano/item_status_left.svg.96dpi.png index 5169343ea4fe9a88df5a21d069d3dec0c99b8654..ec5648081182f6421f6458cc673c2dc1ca287ce5 100644 GIT binary patch delta 245 zcmVxP4&-KIc z@}v$#Ac8JNhG`F?-)yn!o7{5cfRzZDN7b00000NkvXXu0mjf-}7zZ delta 427 zcmV;c0aX5x0>uN6B!3BTNLh0L01m?d01m?e$8V@)0000PbVXQnQ*UN;cVTj60C#tH zE@^ISb7Ns}WiD@WXPfRk8UO$RQb|NXR5*>z(!ENYySC9-1 zh=aH^chFmKa&>faa&mBVbm=092!(=6FF^#06>P<{^yeh!&wr&ArLDG^eBn$V=ixiN zhg?5U00`rGw3OJdRLV~iW@9nps4w~08At%zf~>0R2fMRCl+W*UCT*0?WK)YPn>Gj? zO?3Ehe_j1`qiF-yZ}awhBZ5{-hSIlQp?Hu80)UuxMc8^}8rsoBW!Ep35q>}oEZvK^DOzGB^tQmuBu=Y{})$e`@nR@!zlCV)E|R&nO1eUH{kw_A-t%z6UA z9*4L|1Pw8StrsSEq%`0qhDK3RYG97m{>uM@tmXCG0wm2@{|_ML7yw`m|3YGDluv|^ Vm+Xfdbrb*q002ovPDHLkV1nv^wBw*e2Eq{}Icr!34PBR0Do(Pu9`Rt=}Jx()Y zs*0*SnP%pLkV6NfaWASk&CL1qZ4UXmXl73Ul3LA9U*0aPi+_I3XP3FxRn=N+u@*pw zuMPWrUF^22V|gwp&-F9oG_$>si`ly2SW>v#u8u7Tkfhn77rKE(lEPo>kPL!4u#wve zAQ%F*m;ftD(g^3hCTX@9)X2e_dLR+*^Gyl$_U?kN7+4DuLA$-Xp&B#SYE1^8(amP{ zho(O_a$`(g>o;Mj&HsR&-OCIR1d%s=eQ&RI@4v}S7)`E_=lk;fiT_BuAJwOd`#PaJ QY5)KL07*qoM6N<$f-4`EOaK4? delta 432 zcmV;h0Z;zf0?GrBB!3BTNLh0L01m?d01m?e$8V@)0000PbVXQnQ*UN;cVTj60C#tH zE@^ISb7Ns}WiD@WXPfRk8UO$RS4l)cR5*>z(l1XOK^TDXXZDs{AcX|cqymS@>A=oGAL{&?W1q=^BZF?hTwMRio9d1auC#*wdQ30JxxEodocu{D%$T}3@dx% zfhC9EuLa#<6y0;{T`3AlZRkD;L7~PU{jawN#Q<^Kj47ty&y3ds#+uOs6g3(qYD_d< a^P+zhq`B)>GirAL0000nmu~95w`esT*xrDPc`6PrKq;2VnLL1c+ z&G7Adxeql8x{^xZ5N;7by$)HLj22XA0LKFz7U9_jKpPvyzE*7jbhVaG8z@(6UbRyC z>uouUnurwgYjCt^DjJ|DB%ehz2lI=z`{Tw(6eu_^mTU8RKJwk+w3;HRzmX9i*k9Kh Xz@Sei80cTN00000NkvXXu0mjfT1{S` delta 405 zcmV;G0c!sF0j~p)B!3BTNLh0L01m?d01m?e$8V@)0000PbVXQnQ*UN;cVTj60C#tH zE@^ISb7Ns}WiD@WXPfRk8UO$RJV``BR5*>z)3Hv&Fc1dd--)Fbm@348#K6GFiUa|v zR<~|V-++;sfrnsc;00J1U_t`krlkleiQLl4c5LTZI)F$@T7MY$Crf92zO!Y9nmH7` z-2iw3*j`zk)j=W=?}P9NhHYz<2WWXHYWEL_(E|fE-(_OdG_y;06m{Yb3fzNeW1PJi zqb9CuZ&+10YWHIh?ugKk*~sL2>K7dvly=hYoiWfY5pkIgjMcM+NGTMF_yUYw`NBgc z1MQ6Z5di@HX@AWk(Ypk2?w$2A85-|wQ3nC$mo0?gIcr^maOz#|Wir&>x$keh2P&j3zxJ#*vqRTI^o<|_o?*jZD^LK^y=$Zv?HaowZ*>K^U?iT(A7Vb@BnVLXOqomJaOn00000NkvXXu0mjf?cuZ> diff --git a/Resources/Textures/Interface/Nano/slider_fill.svg.96dpi.png b/Resources/Textures/Interface/Nano/slider_fill.svg.96dpi.png index 05a780078f98dcb1cdee34c2c165698c9e31d691..bb23c626c5b5c00caa47d9d8e344a631aa1a8bd7 100644 GIT binary patch delta 238 zcmV z6)XW|fhD0&7#ApO#y@0^5yz^cIh4|o901^81ONc$82e>y-De0$txOxGoB*Fjfn@Cg zfh0Xf2f+B${S^vc(A5jNxj-a`$26Hj>+71H^?qaTe&qEYS+{yS-gVP-)+1aaslAV5 o(I3|h%x);@ENQn|V$#`p0?4OBv?jzaH2?qr07*qoM6N<$f~w|ahX4Qo literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^QXtI23?!pd0{;Rj=3*z$5DpHG+YkL80J)q69+AZi z417mGm~pB$pEOWVvcxr_Bsf2(yEr+qAXP8FD1G)j8<44@0X`wF zK>9xh@Hn5#0+e7Y3GxeO(9nJM^3{6h-)TURFi#i95Q*@qCpYpoIPf?JDl3X5H2OH6 z<(aAAyXQZL$i=yDCf&EKJ+RAT(whK7U*qX%d8I36EaMZsd}ZOI>{aqszQ-3I%AFK> g0R}Cjinsh`5VKE+y;)!^1hj#{)78&qol`;+0DJ9Y`Tzg` diff --git a/Resources/Textures/Interface/Nano/slider_grabber.svg.96dpi.png b/Resources/Textures/Interface/Nano/slider_grabber.svg.96dpi.png index 557d1ca819b3fe792405d8491ad150e49c84211a..99bb10f5f5be2be23c3a050d4f8d39117ca0d264 100644 GIT binary patch delta 312 zcmV-80muHG0>=W77=H)`00023znt>`0004VQb$4nuFf3k00032Nklo(EtYGsEG~$uyPR{;Jb(p0Dxs#Y@Gx!O;cKc8&eX1t3LuzO49;T z$pRQ-$pD>Mq=<N&PEETNIJkL#1%+;dU|?zczAhv z0T~7c1{M|;mX?-4Ht(XqRX}OhlAwCOV21MghK|kWlokL*l097)TM zAOO!u5Z0$5@-CHo^fJb<_Ayh7A!xbg8EqDzC#Xq|d<2_DFJSkebzrK$eOi(YFmm+N g)SoXMMVWzo0C^#Q%VnSBr~m)}07*qoM6N<$f{D^v&Hw-a delta 256 zcmZo-n!_|frJkkO$uool2x>S|Iv5xjI14-?iy0XBj({-ZRBb+KprB-lYeY$Kep*R+ zVo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt(e>T^vI^I`3XFEUSvnp5pd(V=va0AyD;jq>WAI88LT)U1= zxuCkN&CihCI~Y``XOfcB2L!PtiYCR!&)e7M=kG1vX&icz`2Km&IP}H;b-EA{ zQA}$g!n|1qs}i}ylKKA*cjuYXD0;+-r6BHDQ`!5%O? zSq(9*?wNqrN}%PQtcBW{aMUAKiZ>I}N>g{r{9qslb_TRqDIpDRy&;X{g#oYJ0@3Cj zdW?o>`-K6o#FfZqHaatPC-;Vfj1k5VV{OG*$|I^bK=kxRDzIX0dE*9Z+d}T54&cXHJhwBYy}^TL zoNP#%oa`UFO2{6y)&^vGi{VoDt`1-t)_@_vkm5V)bbG;)9=raI3bicJWIBx)kkF{?9RH zMP6UGc%;pcxF0Omk3+vJAlC3|d8Zl44)K0C;)y0_aR9rhrZ1-TnFXz$XmVEJ(q;x+ z3vy1E3ayz>K6|~M_i7cj2mu=6d4DATS(Y_CAP5Fv zW1ORh?tesAJ>lj`LFNyOT98Px t5G^YU(Pd;HJ|L^35x*-V5yMqch!;%RzM;4o Date: Wed, 10 Apr 2024 23:52:50 +0300 Subject: [PATCH 09/11] some test fix --- .../{hand_m.png => hand_l_no_letter.png} | Bin .../_CP14/Interface/Default/Storage/back.png | Bin 0 -> 219 bytes .../_CP14/Interface/Default/Storage/exit.png | Bin 0 -> 234 bytes .../Default/Storage/sidebar_bottom.png | Bin 199 -> 243 bytes .../Interface/Default/Storage/sidebar_top.png | Bin 185 -> 239 bytes .../_CP14/Interface/Default/meta.json | 110 ++++++++++++++++++ 6 files changed, 110 insertions(+) rename Resources/Textures/_CP14/Interface/Default/Slots/{hand_m.png => hand_l_no_letter.png} (100%) create mode 100644 Resources/Textures/_CP14/Interface/Default/Storage/back.png create mode 100644 Resources/Textures/_CP14/Interface/Default/Storage/exit.png create mode 100644 Resources/Textures/_CP14/Interface/Default/meta.json diff --git a/Resources/Textures/_CP14/Interface/Default/Slots/hand_m.png b/Resources/Textures/_CP14/Interface/Default/Slots/hand_l_no_letter.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Slots/hand_m.png rename to Resources/Textures/_CP14/Interface/Default/Slots/hand_l_no_letter.png diff --git a/Resources/Textures/_CP14/Interface/Default/Storage/back.png b/Resources/Textures/_CP14/Interface/Default/Storage/back.png new file mode 100644 index 0000000000000000000000000000000000000000..abcbabdd9d523861fc9704adba30679305eb0f0a GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|rh2+KhFJ6_ zCrErzh>rYRzirdA`j}5XEhf?bkFONp&v+!`SSEwd=7q2Ho7fD5F4g=qlRg~i#*`~HpUli0!$XckFM;#F8R@N?gGXmQcMi@Rt2sR$~bcx P=s*TfS3j3^P6b&7FZbhV~+!kW3Mi$9&N{jB~wy&>Lj za>}DqHfkEKD>#$ogrB@@+kN4fi0~X^A4aQE4==%x(vGe1CS{T~GZ_|~eruz3wqd4= zD-T0Sr1itM>Nz(#KAw)qUi0dLz~-_!&M9v*6n9-YF{9pY%jXpnQkpa!=H;a&h^4Ll hIPaUZu}{oRzNl^Ur`-|wF(2q&22WQ%mvv4FO#mJMTm1k4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Interface/Default/Storage/sidebar_bottom.png b/Resources/Textures/_CP14/Interface/Default/Storage/sidebar_bottom.png index b095c1ec168ec3a2f07a5b216057c776945eb010..fc9e19a4b5d912c4e1ce4eec7b875e7cc30136db 100644 GIT binary patch delta 169 zcmX@k_?dBnA>-PKMymDfOBwIi|5#*uxggWJNq2a9c!0o9?bm;9rcg<>HT!w}&mCddA%20i^XeO|lf0d+wds0B zMg|6d^f^LO6M$gGhJR)k*Cn_-vzYnfe>zY=11M4P_k;G~)z4++J&hUeDkL#5%vfqv Un|=C~5(5x;y85}Sb4q9e0KUOQNB{r; delta 124 zcmey&c${&9A!Fl2Bh>BCy>ja%*@Q(Jh}7V|0ajf zHqO`ihbJ4~)cf)6v$!Xl!66BQa04LliKw4l!ko|sVvDe>GTKx3W9q}JpZk|cHslEy aGB6ma%lWRG^YT9f5O})!xvXu0mk1=Wt}^=8a_O%6fU?NPy2=1Jp3bW3 zhuwzNT=rrbM_=XJ{Q*GudZCg1yQZ@Q^XhXsG3H~y;2ity`ait`jqGVUI|cNuRS6Oy zpjwwi8b{L>e!+iJoPn0Xxn%)~G5_8HEF2=h6Jx|LxIb``SO5S307*qoM6N<$f-`1b A8UO$Q delta 144 zcmaFQxRY^$VSTZui(`mIZ*s~3ra3-e{wE6`XOq~NSu*uWn!w~I=@no9D1T(LnEB$r zK1WDu#orIwhc6YM?FVdQ&MBb@0CD6!J^%m! diff --git a/Resources/Textures/_CP14/Interface/Default/meta.json b/Resources/Textures/_CP14/Interface/Default/meta.json new file mode 100644 index 0000000000..5f94c90c8c --- /dev/null +++ b/Resources/Textures/_CP14/Interface/Default/meta.json @@ -0,0 +1,110 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from https://github.com/goonstation/goonstation at commit e77d85d9c1d93aa32da7702737ceeac2b56738ac, slightly modified by PixelTK", + "states": [ + { + "name": "back", + }, + { + "name": "belt" + }, + { + "name": "block" + }, + { + "name": "cloak" + }, + { + "name": "ears" + }, + { + "name": "ears_headset" + }, + { + "name": "eyes" + }, + { + "name": "glasses" + }, + { + "name": "gloves" + }, + { + "name": "hand_active" + }, + { + "name": "hand_active_gold" + }, + { + "name": "hand_l" + }, + { + "name": "hand_l_no_letter" + }, + { + "name": "hand_r" + }, + { + "name": "hand_r_no_letter" + }, + { + "name": "head" + }, + { + "name": "id" + }, + { + "name": "keys" + }, + { + "name": "invtoggle" + }, + { + "name": "mask" + }, + { + "name": "neck" + }, + { + "name": "pocket" + }, + { + "name": "pants" + }, + { + "name": "shoes" + }, + { + "name": "ring" + }, + { + "name": "suit" + }, + { + "name": "suit_storage" + }, + { + "name": "shirt" + }, + { + "name": "uniform" + }, + { + "name": "inventory" + }, + { + "name": "pda" + }, + { + "name": "web" + }, + { + "name": "toggle" + } + ] +} From 89342d658d8118dc3545f7bd6d03f78563f9aba8 Mon Sep 17 00:00:00 2001 From: Ed Date: Thu, 11 Apr 2024 00:18:33 +0300 Subject: [PATCH 10/11] try2 --- Resources/Prototypes/_CP14/themes.yml | 6 +++--- .../CrystallPunk}/SlotBackground.png | Bin .../CrystallPunk}/Slots/back.png | Bin .../CrystallPunk}/Slots/belt.png | Bin .../CrystallPunk}/Slots/gloves.png | Bin .../CrystallPunk}/Slots/hand_l.png | Bin .../CrystallPunk}/Slots/hand_l_no_letter.png | Bin .../CrystallPunk}/Slots/hand_r.png | Bin .../CrystallPunk}/Slots/hand_r_no_letter.png | Bin .../CrystallPunk}/Slots/head.png | Bin .../CrystallPunk}/Slots/mask.png | Bin .../CrystallPunk}/Slots/neck.png | Bin .../CrystallPunk}/Slots/pocket.png | Bin .../CrystallPunk}/Slots/shoes.png | Bin .../CrystallPunk}/Slots/toggle.png | Bin .../CrystallPunk}/Storage/back.png | Bin .../CrystallPunk}/Storage/exit.png | Bin .../CrystallPunk}/Storage/piece_bottom.png | Bin .../CrystallPunk}/Storage/piece_bottomLeft.png | Bin .../CrystallPunk}/Storage/piece_bottomRight.png | Bin .../CrystallPunk}/Storage/piece_center.png | Bin .../CrystallPunk}/Storage/piece_left.png | Bin .../CrystallPunk}/Storage/piece_right.png | Bin .../CrystallPunk}/Storage/piece_top.png | Bin .../CrystallPunk}/Storage/piece_topLeft.png | Bin .../CrystallPunk}/Storage/piece_topRight.png | Bin .../CrystallPunk}/Storage/sidebar_bottom.png | Bin .../CrystallPunk}/Storage/sidebar_mid.png | Bin .../CrystallPunk}/Storage/sidebar_top.png | Bin .../Default => Interface/CrystallPunk}/meta.json | 0 .../CrystallPunk}/slot_highlight.png | Bin .../{_CP14 => }/Interface/Default/Slots/cloak.png | Bin .../{_CP14 => }/Interface/Default/Slots/eyes.png | Bin .../{_CP14 => }/Interface/Default/Slots/keys.png | Bin .../{_CP14 => }/Interface/Default/Slots/pants.png | Bin .../{_CP14 => }/Interface/Default/Slots/ring.png | Bin .../{_CP14 => }/Interface/Default/Slots/shirt.png | Bin 37 files changed, 3 insertions(+), 3 deletions(-) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/SlotBackground.png (100%) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/Slots/back.png (100%) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/Slots/belt.png (100%) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/Slots/gloves.png (100%) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/Slots/hand_l.png (100%) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/Slots/hand_l_no_letter.png (100%) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/Slots/hand_r.png (100%) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/Slots/hand_r_no_letter.png (100%) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/Slots/head.png (100%) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/Slots/mask.png (100%) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/Slots/neck.png (100%) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/Slots/pocket.png (100%) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/Slots/shoes.png (100%) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/Slots/toggle.png (100%) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/Storage/back.png (100%) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/Storage/exit.png (100%) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/Storage/piece_bottom.png (100%) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/Storage/piece_bottomLeft.png (100%) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/Storage/piece_bottomRight.png (100%) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/Storage/piece_center.png (100%) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/Storage/piece_left.png (100%) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/Storage/piece_right.png (100%) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/Storage/piece_top.png (100%) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/Storage/piece_topLeft.png (100%) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/Storage/piece_topRight.png (100%) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/Storage/sidebar_bottom.png (100%) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/Storage/sidebar_mid.png (100%) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/Storage/sidebar_top.png (100%) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/meta.json (100%) rename Resources/Textures/{_CP14/Interface/Default => Interface/CrystallPunk}/slot_highlight.png (100%) rename Resources/Textures/{_CP14 => }/Interface/Default/Slots/cloak.png (100%) rename Resources/Textures/{_CP14 => }/Interface/Default/Slots/eyes.png (100%) rename Resources/Textures/{_CP14 => }/Interface/Default/Slots/keys.png (100%) rename Resources/Textures/{_CP14 => }/Interface/Default/Slots/pants.png (100%) rename Resources/Textures/{_CP14 => }/Interface/Default/Slots/ring.png (100%) rename Resources/Textures/{_CP14 => }/Interface/Default/Slots/shirt.png (100%) diff --git a/Resources/Prototypes/_CP14/themes.yml b/Resources/Prototypes/_CP14/themes.yml index 6bb4f9b957..7589aceb55 100644 --- a/Resources/Prototypes/_CP14/themes.yml +++ b/Resources/Prototypes/_CP14/themes.yml @@ -1,12 +1,12 @@ - type: uiTheme id: CP14DefaultTheme - path: /Textures/_CP14/Interface/Default/ + path: /Textures//Interface/CrystallPunk/ colors: whiteText: "#FFF5EE" slotSelectedGold: "#e6b812" slotColor: "#0f1215" - slotOutline: "#333850" - slotText: "#333850" + slotOutline: "#4a3930" + slotText: "#503b33" nanoGold: "#A88B5E" goodGreenFore: "#31843E" concerningOrangeFore: "#A5762F" diff --git a/Resources/Textures/_CP14/Interface/Default/SlotBackground.png b/Resources/Textures/Interface/CrystallPunk/SlotBackground.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/SlotBackground.png rename to Resources/Textures/Interface/CrystallPunk/SlotBackground.png diff --git a/Resources/Textures/_CP14/Interface/Default/Slots/back.png b/Resources/Textures/Interface/CrystallPunk/Slots/back.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Slots/back.png rename to Resources/Textures/Interface/CrystallPunk/Slots/back.png diff --git a/Resources/Textures/_CP14/Interface/Default/Slots/belt.png b/Resources/Textures/Interface/CrystallPunk/Slots/belt.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Slots/belt.png rename to Resources/Textures/Interface/CrystallPunk/Slots/belt.png diff --git a/Resources/Textures/_CP14/Interface/Default/Slots/gloves.png b/Resources/Textures/Interface/CrystallPunk/Slots/gloves.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Slots/gloves.png rename to Resources/Textures/Interface/CrystallPunk/Slots/gloves.png diff --git a/Resources/Textures/_CP14/Interface/Default/Slots/hand_l.png b/Resources/Textures/Interface/CrystallPunk/Slots/hand_l.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Slots/hand_l.png rename to Resources/Textures/Interface/CrystallPunk/Slots/hand_l.png diff --git a/Resources/Textures/_CP14/Interface/Default/Slots/hand_l_no_letter.png b/Resources/Textures/Interface/CrystallPunk/Slots/hand_l_no_letter.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Slots/hand_l_no_letter.png rename to Resources/Textures/Interface/CrystallPunk/Slots/hand_l_no_letter.png diff --git a/Resources/Textures/_CP14/Interface/Default/Slots/hand_r.png b/Resources/Textures/Interface/CrystallPunk/Slots/hand_r.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Slots/hand_r.png rename to Resources/Textures/Interface/CrystallPunk/Slots/hand_r.png diff --git a/Resources/Textures/_CP14/Interface/Default/Slots/hand_r_no_letter.png b/Resources/Textures/Interface/CrystallPunk/Slots/hand_r_no_letter.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Slots/hand_r_no_letter.png rename to Resources/Textures/Interface/CrystallPunk/Slots/hand_r_no_letter.png diff --git a/Resources/Textures/_CP14/Interface/Default/Slots/head.png b/Resources/Textures/Interface/CrystallPunk/Slots/head.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Slots/head.png rename to Resources/Textures/Interface/CrystallPunk/Slots/head.png diff --git a/Resources/Textures/_CP14/Interface/Default/Slots/mask.png b/Resources/Textures/Interface/CrystallPunk/Slots/mask.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Slots/mask.png rename to Resources/Textures/Interface/CrystallPunk/Slots/mask.png diff --git a/Resources/Textures/_CP14/Interface/Default/Slots/neck.png b/Resources/Textures/Interface/CrystallPunk/Slots/neck.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Slots/neck.png rename to Resources/Textures/Interface/CrystallPunk/Slots/neck.png diff --git a/Resources/Textures/_CP14/Interface/Default/Slots/pocket.png b/Resources/Textures/Interface/CrystallPunk/Slots/pocket.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Slots/pocket.png rename to Resources/Textures/Interface/CrystallPunk/Slots/pocket.png diff --git a/Resources/Textures/_CP14/Interface/Default/Slots/shoes.png b/Resources/Textures/Interface/CrystallPunk/Slots/shoes.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Slots/shoes.png rename to Resources/Textures/Interface/CrystallPunk/Slots/shoes.png diff --git a/Resources/Textures/_CP14/Interface/Default/Slots/toggle.png b/Resources/Textures/Interface/CrystallPunk/Slots/toggle.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Slots/toggle.png rename to Resources/Textures/Interface/CrystallPunk/Slots/toggle.png diff --git a/Resources/Textures/_CP14/Interface/Default/Storage/back.png b/Resources/Textures/Interface/CrystallPunk/Storage/back.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Storage/back.png rename to Resources/Textures/Interface/CrystallPunk/Storage/back.png diff --git a/Resources/Textures/_CP14/Interface/Default/Storage/exit.png b/Resources/Textures/Interface/CrystallPunk/Storage/exit.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Storage/exit.png rename to Resources/Textures/Interface/CrystallPunk/Storage/exit.png diff --git a/Resources/Textures/_CP14/Interface/Default/Storage/piece_bottom.png b/Resources/Textures/Interface/CrystallPunk/Storage/piece_bottom.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Storage/piece_bottom.png rename to Resources/Textures/Interface/CrystallPunk/Storage/piece_bottom.png diff --git a/Resources/Textures/_CP14/Interface/Default/Storage/piece_bottomLeft.png b/Resources/Textures/Interface/CrystallPunk/Storage/piece_bottomLeft.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Storage/piece_bottomLeft.png rename to Resources/Textures/Interface/CrystallPunk/Storage/piece_bottomLeft.png diff --git a/Resources/Textures/_CP14/Interface/Default/Storage/piece_bottomRight.png b/Resources/Textures/Interface/CrystallPunk/Storage/piece_bottomRight.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Storage/piece_bottomRight.png rename to Resources/Textures/Interface/CrystallPunk/Storage/piece_bottomRight.png diff --git a/Resources/Textures/_CP14/Interface/Default/Storage/piece_center.png b/Resources/Textures/Interface/CrystallPunk/Storage/piece_center.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Storage/piece_center.png rename to Resources/Textures/Interface/CrystallPunk/Storage/piece_center.png diff --git a/Resources/Textures/_CP14/Interface/Default/Storage/piece_left.png b/Resources/Textures/Interface/CrystallPunk/Storage/piece_left.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Storage/piece_left.png rename to Resources/Textures/Interface/CrystallPunk/Storage/piece_left.png diff --git a/Resources/Textures/_CP14/Interface/Default/Storage/piece_right.png b/Resources/Textures/Interface/CrystallPunk/Storage/piece_right.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Storage/piece_right.png rename to Resources/Textures/Interface/CrystallPunk/Storage/piece_right.png diff --git a/Resources/Textures/_CP14/Interface/Default/Storage/piece_top.png b/Resources/Textures/Interface/CrystallPunk/Storage/piece_top.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Storage/piece_top.png rename to Resources/Textures/Interface/CrystallPunk/Storage/piece_top.png diff --git a/Resources/Textures/_CP14/Interface/Default/Storage/piece_topLeft.png b/Resources/Textures/Interface/CrystallPunk/Storage/piece_topLeft.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Storage/piece_topLeft.png rename to Resources/Textures/Interface/CrystallPunk/Storage/piece_topLeft.png diff --git a/Resources/Textures/_CP14/Interface/Default/Storage/piece_topRight.png b/Resources/Textures/Interface/CrystallPunk/Storage/piece_topRight.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Storage/piece_topRight.png rename to Resources/Textures/Interface/CrystallPunk/Storage/piece_topRight.png diff --git a/Resources/Textures/_CP14/Interface/Default/Storage/sidebar_bottom.png b/Resources/Textures/Interface/CrystallPunk/Storage/sidebar_bottom.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Storage/sidebar_bottom.png rename to Resources/Textures/Interface/CrystallPunk/Storage/sidebar_bottom.png diff --git a/Resources/Textures/_CP14/Interface/Default/Storage/sidebar_mid.png b/Resources/Textures/Interface/CrystallPunk/Storage/sidebar_mid.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Storage/sidebar_mid.png rename to Resources/Textures/Interface/CrystallPunk/Storage/sidebar_mid.png diff --git a/Resources/Textures/_CP14/Interface/Default/Storage/sidebar_top.png b/Resources/Textures/Interface/CrystallPunk/Storage/sidebar_top.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Storage/sidebar_top.png rename to Resources/Textures/Interface/CrystallPunk/Storage/sidebar_top.png diff --git a/Resources/Textures/_CP14/Interface/Default/meta.json b/Resources/Textures/Interface/CrystallPunk/meta.json similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/meta.json rename to Resources/Textures/Interface/CrystallPunk/meta.json diff --git a/Resources/Textures/_CP14/Interface/Default/slot_highlight.png b/Resources/Textures/Interface/CrystallPunk/slot_highlight.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/slot_highlight.png rename to Resources/Textures/Interface/CrystallPunk/slot_highlight.png diff --git a/Resources/Textures/_CP14/Interface/Default/Slots/cloak.png b/Resources/Textures/Interface/Default/Slots/cloak.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Slots/cloak.png rename to Resources/Textures/Interface/Default/Slots/cloak.png diff --git a/Resources/Textures/_CP14/Interface/Default/Slots/eyes.png b/Resources/Textures/Interface/Default/Slots/eyes.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Slots/eyes.png rename to Resources/Textures/Interface/Default/Slots/eyes.png diff --git a/Resources/Textures/_CP14/Interface/Default/Slots/keys.png b/Resources/Textures/Interface/Default/Slots/keys.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Slots/keys.png rename to Resources/Textures/Interface/Default/Slots/keys.png diff --git a/Resources/Textures/_CP14/Interface/Default/Slots/pants.png b/Resources/Textures/Interface/Default/Slots/pants.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Slots/pants.png rename to Resources/Textures/Interface/Default/Slots/pants.png diff --git a/Resources/Textures/_CP14/Interface/Default/Slots/ring.png b/Resources/Textures/Interface/Default/Slots/ring.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Slots/ring.png rename to Resources/Textures/Interface/Default/Slots/ring.png diff --git a/Resources/Textures/_CP14/Interface/Default/Slots/shirt.png b/Resources/Textures/Interface/Default/Slots/shirt.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Default/Slots/shirt.png rename to Resources/Textures/Interface/Default/Slots/shirt.png From 272882fdfdc223c49a975b1f44eb2407c2e90841 Mon Sep 17 00:00:00 2001 From: Ed Date: Thu, 11 Apr 2024 10:45:59 +0300 Subject: [PATCH 11/11] move to _CP14 --- .../_CP14/Entities/Mobs/Player/human.yml | 1 + .../_CP14/Entities/Mobs/Player/tiefling.yml | 6 ++-- .../_CP14/Entities/Mobs/Species/human.yml | 10 ++++++- .../_CP14/Entities/Mobs/Species/tiefling.yml | 2 +- .../Prototypes/_CP14/Species/tiefling.yml | 28 +++++++++--------- .../Mobs/Species/Tiefling/parts.rsi/full.png | Bin .../Species/Tiefling/parts.rsi/head_f.png | Bin .../Species/Tiefling/parts.rsi/head_m.png | Bin .../Mobs/Species/Tiefling/parts.rsi/l_arm.png | Bin .../Species/Tiefling/parts.rsi/l_foot.png | Bin .../Species/Tiefling/parts.rsi/l_hand.png | Bin .../Mobs/Species/Tiefling/parts.rsi/l_leg.png | Bin .../Mobs/Species/Tiefling/parts.rsi/meta.json | 0 .../Mobs/Species/Tiefling/parts.rsi/r_arm.png | Bin .../Species/Tiefling/parts.rsi/r_foot.png | Bin .../Species/Tiefling/parts.rsi/r_hand.png | Bin .../Mobs/Species/Tiefling/parts.rsi/r_leg.png | Bin .../Species/Tiefling/parts.rsi/torso_f.png | Bin .../Species/Tiefling/parts.rsi/torso_m.png | Bin 19 files changed, 28 insertions(+), 19 deletions(-) rename Resources/Textures/{CrystallPunk => _CP14}/Mobs/Species/Tiefling/parts.rsi/full.png (100%) rename Resources/Textures/{CrystallPunk => _CP14}/Mobs/Species/Tiefling/parts.rsi/head_f.png (100%) rename Resources/Textures/{CrystallPunk => _CP14}/Mobs/Species/Tiefling/parts.rsi/head_m.png (100%) rename Resources/Textures/{CrystallPunk => _CP14}/Mobs/Species/Tiefling/parts.rsi/l_arm.png (100%) rename Resources/Textures/{CrystallPunk => _CP14}/Mobs/Species/Tiefling/parts.rsi/l_foot.png (100%) rename Resources/Textures/{CrystallPunk => _CP14}/Mobs/Species/Tiefling/parts.rsi/l_hand.png (100%) rename Resources/Textures/{CrystallPunk => _CP14}/Mobs/Species/Tiefling/parts.rsi/l_leg.png (100%) rename Resources/Textures/{CrystallPunk => _CP14}/Mobs/Species/Tiefling/parts.rsi/meta.json (100%) rename Resources/Textures/{CrystallPunk => _CP14}/Mobs/Species/Tiefling/parts.rsi/r_arm.png (100%) rename Resources/Textures/{CrystallPunk => _CP14}/Mobs/Species/Tiefling/parts.rsi/r_foot.png (100%) rename Resources/Textures/{CrystallPunk => _CP14}/Mobs/Species/Tiefling/parts.rsi/r_hand.png (100%) rename Resources/Textures/{CrystallPunk => _CP14}/Mobs/Species/Tiefling/parts.rsi/r_leg.png (100%) rename Resources/Textures/{CrystallPunk => _CP14}/Mobs/Species/Tiefling/parts.rsi/torso_f.png (100%) rename Resources/Textures/{CrystallPunk => _CP14}/Mobs/Species/Tiefling/parts.rsi/torso_m.png (100%) diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Player/human.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Player/human.yml index 1479464295..0674b5477e 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Player/human.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/human.yml @@ -1,4 +1,5 @@ - type: entity save: false parent: CPBaseMobHuman + name: Mr. Human id: CPMobHuman diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Player/tiefling.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Player/tiefling.yml index 5b36f836a1..a4d1f0883b 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Player/tiefling.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/tiefling.yml @@ -1,5 +1,5 @@ - type: entity - parent: CPBaseMobTiefling - id: CPMobTiefling - name: Mr. Tiefling save: false + parent: CPBaseMobTiefling + name: Mr. Tiefling + id: CPMobTiefling diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml index 5d7e68e217..dfcfc1026c 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml @@ -8,7 +8,7 @@ - type: HumanoidAppearance species: CPHuman - type: Hunger - - type: Icon # It will not have an icon in the adminspawn menu without this. Body parts seem fine for whatever reason. + - type: Icon sprite: _CP14/Mobs/Species/Human/parts.rsi state: full - type: Thirst @@ -22,3 +22,11 @@ requiredLegs: 2 - type: Inventory templateId: CPHuman + +- type: entity + parent: BaseSpeciesDummy + id: CPMobHumanDummy + noSpawn: true + components: + - type: HumanoidAppearance + species: CPHuman \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml index d0515d0aaa..215a92907a 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml @@ -11,7 +11,7 @@ requiredLegs: 2 - type: Hunger - type: Icon - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: full - type: Thirst - type: Wagging diff --git a/Resources/Prototypes/_CP14/Species/tiefling.yml b/Resources/Prototypes/_CP14/Species/tiefling.yml index 0bc4b13e38..eb6f47d473 100644 --- a/Resources/Prototypes/_CP14/Species/tiefling.yml +++ b/Resources/Prototypes/_CP14/Species/tiefling.yml @@ -80,83 +80,83 @@ - type: humanoidBaseSprite id: CPMobTieflingHead baseSprite: - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: head_m - type: humanoidBaseSprite id: CPMobTieflingHeadMale baseSprite: - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: head_m - type: humanoidBaseSprite id: CPMobTieflingHeadFemale baseSprite: - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: head_f - type: humanoidBaseSprite id: CPMobTieflingTorso baseSprite: - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: torso_m - type: humanoidBaseSprite id: CPMobTieflingTorsoMale baseSprite: - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: torso_m - type: humanoidBaseSprite id: CPMobTieflingTorsoFemale baseSprite: - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: torso_f - type: humanoidBaseSprite id: CPMobTieflingLLeg baseSprite: - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: l_leg - type: humanoidBaseSprite id: CPMobTieflingLArm baseSprite: - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: l_arm - type: humanoidBaseSprite id: CPMobTieflingLHand baseSprite: - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: l_hand - type: humanoidBaseSprite id: CPMobTieflingLFoot baseSprite: - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: l_foot - type: humanoidBaseSprite id: CPMobTieflingRLeg baseSprite: - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: r_leg - type: humanoidBaseSprite id: CPMobTieflingRArm baseSprite: - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: r_arm - type: humanoidBaseSprite id: CPMobTieflingRHand baseSprite: - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: r_hand - type: humanoidBaseSprite id: CPMobTieflingRFoot baseSprite: - sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi + sprite: _CP14/Mobs/Species/Tiefling/parts.rsi state: r_foot diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/full.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/full.png similarity index 100% rename from Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/full.png rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/full.png diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/head_f.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/head_f.png similarity index 100% rename from Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/head_f.png rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/head_f.png diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/head_m.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/head_m.png similarity index 100% rename from Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/head_m.png rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/head_m.png diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_arm.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/l_arm.png similarity index 100% rename from Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_arm.png rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/l_arm.png diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_foot.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/l_foot.png similarity index 100% rename from Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_foot.png rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/l_foot.png diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_hand.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/l_hand.png similarity index 100% rename from Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_hand.png rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/l_hand.png diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_leg.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/l_leg.png similarity index 100% rename from Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/l_leg.png rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/l_leg.png diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/meta.json similarity index 100% rename from Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/meta.json rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/meta.json diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_arm.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/r_arm.png similarity index 100% rename from Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_arm.png rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/r_arm.png diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_foot.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/r_foot.png similarity index 100% rename from Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_foot.png rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/r_foot.png diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_hand.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/r_hand.png similarity index 100% rename from Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_hand.png rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/r_hand.png diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_leg.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/r_leg.png similarity index 100% rename from Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/r_leg.png rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/r_leg.png diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/torso_f.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/torso_f.png similarity index 100% rename from Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/torso_f.png rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/torso_f.png diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/torso_m.png b/Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/torso_m.png similarity index 100% rename from Resources/Textures/CrystallPunk/Mobs/Species/Tiefling/parts.rsi/torso_m.png rename to Resources/Textures/_CP14/Mobs/Species/Tiefling/parts.rsi/torso_m.png