Merge remote-tracking branch 'upstream/master' into heretics

code/game/objects/items/devices/PDA/PDA.dm

@@ -1027,6 +1027,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 	else if(is_type_in_list(C, contained_item)) //Checks if there is a pen
 		if(inserted_item)
 			to_chat(user, "<span class='warning'>There is already \a [inserted_item] in \the [src]!</span>")
+			return ..()
 		else
 			if(!user.transferItemToLoc(C, src))
 				return

code/game/objects/items/implants/implant_misc.dm

@@ -47,7 +47,7 @@
 /obj/item/implant/warp/activate()
 	. = ..()
 	uses--
-	imp_in.do_adrenaline(150, TRUE, 0, 0, TRUE, list(/datum/reagent/fermi/eigenstate = 1.2), "<span class='boldnotice'>You feel an internal prick as as the bluespace starts ramping up!</span>")
+	imp_in.do_adrenaline(20, TRUE, 0, 0, TRUE, list(/datum/reagent/fermi/eigenstate = 1.2), "<span class='boldnotice'>You feel an internal prick as as the bluespace starts ramping up!</span>")
 	to_chat(imp_in, "<span class='notice'>You feel an internal prick as as the bluespace starts ramping up!</span>")
 	if(!uses)
 		qdel(src)
@@ -86,4 +86,4 @@
 			healthstring = "<small>Oxygen Deprivation Damage => [round(L.getOxyLoss())]<br />Fire Damage => [round(L.getFireLoss())]<br />Toxin Damage => [round(L.getToxLoss())]<br />Brute Force Damage => [round(L.getBruteLoss())]</small>"
 		if (!healthstring)
 			healthstring = "ERROR"
-		return healthstring
+		return healthstring

code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm

@@ -791,6 +791,10 @@
 	name = "Volaju"
 	icon_state = "hair_volaju"
 
+/datum/sprite_accessory/hair/volajupompless
+	name = "Volaju (Alt)"
+	icon_state = "hair_volajupompless"
+
 /datum/sprite_accessory/hair/wisp
 	name = "Wisp"
 	icon_state = "hair_wisp"

html/changelog.html

@@ -50,6 +50,20 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">11 August 2020</h2>
+			<h3 class="author">Hatterhat updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">PDA uplinks can now steal from pens. Properly. Just make sure to have a pen in your PDA, first.</li>
+			</ul>
+			<h3 class="author">kappa-sama updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">tracer no longer gives you full stamheals per use</li>
+			</ul>
+			<h3 class="author">zeroisthebiggay updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">volaju two</li>
+			</ul>
+
 			<h2 class="date">10 August 2020</h2>
 			<h3 class="author">Hatterhat updated:</h3>
 			<ul class="changes bgimages16">
@@ -1398,31 +1412,6 @@
 				<li class="rscadd">Mice can now breed using cheese wedges</li>
 				<li class="rscadd">Royal cheese can be crafted to convert a mouse into king rat</li>
 			</ul>
-
-			<h2 class="date">09 June 2020</h2>
-			<h3 class="author">Anonymous updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added Orville-inspired clothing as a worthy alternative to Trek stuff.</li>
-				<li class="tweak">Adds chaplain role allowance to the TMP Service Uniform loadout.</li>
-				<li class="tweak">Adds paramedic in every medsci mentioned uniform loadout.</li>
-			</ul>
-			<h3 class="author">DeltaFire15 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Offstation AIs can once again only interact with their z-level</li>
-			</ul>
-			<h3 class="author">Ghommie updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Fixing IC material containers interaction with stacks, for real.</li>
-			</ul>
-			<h3 class="author">Trilbyspaceclone updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Gasses like BZ and Masiam seem to just sell for less in cargo, markets seem to change it seems</li>
-			</ul>
-			<h3 class="author">kevinz000 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="balance">plantpeople should stop dying in the halls now</li>
-				<li class="rscadd">Modifier-independent hotkey bindings have been added.</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

html/changelogs/.all_changelog.yml

@@ -26864,3 +26864,11 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       leave you somewhat winded.
   timothyteakettle:
   - tweak: speech verbs copy through dna copying now
+2020-08-11:
+  Hatterhat:
+  - bugfix: PDA uplinks can now steal from pens. Properly. Just make sure to have
+      a pen in your PDA, first.
+  kappa-sama:
+  - tweak: tracer no longer gives you full stamheals per use
+  zeroisthebiggay:
+  - rscadd: volaju two

html/changelogs/AutoChangeLog-pr-13111.yml

@@ -0,0 +1,4 @@
+author: "zeroisthebiggay"
+delete-after: True
+changes: 
+  - imageadd: "hair and some sechuds"