Merge branch 'bodycam' of https://github.com/Hqlle/Lost-Paradise into…

… bodycam

Resources/Changelog/ChangelogLPP.yml

@@ -2964,3 +2964,11 @@
   id: 157
   time: '2024-12-23T10:37:56.0000000+00:00'
   url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/325
+- author: Evgencheg
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u043E\u0437\u0432\
+      \u0443\u0447\u043A\u0430 \u0430\u0444\u043E\u043D\u0438. CASSIE"
+    type: Add
+  id: 158
+  time: '2024-12-24T13:08:56.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/362

Resources/Locale/en-US/_LostParadise/update20.ftl

@@ -4,7 +4,8 @@ trait-desc-ElfLanguage = Вы знаете Эльфийский (Нет, не OO
 trait-name-DwarfLanguage = Дворфийский
 trait-desc-DwarfLanguage = Если не вслушиваться похоже на бубнёж русских пьяниц
 changelog-tab-title-ChangelogLPP = Обновления Lost Paradise
-announcer-NTH-name = N.T.H
+announcer-NTH-name = N.T.H.
+announcer-AFONYA-name = C.A.S.S.I.E.
 chatsan-awoo = воет
 chatsan-hiss = шипит
 chatsan-nyaaa = някает

Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/newyear.ftl

@@ -0,0 +1,15 @@
+ent-LPPNewYearSocksRed = socks
+    .desc = hanging socks on the wall, like you should put gifts there...
+ent-LPPNewYearSocksGreen = socks
+    .desc = hanging socks on the wall, like you should put gifts there...
+ent-LPPNewYearSocksOrange = socks
+    .desc = hanging socks on the wall, like you should put gifts there...
+ent-LPPNewYearBell = new year bell
+    .desc = New Year's bell with a wreath, festive mood..
+ent-LPPCandyNewYear = candy
+    .desc = A New Year's candy that feels like the end of the past.
+ent-LPPLightbulbsNewYear = light bulbs
+    .desc = Hanging garland, not the best source of light
+ent-LPPPresentRandom = present
+    .desc = A New Year's gift, I wonder what's in it!
+    .suffix = Filled Safe

Resources/Locale/ru-RU/_LostParadise/update20.ftl

@@ -4,7 +4,8 @@ trait-desc-ElfLanguage = Вы знаете Эльфийский (Нет, не OO
 trait-name-DwarfLanguage = Дворфийский
 trait-desc-DwarfLanguage = Если не вслушиваться похоже на бубнёж русских пьяниц
 changelog-tab-title-ChangelogLPP = Обновления Lost Paradise
-announcer-NTH-name = N.T.H
+announcer-NTH-name = N.T.H.
+announcer-AFONYA-name = C.A.S.S.I.E.
 chatsan-awoo = воет
 chatsan-hiss = шипит
 chatsan-nyaaa = някает

Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/newyear.ftl

@@ -0,0 +1,15 @@
+ent-LPPNewYearSocksRed = носок
+    .desc = Новогодний носок, как будто туда надо класть подарки...
+ent-LPPNewYearSocksGreen = носок
+    .desc = Новогодний носок, как будто туда надо класть подарки...
+ent-LPPNewYearSocksOrange = носок
+    .desc = Новогодний носок, как будто туда надо класть подарки...
+ent-LPPNewYearBell = new year bell
+    .desc = Новогодний колокольчик с венком, праздничное настроение..
+ent-LPPCandyNewYear = конфетка
+    .desc = Новогодняя конфета, которая напоминает о конце прошлого.
+ent-LPPLightbulbsNewYear = гирлянда
+    .desc = Новогодняя гирлянда озаряющая красками нового года.
+ent-LPPPresentRandom = подарок
+    .desc = Новогодний подарок, интересно что же внутри!
+    .suffix = безопасный

Resources/Prototypes/Announcers/!randomAnnouncers.yml

@@ -1,4 +1,5 @@
 - type: weightedRandom
   id: RandomAnnouncers
   weights:
-    NTH: 1
+    NTH: 0.5
+    AFONYA: 0.5

Resources/Prototypes/Entities/Objects/Decoration/present.yml

@@ -7,7 +7,7 @@
   - type: Sprite
     sprite: Objects/Decoration/present.rsi
     layers:
-      - state: present
+    - state: present
 
 - type: entity
   id: Present

Resources/Prototypes/_LostParadise/Announcers/AFONYA.yml

@@ -0,0 +1,134 @@
+- type: announcer
+  id: AFONYA # Localized as "announcer-<id>-name" in chat
+  basePath: /Audio/Announcers/_AFONYA # Where to start looking for audio files
+  baseAudioParams: # Default audio parameters for all announcements, all options explained in the template announcement
+    volume: -7 # If this announcer is really loud, lower it to match the others' volume #? Default is 3
+  announcements: # List of all announcements this announcer has audio for #! Comment out unused announcements, don't remove them
+    # Communications
+    - id: announce # Communications console
+      path: comms/announce.ogg
+    - id: attention # Generic alert sound # Should be different from fallback but it's very similar
+      path: comms/attention.ogg
+    - id: commandReport # Station goal, Central Command messages, etc
+      path: comms/command_report.ogg
+#    - id: spawnAnnounce # Captain join # TODO That system is annoyingly not modular
+#      path: comms/spawn_announce.ogg
+    - id: war # Nuclear Operative declaration of war
+      path: comms/war.ogg
+#    - id: nukeCodes # The station has been send nuclear activation codes
+#      path: comms/nuke_codes.ogg # Or command_report.ogg if you want
+#    - id: nukeArm # The nuke is active and ticking
+#      path: comms/nuke_arm.ogg
+#    - id: nukeDisarm # The nuke has been disarmed
+#      path: comms/nuke_disarm.ogg
+#    - id: welcome # The shift has started
+#      path: comms/welcome.ogg
+
+    # Alert levels
+    - id: alertGreen # Everything is fine
+      path: alerts/green.ogg
+    - id: alertBlue # Something is amiss
+      path: alerts/blue.ogg
+    - id: alertViolet # Viral infection or misc medical emergencies, listen to Medical
+      path: alerts/violet.ogg
+    - id: alertWhite # Glimmer is too high, listen to Epistemics
+      path: alerts/white.ogg
+    - id: alertYellow # The station is being largely damaged, listen to Engineering
+      path: alerts/yellow.ogg
+    - id: alertRed # Generic many things are bad, listen to Security
+      path: alerts/red.ogg
+    - id: alertGamma # There is a massive immediate threat to the station, listen to Central Command
+      path: alerts/gamma.ogg
+    - id: alertDelta # The station is being or about to be massively destroyed, run for your life
+      path: alerts/delta.ogg
+    - id: alertEpsilon # The station has been terminated, good luck survivors!
+      path: alerts/epsilon.ogg
+
+    # Events
+    ## Wizard's Den
+    ### Mid-Round Antagonists
+    - id: ninjaHacking # A Ninja is hacking something
+      path: comms/ninja_hacking.ogg
+    - id: powersinkExplosion # A power sink is about to overcharge and explode
+      path: comms/powersink_explosion.ogg
+    ### Events
+    - id: anomalySpawn # An anomaly has spawned in a random place
+      path: events/anomaly.ogg
+    - id: bluespaceArtifact # An artifact has spawned in a random place
+      path: events/bluespace_artifact.ogg
+#    - id: bluespaceLocker # Two random lockers now share inventories
+#      path: events/bluespace_locker.ogg
+    - id: breakerFlip # A few random APCs have been disabled, ask Engineering to fix them
+      path: events/breaker_flip.ogg
+    - id: bureaucraticError # Random jobs have been added, removed, or made infinite
+      path: events/bureaucratic_error.ogg
+    - id: clericalError # Random crew are removed from the manifest
+      path: events/clerical_error.ogg
+    - id: carpRift # A dragon's carp rift is active
+      path: events/carp_rift.ogg
+    - id: revenantSpawn # A revenant has spawned (by a prober?)
+      path: events/revenant_spawn.ogg
+    - id: gasLeak # A random gas is coming out of a random vent
+      path: events/gas_leak.ogg
+    - id: gasLeakComplete # Gas has stopped coming out of a vent
+      path: events/gas_leak-complete.ogg
+    - id: kudzuGrowth # Kudzu is growing in a random place
+      path: events/kudzu_growth.ogg
+    - id: meteorSwarm # Meteors are flying at the station, stay away from windows
+      path: events/meteors.ogg
+    - id: meteorSwarmComplete # Meteors have stopped flying at the station
+      path: events/meteors-complete.ogg
+#    - id: mouseMigration # Several mice have appeared in a random place
+#      path: events/mouse_migration.ogg
+    - id: cockroachMigration # Several cockroaches have appeared in a random place
+      path: events/migration.ogg
+    - id: powerGridCheck # The station's power is offline for some moments
+      path: events/power_grid_check.ogg
+    - id: powerGridCheckComplete # The station's power is online again
+      path: events/power_grid_check-complete.ogg
+    - id: randomSentience # A random few animals have become sentient
+      path: events/random_sentience.ogg
+    - id: solarFlare # A solar flare is nearby, may mess with comms and electronics
+      path: events/solar_flare.ogg
+    - id: solarFlareComplete # The solar flare has passed
+      path: events/solar_flare-complete.ogg
+    - id: ventClog # A random reagent is coming out of a scrubber
+      path: events/vent_clog.ogg
+    - id: slimesSpawn # Some simple slimes are appearing in vents
+      path: events/migration.ogg
+    - id: spiderSpawn # Some simple spiders are appearing in vents
+      path: events/migration.ogg
+    - id: immovableRodSpawn # The station is moving into an immovable rod, don't die or something, ask Engineering for help repairing it
+      path: events/immovable_rod_spawn.ogg
+    - id: ionStorm # AI-controlled equipment are now weird, check their laws
+      path: events/ion_storm.ogg
+    ## Delta-V
+#    - id: xenoVents # Xenomorphs are coming out of vents
+#      path: events/aliens.ogg
+    ## NyanoTrasen
+#    - id: noosphericStorm # A large amount of glimmer has joined the station and made people psionic
+#      path: events/noospheric_storm.ogg
+
+    # Shuttle
+    - id: shuttleCalled # The shuttle is on its way
+      path: shuttle/called.ogg
+    - id: shuttleRecalled # The shuttle is going back to Central Command
+      path: shuttle/recalled.ogg
+    - id: shuttleDock # The shuttle has arrived at the station
+      path: shuttle/docked.ogg
+#    - id: shuttleNearby # The shuttle couldn't dock, it's at a specified location
+#      path: shuttle/nearby.ogg
+#    - id: shuttleGoodLuck # The shuttle could not find its way to the station, good luck crew
+#      path: shuttle/good_luck.ogg
+#    - id: shuttleAuthAdded # One of few have added their acceptance to early launching
+#      path: shuttle/auth_added.ogg
+#    - id: shuttleAuthRevoked # One of few have revoked their acceptance to early launching
+#      path: shuttle/auth_revoked.ogg
+#    - id: shuttleAlmostLaunching # The shuttle will leave to FTL in 10 seconds
+#      path: shuttle/almost_launching.ogg
+    - id: shuttleLeft # The shuttle has left the station
+      path: shuttle/left.ogg
+
+    # Fallback # REQUIRED
+    - id: fallback # Any announcement sent without a valid announcement on this announcer will use this
+      path: fallback.ogg

Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/food/halloween.yml

@@ -12,10 +12,10 @@
   - type: RandomSprite
     available:
       - enum.DamageStateVisualLayers.Base:
-          candy_1: Material 
-          candy_2: Material 
-          candy_3: Material 
-          candy_4: Material 
+          candy_1: Material
+          candy_2: Material
+          candy_3: Material
+          candy_4: Material
   - type: Item
     size: Tiny
     shape:
@@ -33,4 +33,4 @@
           Quantity: 1
   - type: Tag
     tags:
-      - LPPCandy
+      - LPPCandy

Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/halloween.yml

@@ -24,7 +24,7 @@
   parent: BaseSign
   id: LPPPCheckboxes
   name: checkboxes
-  description: Black and orange flags, it's got a halloween feel to it. 
+  description: Black and orange flags, it's got a halloween feel to it.
   components:
   - type: Sprite
     sprite: _LostParadise/Structures/Wallmounts/halloween.rsi