From 06aabaf71e2df5d05aa2fdf27a8c16ffdcf78a83 Mon Sep 17 00:00:00 2001 From: RedBurningPhoenix <147742474+RedBurningPhoenix@users.noreply.github.com> Date: Tue, 13 Aug 2024 00:22:49 +0500 Subject: [PATCH] =?UTF-8?q?=D0=92=D1=8B=D0=BD=D0=BE=D1=81=20=D0=A2=D1=80?= =?UTF-8?q?=D0=B8=D1=83=D0=BC=D1=84=D0=B0=20=D0=B8=D0=B7=20=D1=80=D0=BE?= =?UTF-8?q?=D1=82=D0=B0=D1=86=D0=B8=D0=B8=20=D0=B8=20=D0=BF=D0=B0=D1=80?= =?UTF-8?q?=D0=B0=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B9?= =?UTF-8?q?=20(#615)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Triumph, Slang and Vends * govno --- .../Entities/Structures/Machines/vending_machines.yml | 4 ++-- Resources/Prototypes/Maps/Pools/White.yml | 2 +- Resources/White/ChatFilters/slang.json | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 5d9df35b40..8fc5dfebef 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -94,8 +94,8 @@ - type: ApcPowerReceiver powerLoad: 200 - type: Actions - - type: SentienceTarget - flavorKind: station-event-random-sentience-flavor-mechanical +# - type: SentienceTarget # В пизду, за это говно никто не садится и занимает место. +# flavorKind: station-event-random-sentience-flavor-mechanical - type: StaticPrice price: 100 - type: Appearance diff --git a/Resources/Prototypes/Maps/Pools/White.yml b/Resources/Prototypes/Maps/Pools/White.yml index fc1e3e7dd5..5f98d663d6 100644 --- a/Resources/Prototypes/Maps/Pools/White.yml +++ b/Resources/Prototypes/Maps/Pools/White.yml @@ -2,11 +2,11 @@ id: WhiteMapPool maps: - WonderBox - - Triumph - WhiteBox - WhiteMoose - DryDock - Meta +# - Triumph Связь утеряна # - Train # Temporary # - Scoupidia # - Bagel # Она утонула diff --git a/Resources/White/ChatFilters/slang.json b/Resources/White/ChatFilters/slang.json index d9f87cdbe4..b94072a444 100644 --- a/Resources/White/ChatFilters/slang.json +++ b/Resources/White/ChatFilters/slang.json @@ -43,6 +43,7 @@ "%яойники": "ядерные оперативники", "%уч": "ускоритель частиц", "%спс": "спасибо", + "%пж": "пожалуйста", "%плиз": "пожалуйста", "%эвак": "эвакуацию", "%вв": "высоковольтные", @@ -53,5 +54,6 @@ "%ск": "синий код", "%жк": "желтый код", "%стим": "стимулятор", - "%стимы": "стимуляторы" + "%стимы": "стимуляторы", + "#см": "супер материя" }