Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic

2019-11-14 02:23:48 -08:00
parent ad84b2977a 3d8ebe4219
commit 304ce37d6c
96 changed files with 260 additions and 202 deletions
@@ -0,0 +1,4 @@
+author: "AffectedArc07"
+delete-after: True
+changes: 
+  - code_imp: "Fixes a LOT of code edge cases"
@@ -0,0 +1,7 @@
+author: "nemvar"
+delete-after: True
+changes: 
+  - tweak: "The lavaland clown ruin has some new pranks ready."
+  - rscadd: "Added a new loot item to the lavaland clown ruin."
+  - rscdel: "Removed the slime core from said ruin."
+  - balance: "The clown PDA now properly slips people on jogging move intent regardless of fatigue. Honkmother's will."
@@ -0,0 +1,4 @@
+author: "kappa-sama"
+delete-after: True
+changes: 
+  - imageadd: "added TG's icons for traitor, russian, and golden revolver"