Merge Upstream (space-wizards#555)

* Automatic changelog update * Fix dungeon spawn + ftl overlap (space-wizards#31413) * Fix dungeon spawn + ftl overlap * Better fixes * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * meta update (space-wizards#31423) * Automatic changelog update * Add ContainerComp (space-wizards#31311) Applies EntProtoId changes upon insertion / removal from container. Can also be useful for borgs / mechs / vehicles in future but atm I just used it for AI. * Automatic changelog update * Automatic changelog update * Power stuff (space-wizards#31314) * Power stuff - Add shared IsPowered - Add shared ResolveApc - Move PowerChangedEvent to shared for now - Add SlimPoweredLight that actually functions how you'd expect a PoweredLight to function it id didn't have a bunch of bloat on it. * big update * boing * Automatic changelog update * ContainerComp fix (space-wizards#31434) Forgot to push these ones on the branch. * Automatic changelog update * Automatic changelog update * Automatic changelog update * bagel update (space-wizards#31440) * bagel update * fixgridatmos * qm office * sci cam fix * jesus christ so many routers * remove invalids * Automatic changelog update * Cog update (space-wizards#31458) made disposals less bad * Automatic changelog update * Automatic changelog update * Move OnGhostAttempt to GhostSystem (space-wizards#31445) * Move OnGhostAttempt to GhostSystem * Remove unused dependencies and sort them * Automatic changelog update * Replace obsolete code in shuttle systems. (space-wizards#31408) * Format DockingSystem.Shuttle * arrivals system * docking system * shuttle console system * emergency shuttle system * shuttle system * thruster system * Fix compile error --------- Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * bagel update (space-wizards#31502) * Centcom & FTLDestination cleanup (space-wizards#30226) * centcomm name and ftlcomp * networking microopstimization * go sleep. * map names and arrivals * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automated whitelists (space-wizards#23985) * Beginnings of making the breadmemes jobs easier * stuff * stuff pt. 2 * Stuff pt.3 * Stuff I forgot last time * Basic whitelist Only people that are added to the whitelist with the addwhitelist command will be able to join. I call this the "legacy" whitelist * Remove always deny condition in favor of just breaking if playtime check fails * Change default whitelist Default whitelist is now the "legacy" whitelist. * localization * Admin check * minor spelling change * Fix build * Whitelist message * Fix vars not being datafield and spelling mistakes * Minor spelling mistake * Change config for salamander * Reviews and stuff * Add summaries * Fix whitelists * Forgot to add a datafield * Fixing stuff I guess * Reuse admin remarks to reduce load when connecting. * Update log messages to be verbose instead of debug * Reviews * whoops * Explain a bit more how whitelist checking works * Apply CE's review * Append Membership to Blacklist and Whitelist conditions * Fix review comments * Uncapitalize playerConnectionWhitelist, add to ignored client prototypes * Make note count field work * Fix cvar for thingy --------- Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> * Automatic changelog update * Automatic changelog update * bagel update (space-wizards#31535) * Station AI (space-wizards#30944) * Station AI overlay * implement * Bunch of ports * Fix a heap of bugs and basic scouting * helldivers * Shuffle interactions a bit * navmap stuff * Revert "navmap stuff" This reverts commit d1f89dd. * AI wires implemented * Fix examines * Optimise the overlay significantly * Back to old static * BUI radial working * lots of work * Saving work * thanks fork * alright * pc * AI upload console * AI upload * stuff * Fix copy-paste shitcode * AI actions * navmap work * Fixes * first impressions * a * reh * Revert "navmap work" This reverts commit 6f63fea. * OD * radar * weh * Fix examines * scoop mine eyes * fixes * reh * Optimise * Final round of optimisations * Fixes * fixes * Bagel station ai (space-wizards#31537) * real * AI * proto fix * Fix PostMapInit tests not considering job containerspawns (space-wizards#31538) * Fix PostMapInit tests nto considering job containerspawns * fix * AI whitelist fix (space-wizards#31542) * cog update (space-wizards#31540) updooted cog * AI radio fix (space-wizards#31547) Love to see it * Update AI holo sprite to camera (space-wizards#31558) Update AI camera to 13 default Holo was a placeholder. This is better in the interim. * Add AI warp points (space-wizards#31559) * Automatic changelog update * Fix AI being ejectable (space-wizards#31561) * Automatic changelog update * Fix whitelist (space-wizards#31563) * Automatic changelog update * bagel update (space-wizards#31562) * bagel update * ore processor cargo * Add some more stuff to AI whitelist (space-wizards#31564) * Add some more stuff to AI whitelist * by the nine * Automatic changelog update * Meta - Med disposals and chem room extra pipe fix (space-wizards#31467) Delete extra pipe & fix disposals junction * bagel hotfix (space-wizards#31566) bagel update * update AI job icon to 8x8 (space-wizards#31565) icon and meta.json * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * Automatic changelog update * fix spelling error silicon jobs (space-wizards#31581) Update department.ftl * Automatic changelog update * Fix defibs draining battery when turned off (space-wizards#31593) * Marathon - Names a singular camera (space-wizards#31590) Fixes unnamed camera * Automatic changelog update * Reach - Scientist added to map's prototype (space-wizards#31567) Added scientist to map prototype * Change my copyright (space-wizards#31599) * Remove random cyrillic letters (space-wizards#31600) * escape pod tiny fan (space-wizards#31601) * escape pod tiny fan * oop * Fix nuke disk erroneously being marked 'left behind' (space-wizards#31602) Fix erroneous 'disk left behind' objective * Automatic changelog update * bagel update (space-wizards#31603) * bagel update * light switch to make audience area darker in theatre * Add rings (Salvage loot real)! (space-wizards#31372) * First commit * I'm silly * Another fix * How could I forget the descriptions! * Forgot * Made textures alligned properly * Removed the stuff! * Opps * Typo fixes * Automatic changelog update * fix12312314234235 --------- Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com> Co-authored-by: Spessmann <156740760+Spessmann@users.noreply.github.com> Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com> Co-authored-by: Mervill <mervills.email@gmail.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com> Co-authored-by: JustCone <141039037+JustCone14@users.noreply.github.com> Co-authored-by: lunarcomets <140772713+lunarcomets@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: themias <89101928+themias@users.noreply.github.com> Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Ilya246 · Aug 28, 2024 · f8dcc13 · f8dcc13
1 parent 3ddd662
commit f8dcc13
Show file tree

Hide file tree

Showing 32 changed files with 290 additions and 80 deletions.
diff --git a/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml b/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml
@@ -26,7 +26,7 @@
             Text="{Loc 'news-read-ui-next-text'}"
             ToolTip="{Loc 'news-read-ui-next-tooltip'}"/>
     </BoxContainer>
-    <controls:StripeBack Name="АrticleNameContainer">
+    <controls:StripeBack Name="ArticleNameContainer">
         <PanelContainer>
             <Label Name="PageNum" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="4,0,0,0"/>
             <Label Name="PageName" Align="Center"/>

diff --git a/Content.Server/Anomaly/AnomalySynchronizerSystem.cs b/Content.Server/Anomaly/AnomalySynchronizerSystem.cs
@@ -76,7 +76,7 @@ private void OnPowerChanged(Entity<AnomalySynchronizerComponent> ent, ref PowerC
         if (!TryComp<AnomalyComponent>(ent.Comp.ConnectedAnomaly, out var anomaly))
             return;
 
-        DisconneсtFromAnomaly(ent, anomaly);
+        DisconnectFromAnomaly(ent, anomaly);
     }
 
     private void OnExamined(Entity<AnomalySynchronizerComponent> ent, ref ExaminedEvent args)
@@ -125,7 +125,7 @@ private void ConnectToAnomaly(Entity<AnomalySynchronizerComponent> ent, Entity<A
 
     //TODO: disconnection from the anomaly should also be triggered if the anomaly is far away from the synchronizer.
     //Currently only bluespace anomaly can do this, but for some reason it is the only one that cannot be connected to the synchronizer.
-    private void DisconneсtFromAnomaly(Entity<AnomalySynchronizerComponent> ent, AnomalyComponent anomaly)
+    private void DisconnectFromAnomaly(Entity<AnomalySynchronizerComponent> ent, AnomalyComponent anomaly)
     {
         if (ent.Comp.ConnectedAnomaly == null)
             return;

diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
@@ -215,9 +215,10 @@ private void OnRoundEnd(Entity<NukeopsRuleComponent> ent)
 
         var diskAtCentCom = false;
         var diskQuery = AllEntityQuery<NukeDiskComponent, TransformComponent>();
-        while (diskQuery.MoveNext(out _, out var transform))
+        while (diskQuery.MoveNext(out var diskUid, out _, out var transform))
         {
             diskAtCentCom = transform.MapUid != null && centcomms.Contains(transform.MapUid.Value);
+            diskAtCentCom |= _emergency.IsTargetEscaping(diskUid);
 
             // TODO: The target station should be stored, and the nuke disk should store its original station.
             // This is fine for now, because we can assume a single station in base SS14.

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -1,33 +1,4 @@
 Entries:
-- author: Brandon-Huu
-  changes:
-  - message: Removed the six Handheld GPS devices from the syndicate deathrattle implant
-      box.
-    type: Remove
-  id: 6739
-  time: '2024-06-15T03:23:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28999
-- author: EmoGarbage404
-  changes:
-  - message: Revamped meteors. Meteors now crash through several walls before exploding.
-      They can still come in a weaker "space dust" form where they don't break through
-      structures.
-    type: Add
-  - message: Meteor and space dust events now occur on regular intervals during a
-      round rather than being tied to station events. Expect to see more of them during
-      a round.
-    type: Add
-  id: 6740
-  time: '2024-06-15T03:38:43.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28974
-- author: EmoGarbage404
-  changes:
-  - message: Added Moon Boots! This science research item allows you to move like
-      you're in zero-gravity.
-    type: Add
-  id: 6741
-  time: '2024-06-15T03:43:24.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29009
 - author: EmoGarbage404
   changes:
   - message: Attempting to uncuff oneself while being pulled will now take twice as
@@ -3855,3 +3826,26 @@
   id: 7238
   time: '2024-08-28T13:22:21.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/31569
+- author: themias
+  changes:
+  - message: Defibs batteries no longer drain when switched off
+    type: Fix
+  id: 7239
+  time: '2024-08-28T17:31:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/31593
+- author: themias
+  changes:
+  - message: Fixed the nuke disk being marked 'left behind' when escaping with it
+      on the shuttle
+    type: Fix
+  id: 7240
+  time: '2024-08-28T20:05:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/31602
+- author: Beck Thompson
+  changes:
+  - message: Gold and silver ring, gold and silver diamond ring, gold and silver gem
+      ring. They all can be obtained in salvage loot pools.
+    type: Add
+  id: 7241
+  time: '2024-08-28T20:48:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/31372
diff --git a/Resources/Locale/en-US/paper/story-generation.ftl b/Resources/Locale/en-US/paper/story-generation.ftl
@@ -109,7 +109,7 @@ story-gen-book-character-trait11 = poor
 story-gen-book-character-trait12 = popular
 story-gen-book-character-trait13 = absent-minded
 story-gen-book-character-trait14 = stern
-story-gen-book-character-trait15 = сharismatic
+story-gen-book-character-trait15 = charismatic
 story-gen-book-character-trait16 = stoic
 story-gen-book-character-trait17 = cute
 story-gen-book-character-trait18 = dwarven

diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -437,7 +437,7 @@ uplink-barber-scissors-name = Barber Scissors
 uplink-barber-scissors-desc = A good tool to give your fellow agent a nice haircut, unless you want to give it to yourself.
 
 uplink-backpack-syndicate-name = Syndicate backpack
-uplink-backpack-syndicate-desc = Lightweight explosion-proof а backpack for holding various traitor goods
+uplink-backpack-syndicate-desc = Lightweight explosion-proof a backpack for holding various traitor goods
 
 uplink-combat-bakery-name = Combat Bakery Kit
-uplink-combat-bakery-desc = A kit of clandestine baked weapons. Contains a baguette which a skilled mime could use as a sword and a pair of throwing croissants. Once the job is done, eat the evidence.
+uplink-combat-bakery-desc = A kit of clandestine baked weapons. Contains a baguette which a skilled mime could use as a sword and a pair of throwing croissants. Once the job is done, eat the evidence.
diff --git a/Resources/Maps/Shuttles/escape_pod_small.yml b/Resources/Maps/Shuttles/escape_pod_small.yml
@@ -121,7 +121,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,0.5
       parent: 29
-- proto: AtmosDeviceFanDirectional
+- proto: AtmosDeviceFanTiny
   entities:
   - uid: 9
     components:

diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml
@@ -12126,11 +12126,6 @@ entities:
     - type: Transform
       pos: 1.5,-21.5
       parent: 60
-  - uid: 13738
-    components:
-    - type: Transform
-      pos: 18.5,-18.5
-      parent: 60
   - uid: 13869
     components:
     - type: Transform
@@ -12180,11 +12175,6 @@ entities:
     - type: Transform
       pos: -26.5,22.5
       parent: 60
-  - uid: 16171
-    components:
-    - type: Transform
-      pos: 18.5,-17.5
-      parent: 60
   - uid: 17568
     components:
     - type: MetaData
@@ -62362,6 +62352,28 @@ entities:
     - type: Transform
       pos: 51.475224,-22.209888
       parent: 60
+- proto: CurtainsRedOpen
+  entities:
+  - uid: 23090
+    components:
+    - type: Transform
+      pos: 20.5,-21.5
+      parent: 60
+  - uid: 23091
+    components:
+    - type: Transform
+      pos: 21.5,-21.5
+      parent: 60
+  - uid: 24816
+    components:
+    - type: Transform
+      pos: 22.5,-21.5
+      parent: 60
+  - uid: 24817
+    components:
+    - type: Transform
+      pos: 23.5,-21.5
+      parent: 60
 - proto: CurtainsWhiteOpen
   entities:
   - uid: 21250
@@ -109124,6 +109136,11 @@ entities:
     - type: Transform
       pos: 47.487705,-12.25134
       parent: 60
+  - uid: 23089
+    components:
+    - type: Transform
+      pos: 43.51102,-1.4624498
+      parent: 60
 - proto: MedkitBurnFilled
   entities:
   - uid: 5675
@@ -116408,34 +116425,32 @@ entities:
     - type: Transform
       pos: -57.5,29.5
       parent: 60
-- proto: RadiationCollector
+- proto: RadiationCollectorFullTank
   entities:
   - uid: 8211
     components:
     - type: Transform
-      pos: 5.5,38.5
+      pos: 4.5,38.5
       parent: 60
-  - uid: 16160
+  - uid: 11527
     components:
     - type: Transform
-      pos: 6.5,38.5
+      pos: -4.5,38.5
       parent: 60
-  - uid: 16411
+  - uid: 13738
     components:
     - type: Transform
       pos: -3.5,38.5
       parent: 60
-  - uid: 17479
+  - uid: 16160
     components:
     - type: Transform
-      pos: 4.5,38.5
+      pos: 6.5,38.5
       parent: 60
-- proto: RadiationCollectorFullTank
-  entities:
-  - uid: 11527
+  - uid: 16171
     components:
     - type: Transform
-      pos: -4.5,38.5
+      pos: 5.5,38.5
       parent: 60
   - uid: 16384
     components:
@@ -124251,6 +124266,21 @@ entities:
         21755:
         - On: Open
         - Off: Close
+  - uid: 24818
+    components:
+    - type: MetaData
+      name: light switch
+    - type: Transform
+      pos: 21.5,-14.5
+      parent: 60
+    - type: DeviceLinkSource
+      linkedPorts:
+        1209:
+        - On: On
+        - Off: Off
+        1210:
+        - On: On
+        - Off: Off
 - proto: SignAnomaly
   entities:
   - uid: 9496
@@ -134899,6 +134929,11 @@ entities:
     - type: Transform
       pos: -51.5,-19.5
       parent: 60
+  - uid: 7071
+    components:
+    - type: Transform
+      pos: 18.5,-16.5
+      parent: 60
   - uid: 7077
     components:
     - type: Transform
@@ -134959,6 +134994,11 @@ entities:
     - type: Transform
       pos: -31.5,-4.5
       parent: 60
+  - uid: 16411
+    components:
+    - type: Transform
+      pos: 18.5,-19.5
+      parent: 60
 - proto: TobaccoSeeds
   entities:
   - uid: 3263
@@ -152279,11 +152319,6 @@ entities:
     - type: Transform
       pos: 15.5,-25.5
       parent: 60
-  - uid: 2910
-    components:
-    - type: Transform
-      pos: 18.5,-16.5
-      parent: 60
   - uid: 3347
     components:
     - type: Transform
@@ -152349,11 +152384,6 @@ entities:
     - type: Transform
       pos: 14.5,12.5
       parent: 60
-  - uid: 7071
-    components:
-    - type: Transform
-      pos: 18.5,-19.5
-      parent: 60
   - uid: 7719
     components:
     - type: Transform
@@ -156484,6 +156514,11 @@ entities:
       parent: 60
 - proto: WoodDoor
   entities:
+  - uid: 2910
+    components:
+    - type: Transform
+      pos: 18.5,-18.5
+      parent: 60
   - uid: 3637
     components:
     - type: Transform
@@ -156508,6 +156543,11 @@ entities:
     - type: Transform
       pos: -18.5,19.5
       parent: 60
+  - uid: 17479
+    components:
+    - type: Transform
+      pos: 18.5,-17.5
+      parent: 60
 - proto: Wrench
   entities:
   - uid: 1556

diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml
@@ -11015,7 +11015,7 @@ entities:
       pos: -20.5,-5.5
       parent: 30
     - type: Door
-      secondsUntilStateChange: -25025.113
+      secondsUntilStateChange: -25052.139
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -118893,6 +118893,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -17.5,-0.5
       parent: 30
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Sec Med Office
   - uid: 21283
     components:
     - type: Transform

diff --git a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
@@ -48,3 +48,16 @@
   - type: Fiber
     fiberMaterial: fibers-synthetic
   - type: FingerprintMask
+
+- type: entity
+  abstract: true
+  parent: BaseItem
+  id: RingBase
+  components:
+    - type: Clothing
+      slots: [ gloves, neck ]
+    - type: Item
+      size: Tiny
+    - type: Tag
+      tags:
+      - Ring