diff --git a/Resources/Audio/White/Voice/SpeechSounds/kazooie/ehh.ogg b/Resources/Audio/White/Voice/SpeechSounds/kazooie/ehh.ogg new file mode 100644 index 0000000000..c0b5591ed5 Binary files /dev/null and b/Resources/Audio/White/Voice/SpeechSounds/kazooie/ehh.ogg differ diff --git a/Resources/Audio/White/Voice/SpeechSounds/kazooie/ehh2.ogg b/Resources/Audio/White/Voice/SpeechSounds/kazooie/ehh2.ogg new file mode 100644 index 0000000000..bb0925b68b Binary files /dev/null and b/Resources/Audio/White/Voice/SpeechSounds/kazooie/ehh2.ogg differ diff --git a/Resources/Audio/White/Voice/SpeechSounds/kazooie/ehh3.ogg b/Resources/Audio/White/Voice/SpeechSounds/kazooie/ehh3.ogg new file mode 100644 index 0000000000..970a2040bc Binary files /dev/null and b/Resources/Audio/White/Voice/SpeechSounds/kazooie/ehh3.ogg differ diff --git a/Resources/Locale/ru-RU/_white/accent/gondola.ftl b/Resources/Locale/ru-RU/_white/accent/gondola.ftl new file mode 100644 index 0000000000..c99156eb8b --- /dev/null +++ b/Resources/Locale/ru-RU/_white/accent/gondola.ftl @@ -0,0 +1 @@ +accent-words-gondola-1 = ... diff --git a/Resources/Locale/ru-RU/_white/chat/managers/chat-manager.ftl b/Resources/Locale/ru-RU/_white/chat/managers/chat-manager.ftl new file mode 100644 index 0000000000..2474e9ff61 --- /dev/null +++ b/Resources/Locale/ru-RU/_white/chat/managers/chat-manager.ftl @@ -0,0 +1,3 @@ +chat-speech-verb-name-gondola = Гондола +chat-speech-verb-gondola-1 = уставляется взглядом +chat-speech-verb-gondola-2 = тяжело дышит diff --git a/Resources/Locale/ru-RU/_white/reagents/fun.ftl b/Resources/Locale/ru-RU/_white/reagents/fun.ftl new file mode 100644 index 0000000000..a6ac973807 --- /dev/null +++ b/Resources/Locale/ru-RU/_white/reagents/fun.ftl @@ -0,0 +1 @@ +reagent-popup-tranquility = Вы чувствуете себя странно спокойными... diff --git a/Resources/Locale/ru-RU/_white/reagents/meta/physical-desc.ftl b/Resources/Locale/ru-RU/_white/reagents/meta/physical-desc.ftl new file mode 100644 index 0000000000..4234c871e0 --- /dev/null +++ b/Resources/Locale/ru-RU/_white/reagents/meta/physical-desc.ftl @@ -0,0 +1 @@ +reagent-physical-desc-calming = успокаивающий diff --git a/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl new file mode 100644 index 0000000000..6d7945e70e --- /dev/null +++ b/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl @@ -0,0 +1,2 @@ +uplink-gondola-name = Ящик с Гондолой +uplink-gondola-desc = Ящик, содержащий одну стандартную Гондолу. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/consumable/food/meat.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/consumable/food/meat.ftl new file mode 100644 index 0000000000..55a6d6c194 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/consumable/food/meat.ftl @@ -0,0 +1,5 @@ +ent-FoodMeatGondola = сырое мясо Гондолы + .desc = Ты монстр. + +ent-FoodMeatGondolaCooked = стейк из Гондолы + .desc = Приготовленное мясо Гондолы... diff --git a/Resources/Prototypes/_White/Accents/full_replacements.yml b/Resources/Prototypes/_White/Accents/full_replacements.yml new file mode 100644 index 0000000000..d952d62195 --- /dev/null +++ b/Resources/Prototypes/_White/Accents/full_replacements.yml @@ -0,0 +1,4 @@ +- type: accent + id: gondola + fullReplacements: + - accent-words-gondola-1 diff --git a/Resources/Prototypes/_White/Catalog/Fills/Crates/npc.yml b/Resources/Prototypes/_White/Catalog/Fills/Crates/npc.yml new file mode 100644 index 0000000000..732bbcff20 --- /dev/null +++ b/Resources/Prototypes/_White/Catalog/Fills/Crates/npc.yml @@ -0,0 +1,9 @@ +- type: entity + parent: CrateLivestock + id: CrateNPCGondola + name: ящик с Гондолой + description: Ящик содержащий в себе Гондолу. + components: + - type: StorageFill + contents: + - id: MobGondola diff --git a/Resources/Prototypes/_White/Catalog/uplink.yml b/Resources/Prototypes/_White/Catalog/uplink.yml index 9e8d094515..4eb6ad56db 100644 --- a/Resources/Prototypes/_White/Catalog/uplink.yml +++ b/Resources/Prototypes/_White/Catalog/uplink.yml @@ -292,3 +292,14 @@ categories: - UplinkDisruption saleLimit: 2 + +- type: listing + id: UplinkCrateNPCGondola + name: uplink-gondola-name + description: uplink-gondola-desc + icon: { sprite: /Textures/White/Mobs/Animals/gondola.rsi, state: icon } + productEntity: CrateNPCGondola + cost: + Telecrystal: 2 + categories: + - UplinkDisruption diff --git a/Resources/Prototypes/_White/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/_White/Entities/Markers/Spawners/mobs.yml new file mode 100644 index 0000000000..cb2386e49c --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Markers/Spawners/mobs.yml @@ -0,0 +1,13 @@ +- type: entity + parent: MarkerBase + id: SpawnMobGondola + name: спавнер Гондола + components: + - type: Sprite + layers: + - state: green + - sprite: White/Mobs/Animals/gondola.rsi + state: icon + - type: ConditionalSpawner + prototypes: + - MobGondola diff --git a/Resources/Prototypes/_White/Entities/Mobs/NPCs/gondola.yml b/Resources/Prototypes/_White/Entities/Mobs/NPCs/gondola.yml new file mode 100644 index 0000000000..c5727ccdb1 --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Mobs/NPCs/gondola.yml @@ -0,0 +1,96 @@ +- type: entity + parent: + - MobRespirator + - MobAtmosStandard + - BaseSimpleMob + - MobBloodstream + - MobFlammable + id: MobGondola + name: Гондола + description: Не имея рук, он воплощает даосский принцип у-вэй (бездействия), а выражение его улыбающегося лица показывает его полное принятие мира таким, какой он есть. + components: + - type: FloatingVisuals + - type: RotationVisuals + defaultRotation: 90 + horizontalRotation: 90 + - type: Sprite + sprite: White/Mobs/Animals/gondola.rsi + layers: + - state: gondola_body_medium + map: [ "enum.DamageStateVisualLayers.Base" ] + color: "#6e4e40" + shader: unshaded + - state: gondola_moustache_large_short + map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ] + shader: unshaded + - type: RandomSprite + available: + - enum.DamageStateVisualLayers.Base: + gondola_body_long: GondolaBrowns + gondola_body_medium: GondolaBrowns + enum.DamageStateVisualLayers.BaseUnshaded: + gondola_moustache_large: "" + gondola_moustache_small: "" + - enum.DamageStateVisualLayers.Base: + gondola_body_medium: GondolaBrowns + gondola_body_short: GondolaBrowns + enum.DamageStateVisualLayers.BaseUnshaded: + gondola_moustache_large_short: "" + gondola_moustache_small_short: "" + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.2 + density: 50 + mask: + - MobMask + layer: + - MobLayer + - type: Butcherable + spawned: + - id: FoodMeatGondola + amount: 3 + - type: Bloodstream + bloodMaxVolume: 150 + - type: Damageable + damageContainer: Biological + damageModifierSet: Scale + - type: Tag + tags: + - VimPilot + - type: MovementSpeedModifier + baseWalkSpeed: 1 + baseSprintSpeed: 2 + - type: Speech + speechVerb: Gondola + speechSounds: GoofyAhh + - type: ReplacementAccent + accent: gondola + - type: HTN + rootTask: + task: IdleCompound + - type: Body + prototype: Animal + - type: NameIdentifier + group: GenericNumber + - type: SlowOnDamage + speedModifierThresholds: + 60: 0.7 + 80: 0.5 + - type: MobPrice + price: 1000 + - type: Perishable + - type: GhostRole + makeSentient: true + allowSpeech: true + allowMovement: true + name: Гондола + description: Ты Гондола. + raffle: + settings: default + - type: GhostTakeoverAvailable + - type: NpcFactionMember + factions: + - Passive diff --git a/Resources/Prototypes/_White/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/_White/Entities/Objects/Consumable/Food/meat.yml new file mode 100644 index 0000000000..9304233c02 --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Objects/Consumable/Food/meat.yml @@ -0,0 +1,54 @@ +# RAW + +- type: entity + parent: FoodMeatRawBase + id: FoodMeatGondola + name: raw Gondola meat + description: You're a monster. + components: + - type: Sprite + state: plain + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: UncookedAnimalProteins + Quantity: 9 + - ReagentId: Fat + Quantity: 9 + - ReagentId: Tranquility + Quantity: 10 + - type: Construction + graph: GondolaSteak + node: start + defaultTarget: gondola steak + +# COOKED + +- type: entity + parent: FoodMeatBase + id: FoodMeatGondolaCooked + name: Gondola steak + description: Cooked Gondola meat... + components: + - type: Tag + tags: + - Cooked + - Meat + - Steak + - type: Sprite + layers: + - state: plain-cooked + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Protein + Quantity: 5 + - ReagentId: Tranquility + Quantity: 15 + - type: Construction + graph: GondolaSteak + node: gondola steak diff --git a/Resources/Prototypes/_White/Palettes/sixteen.yml b/Resources/Prototypes/_White/Palettes/sixteen.yml new file mode 100644 index 0000000000..724823c34c --- /dev/null +++ b/Resources/Prototypes/_White/Palettes/sixteen.yml @@ -0,0 +1,8 @@ +- type: palette + id: GondolaBrowns + name: коричневая Гондола + colors: + brown: "#6e4e40" + brown1: "#593d31" + brown2: "#6e4330" + brown3: "#73422d" diff --git a/Resources/Prototypes/_White/Polymorphs/polymorph.yml b/Resources/Prototypes/_White/Polymorphs/polymorph.yml new file mode 100644 index 0000000000..1fab49fc98 --- /dev/null +++ b/Resources/Prototypes/_White/Polymorphs/polymorph.yml @@ -0,0 +1,10 @@ +- type: polymorph + id: Gondola + configuration: + entity: MobGondola + forced: true + transferName: false + transferHumanoidAppearance: false + inventory: Drop + revertOnDeath: true + revertOnCrit: false diff --git a/Resources/Prototypes/_White/Reagents/fun.yml b/Resources/Prototypes/_White/Reagents/fun.yml new file mode 100644 index 0000000000..0079d99d5e --- /dev/null +++ b/Resources/Prototypes/_White/Reagents/fun.yml @@ -0,0 +1,40 @@ +- type: reagent + id: Tranquility + group: Toxins + name: reagent-name-tranquility + desc: reagent-desc-tranquility + physicalDesc: reagent-physical-desc-calming + flavor: mindful + color: "#915E48" + metabolisms: + Poison: + metabolismRate: 0.25 + effects: + - !type:PopupMessage + type: Local + messages: [ "reagent-popup-tranquility" ] + probability: 0.2 + - !type:GenericStatusEffect + key: Muted + component: Muted + refresh: false + type: Add + conditions: + - !type:ReagentThreshold + min: 5 + - !type:GenericStatusEffect + key: Pacified + component: Pacified + refresh: false + type: Add + conditions: + - !type:ReagentThreshold + min: 10 + - !type:Polymorph + prototype: Gondola + conditions: + - !type:OrganType + type: Animal + shouldHave: false + - !type:ReagentThreshold + min: 30 diff --git a/Resources/Prototypes/_White/Recipes/Construction/Graphs/food/steak.yml b/Resources/Prototypes/_White/Recipes/Construction/Graphs/food/steak.yml new file mode 100644 index 0000000000..25e6d20594 --- /dev/null +++ b/Resources/Prototypes/_White/Recipes/Construction/Graphs/food/steak.yml @@ -0,0 +1,15 @@ +- type: constructionGraph + id: GondolaSteak + start: start + graph: + - node: start + edges: + - to: gondola steak + completed: + - !type:PlaySound + sound: /Audio/Effects/sizzle.ogg + steps: + - minTemperature: 345 + + - node: gondola steak + entity: FoodMeatGondolaCooked diff --git a/Resources/Prototypes/_White/Voice/speech_sounds/speech_sounds.yml b/Resources/Prototypes/_White/Voice/speech_sounds/speech_sounds.yml new file mode 100644 index 0000000000..21fdf213b0 --- /dev/null +++ b/Resources/Prototypes/_White/Voice/speech_sounds/speech_sounds.yml @@ -0,0 +1,8 @@ +- type: speechSounds + id: GoofyAhh + saySound: + path: /Audio/White/Voice/SpeechSounds/kazooie/ehh.ogg + askSound: + path: /Audio/White/Voice/SpeechSounds/kazooie/ehh3.ogg + exclaimSound: + path: /Audio/White/Voice/SpeechSounds/kazooie/ehh2.ogg diff --git a/Resources/Prototypes/_White/Voice/speech_verbs.yml b/Resources/Prototypes/_White/Voice/speech_verbs.yml new file mode 100644 index 0000000000..cdf8d4d807 --- /dev/null +++ b/Resources/Prototypes/_White/Voice/speech_verbs.yml @@ -0,0 +1,6 @@ +- type: speechVerb + id: Gondola + name: chat-speech-verb-name-gondola + speechVerbStrings: + - chat-speech-verb-gondola-1 + - chat-speech-verb-gondola-2 diff --git a/Resources/Textures/White/Mobs/Animals/gondola.rsi/gondola_body_long.png b/Resources/Textures/White/Mobs/Animals/gondola.rsi/gondola_body_long.png new file mode 100644 index 0000000000..d76d8bcac8 Binary files /dev/null and b/Resources/Textures/White/Mobs/Animals/gondola.rsi/gondola_body_long.png differ diff --git a/Resources/Textures/White/Mobs/Animals/gondola.rsi/gondola_body_medium.png b/Resources/Textures/White/Mobs/Animals/gondola.rsi/gondola_body_medium.png new file mode 100644 index 0000000000..5a31cce922 Binary files /dev/null and b/Resources/Textures/White/Mobs/Animals/gondola.rsi/gondola_body_medium.png differ diff --git a/Resources/Textures/White/Mobs/Animals/gondola.rsi/gondola_body_short.png b/Resources/Textures/White/Mobs/Animals/gondola.rsi/gondola_body_short.png new file mode 100644 index 0000000000..0dbda000c8 Binary files /dev/null and b/Resources/Textures/White/Mobs/Animals/gondola.rsi/gondola_body_short.png differ diff --git a/Resources/Textures/White/Mobs/Animals/gondola.rsi/gondola_moustache_large.png b/Resources/Textures/White/Mobs/Animals/gondola.rsi/gondola_moustache_large.png new file mode 100644 index 0000000000..0956b1687a Binary files /dev/null and b/Resources/Textures/White/Mobs/Animals/gondola.rsi/gondola_moustache_large.png differ diff --git a/Resources/Textures/White/Mobs/Animals/gondola.rsi/gondola_moustache_large_short.png b/Resources/Textures/White/Mobs/Animals/gondola.rsi/gondola_moustache_large_short.png new file mode 100644 index 0000000000..f1455139f9 Binary files /dev/null and b/Resources/Textures/White/Mobs/Animals/gondola.rsi/gondola_moustache_large_short.png differ diff --git a/Resources/Textures/White/Mobs/Animals/gondola.rsi/gondola_moustache_small.png b/Resources/Textures/White/Mobs/Animals/gondola.rsi/gondola_moustache_small.png new file mode 100644 index 0000000000..6150f04e4c Binary files /dev/null and b/Resources/Textures/White/Mobs/Animals/gondola.rsi/gondola_moustache_small.png differ diff --git a/Resources/Textures/White/Mobs/Animals/gondola.rsi/gondola_moustache_small_short.png b/Resources/Textures/White/Mobs/Animals/gondola.rsi/gondola_moustache_small_short.png new file mode 100644 index 0000000000..383ea4e747 Binary files /dev/null and b/Resources/Textures/White/Mobs/Animals/gondola.rsi/gondola_moustache_small_short.png differ diff --git a/Resources/Textures/White/Mobs/Animals/gondola.rsi/icon.png b/Resources/Textures/White/Mobs/Animals/gondola.rsi/icon.png new file mode 100644 index 0000000000..9f6b8b20af Binary files /dev/null and b/Resources/Textures/White/Mobs/Animals/gondola.rsi/icon.png differ diff --git a/Resources/Textures/White/Mobs/Animals/gondola.rsi/meta.json b/Resources/Textures/White/Mobs/Animals/gondola.rsi/meta.json new file mode 100644 index 0000000000..a944406ab8 --- /dev/null +++ b/Resources/Textures/White/Mobs/Animals/gondola.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from /TG/ station | Edited by PuroSlavKing (Github) ", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "gondola_body_long", + "directions": 4 + }, + { + "name": "gondola_body_medium", + "directions": 4 + }, + { + "name": "gondola_body_short", + "directions": 4 + }, + { + "name": "gondola_moustache_large", + "directions": 4 + }, + { + "name": "gondola_moustache_small", + "directions": 4 + }, + { + "name": "gondola_moustache_large_short", + "directions": 4 + }, + { + "name": "gondola_moustache_small_short", + "directions": 4 + } + ] +}