Skip to content

add underclothing #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MilonPL merged 4 commits into from
Feb 10, 2025
Merged

add underclothing #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
29fb340
mostly done
MilonPL Jan 25, 2025
5e66664
Merge branch 'master' into next-week
MilonPL Feb 9, 2025
1529fe2
hell
MilonPL Feb 9, 2025
594b516
fix templates
MilonPL Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Content.Client/Clothing/ClientClothingSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ public sealed class ClientClothingSystem : ClothingSystem
{"pocket1", "POCKET1"},
{"pocket2", "POCKET2"},
{"suitstorage", "SUITSTORAGE"},
{"underpants", "UNDERPANTS"}, // Emberfall
{"undershirt", "UNDERSHIRT"}, // Emberfall
{"socks", "SOCKS"}, // Emberfall
};

[Dependency] private readonly IResourceCache _cache = default!;
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Inventory/StrippableBoundUserInterface.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public void UpdateMenu()
// for now: shit-code
// this breaks for drones (too many hands, lots of empty vertical space), and looks shit for monkeys and the like.
// but the window is realizable, so eh.
_strippingMenu.SetSize = new Vector2(220, snare?.IsEnsnared == true ? 550 : 530);
_strippingMenu.SetSize = new Vector2(290, snare?.IsEnsnared == true ? 550 : 530); // Emberfall - changed width cause shitcode
}

private void AddHandButton(Hand hand)
Expand Down
3 changes: 3 additions & 0 deletions Content.Shared/Inventory/SlotFlags.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ public enum SlotFlags
LEGS = 1 << 13,
FEET = 1 << 14,
SUITSTORAGE = 1 << 15,
UNDERPANTS = 1 << 16, // Emberfall
UNDERSHIRT = 1 << 17, // Emberfall
SOCKS = 1 << 18, // Emberfall
All = ~NONE,

WITHOUT_POCKET = All & ~POCKET
Expand Down
6 changes: 6 additions & 0 deletions Resources/Locale/en-US/_emberfall/preferences/loudout-groups.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
## Chief Service Supervisor
loadout-group-css-head = Chief Service Supervisor head
loadout-group-css-jumpsuit = Chief Service Supervisor jumpsuit
loadout-group-css-outerclothing = Chief Service Supervisor outer clothing
loadout-group-css-headset = Chief Service Supervisor headset
loadout-group-css-shoes = Chief Service Supervisor shoes
loadout-group-css-gloves = Chief Service Supervisor gloves

##
loadout-group-underpants = Underpants
loadout-group-undershirt = Undershirt
loadout-group-socks = Socks
10 changes: 8 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Under/under.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# I would cry if we didn't have them. -swept

- type: entity
parent: ClothingShoesBase
parent: ClothingUnderSocksBase # Emberfall
id: ClothingUnderSocksBee
name: bee socks
description: Make them loins buzz!
Expand All @@ -11,9 +11,12 @@
sprite: Clothing/Under/Socks/bee.rsi
- type: Clothing
sprite: Clothing/Under/Socks/bee.rsi
clothingVisuals: # Emberfall
socks:
- state: equipped-FEET

- type: entity
parent: ClothingShoesBase
parent: ClothingUnderSocksBase # Emberfall
id: ClothingUnderSocksCoder
name: coder socks
description: It's time to code sisters!!11!
Expand All @@ -22,3 +25,6 @@
sprite: Clothing/Under/Socks/coder.rsi
- type: Clothing
sprite: Clothing/Under/Socks/coder.rsi
clothingVisuals: # Emberfall
socks:
- state: equipped-FEET
3 changes: 3 additions & 0 deletions Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@
- map: [ "enum.HumanoidVisualLayers.LArm" ]
- map: [ "enum.HumanoidVisualLayers.RLeg" ]
- map: [ "enum.HumanoidVisualLayers.LLeg" ]
- map: [ "underpants" ] # Emberfall
- map: [ "undershirt" ] # Emberfall
- map: [ "socks" ] # Emberfall
- map: ["jumpsuit"]
- map: ["enum.HumanoidVisualLayers.LFoot"]
- map: ["enum.HumanoidVisualLayers.RFoot"]
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/Entities/Mobs/Species/base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
- map: [ "enum.HumanoidVisualLayers.LArm" ]
- map: [ "enum.HumanoidVisualLayers.RLeg" ]
- map: [ "enum.HumanoidVisualLayers.LLeg" ]
- map: [ "underpants" ] # Emberfall
- map: [ "undershirt" ] # Emberfall
- map: [ "socks" ] # Emberfall
- map: ["jumpsuit"]
- map: ["enum.HumanoidVisualLayers.LFoot"]
- map: ["enum.HumanoidVisualLayers.RFoot"]
Expand Down Expand Up @@ -305,6 +308,9 @@
- map: [ "enum.HumanoidVisualLayers.LArm" ]
- map: [ "enum.HumanoidVisualLayers.RLeg" ]
- map: [ "enum.HumanoidVisualLayers.LLeg" ]
- map: [ "underpants" ] # Emberfall
- map: [ "undershirt" ] # Emberfall
- map: [ "socks" ] # Emberfall
- map: ["jumpsuit"]
- map: ["enum.HumanoidVisualLayers.LFoot"]
- map: ["enum.HumanoidVisualLayers.RFoot"]
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Entities/Mobs/Species/moth.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@
- map: [ "enum.HumanoidVisualLayers.LArm" ]
- map: [ "enum.HumanoidVisualLayers.RLeg" ]
- map: [ "enum.HumanoidVisualLayers.LLeg" ]
- map: [ "underpants" ] # Emberfall
- map: [ "undershirt" ] # Emberfall
- map: [ "socks" ] # Emberfall
- map: [ "jumpsuit" ]
- map: [ "enum.HumanoidVisualLayers.LHand" ]
- map: [ "enum.HumanoidVisualLayers.RHand" ]
Expand Down
23 changes: 22 additions & 1 deletion Resources/Prototypes/InventoryTemplates/arachnid_inventory_template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
slotTexture: gloves
slotFlags: GLOVES
uiWindowPos: 2,1
strippingWindowPos: 2,2
strippingWindowPos: 3,2 # Emberfall
displayName: Gloves
- name: neck
slotTexture: neck
Expand Down Expand Up @@ -140,3 +140,24 @@
dependsOnComponents:
- type: AllowSuitStorage
displayName: Suit Storage
- name: undershirt # Emberfall
slotTexture: undershirt
slotFlags: UNDERSHIRT
stripTime: 8
uiWindowPos: 4,1
strippingWindowPos: 2,1
displayName: Undershirt
- name: underpants # Emberfall
slotTexture: underpants
slotFlags: UNDERPANTS
stripTime: 8
uiWindowPos: 4,0
strippingWindowPos: 2,2
displayName: Underpants
- name: socks # Emberfall
slotTexture: socks
slotFlags: SOCKS
stripTime: 8
uiWindowPos: 4,2
strippingWindowPos: 2,3
displayName: Socks
23 changes: 22 additions & 1 deletion Resources/Prototypes/InventoryTemplates/corpse_inventory_template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
slotTexture: gloves
slotFlags: GLOVES
uiWindowPos: 2,1
strippingWindowPos: 2,2
strippingWindowPos: 3,2 # Emberfall
displayName: Gloves
- name: neck
slotTexture: neck
Expand Down Expand Up @@ -95,3 +95,24 @@
uiWindowPos: 3,1
strippingWindowPos: 1,5
displayName: Belt
- name: undershirt # Emberfall
slotTexture: undershirt
slotFlags: UNDERSHIRT
stripTime: 8
uiWindowPos: 4,1
strippingWindowPos: 2,1
displayName: Undershirt
- name: underpants # Emberfall
slotTexture: underpants
slotFlags: UNDERPANTS
stripTime: 8
uiWindowPos: 4,0
strippingWindowPos: 2,2
displayName: Underpants
- name: socks # Emberfall
slotTexture: socks
slotFlags: SOCKS
stripTime: 8
uiWindowPos: 4,2
strippingWindowPos: 2,3
displayName: Socks
23 changes: 22 additions & 1 deletion Resources/Prototypes/InventoryTemplates/human_inventory_template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
slotTexture: gloves
slotFlags: GLOVES
uiWindowPos: 2,1
strippingWindowPos: 2,2
strippingWindowPos: 3,2 # Emberfall
displayName: Gloves
- name: neck
slotTexture: neck
Expand Down Expand Up @@ -121,3 +121,24 @@
uiWindowPos: 3,0
strippingWindowPos: 0,5
displayName: Back
- name: undershirt # Emberfall
slotTexture: undershirt
slotFlags: UNDERSHIRT
stripTime: 8
uiWindowPos: 4,1
strippingWindowPos: 2,1
displayName: Undershirt
- name: underpants # Emberfall
slotTexture: underpants
slotFlags: UNDERPANTS
stripTime: 8
uiWindowPos: 4,0
strippingWindowPos: 2,2
displayName: Underpants
- name: socks # Emberfall
slotTexture: socks
slotFlags: SOCKS
stripTime: 8
uiWindowPos: 4,2
strippingWindowPos: 2,3
displayName: Socks
Loading
Loading