Automatic changelog compile [ci skip]

2021-01-27 00:46:54 +00:00
parent b292726a64
commit dd540c29fb
1 changed files with 5 additions and 0 deletions
@@ -28271,6 +28271,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
  silicons:
  - tweak: you can now shove yourself up in any intent, not just help.
 2021-01-27:
+<<<<<<< HEAD
  ArcaneMusic, ported by Hatterhat:
  - rscadd: Strike a hydroponics tray with a fully-charged floral somatoray to lock
      in a mutation.
@@ -28368,3 +28369,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2021-02-03:
  Hatterhat:
  - bugfix: The green energy sabre's sprite now respects proper handedness.
+=======
+  raspy-on-osu:
+  - bugfix: bespoke ventcrawling element not detaching due to malformed call
+>>>>>>> a704286c2d... Automatic changelog compile [ci skip]