Merge remote-tracking branch 'upstream/master'

2020-10-03 16:57:37 +02:00
parent 484a720687 56ddfae693
commit 3d42b3cf0d
10 changed files with 52 additions and 28 deletions
@@ -491,7 +491,6 @@ mob/visible_message(message, self_message, blind_message, vision_distance = DEFA
 				client.prefs.chat_toggles ^= CHAT_OOC
 			if (!(client.prefs.chat_toggles & CHAT_OOC) && isdead(new_mob))
 				client.prefs.chat_toggles ^= CHAT_OOC
-		client.change_view(CONFIG_GET(string/default_view))
 	new_mob.ckey = ckey
 	if(send_signal)
 		SEND_SIGNAL(src, COMSIG_MOB_KEY_CHANGE, new_mob, src)
@@ -51,6 +51,22 @@
 		<div class="commit sansserif">

 			<h2 class="date">02 October 2020</h2>
+			<h3 class="author">ArcaneMusic, with minor tweaks by TheObserver-sys updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds and modifies fertilizers, as well as a new stat, Instability.</li>
+				<li class="rscdel">Removes the rather disused functionality of irrigation hoses, temporarily disables circuit use on hydroponics trays.</li>
+				<li class="tweak">Plant Analyzer have been upgraded. Using one in hand will now switch between a stat view of your plant, and a chemical view of your plant. tweak:Trays now accept and store reagents, as well as coming with an autogrow mode. However, these upgrades came at the cost of old self sufficiency, meaning you must attend to your plants a bit more often.</li>
+				<li class="tweak">Earthsblood, while not being able to gild trays anymore, has been found to still be quite powerful as a fertilizer.</li>
+			</ul>
+			<h3 class="author">CoreFlare updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Altcloaks! Available in loadout.</li>
+			</ul>
+			<h3 class="author">Detective-Google updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">a smattering of clothes from the RP server</li>
+				<li class="rscadd">detective wardrobe</li>
+			</ul>
 			<h3 class="author">EmeraldSundisk updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Adds the "Skelter" space ruin</li>
@@ -116,6 +132,15 @@
 				<li class="config">wound exponent and limb damage multiplier are now config values</li>
 				<li class="refactor">emps now work from 1-100 severity instead of 1/2 and the severity reduces as you move from the epicentre</li>
 			</ul>
+				<li class="rscadd">ipcs and synthlizards are now treated as actual robots, with robotic limbs, an extra organ, and better emp acts</li>
+				<li class="rscadd">surgeries for healing robotic limbs, and brain surgery for robotic heads</li>
+				<li class="bugfix">androids limbs now show up as intended</li>
+				<li class="refactor">emps now work from 1-100 severity instead of 1/2 and the severity reduces as you move from the epicentre</li>
+			</ul>
+			<h3 class="author">zeroisthebiggay updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">ratvar gf is complete</li>
+			</ul>

 			<h2 class="date">01 October 2020</h2>
 			<h3 class="author">BlueWildrose updated:</h3>
@@ -27418,6 +27418,22 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
  - tweak: Adds "warbles", "chimpers", and "puffs" to the customizable speech verbs
      for character.
 2020-10-02:
+  ArcaneMusic, with minor tweaks by TheObserver-sys:
+  - rscadd: Adds and modifies fertilizers, as well as a new stat, Instability.
+  - rscdel: Removes the rather disused functionality of irrigation hoses, temporarily
+      disables circuit use on hydroponics trays.
+  - tweak: Plant Analyzer have been upgraded. Using one in hand will now switch between
+      a stat view of your plant, and a chemical view of your plant. tweak:Trays now
+      accept and store reagents, as well as coming with an autogrow mode. However,
+      these upgrades came at the cost of old self sufficiency, meaning you must attend
+      to your plants a bit more often.
+  - tweak: Earthsblood, while not being able to gild trays anymore, has been found
+      to still be quite powerful as a fertilizer.
+  CoreFlare:
+  - rscadd: Altcloaks! Available in loadout.
+  Detective-Google:
+  - rscadd: a smattering of clothes from the RP server
+  - rscadd: detective wardrobe
  EmeraldSundisk:
  - rscadd: Adds the "Skelter" space ruin
  - code_imp: Creates a few new area designations for the Skelter
@@ -27478,5 +27494,11 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
      slimes
  - tweak: wound exponent lowered slightly from 1.225 to 1.2
  - config: wound exponent and limb damage multiplier are now config values
+  - rscadd: ipcs and synthlizards are now treated as actual robots, with robotic limbs,
+      an extra organ, and better emp acts
+  - rscadd: surgeries for healing robotic limbs, and brain surgery for robotic heads
+  - bugfix: androids limbs now show up as intended
  - refactor: emps now work from 1-100 severity instead of 1/2 and the severity reduces
      as you move from the epicentre
+  zeroisthebiggay:
+  - rscadd: ratvar gf is complete
@@ -1,6 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes: 
-  - rscadd: "ipcs and synthlizards are now treated as actual robots, with robotic limbs, an extra organ, and better emp acts"
-  - rscadd: "surgeries for healing robotic limbs, and brain surgery for robotic heads"
-  - bugfix: "androids limbs now show up as intended"
@@ -1,8 +0,0 @@
-author: "ArcaneMusic, with minor tweaks by TheObserver-sys"
-delete-after: True
-changes: 
-  - rscadd: "Adds and modifies fertilizers, as well as a new stat, Instability."
-  - rscdel: "Removes the rather disused functionality of irrigation hoses, temporarily disables circuit use on hydroponics trays."
-  - tweak: "Plant Analyzer have been upgraded. Using one in hand will now switch between a stat view of your plant, and a chemical view of your plant.
-tweak:Trays now accept and store reagents, as well as coming with an autogrow mode. However, these upgrades came at the cost of old self sufficiency, meaning you must attend to your plants a bit more often."
-  - tweak: "Earthsblood, while not being able to gild trays anymore, has been found to still be quite powerful as a fertilizer."
@@ -1,4 +0,0 @@
-author: "zeroisthebiggay"
-delete-after: True
-changes: 
-  - rscadd: "ratvar gf is complete"
@@ -1,5 +0,0 @@
-author: "Detective-Google"
-delete-after: True
-changes: 
-  - rscadd: "a smattering of clothes from the RP server"
-  - rscadd: "detective wardrobe"
@@ -1,4 +0,0 @@
-author: "CoreFlare"
-delete-after: True
-changes: 
-  - rscadd: "Altcloaks! Available in loadout."
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - bugfix: "Ghosts are no longer incapable of going away."
@@ -129,6 +129,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 					log_reagent("FERMICHEM: [SM] ckey: [SM.key]'s is not bound by [M] ckey [M.key]'s will, and is free to determine their own goals, while respecting and acting as their origin.")
 	
 				to_chat(SM, "<span class='warning'>You feel a strange sensation building in your mind as you realise there's two of you. Before you get a chance to think about it, you suddenly split from your old body, and find yourself face to face with your original, a perfect clone of your origin.</span>")
+				SM.client?.change_view(CONFIG_GET(string/default_view))
 				to_chat(M, "<span class='warning'>You feel a strange sensation building in your mind as you realise there's two of you. Before you get a chance to think about it, a mass splits from you, and find yourself face to face with yourself.</span>")
 				M.visible_message("[M] suddenly shudders, and splits into two identical twins!")
 				SM.copy_languages(M, LANGUAGE_MIND)