mirror of
https://github.com/space-syndicate/space-station-14.git
synced 2026-11-08 20:14:16 +03:00
Merge remote-tracking branch 'upstream/master' into upstream-sync
This commit is contained in:
commit
0003e1e57c
3 changed files with 12 additions and 12 deletions
|
|
@ -1,9 +1,4 @@
|
|||
Entries:
|
||||
- author: DrSmugleaf
|
||||
changes:
|
||||
- {message: Fixed not being able to use vehicle horns., type: Fix}
|
||||
id: 4788
|
||||
time: '2023-09-09T23:39:29.0000000+00:00'
|
||||
- author: deltanedas
|
||||
changes:
|
||||
- {message: Monkeys can now bump doors open and strip mobs like people can., type: Tweak}
|
||||
|
|
@ -2897,3 +2892,8 @@ Entries:
|
|||
- {message: Adds a bed for the psychologist's office., type: Add}
|
||||
id: 5287
|
||||
time: '2023-12-08T05:24:35.0000000+00:00'
|
||||
- author: Emisse
|
||||
changes:
|
||||
- {message: Chemical explosions are powerful again., type: Tweak}
|
||||
id: 5288
|
||||
time: '2023-12-08T10:58:25.0000000+00:00'
|
||||
|
|
|
|||
|
|
@ -102,10 +102,10 @@
|
|||
effects:
|
||||
- !type:ExplosionReactionEffect
|
||||
explosionType: Default
|
||||
maxIntensity: 5
|
||||
maxIntensity: 100
|
||||
intensityPerUnit: 0.5 # 50+50 reagent for maximum explosion
|
||||
intensitySlope: .5
|
||||
maxTotalIntensity: 30
|
||||
intensitySlope: 4
|
||||
maxTotalIntensity: 100
|
||||
|
||||
- type: reaction
|
||||
id: Smoke
|
||||
|
|
|
|||
|
|
@ -41,10 +41,10 @@
|
|||
# TODO solution temperature!!
|
||||
- !type:ExplosionReactionEffect
|
||||
explosionType: Default # 15 damage per intensity.
|
||||
maxIntensity: 1 # at most 15 damage per tile.
|
||||
intensityPerUnit: 3 # 12 total input reagent units reach max total intensity
|
||||
intensitySlope: 0.5
|
||||
maxTotalIntensity: 9
|
||||
maxIntensity: 200
|
||||
intensityPerUnit: 5
|
||||
intensitySlope: 5
|
||||
maxTotalIntensity: 200
|
||||
- !type:PopupMessage
|
||||
messages: [ "clf3-explosion" ]
|
||||
type: Pvs
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue