Conflict fix

2020-01-20 13:50:52 +02:00
parent 782125b339 0f4f07dc95
commit f5ad854c2c
373 changed files with 6548 additions and 3989 deletions
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes: 
+  - tweak: "Attached kevlar/soft/plastic padding accessories are now stealthier and will no longer be displayed on mob examine."
@@ -0,0 +1,5 @@
+author: "Kevinz000"
+delete-after: True
+changes: 
+  - bugfix: "Fixes successful projectile hits also striking another atom on the same turf should the first one be not the target the projectile was meant for."
+  - rscdel: "Removes infinite reflector loops."
@@ -0,0 +1,4 @@
+author: "Seris02"
+delete-after: True
+changes: 
+  - rscadd: "stunglasses"
@@ -0,0 +1,6 @@
+author: "Bhijn"
+delete-after: True
+changes: 
+  - rscadd: "Limbs now regenerate their stamina faster while disabled"
+  - rscadd: "Limbs now have the same incoming stamina damage multiplier mechanics as spacemen, where the more staminaloss they take while disabled, the less staminaloss they'll take."
+  - balance: "Limbs have had their base stamina regen rate doubled to match the doubled stamina regen rate of standard spacemen."
@@ -0,0 +1,4 @@
+author: "deathride58"
+delete-after: True
+changes: 
+  - balance: "The stamina buffer no longer uses stamina while recharging."
@@ -0,0 +1,5 @@
+author: "r4d6"
+delete-after: True
+changes: 
+  - rscadd: "Added a Radiation Hardsuit"
+  - rscadd: "Added a Radiation Hardsuit crate"
@@ -0,0 +1,12 @@
+author: "Putnam"
+delete-after: True
+changes: 
+  - rscdel: "Arousal damage is gone, and with it the arousal damage heart on the UI."
+  - rscdel: "As exhibitionist relied on arousal damage, that's gone too."
+  - rscdel: "Bonermeter and electronic stimulation circuit modules are gone."
+  - rscdel: "Masturbation is no longer an option in the climax menu. It was identical to climax alone in every way but text. Emote it out."
+  - rscadd: "Arousal on genitals can now be displayed manually, on a case-by-case basis."
+  - rscadd: "\"Climax alone\" and \"climax with partner\" now only display to the people directly involved in the interaction.
+rework: Catnip tea, catnip, crocin, hexacrocin, camphor, hexacamphor all had functions or bits of functions reworked."
+  - tweak: "\"Climax with partner\" now requires consent from both parties--it can no longer be used on mindless mobs, and it asks the mob getting climaxed with if they consent first."
+  - tweak: "A lot of MKUltra behaviors have been moved to hypno checks or removed due to reliance on maso/nympho/exhib."
@@ -0,0 +1,5 @@
+author: "dapnee"
+delete-after: True
+changes: 
+  - imageadd: "new toxin's uniform and accessories"
+  - imagedel: "old toxin's uniform and accessories"
@@ -0,0 +1,5 @@
+author: "Putnam"
+delete-after: True
+changes: 
+  - rscadd: "Two relief valves for atmospherics, available in your RPD today: a unary one that opens to air and a binary one that connects two pipenets, like a manual valve."
+  - tweak: "The atmos waste outlet injector on box has been replaced with an atmos waste relief valve."
@@ -0,0 +1,7 @@
+author: "Denton, ported by Hatterhat"
+delete-after: True
+changes: 
+  - tweak: "Most upgradeable machines now show their upgrade status when examined while standing right next to them."
+  - tweak: "Added examine messages to teleporter stations that hint at their multitool/wirecutter interactions."
+  - tweak: "Renamed teleporter stations from station to teleporter station."
+  - code_imp: "Changed the teleporter hub accurate var to accuracy; the old name misled people into thinking that it was a boolean."
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - tweak: "Ghost dojo spawns will dust if their owner suicides or uses the \"ghost\" verb."
@@ -0,0 +1,4 @@
+author: "r4d6"
+delete-after: True
+changes: 
+  - rscadd: "added passive vent to the arsenal of atmospheric devices."
@@ -0,0 +1,5 @@
+author: "keronshb"
+delete-after: True
+changes: 
+  - rscadd: "Ports the special nanite remote, mood programs, and research generating nanites"
+  - balance: "rebalances some nanites"
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes: 
+  - code_imp: "Mapping helpers added for power cables and atmos pipes."
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes: 
+  - bugfix: "Riot foam dart (not the ammo box) design cost is yet again consistent with the result's material amount."
@@ -0,0 +1,4 @@
+author: "r4d6"
+delete-after: True
+changes: 
+  - rscadd: "Mining base now has a common area accessible via a new shuttle on the medium-highpop maps, and a security office connecting the gulag and the mining base. Gulag also has functional atmos."
@@ -0,0 +1,4 @@
+author: "r4d6"
+delete-after: True
+changes: 
+  - rscadd: "Added more Cyborg Landmarks"
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - admin: "Crafting is logged in a file now"
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - bugfix: "temporary flavor text now pops up properly"
@@ -0,0 +1,4 @@
+author: "AffectedArc07"
+delete-after: True
+changes: 
+  - code_imp: "Line ending CI works now"
@@ -0,0 +1,4 @@
+author: "Tupinambis"
+delete-after: True
+changes: 
+  - balance: "RLDs now cost more to use, have reduced matter capacity, and sheets are worth less when refilling them."
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes: 
+  - rscdel: "Blood duplication is gone, but viruses now react up to 5 times, 1 time per unit, for virus mix."
@@ -0,0 +1,5 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - code_imp: "demodularized player panel code, mostly"
+  - admin: "added ghost role eligibility delay removal to player panel"
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - bugfix: "Gibtonite no longer instantly explodes upon being pickaxe'd."
@@ -0,0 +1,6 @@
+author: "Kraseo"
+delete-after: True
+changes: 
+  - bugfix: "Jelly donuts and pink jelly donuts will now properly display sprinkled icon state."
+  - bugfix: "Jelly donuts and its variants will properly spawn with berry juice."
+  - bugfix: "Slime jelly donuts have slime jelly in them now. (thanks ghommie)"
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - config: "Added suicide to the config."
@@ -0,0 +1,9 @@
+author: "Ghommie (original PRs by Kevinz000, ShivCalez, 4dplanner, Barhandar, 81Denton, zxaber, Fox-McCloud)"
+delete-after: True
+changes: 
+  - rscadd: "All atom movables now have move force and move resist, and pull force An atom can only pull another atom if its pull force is stronger than that atom's move resist"
+  - rscadd: "Mobs with a higher move force than an atom's move resist will automatically try to force the atom out of its way. This might not always work, depending on how snowflakey code is.
+experimental: As of right now, everything has a move force and resist of 100, and a pull force of 101. Things take (resist - force) damage when bumped into
+experimental: Failing to move onto a tile will now still bump up your last move timer. However, successfully pushing something out of your way will result in you automatically moving into where it was."
+  - bugfix: "Bolted AIs can no longer be teleported by launchpads."
+  - balance: "Megafauna cannot teleport"