Merge branch 'fix-presets' of https://github.com/Kaga-404/CM13 into f…

…ix-presets

html/changelogs/AutoChangeLog-pr-5645.yml

@@ -0,0 +1,4 @@
+author: "hislittlecuzingames"
+delete-after: True
+changes:
+  - maptweak: "tweaked Trijent Dam to add a new choke point."

html/changelogs/archive/2024-02.yml

@@ -218,3 +218,32 @@
   Diegoflores31:
   - balance: Tail Jab will now target enemies on the same tile it was targeted.
   - balance: Aiming Tail Jab directly on a target will do an additional 15 damage
+2024-02-20:
+  BeagleGaming1:
+  - balance: Xenos can slash reactors
+  - balance: Reactors that are damaged will still run until reaching weld damage or
+      being manually de-activated
+  - balance: Reactors that are damaged will lose fuel (when applicable) and fail more
+      often when fuel runs out, new cells need to be used to reset the fail rate
+  - balance: Reactors can be damaged by bullets or explosions
+  - code_imp: Updated Power all ship reactors admin button code
+  - imageadd: Updated reactor sprites
+  - maptweak: Minor changes to reactors and surrounding areas
+  Drathek:
+  - code_imp: Autowiki now skips guns and mags without icon_states
+  - code_imp: Unit testing for spritesheets now enforces css requirements for class
+      names
+  - imageadd: Gun stats lineart now uses the no_name sprite again for guns without
+      lineart
+  - rscdel: Removed death messages for lesser drones and facehuggers that are still
+      temporarily muted
+  Huffie56:
+  - balance: add the ability for SG to buy an VP78 or an SU-6 each for 15 points.
+  SabreML:
+  - ui: Added tooltips to entry icons in the changelog.
+  - code_imp: Added a unit test for xeno strains.
+  Vicacrov:
+  - bugfix: Fixes a missing examine text when you hit an exactly half-full ammo magazine
+      against your helmet.
+  Zonespace27:
+  - bugfix: You can no longer remove vehicle parts from a vehicle at a distance

maps/map_files/DesertDam/Desert_Dam.dmm

@@ -11227,11 +11227,6 @@
 /obj/structure/flora/grass/desert/heavygrass_3,
 /turf/open/desert/dirt,
 /area/desert_dam/interior/caves/central_caves)
-"aHO" = (
-/turf/open/asphalt/cement_sunbleached{
-	icon_state = "cement_sunbleached16"
-	},
-/area/desert_dam/exterior/valley/valley_wilderness)
 "aHP" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/asphalt{
@@ -96361,7 +96356,7 @@ awC
 awC
 dTs
 dTs
-aHO
+aXv
 aPP
 aaC
 aXC
@@ -96607,7 +96602,7 @@ aVZ
 aHd
 dTs
 aOh
-dTs
+aWz
 dTs
 dTs
 dTs
@@ -98713,8 +98708,8 @@ dTs
 dTs
 dTs
 dTs
-aam
-ayp
+dTs
+dTs
 aeE
 aeE
 ayD
@@ -99885,7 +99880,7 @@ dTs
 dTs
 aam
 ayp
-aeE
+dTs
 aeE
 bgH
 dTs