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

2021-01-19 04:24:42 -07:00
parent f0a9a7a179 e6e9a22615
commit dedb0cb62e
105 changed files with 978 additions and 411 deletions
@@ -0,0 +1,4 @@
+author: "necromanceranne"
+delete-after: True
+changes: 
+  - rscadd: "Adds new roboticist labcoat sprites!"
@@ -0,0 +1,4 @@
+author: "zeroisthebiggay"
+delete-after: True
+changes: 
+  - imageadd: "fuck the r*d cr*ss"
@@ -0,0 +1,7 @@
+author: "shellspeed1"
+delete-after: True
+changes: 
+  - rscadd: "Wings from Cit RP have been ported over"
+  - rscadd: "Moth wings from cit have been ported over"
+  - bugfix: "Cleaned up some pixels on existing moth wings."
+  - tweak: "Organized the lists for wings by if they are for moths or not and than by alphabetical."
@@ -0,0 +1,4 @@
+author: "DeltaFire15"
+delete-after: True
+changes: 
+  - bugfix: "Combat mode now will not stay permanently disabled due to status effects not working as intended."
@@ -0,0 +1,7 @@
+author: "DeltaFire15"
+delete-after: True
+changes: 
+  - rscadd: "A new surgery, allowing revival of synths without a defib at hand."
+  - balance: "Semi-permanent damage of Synth limbs caused by passing the damage threshold: 10 <- 15."
+  - tweak: "The embed removal surgery now has a version for Synths."
+  - balance: "EMPs no longer hardstun Synths."
@@ -0,0 +1,4 @@
+author: "HeroWithYay"
+delete-after: True
+changes: 
+  - tweak: "Wormhole Projector and Gravity Gun now require anomaly cores to function instead of firing pins."
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - tweak: "Replaces majority judgement with usual judgement."
@@ -0,0 +1,8 @@
+author: "kappa-sama"
+delete-after: True
+changes: 
+  - rscadd: "A new spell for the wizard and his martial apprentices, the Inner Mantra technique. It makes you punch people really good and makes you durable, but drains your energy while it's active."
+  - rscadd: "A self-buffing spell for valiant bubblegum slayers that is ultimately useless on lavaland and probably overpowered for miner antagonists. Go figure. At least all it does is let you punch hard while draining your health every second."
+  - balance: "bubblegum now drops a book that makes you into an abusive father instead of a shotgun that plays like pre-nerf shotguns"
+  - soundadd: "a powerup and powerdown sound effect"
+  - imageadd: "two icons for two buff spells"
@@ -0,0 +1,4 @@
+author: "DeltaFire15"
+delete-after: True
+changes: 
+  - bugfix: "Some edge cases causing issues with system corruption shouldn't be able to occur anymore."
@@ -0,0 +1,4 @@
+author: "SiliconMain"
+delete-after: True
+changes: 
+  - tweak: "hololocks (which haven't worked for god knows how long) commented out until auxmos is merged"
@@ -0,0 +1,4 @@
+author: "DeltaFire15"
+delete-after: True
+changes: 
+  - rscadd: "Nanogel, available at medical and robotics, which fixes internal damage in sufficiently repaired robotic limbs."
@@ -0,0 +1,4 @@
+author: "Hatterhat"
+delete-after: True
+changes: 
+  - rscadd: "Basic sticky technology is now a roundstart tech. Advanced sticky technology is BEPIS-locked, though. Theoretically."
@@ -0,0 +1,4 @@
+author: "LetterN"
+delete-after: True
+changes: 
+  - bugfix: "fixed telecomms pda log"
@@ -0,0 +1,4 @@
+author: "kiwedespars"
+delete-after: True
+changes: 
+  - rscadd: "the robust dildo weapon now has sound."
@@ -0,0 +1,4 @@
+author: "timothyteakettle"
+delete-after: True
+changes: 
+  - rscadd: "licking people washes pie off their face"
@@ -0,0 +1,4 @@
+author: "corin9090"
+delete-after: True
+changes: 
+  - tweak: "The chaplain's prayer beads can now be worn on your belt slot"
@@ -0,0 +1,4 @@
+author: "MrJWhit"
+delete-after: True
+changes: 
+  - tweak: "Updates suit storage info on Tip Of the Round."
@@ -0,0 +1,5 @@
+author: "TheObserver"
+delete-after: True
+changes: 
+  - rscadd: "Re-adds the rifle stock, and sets the improv shotgun to be as it was."
+  - rscdel: "The maintenance rifle has been shelved - for now. Watch this space."
@@ -0,0 +1,4 @@
+author: "BlueWildrose"
+delete-after: True
+changes: 
+  - tweak: "No more straining when your cock or breasts are growing via incubus draft or succubus milk."
@@ -0,0 +1,4 @@
+author: "Hatterhat"
+delete-after: True
+changes: 
+  - rscdel: "Apparently, shrink rays were buyable again, despite a PR having been made a while ago specifically for removing shrink rays. They're gone again."
@@ -0,0 +1,5 @@
+author: "Hatterhat"
+delete-after: True
+changes: 
+  - tweak: "Improvised gauzes can now be crafted in stacks up to 10, like their maximum stacksize implies they should be capable of doing."
+  - bugfix: "Pouring sterilizine on gauze now takes the proper 5u per sterilized gauze instead of 10u."
@@ -0,0 +1,4 @@
+author: "kappa-sama"
+delete-after: True
+changes: 
+  - bugfix: "super saiyan"
@@ -0,0 +1,4 @@
+author: "MrJWhit"
+delete-after: True
+changes: 
+  - tweak: "A small bucket of random fixes,"
@@ -0,0 +1,4 @@
+author: "YakumoChen"
+delete-after: True
+changes: 
+  - balance: "To lower production costs, Buzz Fuzz is now manufactured with Real™️ Synthetic honey."
@@ -0,0 +1,7 @@
+author: "kappa-sama"
+delete-after: True
+changes: 
+  - rscadd: "s"
+  - tweak: "s"
+  - balance: "s"
+  - bugfix: "s"