Cherrypicks 5 (#440)
* Chances of triggering effects (#27056) * electrocution * slippery * flashibg * Update SlipperyComponent.cs * Update SlipperySystem.cs * Flash buff (#25730) * flash buff * oops! * bool * 3 -> 1.5 seconds * okay fix * sluth * Flash overlay rework and bugfixes (#27369) * fix mapping door access (#27784) Co-authored-by: deltanedas <@deltanedas:kde.org> * - fix: Errors. * - fix: Incorporeal. --------- Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
This commit is contained in:
@@ -125,6 +125,7 @@
|
||||
- Stun
|
||||
- KnockedDown
|
||||
- SlowedDown
|
||||
- Flashed
|
||||
- type: TypingIndicator
|
||||
proto: robot
|
||||
- type: Speech
|
||||
@@ -143,7 +144,6 @@
|
||||
locked: true
|
||||
- type: ActivatableUIRequiresLock
|
||||
- type: LockedWiresPanel
|
||||
- type: Flashable
|
||||
- type: Damageable
|
||||
damageContainer: Silicon
|
||||
- type: Destructible
|
||||
|
||||
@@ -48,7 +48,6 @@
|
||||
sprite: Mobs/Effects/onfire.rsi
|
||||
normalState: Generic_mob_burning
|
||||
- type: Climbing
|
||||
- type: Flashable
|
||||
- type: NameIdentifier
|
||||
group: GenericNumber
|
||||
|
||||
|
||||
@@ -780,7 +780,6 @@
|
||||
amount: 3
|
||||
- id: DrinkTequilaBottleFull
|
||||
amount: 1
|
||||
- type: Flashable
|
||||
- type: Tag
|
||||
tags:
|
||||
- CannotSuicide
|
||||
@@ -807,7 +806,6 @@
|
||||
# name: ghost-role-information-tropico-name
|
||||
# description: ghost-role-information-tropico-description
|
||||
# - type: GhostTakeoverAvailable
|
||||
# - type: Flashable
|
||||
- type: Tag
|
||||
tags:
|
||||
- VimPilot
|
||||
@@ -861,7 +859,6 @@
|
||||
raffle:
|
||||
settings: short
|
||||
- type: GhostTakeoverAvailable
|
||||
- type: Flashable
|
||||
- type: Tag
|
||||
tags:
|
||||
- CannotSuicide
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
- Pacified
|
||||
- RadiationProtection
|
||||
- Drowsiness
|
||||
- Flashed
|
||||
- type: Buckle
|
||||
- type: StandingState
|
||||
- type: Tag
|
||||
@@ -108,6 +109,7 @@
|
||||
- StaminaModifier
|
||||
- RadiationProtection
|
||||
- Drowsiness
|
||||
- Flashed
|
||||
- type: Bloodstream
|
||||
bloodMaxVolume: 150
|
||||
- type: MobPrice
|
||||
|
||||
@@ -119,7 +119,6 @@
|
||||
thresholds:
|
||||
0: Alive
|
||||
60: Dead
|
||||
- type: Flashable
|
||||
- type: NoSlip
|
||||
- type: StatusEffects
|
||||
allowed:
|
||||
|
||||
@@ -146,6 +146,7 @@
|
||||
- StaminaModifier
|
||||
- RadiationProtection
|
||||
- Drowsiness
|
||||
- Flashed
|
||||
- type: Reflect
|
||||
enabled: false
|
||||
reflectProb: 0
|
||||
@@ -271,7 +272,6 @@
|
||||
id: BaseMobSpeciesOrganic
|
||||
abstract: true
|
||||
components:
|
||||
- type: Flashable
|
||||
- type: Barotrauma
|
||||
damage:
|
||||
types:
|
||||
@@ -286,26 +286,6 @@
|
||||
Heat: -0.07
|
||||
groups:
|
||||
Brute: -0.07
|
||||
# Organs
|
||||
- type: StatusEffects
|
||||
allowed:
|
||||
- Stun
|
||||
- KnockedDown
|
||||
- SlowedDown
|
||||
- Stutter
|
||||
- BloodLoss
|
||||
- SeeingRainbows
|
||||
- Electrocution
|
||||
- ForcedSleep
|
||||
- TemporaryBlindness
|
||||
- Drunk
|
||||
- SlurredSpeech
|
||||
- RatvarianLanguage
|
||||
- PressureImmunity
|
||||
- Muted
|
||||
- Pacified
|
||||
- StaminaModifier
|
||||
- Incorporeal
|
||||
- type: Blindable
|
||||
# Other
|
||||
- type: Temperature
|
||||
|
||||
@@ -15,9 +15,6 @@
|
||||
path: /Audio/Items/hiss.ogg
|
||||
params:
|
||||
variation: 0.08
|
||||
- type: Flashable
|
||||
collisionGroup:
|
||||
- None
|
||||
- type: DamagedByFlashing
|
||||
flashDamage:
|
||||
types:
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Status effect prototypes.
|
||||
# Status effect prototypes.
|
||||
# Holds no actual logic, just some basic data about the effect.
|
||||
|
||||
- type: statusEffect
|
||||
@@ -74,9 +74,13 @@
|
||||
- type: statusEffect
|
||||
id: Drowsiness #blurs your vision and makes you randomly fall asleep
|
||||
|
||||
- type: statusEffect
|
||||
id: Flashed
|
||||
|
||||
# WD EDIT
|
||||
- type: statusEffect
|
||||
id: Incorporeal
|
||||
alwaysAllowed: true
|
||||
|
||||
- type: statusEffect
|
||||
id: BloodLoss
|
||||
|
||||
@@ -11,7 +11,7 @@ void fragment() {
|
||||
|
||||
highp vec4 textureMix = mix(tex1, tex2, 0.5);
|
||||
|
||||
// Gradually mixes between the texture mix and a full-white texture, causing the "blinding" effect
|
||||
// Gradually mixes between the texture mix and a full-black texture, causing the "blinding" effect
|
||||
highp vec4 mixed = mix(vec4(0.0, 0.0, 0.0, 1.0), textureMix, percentComplete);
|
||||
|
||||
COLOR = vec4(mixed.rgb, remaining);
|
||||
|
||||
Reference in New Issue
Block a user