juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Emergency light tweaks (#22310)

Browse Source 
* Emergency light tweaks

* maps
This commit is contained in:
Kara
2023-12-11 02:24:10 -07:00
committed by GitHub
parent 8303be69b5
commit 7679c5d02e
8 changed files with 70 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Resources/Maps/Dungeon/experiment.yml
View File

@@ -6801,9 +6801,6 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1606
components:
- rot: 3.141592653589793 rad
@@ -6812,9 +6809,6 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1607
components:
- rot: 3.141592653589793 rad
@@ -6823,9 +6817,6 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- proto: ExplosivePayload
entities:
- uid: 1104

137
Resources/Maps/Dungeon/lava_brig.yml
View File

@@ -7968,9 +7968,6 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1717
components:
- pos: 21.5,10.5
@@ -7978,9 +7975,6 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1718
components:
- pos: 30.5,4.5
@@ -7988,9 +7982,6 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1719
components:
- rot: 3.141592653589793 rad
@@ -7999,9 +7990,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1720
components:
- rot: 3.141592653589793 rad
@@ -8010,9 +7999,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1721
components:
- rot: 3.141592653589793 rad
@@ -8021,9 +8008,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1722
components:
- pos: 18.5,16.5
@@ -8031,9 +8016,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1723
components:
- pos: 31.5,22.5
@@ -8041,9 +8024,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1724
components:
- rot: -1.5707963267948966 rad
@@ -8052,9 +8033,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1726
components:
- rot: -1.5707963267948966 rad
@@ -8063,9 +8042,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1727
components:
- rot: -1.5707963267948966 rad
@@ -8074,9 +8051,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1728
components:
- rot: 1.5707963267948966 rad
@@ -8085,9 +8060,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1729
components:
- rot: -1.5707963267948966 rad
@@ -8096,9 +8069,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1730
components:
- rot: 1.5707963267948966 rad
@@ -8107,9 +8078,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1731
components:
- rot: 1.5707963267948966 rad
@@ -8118,9 +8087,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1732
components:
- rot: -1.5707963267948966 rad
@@ -8129,9 +8096,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1733
components:
- rot: 1.5707963267948966 rad
@@ -8140,9 +8105,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1734
components:
- pos: 1.5,24.5
@@ -8150,9 +8113,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1735
components:
- rot: 3.141592653589793 rad
@@ -8161,9 +8122,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1736
components:
- pos: 11.5,32.5
@@ -8171,9 +8130,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1737
components:
- rot: -1.5707963267948966 rad
@@ -8182,9 +8139,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1738
components:
- rot: 1.5707963267948966 rad
@@ -8193,9 +8148,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1739
components:
- rot: 3.141592653589793 rad
@@ -8204,9 +8157,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1740
components:
- rot: 1.5707963267948966 rad
@@ -8215,9 +8166,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1742
components:
- rot: -1.5707963267948966 rad
@@ -8226,9 +8175,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1744
components:
- rot: 3.141592653589793 rad
@@ -8237,9 +8184,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1745
components:
- rot: 3.141592653589793 rad
@@ -8248,9 +8193,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1746
components:
- rot: 3.141592653589793 rad
@@ -8259,9 +8202,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1747
components:
- rot: 3.141592653589793 rad
@@ -8270,9 +8211,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1748
components:
- rot: -1.5707963267948966 rad
@@ -8281,9 +8220,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1749
components:
- rot: 1.5707963267948966 rad
@@ -8292,9 +8229,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1750
components:
- rot: -1.5707963267948966 rad
@@ -8303,9 +8238,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1751
components:
- pos: 30.5,6.5
@@ -8313,9 +8246,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1752
components:
- rot: 3.141592653589793 rad
@@ -8324,9 +8255,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 1832
components:
- rot: -1.5707963267948966 rad
@@ -8335,9 +8264,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- proto: EmergencyRollerBed
entities:
- uid: 1141

24
Resources/Maps/Shuttles/dart.yml
View File

@@ -3161,9 +3161,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 885
components:
- rot: -1.5707963267948966 rad
@@ -3172,9 +3170,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 888
components:
- pos: 2.5,-7.5
@@ -3182,9 +3178,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 889
components:
- rot: 3.141592653589793 rad
@@ -3193,9 +3187,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 890
components:
- rot: 1.5707963267948966 rad
@@ -3204,9 +3196,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 892
components:
- rot: 3.141592653589793 rad
@@ -3215,9 +3205,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- proto: EncryptionKeyCommand
entities:
- uid: 982

8
Resources/Maps/Shuttles/emergency.yml
View File

@@ -1560,9 +1560,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 392
components:
- rot: 3.141592653589793 rad
@@ -1571,9 +1569,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- proto: ExtinguisherCabinetFilled
entities:
- uid: 362

8
Resources/Maps/Shuttles/emergency_box.yml
View File

@@ -2353,9 +2353,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 435
components:
- pos: -6.5,7.5
@@ -2363,9 +2361,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- proto: EmergencyOxygenTankFilled
entities:
- uid: 496

8
Resources/Maps/Shuttles/emergency_lox.yml
View File

@@ -2408,9 +2408,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 639
components:
- rot: 3.141592653589793 rad
@@ -2419,9 +2417,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- proto: ExtinguisherCabinetFilled
entities:
- uid: 170

84
Resources/Maps/Shuttles/emergency_raven.yml
View File

@@ -7409,9 +7409,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 2492
components:
- rot: -1.5707963267948966 rad
@@ -7420,9 +7418,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 2493
components:
- pos: 7.5,3.5
@@ -7430,9 +7426,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 2494
components:
- pos: 11.5,-16.5
@@ -7440,9 +7434,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 2495
components:
- rot: 1.5707963267948966 rad
@@ -7451,9 +7443,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 2496
components:
- rot: 1.5707963267948966 rad
@@ -7462,9 +7452,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 2497
components:
- pos: 15.5,3.5
@@ -7472,9 +7460,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 2498
components:
- rot: 3.141592653589793 rad
@@ -7483,9 +7469,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 2499
components:
- rot: -1.5707963267948966 rad
@@ -7494,9 +7478,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 2500
components:
- rot: -1.5707963267948966 rad
@@ -7505,9 +7487,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 2501
components:
- pos: 11.5,17.5
@@ -7515,9 +7495,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 2502
components:
- rot: 3.141592653589793 rad
@@ -7526,9 +7504,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 2503
components:
- rot: 1.5707963267948966 rad
@@ -7537,9 +7513,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 2504
components:
- pos: 11.5,14.5
@@ -7547,9 +7521,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 2505
components:
- rot: 3.141592653589793 rad
@@ -7558,9 +7530,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 2506
components:
- rot: 1.5707963267948966 rad
@@ -7569,9 +7539,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 2507
components:
- rot: -1.5707963267948966 rad
@@ -7580,9 +7548,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 2508
components:
- pos: 10.5,6.5
@@ -7590,9 +7556,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 2509
components:
- rot: 3.141592653589793 rad
@@ -7601,9 +7565,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 2510
components:
- rot: 1.5707963267948966 rad
@@ -7612,9 +7574,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- uid: 2511
components:
- rot: -1.5707963267948966 rad
@@ -7623,9 +7583,7 @@ entities:
type: Transform
- enabled: True
type: PointLight
- enabled: True
type: AmbientSound
- type: ActiveEmergencyLight
- proto: EmergencyMedipen
entities:
- uid: 2069

15
Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
View File

@@ -303,11 +303,11 @@
components:
- type: PointLight
enabled: false
radius: 10
energy: 2.5
offset: "0, 0.2"
radius: 5
energy: 0.6
offset: "0, 0.4"
color: "#FF4020"
mask: /Textures/Effects/LightMasks/cone.png
mask: /Textures/Effects/LightMasks/double_cone.png
- type: ApcPowerReceiver
- type: ExtensionCableReceiver
- type: Battery
@@ -315,6 +315,7 @@
startingCharge: 0
- type: EmergencyLight
- type: RotatingLight
speed: 40
- type: Sprite
sprite: Structures/Wallmounts/Lighting/emergency_light.rsi
layers:
@@ -329,12 +330,6 @@
shader: "unshaded"
visible: false
- type: Appearance
- type: AmbientSound
sound:
path: /Audio/Ambience/Objects/alarm.ogg
volume: -12
range: 5
enabled: false
placement:
mode: SnapgridCenter
snap: