Merge remote-tracking branch 'citadel/master' into tgsync

2021-01-13 15:41:28 -07:00
parent 343ef7db2c 1fd9bc8a50
commit ea07ad6e48
63 changed files with 303 additions and 252 deletions
@@ -0,0 +1,4 @@
+author: "Arturlang"
+delete-after: True
+changes: 
+  - tweak: "The cursed heart now only takes away half as much blood every loop, and can be used as long as you are alive, instead if only you are awake/able to use your hands"
@@ -0,0 +1,4 @@
+author: "necromanceranne"
+delete-after: True
+changes: 
+  - bugfix: "Fixes various sprites for bokken, as well as being unable to craft certain parts and duplicate entries."
@@ -0,0 +1,4 @@
+author: "DeltaFire15"
+delete-after: True
+changes: 
+  - balance: "Some synth damage stuff has been a bit rebalanced, see the PR for details."
@@ -0,0 +1,4 @@
+author: "timothyteakettle"
+delete-after: True
+changes: 
+  - bugfix: "species with NOTRANSSTING cannot have envy's knife used on them"
@@ -0,0 +1,4 @@
+author: "BlueWildrose"
+delete-after: True
+changes: 
+  - bugfix: "Fixes noodle size appearance for 12+ inch members."
@@ -0,0 +1,4 @@
+author: "BlueWildrose"
+delete-after: True
+changes: 
+  - rscadd: "Color Mates have been added to all stations (except Snaxi). Enjoy coloring your attire without having to bug science!"
@@ -0,0 +1,4 @@
+author: "BlueWildrose"
+delete-after: True
+changes: 
+  - tweak: "You will now only unbuckle fireman-carried/piggybacked people on disarm or harm intent."
@@ -0,0 +1,9 @@
+author: "Hatterhat"
+delete-after: True
+changes: 
+  - rscadd: "The nature interaction shuttle with the monkeys now has tiny fans on the airlocks in, because that's apparently a feature that was missing."
+  - rscadd: "More bags have been added to department vendors."
+  - balance: "Every roundstart species (and also ash walkers) now has flesh and bone that can be wounded."
+  - balance: "Recipes for sutures, regen mesh, and sterilized gauze have been adjusted to be easier, mostly."
+  - balance: "Sterilized gauze is better at absorbing blood and being a splint."
+  - bugfix: "Energy sabres now have an off inhand."