Всякое (#474)
* Economy price tweaks * Fix slang & crit radio & explosion immunity & tweak spiders and slimes * Fix vending message * Typo * Style
This commit is contained in:
@@ -139,7 +139,7 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager
|
|||||||
//WD-EDIT
|
//WD-EDIT
|
||||||
public string SanitizeOutSlang(string input)
|
public string SanitizeOutSlang(string input)
|
||||||
{
|
{
|
||||||
var pattern = @"([\?\!\p{L}\d'`-]+)";
|
var pattern = @"(^\!|^\?|[\p{L}\d'`-]+)";
|
||||||
|
|
||||||
var newMessage = Regex.Replace(input, pattern ,
|
var newMessage = Regex.Replace(input, pattern ,
|
||||||
match => _slangToNormal.ContainsKey(match.Groups[1].Value.ToLower()) ? _slangToNormal[match.Groups[1].Value.ToLower()] : match.Value, RegexOptions.IgnoreCase);
|
match => _slangToNormal.ContainsKey(match.Groups[1].Value.ToLower()) ? _slangToNormal[match.Groups[1].Value.ToLower()] : match.Value, RegexOptions.IgnoreCase);
|
||||||
|
|||||||
@@ -75,7 +75,11 @@ public sealed class CritMobActionsSystem : EntitySystem
|
|||||||
}
|
}
|
||||||
lastWords += "...";
|
lastWords += "...";
|
||||||
|
|
||||||
_chat.TrySendInGameICMessage(uid, lastWords, InGameICChatType.Whisper, ChatTransmitRange.Normal, checkRadioPrefix: false, ignoreActionBlocker: true);
|
// WD EDIT START
|
||||||
|
_chat.TryProccessRadioMessage(uid, lastWords, out var output, out _);
|
||||||
|
_chat.TrySendInGameICMessage(uid, output, InGameICChatType.Whisper, ChatTransmitRange.Normal, checkRadioPrefix: false, ignoreActionBlocker: true);
|
||||||
|
// WD EDIT END
|
||||||
|
|
||||||
_host.ExecuteCommand(actor.PlayerSession, "ghost");
|
_host.ExecuteCommand(actor.PlayerSession, "ghost");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -1 +1,2 @@
|
|||||||
vending-ui-credits-amount = Кредитов в автомате: { $credits }
|
vending-ui-credits-amount = Кредитов в автомате: { $credits }
|
||||||
|
vending-machine-component-no-balance = Недостаточно средств.
|
||||||
|
|||||||
@@ -42,6 +42,7 @@
|
|||||||
volume: 3
|
volume: 3
|
||||||
- type: Tag
|
- type: Tag
|
||||||
tags:
|
tags:
|
||||||
|
- DoorBumpOpener
|
||||||
- FootstepSound
|
- FootstepSound
|
||||||
- type: Butcherable
|
- type: Butcherable
|
||||||
butcheringType: Knife
|
butcheringType: Knife
|
||||||
|
|||||||
@@ -73,6 +73,8 @@
|
|||||||
- type: PhysicalComposition
|
- type: PhysicalComposition
|
||||||
materialComposition:
|
materialComposition:
|
||||||
Glass: 100
|
Glass: 100
|
||||||
|
- type: StaticPrice
|
||||||
|
price: 50
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
parent: DrinkBottleGlassBaseFull
|
parent: DrinkBottleGlassBaseFull
|
||||||
|
|||||||
@@ -530,6 +530,8 @@
|
|||||||
- id: GoldenBikeHorn
|
- id: GoldenBikeHorn
|
||||||
prob: 0.1
|
prob: 0.1
|
||||||
orGroup: GiftPool
|
orGroup: GiftPool
|
||||||
|
- type: StaticPrice
|
||||||
|
price: 30
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
id: HappyHonkMime
|
id: HappyHonkMime
|
||||||
|
|||||||
@@ -952,7 +952,6 @@
|
|||||||
normalState: normal-unshaded
|
normalState: normal-unshaded
|
||||||
ejectState: eject-unshaded
|
ejectState: eject-unshaded
|
||||||
denyState: deny-unshaded
|
denyState: deny-unshaded
|
||||||
priceMultiplier: 1.0
|
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
sprite: Structures/Machines/VendingMachines/sustenance.rsi
|
sprite: Structures/Machines/VendingMachines/sustenance.rsi
|
||||||
layers:
|
layers:
|
||||||
|
|||||||
@@ -71,6 +71,26 @@
|
|||||||
- type: AntiRottingContainer
|
- type: AntiRottingContainer
|
||||||
- type: StaticPrice
|
- type: StaticPrice
|
||||||
price: 200
|
price: 200
|
||||||
|
- type: Damageable
|
||||||
|
damageContainer: Inorganic
|
||||||
|
damageModifierSet: Metallic
|
||||||
|
- type: Destructible
|
||||||
|
thresholds:
|
||||||
|
- trigger:
|
||||||
|
!type:DamageTrigger
|
||||||
|
damage: 200
|
||||||
|
behaviors:
|
||||||
|
- !type:DoActsBehavior
|
||||||
|
acts: [ "Destruction" ]
|
||||||
|
- trigger:
|
||||||
|
!type:DamageTrigger
|
||||||
|
damage: 100
|
||||||
|
behaviors:
|
||||||
|
- !type:DoActsBehavior
|
||||||
|
acts: ["Destruction"]
|
||||||
|
- !type:PlaySoundBehavior
|
||||||
|
sound:
|
||||||
|
path: /Audio/Effects/metalbreak.ogg
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
id: Crematorium
|
id: Crematorium
|
||||||
@@ -141,3 +161,23 @@
|
|||||||
False: { visible: false }
|
False: { visible: false }
|
||||||
- type: Transform
|
- type: Transform
|
||||||
anchored: true
|
anchored: true
|
||||||
|
- type: Damageable
|
||||||
|
damageContainer: Inorganic
|
||||||
|
damageModifierSet: Metallic
|
||||||
|
- type: Destructible
|
||||||
|
thresholds:
|
||||||
|
- trigger:
|
||||||
|
!type:DamageTrigger
|
||||||
|
damage: 200
|
||||||
|
behaviors:
|
||||||
|
- !type:DoActsBehavior
|
||||||
|
acts: [ "Destruction" ]
|
||||||
|
- trigger:
|
||||||
|
!type:DamageTrigger
|
||||||
|
damage: 100
|
||||||
|
behaviors:
|
||||||
|
- !type:DoActsBehavior
|
||||||
|
acts: ["Destruction"]
|
||||||
|
- !type:PlaySoundBehavior
|
||||||
|
sound:
|
||||||
|
path: /Audio/Effects/metalbreak.ogg
|
||||||
|
|||||||
Reference in New Issue
Block a user