Skip to content
New issue

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

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

Jump to bottom

Слот и небольшая система для носков. Включая 31 новый вид их расцветки. #241

Merged
merged 20 commits into from
Sep 16, 2023
Merged

Слот и небольшая система для носков. Включая 31 новый вид их расцветки. #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4a73f46
Socks
ITamiokiI Sep 11, 2023
8b4a701
Socks
ITamiokiI Sep 11, 2023
52a863d
socks
ITamiokiI Sep 11, 2023
c6985a3
socks2
ITamiokiI Sep 11, 2023
47c07c5
Merge branch 'arumoon-server' of https://github.com/Workbench-Team/sp…
ITamiokiI Sep 11, 2023
83aad01
Socks
ITamiokiI Sep 12, 2023
2759662
Socks
ITamiokiI Sep 12, 2023
3b9da2c
Socks
ITamiokiI Sep 12, 2023
1902c6a
Socks
ITamiokiI Sep 12, 2023
938f620
Socks
ITamiokiI Sep 12, 2023
7cf50af
Socks
ITamiokiI Sep 14, 2023
c3187d3
Socks
ITamiokiI Sep 15, 2023
4ea245e
Socks
ITamiokiI Sep 15, 2023
76426a9
Socks
ITamiokiI Sep 15, 2023
4b072bf
Socks
ITamiokiI Sep 16, 2023
239a063
trolled by devs
AruMoon Sep 16, 2023
64563ca
Merge branch 'arumoon-server' of git.arumoon.ru:Workbench-Team/space-…
AruMoon Sep 16, 2023
70b3f40
Socks
ITamiokiI Sep 16, 2023
b3a397d
Socks
ITamiokiI Sep 16, 2023
0b652a5
resolve conflict and reduce base socks capacity
AruMoon Sep 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions Content.Client/Clothing/ClientClothingSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public sealed class ClientClothingSystem : ClothingSystem
{"belt", "BELT"},
{"gloves", "HAND"},
{"shoes", "FEET"},
{"socks", "SOCKS"},
{"id", "IDCARD"},
{"pocket1", "POCKET1"},
{"pocket2", "POCKET2"},
Expand Down
1 change: 1 addition & 0 deletions Content.Server/Zombies/ZombieSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ private float GetZombieInfectionChance(EntityUid uid, ZombieComponent component)
var enumerator =
new InventorySystem.ContainerSlotEnumerator(uid, inventoryComponent.TemplateId, _protoManager, _inv,
SlotFlags.FEET |
SlotFlags.SOCKS |
SlotFlags.HEAD |
SlotFlags.EYES |
SlotFlags.GLOVES |
Expand Down
1 change: 1 addition & 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,5 +26,6 @@ public enum SlotFlags
LEGS = 1 << 13,
FEET = 1 << 14,
SUITSTORAGE = 1 << 15,
SOCKS = 1 << 16,
All = ~NONE,
}
5 changes: 5 additions & 0 deletions Content.Shared/Roles/StartingGearPrototype.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ public sealed class StartingGearPrototype : IPrototype
[DataField("innerclothingskirt", customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
private string? _innerClothingSkirt;

[DataField("femaleSocks", customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
private string? _femaleSocks;

[DataField("satchel", customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
private string? _satchel;

Expand All @@ -40,6 +43,8 @@ public string GetGear(string slot, HumanoidCharacterProfile? profile)
{
if (slot == "jumpsuit" && profile.Clothing == ClothingPreference.Jumpskirt && !string.IsNullOrEmpty(_innerClothingSkirt))
return _innerClothingSkirt;
if (slot == "socks" && profile.Clothing == ClothingPreference.Jumpskirt && !string.IsNullOrEmpty(_femaleSocks))
return _femaleSocks;
if (slot == "back" && profile.Backpack == BackpackPreference.Satchel && !string.IsNullOrEmpty(_satchel))
return _satchel;
if (slot == "back" && profile.Backpack == BackpackPreference.Duffelbag && !string.IsNullOrEmpty(_duffelbag))
Expand Down
3 changes: 3 additions & 0 deletions Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/under/specific.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ent-ClothingUnderSocksChameleonSocks = Розовые чулки
.desc = Пришло время кодить, сёстры!!11!
.suffix = { "Хамелеон" }
263 changes: 259 additions & 4 deletions Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/under/under.ftl
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,3 +281,4 @@
- id: WeaponTechFabCircuitboard
- id: HoloprojectorSecurity
- id: BookSecretDocuments

4 changes: 4 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,7 @@
ClothingOuterSuitFire: 2
ClothingOuterWinterAtmos: 2
ClothingNeckScarfStripedLightBlue: 3
ClothingUnderSocksCyanStockings: 2
ClothingUnderSocksCyanKneeSocks: 2
ClothingUnderSocksCyanSocks: 2

4 changes: 3 additions & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,6 @@
ClothingOuterVest: 2
ClothingBeltBandolier: 2
ClothingEyesGlassesSunglasses: 2

ClothingUnderSocksBlackStockings: 2
ClothingUnderSocksBlackKneeSocks: 2
ClothingUnderSocksBlackSocks: 2
4 changes: 4 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,7 @@
ClothingOuterWinterCargo: 2
ClothingOuterWinterMiner: 2
ClothingNeckScarfStripedBrown: 3
ClothingUnderSocksWhiteStockings: 2
ClothingUnderSocksWhiteKneeSocks: 2
ClothingUnderSocksWhiteSocks: 2

3 changes: 3 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,7 @@
ClothingHeadsetCentCom: 3
ClothingOuterWinterCentcom: 3
ClothingNeckScarfStripedCentcom: 3
ClothingUnderSocksCentCommStockings: 2
ClothingUnderSocksCentCommKneeSocks: 2
ClothingUnderSocksCentCommSocks: 2

3 changes: 3 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@
ClothingUniformJumpskirtChef: 2
ClothingHeadHatChef: 2
ClothingShoesColorBlack: 2
ClothingUnderSocksWhiteStockings: 2
ClothingUnderSocksWhiteKneeSocks: 2
ClothingUnderSocksWhiteSocks: 2
4 changes: 4 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,7 @@
ClothingHandsGlovesLatex: 2
ClothingHeadsetMedical: 2
ClothingOuterWinterChem: 2
ClothingUnderSocksOrangeStockings: 2
ClothingUnderSocksOrangeKneeSocks: 2
ClothingUnderSocksOrangeSocks: 2

13 changes: 13 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,19 @@
ClothingHeadRastaHat: 2
ClothingBeltStorageWaistbag: 3
ClothingUniformJumpsuitCitizen: 3
ClothingUnderSocksWhiteStockings: 2
ClothingUnderSocksWhiteKneeSocks: 2
ClothingUnderSocksWhiteSocks: 2
ClothingUnderSocksBlackStockings: 2
ClothingUnderSocksBlackKneeSocks: 2
ClothingUnderSocksBlackSocks: 2
ClothingUnderSocksPantyhose: 1
ClothingUnderSocksThinStockings: 2
ClothingUnderSocksThinKneeSocks: 2
ClothingUnderSocksFishnetPantyhose: 1
ClothingUnderSocksFishnetStockings: 2
ClothingUnderSocksFishnetKneeSocks: 2

contrabandInventory:
ClothingUniformJumpsuitTacticool: 1
ClothingUniformJumpskirtTacticool: 1
3 changes: 2 additions & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@
SpoonPlastic: 10
KnifePlastic: 10
FoodPlatePlastic: 10
FoodPlateSmallPlastic: 10
FoodPlateSmallPlastic: 10

4 changes: 4 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,7 @@
ClothingHandsGlovesColorBlack: 2
ClothingHandsGlovesLatex: 2
ClothingHeadsetSecurity: 2
ClothingUnderSocksBlackStockings: 2
ClothingUnderSocksBlackKneeSocks: 2
ClothingUnderSocksBlackSocks: 2

7 changes: 7 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,10 @@
ClothingHeadsetEngineering: 3
ClothingOuterWinterEngi: 2
ClothingNeckScarfStripedOrange: 3
ClothingUnderSocksOrangeStockings: 2
ClothingUnderSocksOrangeKneeSocks: 2
ClothingUnderSocksOrangeSocks: 2
ClothingUnderSocksYellowStockings: 2
ClothingUnderSocksYellowKneeSocks: 2
ClothingUnderSocksYellowSocks: 2

4 changes: 4 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/genedrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@
ClothingBackpackGenetics: 2
ClothingBackpackSatchelGenetics: 2
ClothingBackpackDuffelGenetics: 2
ClothingUnderSocksCyanStockings: 2
ClothingUnderSocksCyanKneeSocks: 2
ClothingUnderSocksCyanSocks: 2

4 changes: 4 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@
ClothingHeadBandBotany: 3
ClothingHeadsetService: 2
ClothingOuterWinterHydro: 2
ClothingUnderSocksGreenStockings: 2
ClothingUnderSocksGreenKneeSocks: 2
ClothingUnderSocksGreenSocks: 2

5 changes: 5 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@
ClothingHeadsetService: 2
ClothingOuterWinterJani: 2
ClothingNeckScarfStripedPurple: 3
ClothingUnderSocksPurpleStockings: 2
ClothingUnderSocksPurpleKneeSocks: 2
ClothingUnderSocksPurpleSocks: 2

emaggedInventory:
ClothingUniformJumpskirtJanimaid: 2
ClothingUniformJumpskirtJanimaidmini: 1
ClothingUnderSocksWhiteStockings: 3

3 changes: 3 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,8 @@
ClothingShoesBootsLaceup: 2
ClothingHeadsetService: 2
ClothingNeckLawyerbadge: 2
ClothingUnderSocksBlackStockings: 2
ClothingUnderSocksBlackKneeSocks: 2
ClothingUnderSocksBlackSocks: 2
emaggedInventory:
CyberPen: 1
7 changes: 7 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,10 @@
UniformScrubsColorGreen: 4
UniformScrubsColorBlue: 4
UniformScrubsColorPurple: 4
ClothingUnderSocksCyanStockings: 2
ClothingUnderSocksCyanKneeSocks: 2
ClothingUnderSocksCyanSocks: 2
ClothingUnderSocksAzureStockings: 2
ClothingUnderSocksAzureKneeSocks: 2
ClothingUnderSocksAzureSocks: 2

4 changes: 4 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@
ClothingHeadBandSkull: 2
ClothingHeadsetRobotics: 2
ClothingOuterWinterRobo: 2
ClothingUnderSocksBlackStockings: 2
ClothingUnderSocksBlackKneeSocks: 2
ClothingUnderSocksBlackSocks: 2

7 changes: 7 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,10 @@
ClothingMaskGas: 3
ClothingOuterWinterSci: 2
ClothingNeckScarfStripedPurple: 3
ClothingUnderSocksPurpleStockings: 2
ClothingUnderSocksPurpleKneeSocks: 2
ClothingUnderSocksPurpleSocks: 2
ClothingUnderSocksWhiteStockings: 2
ClothingUnderSocksWhiteKneeSocks: 2
ClothingUnderSocksWhiteSocks: 2

6 changes: 6 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,9 @@
ClothingEyesBlindfold: 1
ClothingShoesBootsCombat: 1
ClothingUniformHECU: 1
ClothingUnderSocksBlackStockings: 2
ClothingUnderSocksBlackKneeSocks: 2
ClothingUnderSocksBlackSocks: 2
ClothingUnderSocksRedStockings: 2
ClothingUnderSocksRedKneeSocks: 2
ClothingUnderSocksRedSocks: 2
8 changes: 8 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,17 @@
ClothingUniformJumpskirtOperative: 5
ClothingNeckScarfStripedSyndieGreen: 2
ClothingNeckScarfStripedSyndieRed: 2
ClothingUnderSocksGreenSyndieStockings: 2
ClothingUnderSocksGreenSyndieKneeSocks: 2
ClothingUnderSocksGreenSyndieSocks: 2
ClothingUnderSocksRedSyndieStockings: 2
ClothingUnderSocksRedSyndieKneeSocks: 2
ClothingUnderSocksRedSyndieSocks: 2
emaggedInventory:
ClothingOuterCoatSyndieCapArmored: 1
ClothingOuterWinterSyndieCapArmored: 1
ClothingHeadHatTacticalMaidHeadband: 5
ClothingUniformJumpskirtTacticalMaid: 5
ClothingHandsTacticalMaidGloves: 5
ClothingUnderSocksWhiteStockings: 4

24 changes: 24 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,30 @@
ClothingUniformJumpsuitKimono: 1
ClothingHeadHatCasa: 1
ClothingHeadHatHairflower: 1
ClothingUnderSocksMonochromeStockings: 1
ClothingUnderSocksMonochromeKneeSocks: 1
ClothingUnderSocksMonochromeSocks: 1
ClothingUnderSocksRedStockings: 1
ClothingUnderSocksRedKneeSocks: 1
ClothingUnderSocksRedSocks: 1
ClothingUnderSocksPatriotStockings: 1
ClothingUnderSocksPatriotKneeSocks: 1
ClothingUnderSocksPatriotSocks: 1
ClothingUnderSocksBee: 1
ClothingUnderSocksBeeKneeSocks: 1
ClothingUnderSocksBeeSocks: 1
ClothingUnderSocksCreepyStockings: 1
ClothingUnderSocksCreepyKneeSocks: 1
ClothingUnderSocksFurrStockings: 1
ClothingUnderSocksFurrKneeSocks: 1
ClothingUnderSocksFurrSocks: 1
ClothingUnderSocksRainbowStockings: 1
ClothingUnderSocksRainbowKneeSocks: 1
ClothingUnderSocksAceStockings: 1
ClothingUnderSocksAceKneeSocks: 1
ClothingUnderSocksAceSocks: 1
ClothingUnderSocksVampireStockings: 1
ClothingUnderSocksVampireKneeSocks: 1
emaggedInventory:
ClothingShoesBling: 1
ClothingOuterDogi: 1
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@
PowerCellSmallPrinted: 3
MatterBinStockPart: 4
CapacitorStockPart: 4
MicroManipulatorStockPart: 4
MicroManipulatorStockPart: 4

4 changes: 4 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/virodrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@
ClothingBackpackVirology: 2
ClothingBackpackSatchelVirology: 2
ClothingBackpackDuffelVirology: 2
ClothingUnderSocksGreenStockings: 2
ClothingUnderSocksGreenKneeSocks: 2
ClothingUnderSocksGreenSocks: 2

42 changes: 42 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,50 @@
ClothingOuterCoatBomber: 3
ClothingHeadHatSantahat: 2
ClothingHeadHatXmasCrown: 2
ClothingUnderSocksHolydayStockings: 4
ClothingUnderSocksHolydayKneeSocks: 2
ClothingUnderSocksRedStockings: 2
ClothingUnderSocksRedKneeSocks: 2
ClothingUnderSocksRedSocks: 2
ClothingUnderSocksOrangeStockings: 2
ClothingUnderSocksOrangeKneeSocks: 2
ClothingUnderSocksOrangeSocks: 2
ClothingUnderSocksYellowStockings: 2
ClothingUnderSocksYellowKneeSocks: 2
ClothingUnderSocksYellowSocks: 2
ClothingUnderSocksGreenStockings: 2
ClothingUnderSocksGreenKneeSocks: 2
ClothingUnderSocksGreenSocks: 2
ClothingUnderSocksCyanStockings: 2
ClothingUnderSocksCyanKneeSocks: 2
ClothingUnderSocksCyanSocks: 2
ClothingUnderSocksBlueStockings: 2
ClothingUnderSocksBlueKneeSocks: 2
ClothingUnderSocksBlueSocks: 2
ClothingUnderSocksAzureStockings: 2
ClothingUnderSocksAzureKneeSocks: 2
ClothingUnderSocksAzureSocks: 2
ClothingUnderSocksPurpleStockings: 2
ClothingUnderSocksPurpleKneeSocks: 2
ClothingUnderSocksPurpleSocks: 2
ClothingUnderSocksHotpinkStockings: 2
ClothingUnderSocksHotpinkKneeSocks: 2
ClothingUnderSocksHotpinkSocks: 2
ClothingUnderSocksCoder: 2
ClothingUnderSocksPinkKneeSocks: 2
ClothingUnderSocksPinkSocks: 2
ClothingUnderSocksGreyStockings: 2
ClothingUnderSocksGreyKneeSocks: 2
ClothingUnderSocksGreySocks: 2

emaggedInventory:
ClothingNeckScarfStripedSyndieGreen: 3
ClothingNeckScarfStripedSyndieRed: 3
ClothingNeckScarfStripedCentcom: 3
ClothingUnderSocksGreenSyndieStockings: 1
ClothingUnderSocksGreenSyndieKneeSocks: 1
ClothingUnderSocksGreenSyndieSocks: 1
ClothingUnderSocksRedSyndieStockings: 1
ClothingUnderSocksRedSyndieKneeSocks: 1
ClothingUnderSocksRedSyndieSocks: 1

Loading
Loading