Conflict fix

2020-01-24 23:06:32 +01:00
parent ff8289c177 0817639139
commit e360ac1d36
202 changed files with 15686 additions and 10893 deletions
@@ -0,0 +1,28 @@
+author: "4dplanner, CRITAWAKETS, XDTM, ninjanomnom"
+delete-after: True
+changes: 
+  - rscadd: "sepia slime extract has a delay before activating"
+  - balance: "the user of a sepia slime extract is no longer immune to the time field"
+  - balance: "chilling sepia is now the support extract - it always freezes the user, but not other marked people. give one to your golem!"
+  - rscadd: "burning sepia spawns the rewind camera. Take a selfie with someone and give it to them to make sure they remember the moment forever! You don't actually need to give them the photo, they'll remember anyway. Keep it as a reminder."
+  - rscadd: "rewinding (deja vu) effect resets your location to the turf you were on after 10 seconds as well as resetting limbs/mobs/objects damage to the point it was added."
+  - rscadd: "The deja vu effect cannot resurrect the dead, but will heal their corpse. New limbs fall off, old ones re-attach"
+  - rscadd: "Regenerative sepia cores add a deja vu effect before healing instead of a timestop
+remove: timefreeze camera is admin spawn only."
+  - rscadd: "recurring sepia recalls to the hand of the last person to touch it after activating. Reusable timestop grenades!"
+  - tweak: "some special cameras don't prompt for customisation"
+  - bugfix: "timefreeze camera actually makes a photo"
+  - bugfix: "timestop stops pathing and mechs."
+  - bugfix: "adds a check to make sure simple_animals don't get their AI toggled while sentient"
+  - bugfix: "Adds the timestop overlay to frozen projectiles"
+  - bugfix: "Timestopped things have INFINITY move_resist as opposed to being anchored"
+  - bugfix: "Timestop will now unfreeze things that somehow leave it"
+  - bugfix: "mobs in the middle of a walk_to will have their walk stopped by timestop"
+  - bugfix: "mobs that are stunned will be stopped mid walk as well"
+  - bugfix: "pulling respects changes in move_force"
+  - bugfix: "swapping places respects move_force if the participant is not willing"
+  - bugfix: "timestop is properly defeated by antimagic."
+  - bugfix: "timestop only checks antimagic once"
+  - tweak: "Time stop now applies its visual effect on floors, walls and static structures (with no change otherwise)"
+  - tweak: "Movable structures are now anchored while time stopped."
+  - tweak: "Timestop effects now prevent speech."
@@ -0,0 +1,4 @@
+author: "CameronWoof"
+delete-after: True
+changes: 
+  - tweak: "Lizard tails are now viable options for humans and anthromorphs."
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes: 
+  - balance: "emitters are now hitscan"
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes: 
+  - rscadd: "Ghosting no longer stops abductors from using you."
@@ -0,0 +1,4 @@
+author: "Seris02"
+delete-after: True
+changes: 
+  - rscadd: "traitor tool for bowmanizing headsets + bowmanizing headsets"
@@ -0,0 +1,4 @@
+author: "PersianXerxes"
+delete-after: True
+changes: 
+  - tweak: "Reduces the range of the forcefield projector from 7 tiles to 2 tiles."
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - balance: "Metabolic synthesis disables if user isn't well-fed rather than if user is starving"
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes: 
+  - bugfix: "Fixed a little exploit with ventcrawlers being capable of escaping closed turfs by printing scrubbers/vents into them."
@@ -0,0 +1,4 @@
+author: "KeRSedChaplain"
+delete-after: True
+changes: 
+  - imageadd: "The clockwork cuirass can now support slithering taur bodies."
@@ -0,0 +1,4 @@
+author: "r4d6"
+delete-after: True
+changes: 
+  - refactor: "better code for passive vents"
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes: 
+  - rscadd: "you can now block people on your PDA"
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - balance: "Cold-blooded costs -2 quirk points now"
@@ -0,0 +1,8 @@
+author: "Owai-Seek"
+delete-after: True
+changes: 
+  - rscadd: "Four New Bounties"
+  - tweak: "tweaked several bounties"
+  - tweak: "reorganised several bounties"
+  - balance: "balanced several bounties"
+  - bugfix: "added shady jims to vendor"
@@ -0,0 +1,4 @@
+author: "keronshb"
+delete-after: True
+changes: 
+  - bugfix: "fixed my messup"
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes: 
+  - bugfix: "Grenades can now have their timers adjusted."
@@ -0,0 +1,7 @@
+author: "Seris02"
+delete-after: True
+changes: 
+  - tweak: "conveyor belt now are stacks instead of single item"
+  - tweak: "conveyor crate has 30 belts"
+  - tweak: "printing a conveyor costs 3000 metal"
+  - rscadd: "you can press the conveyor switch in hand to link any not deployed belts to it"
@@ -0,0 +1,4 @@
+author: "Hatterhat"
+delete-after: True
+changes: 
+  - balance: "Dropped Exo-suit armor to put it more in line with being an explorer suit sidegrade and not a straight upgrade for Lavaland usage."
@@ -0,0 +1,4 @@
+author: "Hatterhat"
+delete-after: True
+changes: 
+  - rscadd: "You can now print .357 AP speedloaders from Security techfabs after you pick up the Advanced Non-Standard Ballistics node."
@@ -0,0 +1,11 @@
+author: "Owai-Seek"
+delete-after: True
+changes: 
+  - rscadd: "Towel, Bedsheet, and Colored bedsheet bins to Dojo. Some lockers with carpets and wood, another bathroom/shower, tons of cleaning supplies, some additional trash cans, a tiny medical area, and some vendors/vendor resupplies. Also added some Ambrosia Gaia seeds."
+  - tweak: "Moved some lights around, extended the dojo a bit to make it feel more spacious."
+  - rscdel: "Cafe Newsfeed Frame"
+  - rscadd: "Towel, Bedsheet, and Colored bedsheet bins to Dojo. Some lockers with carpets and wood, another bathroom/shower, tons of cleaning supplies, some additional trash cans, a tiny medical area, and some vendors/vendor resupplies. Also added some Ambrosia Gaia seeds."
+  - tweak: "Moved some lights around, extended the dojo a bit to make it feel more spacious."
+  - rscdel: "Cafe Newsfeed Frame"
+  - rscadd: "Towel, Bedsheet, and Colored bedsheet bins to Dojo. Some lockers with carpets and wood, another bathroom/shower, tons of cleaning supplies, some additional trash cans, a tiny medical area, and some vendors/vendor resupplies. Also added some Ambrosia Gaia seeds."
+  - tweak: "Moved some lights around, extended the dojo a bit to make it feel more spacious."
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes: 
+  - bugfix: "deconstructing a rubber toolbox with the destructive analyzer won't \"lock\" the machine anymore."
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes: 
+  - balance: "Cloning has been nerfed."
@@ -0,0 +1,5 @@
+author: "Commandersand"
+delete-after: True
+changes: 
+  - balance: "lightning bolt,tesla,forcewall,emp spells have lower cooldown"
+  - balance: "fireball has a 10 second starting cooldown"
@@ -0,0 +1,4 @@
+author: "Hatterhat"
+delete-after: True
+changes: 
+  - rscdel: "Forensic scanner removed from Advanced Biotechnology node."
@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone, Ghommie"
+delete-after: True
+changes: 
+  - rscadd: "More types of glass can now be used to make a solar panel, with different sturdiness and efficiency depending the type."
@@ -0,0 +1,4 @@
+author: "r4d6"
+delete-after: True
+changes: 
+  - bugfix: "fixed a hole in Meta"
@@ -0,0 +1,4 @@
+author: "jakeramsay007"
+delete-after: True
+changes: 
+  - rscadd: "The assorted .357 revolvers (except russian revolver) can now also load .38, like real life."
@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes: 
+  - rscadd: "tip of the round: Cleanbot can withstand lava and burning hot ash. Its a god"
@@ -0,0 +1,4 @@
+author: "r4d6"
+delete-after: True
+changes: 
+  - rscadd: "Added the ability to easily add variations of the mining base"
@@ -0,0 +1,4 @@
+author: "Arturlang"
+delete-after: True
+changes: 
+  - rscadd: "Added modular computers to the loadout"
@@ -0,0 +1,4 @@
+author: "kappa-sama"
+delete-after: True
+changes: 
+  - balance: "dragnet snares can now be removed in 5 seconds"
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes: 
+  - bugfix: "Something about empty hand combat mode right click waving hands defying common sense and being spammy."
@@ -0,0 +1,5 @@
+author: "Kraseo"
+delete-after: True
+changes: 
+  - bugfix: "Virgo hairstyles no longer have those annoying quotation marks. Rejoice for you will no longer have to use the scrollbar."
+  - imagedel: "Got rid of some strange-looking hairstyles. (Tbob, fingerweave, etc.)"
@@ -0,0 +1,7 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes: 
+  - rscadd: "more glassware"
+  - rscadd: "Few new packs and glassmaker kit!"
+  - tweak: "prices/chems of crates/autobottler"
+  - bugfix: "some crates ungettable as well as some broken crates"