Merge remote-tracking branch 'origin/master' into semi-sync

2020-12-21 21:19:06 +08:00
parent 2966f985a3 ce3cfca619
commit abd94d1c03
189 changed files with 10453 additions and 8486 deletions
@@ -1,41 +1,41 @@
-.top{font-family:Tahoma,sans-serif;font-size:12px;}
-h2{font-family:Tahoma,sans-serif;}
-a img {border:none;}
-.bgimages16 li {
-	padding:2px 10px 2px 30px;
-	background-position:6px center;
-	background-repeat:no-repeat;
-	border:1px solid #ddd;
-	border-left:4px solid #999;
-	margin-bottom:2px;
-}
-.bugfix {background-image:url(bug-minus.png)}
-.wip {background-image:url(hard-hat-exclamation.png)}
-.tweak {background-image:url(wrench-screwdriver.png)}
-.soundadd {background-image:url(music-plus.png)}
-.sounddel {background-image:url(music-minus.png)}
-.rscdel {background-image:url(cross-circle.png)}
-.rscadd {background-image:url(tick-circle.png)}
-.imageadd {background-image:url(image-plus.png)}
-.imagedel {background-image:url(image-minus.png)}
-.spellcheck {background-image:url(spell-check.png)}
-.experiment {background-image:url(burn-exclamation.png)}
-.refactor {background-image:url(burn-exclamation.png)}
-.code_imp {background-image:url(coding.png)}
-.config {background-image:url(chrome-wrench.png)}
-.admin {background-image:url(ban.png)}
-.server {background-image:url(hard-hat-exclamation.png)}
-.balance {background-image:url(scales.png)}
-.sansserif {font-family:Tahoma,sans-serif;font-size:12px;}
-.commit {margin-bottom:20px;font-size:100%;font-weight:normal;}
-.changes {list-style:none;margin:5px 0;padding:0 0 0 25px;font-size:0.8em;}
-.date {margin:10px 0;color:blue;border-bottom:2px solid #00f;width:60%;padding:2px 0;font-size:1em;font-weight:bold;}	
-.author {padding-left:10px;margin:0;font-weight:bold;font-size:0.9em;}
-.drop {cursor:pointer;border:1px solid #999;display:inline;font-size:0.9em;padding:1px 20px 1px 5px;line-height:16px;}
-.hidden {display:none;}
-.indrop {margin:2px 0 0 0;clear:both;background:#fff;border:1px solid #ddd;padding:5px 10px;}
-.indrop p {margin:0;font-size:0.8em;line-height:16px;margin:1px 0;}
-.indrop img {margin-right:5px;vertical-align:middle;}
-.closed {background:url(chevron-expand.png) right center no-repeat;}
-.open {background:url(chevron.png) right center no-repeat;}
-.lic {font-size:9px;}
+.top{font-family:Tahoma,sans-serif;font-size:12px;}
+h2{font-family:Tahoma,sans-serif;}
+a img {border:none;}
+.bgimages16 li {
+	padding:2px 10px 2px 30px;
+	background-position:6px center;
+	background-repeat:no-repeat;
+	border:1px solid #ddd;
+	border-left:4px solid #999;
+	margin-bottom:2px;
+}
+.bugfix {background-image:url(bug-minus.png)}
+.wip {background-image:url(hard-hat-exclamation.png)}
+.tweak {background-image:url(wrench-screwdriver.png)}
+.soundadd {background-image:url(music-plus.png)}
+.sounddel {background-image:url(music-minus.png)}
+.rscdel {background-image:url(cross-circle.png)}
+.rscadd {background-image:url(tick-circle.png)}
+.imageadd {background-image:url(image-plus.png)}
+.imagedel {background-image:url(image-minus.png)}
+.spellcheck {background-image:url(spell-check.png)}
+.experiment {background-image:url(burn-exclamation.png)}
+.refactor {background-image:url(burn-exclamation.png)}
+.code_imp {background-image:url(coding.png)}
+.config {background-image:url(chrome-wrench.png)}
+.admin {background-image:url(ban.png)}
+.server {background-image:url(hard-hat-exclamation.png)}
+.balance {background-image:url(scales.png)}
+.sansserif {font-family:Tahoma,sans-serif;font-size:12px;}
+.commit {margin-bottom:20px;font-size:100%;font-weight:normal;}
+.changes {list-style:none;margin:5px 0;padding:0 0 0 25px;font-size:0.8em;}
+.date {margin:10px 0;color:blue;border-bottom:2px solid #00f;width:60%;padding:2px 0;font-size:1em;font-weight:bold;}	
+.author {padding-left:10px;margin:0;font-weight:bold;font-size:0.9em;}
+.drop {cursor:pointer;border:1px solid #999;display:inline;font-size:0.9em;padding:1px 20px 1px 5px;line-height:16px;}
+.hidden {display:none;}
+.indrop {margin:2px 0 0 0;clear:both;background:#fff;border:1px solid #ddd;padding:5px 10px;}
+.indrop p {margin:0;font-size:0.8em;line-height:16px;margin:1px 0;}
+.indrop img {margin-right:5px;vertical-align:middle;}
+.closed {background:url(chevron-expand.png) right center no-repeat;}
+.open {background:url(chevron.png) right center no-repeat;}
+.lic {font-size:9px;}
@@ -0,0 +1,5 @@
+author: "silicons"
+delete-after: True
+changes: 
+  - tweak: "nanite resistances tweaked"
+  - rscadd: "new nanite programs added for locking the user out from being modified by consoles or antivirals."
@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes: 
+  - bugfix: "keybinds generate anti-collision bindings where necessary automatically now"
@@ -0,0 +1,5 @@
+author: "keronshb"
+delete-after: True
+changes: 
+  - rscadd: "Adds more room to northwest maint"
+  - rscadd: "Adds a bridge between Atmos and the Turbine."
@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes: 
+  - tweak: "text formatting now uses one character instead of two around the text to emphasize."
@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes: 
+  - balance: "stamina crit is only removed when at or under 100 stamina, rather than 140. stamina crit threshold is still at 140."
@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes: 
+  - balance: "shoving yourself up now costs 50% more"
@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes: 
+  - rscadd: "colormates"
@@ -0,0 +1,4 @@
+author: "timothyteakettle"
+delete-after: True
+changes: 
+  - rscadd: "improvements to the automatic age gate"
@@ -0,0 +1,5 @@
+author: "timothyteakettle"
+delete-after: True
+changes: 
+  - tweak: "custom holoforms are now accessible through an action instead of through verbs"
+  - tweak: "AI holoforms can now emote"
@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes: 
+  - balance: "dna melt drops all items being destroying you"
@@ -0,0 +1,4 @@
+author: "Hatterhat"
+delete-after: True
+changes: 
+  - tweak: "RPEDs now drop their lowest part tier first when quick-emptied (used inhand)."
@@ -0,0 +1,4 @@
+author: "Hatterhat"
+delete-after: True
+changes: 
+  - tweak: "Exosuits sold on the Supply shuttle no longer leave wreckages."
@@ -0,0 +1,4 @@
+author: "MrJWhit"
+delete-after: True
+changes: 
+  - tweak: "Updated jukebox sprite."
@@ -0,0 +1,4 @@
+author: "MrJWhit"
+delete-after: True
+changes: 
+  - tweak: "Updates our dark gygax sprites to /tg/'s"
@@ -0,0 +1,4 @@
+author: "MrJWhit"
+delete-after: True
+changes: 
+  - tweak: "Updated meat icons"
@@ -0,0 +1,4 @@
+author: "MrJWhit"
+delete-after: True
+changes: 
+  - rscadd: "Adds a goose bar sign"
@@ -0,0 +1,4 @@
+author: "MrJWhit"
+delete-after: True
+changes: 
+  - tweak: "Donut boxes show what's inside of them now"
@@ -0,0 +1,6 @@
+author: "keronshb"
+delete-after: True
+changes: 
+  - rscadd: "Re-adds the Clown Car to the clown uplink"
+  - balance: "15 >16 TC cost"
+  - balance: "bonks on external airlocks"
@@ -0,0 +1,4 @@
+author: "DeltaFire15"
+delete-after: True
+changes: 
+  - tweak: "AIs now only have to kill people once instead of permanently."
@@ -0,0 +1,4 @@
+author: "The Grinch"
+delete-after: True
+changes: 
+  - rscdel: "infinite presents from hilbert hotel"
@@ -0,0 +1,4 @@
+author: "MrJWhit"
+delete-after: True
+changes: 
+  - bugfix: "Effects can no longer trigger landmines"
@@ -0,0 +1,5 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - tweak: "Grab bag works as advertised."
+  - balance: "Xeno threat in dynamic tripled."
@@ -0,0 +1,5 @@
+author: "MrJWhit"
+delete-after: True
+changes: 
+  - tweak: "Replaced engineering fuel tank with a large fuel tank"
+  - tweak: "Changed access to sec suit storage from armory access in every map to other security access"
@@ -0,0 +1,9 @@
+author: "keronshb"
+delete-after: True
+changes: 
+  - rscadd: "Adds a reduced stamina buffer for SCarp users"
+  - rscadd: "Gives SCarp users a better parry"
+  - rscadd: "Adds the SCarp bundle which includes a bo staff"
+  - rscadd: "Lets Carp costumes carry Bo Staffs"
+  - balance: "reduces the stamina damage of scarp slightly"
+  - balance: "reduced the blockchance of the bo staff"
@@ -0,0 +1,5 @@
+author: "silicons"
+delete-after: True
+changes: 
+  - bugfix: "ninja gloves no longer hardstun"
+  - balance: "ninja gloves now cost half as much to use to compensate"
@@ -0,0 +1,5 @@
+author: "SandPoot"
+delete-after: True
+changes: 
+  - refactor: "Changes the limb grower a lot."
+  - bugfix: "\"Limb\" costs on limbgrower are actually displayed like it was meant to all along."
@@ -0,0 +1,4 @@
+author: "BlueWildrose"
+delete-after: True
+changes: 
+  - balance: "The traitor AI can no longer activate the doomsday device while carded."
@@ -0,0 +1,4 @@
+author: "timothyteakettle"
+delete-after: True
+changes: 
+  - bugfix: "circuits get pin data proc is sanitized when text is returned as data"
@@ -0,0 +1,5 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - tweak: "You can now exit polycircuit input"
+  - bugfix: "Polycircuits now check for range"
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - tweak: "Gear harness now covers nothing."
@@ -0,0 +1,4 @@
+author: "BlackMajor"
+delete-after: True
+changes: 
+  - tweak: "Cyborg hypospray no longer injects if it means OD'ing while on help intent."
@@ -0,0 +1,5 @@
+author: "silicons"
+delete-after: True
+changes: 
+  - tweak: "command headsets are 120% instead of 160%"
+  - bugfix: "no more emote italics"
@@ -0,0 +1,4 @@
+author: "Xantholne"
+delete-after: True
+changes: 
+  - bugfix: "Twin Sword Sheaths have an equipment icon and icon when worn now and make a sound when sheathed/unsheathed"