diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs index 7d5e24a15b..9f854d674d 100644 --- a/Content.Shared/Movement/Systems/SharedMoverController.cs +++ b/Content.Shared/Movement/Systems/SharedMoverController.cs @@ -451,6 +451,15 @@ namespace Content.Shared.Movement.Systems return true; } + //WD start + if (_inventory.TryGetSlotEntity(uid, "neck", out var neck) + && TryComp(neck, out var modifierComponent)) + { + sound = modifierComponent.FootstepSoundCollection; + return true; + } + //WD end + return TryGetFootstepSound(uid, xform, shoes != null, out sound, tileDef: tileDef); } diff --git a/Resources/Prototypes/White/Fluff/fluff.yml b/Resources/Prototypes/White/Fluff/fluff.yml index c9f6ca588a..6039acf772 100644 --- a/Resources/Prototypes/White/Fluff/fluff.yml +++ b/Resources/Prototypes/White/Fluff/fluff.yml @@ -51,16 +51,52 @@ - type: GiftIgnore # Maury +#- type: entity +# parent: ClothingUniformJumpsuitChemistry +# id: ClothingUniformJumpsuitMauryZ #Should be ClothingUniformJumpsuitMaury but i`m retard and lazy idiot +# name: Rupi's chemist uniform +# description: Обычно NanoTrasen не позволяет сотрудникам изменять выданную им униформу, но по отношению к Руперту они проявили снисходительность. +# components: +# - type: Sprite +# sprite: White/Fluff/Maury/chemshit.rsi +# - type: Clothing +# sprite: White/Fluff/Maury/chemshit.rsi + - type: entity - parent: ClothingUniformJumpsuitChemistry - id: ClothingUniformJumpsuitMauryZ #Should be ClothingUniformJumpsuitMaury but i`m retard and lazy idiot - name: Rupi's chemist uniform - description: Обычно NanoTrasen не позволяет сотрудникам изменять выданную им униформу, но по отношению к Руперту они проявили снисходительность. + parent: ClothingUniformJumpsuitColorGrey + id: ClothingUniformJumpsuitColorMaury #Should be ClothingUniformJumpsuitMaury but i`m retard and lazy idiot + name: красное худи + description: Любимая худи Рупи с шортиками. Довольно странно, что NanoTrasen разрешила ему в очередной раз видоизменить свою форму, хотя и с условиями. components: - type: Sprite - sprite: White/Fluff/Maury/chemshit.rsi + sprite: White/Fluff/Maury/hoodie.rsi - type: Clothing - sprite: White/Fluff/Maury/chemshit.rsi + sprite: White/Fluff/Maury/hoodie.rsi + +- type: entity + parent: ClothingShoesColorBlack + id: ClothingShoesMaurySneakers + name: кеды + description: Крутые высокие кеды некой дочерней компании демократической страны, которая производила кеды с XX века. + components: + - type: Sprite + sprite: White/Fluff/Maury/sneakers.rsi + - type: Clothing + sprite: White/Fluff/Maury/sneakers.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckMauryChoker + name: кошачий ошейник + description: Кошачий ошейник с колокольчиком. Мило дзынькает и выглядит, но Рупи не даст вам его на себя надеть. + components: + - type: Sprite + sprite: White/Fluff/Maury/choker.rsi + - type: Clothing + sprite: White/Fluff/Maury/choker.rsi + - type: FootstepModifier + footstepSoundCollection: + collection: FootstepJester # YouWellLeer diff --git a/Resources/Prototypes/White/Fluff/sponsor.yml b/Resources/Prototypes/White/Fluff/sponsor.yml index 49770204e1..c40ff7d523 100644 --- a/Resources/Prototypes/White/Fluff/sponsor.yml +++ b/Resources/Prototypes/White/Fluff/sponsor.yml @@ -12,9 +12,24 @@ whitelistJobs: [Captain, HeadOfPersonnel, ChiefEngineer, ChiefMedicalOfficer, ResearchDirector, HeadOfSecurity, Quartermaster] # Maury +#- type: loadout +# id: ClothingUniformJumpsuitMaury #Should be ClothingUniformMauryLoadout but like i said i`m retard +# entity: ClothingUniformJumpsuitMauryZ +# sponsorOnly: true + - type: loadout - id: ClothingUniformJumpsuitMaury #Should be ClothingUniformMauryLoadout but like i said i`m retard - entity: ClothingUniformJumpsuitMauryZ + id: MauryHoodieRed + entity: ClothingUniformJumpsuitColorMaury + sponsorOnly: true + +- type: loadout + id: MaurySneakersKedi + entity: ClothingShoesMaurySneakers + sponsorOnly: true + +- type: loadout + id: MauryKolokolchik + entity: ClothingNeckMauryChoker sponsorOnly: true # YouWellLeer diff --git a/Resources/Textures/White/Fluff/Maury/choker.rsi/equipped-NECK.png b/Resources/Textures/White/Fluff/Maury/choker.rsi/equipped-NECK.png new file mode 100644 index 0000000000..8801650895 Binary files /dev/null and b/Resources/Textures/White/Fluff/Maury/choker.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/White/Fluff/Maury/choker.rsi/icon.png b/Resources/Textures/White/Fluff/Maury/choker.rsi/icon.png new file mode 100644 index 0000000000..52e6faccde Binary files /dev/null and b/Resources/Textures/White/Fluff/Maury/choker.rsi/icon.png differ diff --git a/Resources/Textures/White/Fluff/Maury/choker.rsi/inhand-left.png b/Resources/Textures/White/Fluff/Maury/choker.rsi/inhand-left.png new file mode 100644 index 0000000000..8ac5b790a0 Binary files /dev/null and b/Resources/Textures/White/Fluff/Maury/choker.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Fluff/Maury/choker.rsi/inhand-right.png b/Resources/Textures/White/Fluff/Maury/choker.rsi/inhand-right.png new file mode 100644 index 0000000000..6a70cc715d Binary files /dev/null and b/Resources/Textures/White/Fluff/Maury/choker.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Fluff/Maury/choker.rsi/meta.json b/Resources/Textures/White/Fluff/Maury/choker.rsi/meta.json new file mode 100644 index 0000000000..c43b862165 --- /dev/null +++ b/Resources/Textures/White/Fluff/Maury/choker.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "@.m4ury", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Fluff/Maury/hoodie.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/White/Fluff/Maury/hoodie.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..16013b6c91 Binary files /dev/null and b/Resources/Textures/White/Fluff/Maury/hoodie.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/White/Fluff/Maury/hoodie.rsi/icon.png b/Resources/Textures/White/Fluff/Maury/hoodie.rsi/icon.png new file mode 100644 index 0000000000..d242378a4d Binary files /dev/null and b/Resources/Textures/White/Fluff/Maury/hoodie.rsi/icon.png differ diff --git a/Resources/Textures/White/Fluff/Maury/hoodie.rsi/inhand-left.png b/Resources/Textures/White/Fluff/Maury/hoodie.rsi/inhand-left.png new file mode 100644 index 0000000000..1bdf4b69b7 Binary files /dev/null and b/Resources/Textures/White/Fluff/Maury/hoodie.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Fluff/Maury/hoodie.rsi/inhand-right.png b/Resources/Textures/White/Fluff/Maury/hoodie.rsi/inhand-right.png new file mode 100644 index 0000000000..5db9f06203 Binary files /dev/null and b/Resources/Textures/White/Fluff/Maury/hoodie.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Fluff/Maury/hoodie.rsi/meta.json b/Resources/Textures/White/Fluff/Maury/hoodie.rsi/meta.json new file mode 100644 index 0000000000..3812b62b67 --- /dev/null +++ b/Resources/Textures/White/Fluff/Maury/hoodie.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "@.m4ury", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Fluff/Maury/sneakers.rsi/equipped-FEET-body-slim.png b/Resources/Textures/White/Fluff/Maury/sneakers.rsi/equipped-FEET-body-slim.png new file mode 100644 index 0000000000..7140f3cf10 Binary files /dev/null and b/Resources/Textures/White/Fluff/Maury/sneakers.rsi/equipped-FEET-body-slim.png differ diff --git a/Resources/Textures/White/Fluff/Maury/sneakers.rsi/equipped-FEET.png b/Resources/Textures/White/Fluff/Maury/sneakers.rsi/equipped-FEET.png new file mode 100644 index 0000000000..7140f3cf10 Binary files /dev/null and b/Resources/Textures/White/Fluff/Maury/sneakers.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/White/Fluff/Maury/sneakers.rsi/icon.png b/Resources/Textures/White/Fluff/Maury/sneakers.rsi/icon.png new file mode 100644 index 0000000000..d7a9581d0d Binary files /dev/null and b/Resources/Textures/White/Fluff/Maury/sneakers.rsi/icon.png differ diff --git a/Resources/Textures/White/Fluff/Maury/sneakers.rsi/inhand-left.png b/Resources/Textures/White/Fluff/Maury/sneakers.rsi/inhand-left.png new file mode 100644 index 0000000000..9c9db1d879 Binary files /dev/null and b/Resources/Textures/White/Fluff/Maury/sneakers.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Fluff/Maury/sneakers.rsi/inhand-right.png b/Resources/Textures/White/Fluff/Maury/sneakers.rsi/inhand-right.png new file mode 100644 index 0000000000..27f343e931 Binary files /dev/null and b/Resources/Textures/White/Fluff/Maury/sneakers.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Fluff/Maury/sneakers.rsi/meta.json b/Resources/Textures/White/Fluff/Maury/sneakers.rsi/meta.json new file mode 100644 index 0000000000..94a8766dd8 --- /dev/null +++ b/Resources/Textures/White/Fluff/Maury/sneakers.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "@.m4ury", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "equipped-FEET-body-slim", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}