фиксы апстрима
This commit is contained in:
parent
22e0c668fd
commit
61d66cfbc1
30 changed files with 270 additions and 259 deletions
|
|
@ -139,7 +139,6 @@ namespace Content.Server.Entry
|
|||
_ghostKick.Initialize();
|
||||
_serverInfo.Initialize();
|
||||
_serverApi.Initialize();
|
||||
IoCManager.Resolve<PlayerCacheManager>().Initialize(); // Sunrise-Edit
|
||||
|
||||
// Sunrise-Sponsors-Start
|
||||
SunriseServerEntry.Init();
|
||||
|
|
|
|||
|
|
@ -55,6 +55,8 @@ namespace Content.Shared.Localizations
|
|||
|
||||
_loc.AddFunction(cultureEn, "MAKEPLURAL", FormatMakePlural);
|
||||
_loc.AddFunction(cultureEn, "MANY", FormatMany);
|
||||
_loc.AddFunction(cultureEn, "NATURALFIXED", FormatNaturalFixed);
|
||||
_loc.AddFunction(cultureEn, "LOC", FormatLoc);
|
||||
}
|
||||
|
||||
private ILocValue FormatMany(LocArgs args)
|
||||
|
|
|
|||
|
|
@ -5,4 +5,4 @@ metabolizer-type-mothroach = Таракамоль
|
|||
metabolizer-type-wild-slime = Дикий слайм
|
||||
metabolizer-type-felinid = Фелинид
|
||||
metabolizer-type-kobold = Кобольд
|
||||
metabolizer-type-inferior-vulpkanin = Низший вульканин
|
||||
metabolizer-type-inferior-vulpkanin = Низший вульканин
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 3
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
reactiveEffects:
|
||||
Extinguish:
|
||||
methods: [ Touch ]
|
||||
|
|
@ -35,9 +35,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 2
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
plantMetabolism:
|
||||
- !type:PlantAdjustNutrition
|
||||
amount: 0.1
|
||||
|
|
|
|||
|
|
@ -13,9 +13,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 2
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
- !type:ModifyStatusEffect
|
||||
effectProto: StatusEffectDrowsiness
|
||||
time: 2
|
||||
|
|
@ -45,9 +45,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 2
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
- !type:AdjustReagent
|
||||
reagent: Theobromine
|
||||
amount: 0.05
|
||||
|
|
@ -66,9 +66,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 1
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
|
||||
- type: reagent
|
||||
id: CoconutWater
|
||||
|
|
@ -84,9 +84,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 4 # Coconut water is 94% water
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
|
||||
- type: reagent
|
||||
id: CreamOfCoconut
|
||||
|
|
@ -102,9 +102,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 2
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
|
||||
- type: reagent
|
||||
id: CafeLatte
|
||||
|
|
@ -126,9 +126,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 2
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
- !type:ModifyStatusEffect
|
||||
effectProto: StatusEffectDrowsiness
|
||||
time: 2
|
||||
|
|
@ -186,9 +186,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 2
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
- !type:AdjustReagent
|
||||
reagent: Theobromine
|
||||
amount: 0.05
|
||||
|
|
@ -232,9 +232,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 2
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
- !type:AdjustReagent
|
||||
reagent: Theobromine
|
||||
amount: 0.05
|
||||
|
|
@ -253,9 +253,9 @@
|
|||
effects:
|
||||
- !type:SatiateThirst
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
Poison:
|
||||
effects:
|
||||
- !type:HealthChange
|
||||
|
|
@ -284,9 +284,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 2
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
|
||||
- type: reagent
|
||||
id: Milk
|
||||
|
|
@ -308,9 +308,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 4
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
|
||||
- type: reagent
|
||||
id: MilkGoat
|
||||
|
|
@ -333,9 +333,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 4
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
|
||||
- type: reagent
|
||||
id: MilkSoy
|
||||
|
|
@ -372,9 +372,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 2
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
# TODO heal mimes
|
||||
|
||||
- type: reagent
|
||||
|
|
@ -398,9 +398,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 6
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
- !type:ModifyStatusEffect
|
||||
effectProto: StatusEffectDrowsiness
|
||||
time: 3
|
||||
|
|
@ -443,9 +443,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 2
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
- !type:ModifyStatusEffect
|
||||
effectProto: StatusEffectDrowsiness
|
||||
time: 2
|
||||
|
|
@ -466,9 +466,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 2
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
- !type:AdjustReagent
|
||||
reagent: Theobromine
|
||||
amount: 0.05
|
||||
|
|
@ -515,9 +515,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 4
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
Gas:
|
||||
effects:
|
||||
- !type:HealthChange
|
||||
|
|
@ -607,9 +607,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 4
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
- !type:AdjustReagent
|
||||
reagent: Theobromine
|
||||
amount: 0.05
|
||||
|
|
@ -628,9 +628,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 1
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
fizziness: 0.3
|
||||
|
||||
- type: reagent
|
||||
|
|
@ -688,9 +688,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 0.6
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
|
||||
- type: reagent
|
||||
id: Tortuga
|
||||
|
|
|
|||
|
|
@ -58,9 +58,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 2
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
- !type:AdjustReagent
|
||||
reagent: Oculine
|
||||
amount: 0.5
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 2
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
- !type:ModifyStatusEffect
|
||||
effectProto: StatusEffectDrowsiness
|
||||
time: 1
|
||||
|
|
@ -47,9 +47,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 4
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
|
||||
- type: reagent
|
||||
id: ChangelingSting
|
||||
|
|
@ -89,9 +89,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 2
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
- !type:ModifyStatusEffect
|
||||
effectProto: StatusEffectDrowsiness
|
||||
time: 2
|
||||
|
|
@ -221,9 +221,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 4
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
|
||||
- type: reagent
|
||||
id: SpaceMountainWind
|
||||
|
|
@ -284,9 +284,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 2
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
- !type:AdjustReagent
|
||||
reagent: Theobromine
|
||||
amount: 0.1
|
||||
|
|
|
|||
|
|
@ -102,9 +102,8 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 1
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
footstepSound:
|
||||
collection: FootstepSlime
|
||||
params:
|
||||
|
|
@ -170,9 +169,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 1.5
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
# Dragon doesn't require airloss healing, so omnizine is still best for humans.
|
||||
- !type:ModifyBloodLevel
|
||||
amount: 3
|
||||
|
|
@ -232,9 +231,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 0.5
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
- !type:AdjustReagent
|
||||
reagent: Nutriment
|
||||
amount: 0.1
|
||||
|
|
|
|||
|
|
@ -168,7 +168,8 @@
|
|||
- !type:Electrocute
|
||||
probability: 0.35
|
||||
conditions: # Sunrise-Edit
|
||||
- !type:ReagentThreshold
|
||||
- !type:ReagentCondition
|
||||
reagent: Licoxide
|
||||
min: 1
|
||||
|
||||
- type: reagent
|
||||
|
|
|
|||
|
|
@ -369,7 +369,8 @@
|
|||
#Sunrise-Start
|
||||
- !type:HealthChange
|
||||
conditions:
|
||||
- !type:ReagentThreshold
|
||||
- !type:ReagentCondition
|
||||
reagent: Epinephrine
|
||||
min: 5
|
||||
damage:
|
||||
types:
|
||||
|
|
@ -755,9 +756,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 6
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
- !type:ModifyBloodLevel
|
||||
amount: 6
|
||||
|
||||
|
|
@ -1240,7 +1241,8 @@
|
|||
# Sunrise-Start
|
||||
- !type:DeconvertCultist
|
||||
conditions:
|
||||
- !type:ReagentThreshold
|
||||
- !type:ReagentCondition
|
||||
reagent: Holywater
|
||||
min: 10 # Пусть культистов крови не будут выбивать сразу из раунда, а попробуют перевести в нормальных людей
|
||||
# Sunrise-End
|
||||
Medicine:
|
||||
|
|
@ -1248,15 +1250,15 @@
|
|||
#If vampire
|
||||
- !type:HealthChange
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Vampire
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Vampire ]
|
||||
damage:
|
||||
types:
|
||||
Heat: 2
|
||||
- !type:Emote
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Vampire
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Vampire ]
|
||||
emote: Scream
|
||||
probability: 0.3
|
||||
#If not vampire
|
||||
|
|
@ -1264,9 +1266,9 @@
|
|||
conditions:
|
||||
- !type:TotalDamageCondition
|
||||
max: 50
|
||||
- !type:OrganType
|
||||
type: Vampire
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Vampire ]
|
||||
inverted: true
|
||||
damage:
|
||||
types:
|
||||
# Sunrise-Start
|
||||
|
|
@ -1626,7 +1628,7 @@
|
|||
effects:
|
||||
- !type:HealthChange
|
||||
conditions:
|
||||
- !type:Temperature
|
||||
- !type:TemperatureCondition
|
||||
max: 180.0
|
||||
damage:
|
||||
groups:
|
||||
|
|
@ -1638,7 +1640,7 @@
|
|||
- !type:ReduceRotting
|
||||
seconds: 1
|
||||
conditions:
|
||||
- !type:Temperature
|
||||
- !type:TemperatureCondition
|
||||
max: 180.0
|
||||
- !type:MobStateCondition
|
||||
mobstate: Dead
|
||||
|
|
@ -1658,7 +1660,7 @@
|
|||
effects:
|
||||
- !type:HealthChange
|
||||
conditions:
|
||||
- !type:Temperature
|
||||
- !type:TemperatureCondition
|
||||
max: 213.0
|
||||
damage:
|
||||
types:
|
||||
|
|
@ -1679,7 +1681,7 @@
|
|||
effects:
|
||||
- !type:HealthChange
|
||||
conditions:
|
||||
- !type:Temperature
|
||||
- !type:TemperatureCondition
|
||||
max: 200.0
|
||||
damage:
|
||||
types:
|
||||
|
|
@ -1700,7 +1702,7 @@
|
|||
effects:
|
||||
- !type:HealthChange
|
||||
conditions:
|
||||
- !type:Temperature
|
||||
- !type:TemperatureCondition
|
||||
max: 200.0
|
||||
damage:
|
||||
groups:
|
||||
|
|
|
|||
|
|
@ -57,18 +57,20 @@
|
|||
- !type:ReagentCondition
|
||||
reagent: Desoxyephedrine
|
||||
min: 20
|
||||
- !type:ModifyBleedAmount # Sunrise-Start # Кровотечение(кровь из носа) из-за того что мет повышает давление
|
||||
- !type:ModifyBleed # Sunrise-Start # Кровотечение(кровь из носа) из-за того что мет повышает давление
|
||||
amount: 0.4
|
||||
conditions:
|
||||
- !type:ReagentThreshold
|
||||
min: 10
|
||||
- !type:ReagentCondition
|
||||
reagent: Desoxyephedrine
|
||||
min: 10
|
||||
- !type:PopupMessage # От мета боль в груди и учащенное сердцебиение
|
||||
visualType: Medium
|
||||
messages: ["ephedrine-effect-tight-pain", "ephedrine-effect-heart-pounds"]
|
||||
type: Local
|
||||
probability: 0.5
|
||||
conditions:
|
||||
- !type:ReagentThreshold
|
||||
- !type:ReagentCondition
|
||||
reagent: Desoxyephedrine
|
||||
min: 10
|
||||
- !type:Drunk # Пусть кружит голову от подобного вещества
|
||||
boozePower: 5 # Sunrise-End
|
||||
|
|
@ -216,9 +218,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 1
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
- !type:HealthChange
|
||||
conditions:
|
||||
- !type:TotalDamageCondition
|
||||
|
|
|
|||
|
|
@ -528,9 +528,8 @@
|
|||
amount: 0.25
|
||||
- !type:AdjustReagent
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Vampire
|
||||
shouldHave: true
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Vampire ]
|
||||
reagent: Protein
|
||||
amount: 0.5
|
||||
|
||||
|
|
@ -578,9 +577,9 @@
|
|||
component: Pacified
|
||||
time: 2
|
||||
conditions:
|
||||
- !type:ReagentThreshold
|
||||
reagent: Pax
|
||||
min: 1
|
||||
- !type:ReagentCondition
|
||||
reagent: Pax
|
||||
min: 1
|
||||
|
||||
- type: reagent
|
||||
id: Honk
|
||||
|
|
@ -686,7 +685,8 @@
|
|||
- !type:Electrocute
|
||||
probability: 0.8
|
||||
conditions: # Sunrise-Edit
|
||||
- !type:ReagentThreshold
|
||||
- !type:ReagentCondition
|
||||
reagent: Tazinide
|
||||
min: 1
|
||||
|
||||
- type: reagent
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
effects:
|
||||
- !type:HealthChange
|
||||
conditions:
|
||||
- !type:HasTag
|
||||
- !type:TagCondition
|
||||
tag: "Cultist"
|
||||
damage:
|
||||
groups:
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
Brute: -2
|
||||
- !type:HealthChange
|
||||
conditions:
|
||||
- !type:HasTag
|
||||
- !type:TagCondition
|
||||
tag: "Cultist"
|
||||
invert: true
|
||||
damage:
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
metabolisms:
|
||||
Medicine:
|
||||
effects:
|
||||
- !type:ModifyBleedAmount
|
||||
- !type:ModifyBleed
|
||||
amount: -4.2
|
||||
- !type:HealthChange
|
||||
damage:
|
||||
|
|
@ -21,7 +21,8 @@
|
|||
Mangleness: 0.2
|
||||
- !type:HealthChange
|
||||
conditions:
|
||||
- !type:ReagentThreshold
|
||||
- !type:ReagentCondition
|
||||
reagent: HemostaticPowder
|
||||
min: 10.1
|
||||
damage:
|
||||
types:
|
||||
|
|
|
|||
|
|
@ -28,4 +28,8 @@
|
|||
|
||||
- type: metabolizerType
|
||||
id: InferiorVulpkanin
|
||||
name: metabolizer-type-inferior-vulpkanin
|
||||
name: metabolizer-type-inferior-vulpkanin
|
||||
|
||||
- type: metabolizerType
|
||||
id: Vampire
|
||||
name: metabolizer-type-vampire
|
||||
|
|
|
|||
|
|
@ -498,7 +498,7 @@
|
|||
- reagents: [ Water, SpaceCleaner ]
|
||||
methods: [ Touch ]
|
||||
effects:
|
||||
- !type:WashCreamPieReaction
|
||||
- !type:WashCreamPie
|
||||
- !type:Emote
|
||||
emote: Hisses
|
||||
showInChat: true
|
||||
|
|
|
|||
|
|
@ -62,15 +62,6 @@
|
|||
- type: AccessReader
|
||||
access: [["CentralCommand"]]
|
||||
|
||||
- type: entity
|
||||
parent: AirlockHatchMaintenance
|
||||
id: AirlockHatchMaintenanceLocked
|
||||
name: Maintenance Hatch
|
||||
suffix: Maint, Locked
|
||||
components:
|
||||
- type: AccessReader
|
||||
access: [["Maintenance"]]
|
||||
|
||||
- type: entity
|
||||
parent: AirlockHatch
|
||||
id: AirlockHatchSyndicateLocked
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
effects:
|
||||
- !type:HealthChange
|
||||
conditions:
|
||||
- !type:HasTag
|
||||
- !type:TagCondition
|
||||
tag: "Flesh"
|
||||
invert: true
|
||||
scaleByQuantity: false
|
||||
|
|
@ -24,14 +24,14 @@
|
|||
Caustic: 15
|
||||
- !type:Emote
|
||||
conditions:
|
||||
- !type:HasTag
|
||||
- !type:TagCondition
|
||||
tag: "Flesh"
|
||||
invert: true
|
||||
emote: Scream
|
||||
probability: 0.9
|
||||
- !type:PopupMessage
|
||||
conditions:
|
||||
- !type:HasTag
|
||||
- !type:TagCondition
|
||||
tag: "Flesh"
|
||||
invert: true
|
||||
type: Local
|
||||
|
|
@ -53,29 +53,30 @@
|
|||
effects:
|
||||
- !type:CauseFleshCultInfection
|
||||
conditions:
|
||||
- !type:HasTag
|
||||
- !type:TagCondition
|
||||
tag: "Flesh"
|
||||
invert: true
|
||||
- !type:ReagentThreshold
|
||||
- !type:ReagentCondition
|
||||
reagent: Carol
|
||||
min: 5
|
||||
- !type:ModifyBloodLevel
|
||||
conditions:
|
||||
- !type:HasTag
|
||||
- !type:TagCondition
|
||||
tag: "Flesh"
|
||||
amount: 5
|
||||
- !type:SatiateThirst
|
||||
conditions:
|
||||
- !type:HasTag
|
||||
- !type:TagCondition
|
||||
tag: "Flesh"
|
||||
factor: 2.5
|
||||
- !type:SatiateHunger
|
||||
conditions:
|
||||
- !type:HasTag
|
||||
- !type:TagCondition
|
||||
tag: "Flesh"
|
||||
factor: 2.5
|
||||
- !type:HealthChange
|
||||
conditions:
|
||||
- !type:HasTag
|
||||
- !type:TagCondition
|
||||
tag: "Flesh"
|
||||
damage:
|
||||
groups:
|
||||
|
|
|
|||
|
|
@ -26,16 +26,17 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 4
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
Medicine:
|
||||
effects:
|
||||
- !type:HealthChange
|
||||
damage:
|
||||
types:
|
||||
Poison: -2
|
||||
- !type:ChemCleanBloodstream
|
||||
- !type:CleanBloodstream
|
||||
excluded: ChamomileTincture
|
||||
cleanseRate: 1
|
||||
|
||||
- type: reagent
|
||||
|
|
@ -53,9 +54,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 2
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
- !type:GenericStatusEffect
|
||||
key: Drowsiness
|
||||
time: 2.0
|
||||
|
|
@ -86,9 +87,9 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 3
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
- !type:AdjustReagent
|
||||
reagent: Ethanol
|
||||
amount: 0.03
|
||||
|
|
|
|||
|
|
@ -12,12 +12,12 @@
|
|||
- !type:SatiateThirst
|
||||
factor: 2
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Dwarf
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Dwarf ]
|
||||
inverted: true
|
||||
Narcotic:
|
||||
effects:
|
||||
- !type:MovespeedModifier
|
||||
- !type:MovementSpeedModifier
|
||||
walkSpeedModifier: 1.16
|
||||
sprintSpeedModifier: 1.16
|
||||
Poison:
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
effects:
|
||||
- !type:HealthChange
|
||||
conditions:
|
||||
- !type:Temperature
|
||||
- !type:TemperatureCondition
|
||||
max: 213.0
|
||||
damage:
|
||||
types:
|
||||
|
|
|
|||
|
|
@ -10,23 +10,23 @@
|
|||
effects:
|
||||
- !type:Emote
|
||||
conditions:
|
||||
- !type:ReagentThreshold
|
||||
- !type:ReagentCondition
|
||||
reagent: BZ
|
||||
min: 0.2
|
||||
- !type:OrganType
|
||||
type: Slime
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Slime ]
|
||||
inverted: true
|
||||
emote: Cough
|
||||
showInChat: true
|
||||
probability: 0.1
|
||||
- !type:HealthChange
|
||||
conditions:
|
||||
- !type:ReagentThreshold
|
||||
- !type:ReagentCondition
|
||||
reagent: BZ
|
||||
min: 0.5
|
||||
- !type:OrganType
|
||||
type: Slime
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Slime ]
|
||||
inverted: true
|
||||
scaleByQuantity: true
|
||||
ignoreResistances: true
|
||||
damage:
|
||||
|
|
@ -35,12 +35,12 @@
|
|||
Poison: 2.5
|
||||
- !type:GenericStatusEffect
|
||||
conditions:
|
||||
- !type:ReagentThreshold
|
||||
- !type:ReagentCondition
|
||||
reagent: BZ
|
||||
min: 1
|
||||
- !type:OrganType
|
||||
type: Slime
|
||||
shouldHave: false
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Slime ]
|
||||
inverted: true
|
||||
key: SeeingRainbows
|
||||
component: SeeingRainbows
|
||||
type: Add
|
||||
|
|
@ -48,56 +48,51 @@
|
|||
refresh: false
|
||||
- !type:Emote
|
||||
conditions:
|
||||
- !type:ReagentThreshold
|
||||
- !type:ReagentCondition
|
||||
reagent: BZ
|
||||
min: 0.2
|
||||
- !type:OrganType
|
||||
type: Slime
|
||||
shouldHave: true
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Slime ]
|
||||
emote: Laugh
|
||||
showInChat: true
|
||||
probability: 0.1
|
||||
- !type:Emote
|
||||
conditions:
|
||||
- !type:ReagentThreshold
|
||||
- !type:ReagentCondition
|
||||
reagent: BZ
|
||||
min: 0.2
|
||||
- !type:OrganType
|
||||
type: Slime
|
||||
shouldHave: true
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Slime ]
|
||||
emote: Scream
|
||||
showInChat: true
|
||||
probability: 0.01
|
||||
- !type:PopupMessage
|
||||
conditions:
|
||||
- !type:ReagentThreshold
|
||||
- !type:ReagentCondition
|
||||
reagent: BZ
|
||||
min: 0.5
|
||||
- !type:OrganType
|
||||
type: Slime
|
||||
shouldHave: true
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Slime ]
|
||||
type: Local
|
||||
visualType: Medium
|
||||
messages: [ "effect-sleepy" ]
|
||||
probability: 0.1
|
||||
- !type:MovespeedModifier
|
||||
- !type:MovementSpeedModifier
|
||||
conditions:
|
||||
- !type:ReagentThreshold
|
||||
- !type:ReagentCondition
|
||||
reagent: BZ
|
||||
min: 1
|
||||
- !type:OrganType
|
||||
type: Slime
|
||||
shouldHave: true
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Slime ]
|
||||
walkSpeedModifier: 0.65
|
||||
sprintSpeedModifier: 0.65
|
||||
- !type:GenericStatusEffect
|
||||
conditions:
|
||||
- !type:ReagentThreshold
|
||||
- !type:ReagentCondition
|
||||
reagent: BZ
|
||||
min: 1
|
||||
- !type:OrganType
|
||||
type: Slime
|
||||
shouldHave: true
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Slime ]
|
||||
key: ForcedSleep
|
||||
component: ForcedSleeping
|
||||
time: 10
|
||||
|
|
@ -115,7 +110,7 @@
|
|||
effects:
|
||||
- !type:HealthChange
|
||||
conditions:
|
||||
- !type:ReagentThreshold
|
||||
- !type:ReagentCondition
|
||||
reagent: Healium
|
||||
min: 0.5
|
||||
scaleByQuantity: true
|
||||
|
|
@ -127,27 +122,27 @@
|
|||
Brute: -0.7
|
||||
types:
|
||||
Mangleness: 0.03
|
||||
- !type:ModifyBleedAmount
|
||||
- !type:ModifyBleed
|
||||
amount: -0.15
|
||||
- !type:PopupMessage
|
||||
conditions:
|
||||
- !type:ReagentThreshold
|
||||
- !type:ReagentCondition
|
||||
reagent: Healium
|
||||
min: 0.5
|
||||
type: Local
|
||||
visualType: Medium
|
||||
messages: [ "effect-sleepy" ]
|
||||
probability: 0.1
|
||||
- !type:MovespeedModifier
|
||||
- !type:MovementSpeedModifier
|
||||
conditions:
|
||||
- !type:ReagentThreshold
|
||||
- !type:ReagentCondition
|
||||
reagent: Healium
|
||||
min: 1
|
||||
walkSpeedModifier: 0.65
|
||||
sprintSpeedModifier: 0.65
|
||||
- !type:GenericStatusEffect
|
||||
conditions:
|
||||
- !type:ReagentThreshold
|
||||
- !type:ReagentCondition
|
||||
reagent: Healium
|
||||
min: 1.8
|
||||
key: ForcedSleep
|
||||
|
|
@ -167,21 +162,21 @@
|
|||
Gas:
|
||||
metabolismRate: 1.0
|
||||
effects:
|
||||
- !type:MovespeedModifier
|
||||
- !type:MovementSpeedModifier
|
||||
walkSpeedModifier: 1.4
|
||||
sprintSpeedModifier: 1.4
|
||||
- !type:MovespeedModifier
|
||||
- !type:MovementSpeedModifier
|
||||
walkSpeedModifier: 1.4
|
||||
sprintSpeedModifier: 1.4
|
||||
- !type:MovespeedModifier
|
||||
- !type:MovementSpeedModifier
|
||||
walkSpeedModifier: 1.4
|
||||
sprintSpeedModifier: 1.4
|
||||
- !type:MovespeedModifier
|
||||
- !type:MovementSpeedModifier
|
||||
walkSpeedModifier: 1.4
|
||||
sprintSpeedModifier: 1.4
|
||||
- !type:HealthChange
|
||||
conditions:
|
||||
- !type:ReagentThreshold
|
||||
- !type:ReagentCondition
|
||||
reagent: Nitrium
|
||||
min: 0.5
|
||||
ignoreResistances: true
|
||||
|
|
@ -190,14 +185,15 @@
|
|||
Mangleness: 0.8
|
||||
- !type:HealthChange
|
||||
conditions:
|
||||
- !type:ReagentThreshold
|
||||
- !type:ReagentCondition
|
||||
reagent: Nitrium
|
||||
min: 80
|
||||
damage:
|
||||
types:
|
||||
Poison: 20
|
||||
- !type:AdjustReagent
|
||||
conditions:
|
||||
- !type:ReagentThreshold
|
||||
- !type:ReagentCondition
|
||||
reagent: ChloralHydrate
|
||||
min: 1
|
||||
reagent: ChloralHydrate
|
||||
|
|
|
|||
|
|
@ -18,7 +18,8 @@
|
|||
Mangleness: 0.3
|
||||
- !type:HealthChange
|
||||
conditions:
|
||||
- !type:ReagentThreshold
|
||||
- !type:ReagentCondition
|
||||
reagent: Desoantizyne
|
||||
min: 25
|
||||
damage:
|
||||
types:
|
||||
|
|
@ -32,7 +33,7 @@
|
|||
type: Add
|
||||
time: 30
|
||||
refresh: true
|
||||
- !type:MovespeedModifier
|
||||
- !type:MovementSpeedModifier
|
||||
walkSpeedModifier: 1.35
|
||||
sprintSpeedModifier: 1.50
|
||||
- !type:Jitter
|
||||
|
|
@ -51,7 +52,7 @@
|
|||
probability: 0.25
|
||||
- !type:GenericStatusEffect
|
||||
conditions:
|
||||
- !type:ReagentThreshold
|
||||
- !type:ReagentCondition
|
||||
reagent: Haloperidol
|
||||
max: 0.01
|
||||
key: Drowsiness
|
||||
|
|
@ -61,5 +62,6 @@
|
|||
effects:
|
||||
- !type:ResetNarcolepsy
|
||||
conditions:
|
||||
- !type:ReagentThreshold
|
||||
- !type:ReagentCondition
|
||||
reagent: Desoantizyne
|
||||
min: 20
|
||||
|
|
|
|||
|
|
@ -15,5 +15,5 @@
|
|||
damage:
|
||||
types:
|
||||
Poison: 1
|
||||
- !type:FlammableReaction
|
||||
- !type:Flammable
|
||||
multiplier: 0.4
|
||||
|
|
|
|||
|
|
@ -12,58 +12,66 @@
|
|||
- !type:Polymorph
|
||||
prototype: PermanentlyHuman
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Primate
|
||||
- !type:ReagentThreshold
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Primate ]
|
||||
- !type:ReagentCondition
|
||||
reagent: Darvinium
|
||||
min: 5
|
||||
- !type:Polymorph
|
||||
prototype: PermanentlyReptilian
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Kobold
|
||||
- !type:ReagentThreshold
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Kobold ]
|
||||
- !type:ReagentCondition
|
||||
reagent: Darvinium
|
||||
min: 5
|
||||
- !type:Polymorph
|
||||
prototype: PermanentlyTajaran
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Felinid
|
||||
- !type:ReagentThreshold
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Felinid ]
|
||||
- !type:ReagentCondition
|
||||
reagent: Darvinium
|
||||
min: 5
|
||||
- !type:Polymorph
|
||||
prototype: PermanentlySlime
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: WildSlime
|
||||
- !type:ReagentThreshold
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ WildSlime ]
|
||||
- !type:ReagentCondition
|
||||
reagent: Darvinium
|
||||
min: 5
|
||||
- !type:Polymorph
|
||||
prototype: PermanentlyMoth
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Mothroach
|
||||
- !type:ReagentThreshold
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Mothroach ]
|
||||
- !type:ReagentCondition
|
||||
reagent: Darvinium
|
||||
min: 5
|
||||
- !type:Polymorph
|
||||
prototype: PermanentlySwine
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Pig
|
||||
- !type:ReagentThreshold
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Pig ]
|
||||
- !type:ReagentCondition
|
||||
reagent: Darvinium
|
||||
min: 5
|
||||
- !type:Polymorph
|
||||
prototype: PermanentlyVox
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: Chiken
|
||||
- !type:ReagentThreshold
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ Chiken ]
|
||||
- !type:ReagentCondition
|
||||
reagent: Darvinium
|
||||
min: 5
|
||||
- !type:Polymorph
|
||||
prototype: PermanentlyVulpkanin
|
||||
conditions:
|
||||
- !type:OrganType
|
||||
type: InferiorVulpkanin
|
||||
- !type:ReagentThreshold
|
||||
- !type:MetabolizerTypeCondition
|
||||
type: [ InferiorVulpkanin ]
|
||||
- !type:ReagentCondition
|
||||
reagent: Darvinium
|
||||
min: 5
|
||||
|
||||
- type: reagent
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
effects:
|
||||
- !type:HealthChange
|
||||
conditions:
|
||||
- !type:HasTag
|
||||
- !type:TagCondition
|
||||
tag: "HumanoidXeno"
|
||||
invert: true
|
||||
scaleByQuantity: true
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
Caustic: 0.2
|
||||
- !type:Emote
|
||||
conditions:
|
||||
- !type:HasTag
|
||||
- !type:TagCondition
|
||||
tag: "HumanoidXeno"
|
||||
invert: true
|
||||
emote: Scream
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
effects:
|
||||
- !type:HealthChange
|
||||
conditions:
|
||||
- !type:HasTag
|
||||
- !type:TagCondition
|
||||
tag: "HumanoidXeno"
|
||||
invert: true
|
||||
damage:
|
||||
|
|
@ -44,7 +44,7 @@
|
|||
Caustic: 1
|
||||
- !type:PopupMessage
|
||||
conditions:
|
||||
- !type:HasTag
|
||||
- !type:TagCondition
|
||||
tag: "HumanoidXeno"
|
||||
invert: true
|
||||
type: Local
|
||||
|
|
@ -53,7 +53,7 @@
|
|||
probability: 0.33
|
||||
- !type:Emote
|
||||
conditions:
|
||||
- !type:HasTag
|
||||
- !type:TagCondition
|
||||
tag: "HumanoidXeno"
|
||||
invert: true
|
||||
emote: Scream
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
effects:
|
||||
- !type:HealthChange
|
||||
conditions:
|
||||
- !type:HasTag
|
||||
- !type:TagCondition
|
||||
tag: "Predator"
|
||||
invert: true
|
||||
scaleByQuantity: true
|
||||
|
|
@ -84,7 +84,7 @@
|
|||
Caustic: 1
|
||||
- !type:Emote
|
||||
conditions:
|
||||
- !type:HasTag
|
||||
- !type:TagCondition
|
||||
tag: "Predator"
|
||||
invert: true
|
||||
emote: Scream
|
||||
|
|
@ -94,7 +94,7 @@
|
|||
effects:
|
||||
- !type:HealthChange
|
||||
conditions:
|
||||
- !type:HasTag
|
||||
- !type:TagCondition
|
||||
tag: "Predator"
|
||||
invert: true
|
||||
damage:
|
||||
|
|
@ -102,7 +102,7 @@
|
|||
Caustic: 3
|
||||
- !type:PopupMessage
|
||||
conditions:
|
||||
- !type:HasTag
|
||||
- !type:TagCondition
|
||||
tag: "Predator"
|
||||
invert: true
|
||||
type: Local
|
||||
|
|
@ -178,7 +178,7 @@
|
|||
effects:
|
||||
- !type:ModifyStatusEffect
|
||||
conditions:
|
||||
- !type:ReagentThreshold
|
||||
- !type:ReagentCondition
|
||||
reagent: NocturineAbductor
|
||||
min: 8
|
||||
effectProto: StatusEffectForcedSleeping
|
||||
|
|
|
|||
|
|
@ -8,5 +8,5 @@
|
|||
Water:
|
||||
amount: 0.5
|
||||
effects:
|
||||
- !type:FlashReactionEffect
|
||||
- !type:Flash
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
minTemp: 120
|
||||
maxTemp: 300
|
||||
effects:
|
||||
- !type:CreateEntityReactionEffect
|
||||
- !type:SpawnEntity
|
||||
entity: EffectHearts
|
||||
priority: 100
|
||||
reactants:
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
damage:
|
||||
types:
|
||||
Poison: 4
|
||||
- !type:ChemVomit
|
||||
- !type:Vomit
|
||||
probability: 0.25
|
||||
|
||||
- type: reagent
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
damage:
|
||||
types:
|
||||
Poison: 4
|
||||
- !type:ChemVomit
|
||||
- !type:Vomit
|
||||
probability: 0.25
|
||||
|
||||
- type: reagent
|
||||
|
|
@ -64,7 +64,7 @@
|
|||
damage:
|
||||
types:
|
||||
Poison: 4
|
||||
- !type:ChemVomit
|
||||
- !type:Vomit
|
||||
probability: 0.88
|
||||
|
||||
- type: reagent
|
||||
|
|
@ -87,5 +87,5 @@
|
|||
damage:
|
||||
types:
|
||||
Poison: 8
|
||||
- !type:ChemVomit
|
||||
- !type:Vomit
|
||||
probability: 1
|
||||
|
|
|
|||
|
|
@ -20,7 +20,8 @@
|
|||
effects:
|
||||
- !type:CureDiseaseInfection
|
||||
conditions:
|
||||
- !type:ReagentThreshold
|
||||
- !type:ReagentCondition
|
||||
reagent: Vaccine
|
||||
min: 10
|
||||
|
||||
- type: reagent
|
||||
|
|
@ -37,5 +38,6 @@
|
|||
- !type:CureDiseaseInfection
|
||||
innoculate: true
|
||||
conditions:
|
||||
- !type:ReagentThreshold
|
||||
- !type:ReagentCondition
|
||||
reagent: VaccinePlus
|
||||
min: 7
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue