diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index d706f5468a..ec68cdb40c 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/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, "There is already \a [inserted_item] in \the [src]!")
+ return ..()
else
if(!user.transferItemToLoc(C, src))
return
diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm
index 897cb9b750..08d6a586c8 100644
--- a/code/game/objects/items/implants/implant_misc.dm
+++ b/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), "You feel an internal prick as as the bluespace starts ramping up!")
+ imp_in.do_adrenaline(20, TRUE, 0, 0, TRUE, list(/datum/reagent/fermi/eigenstate = 1.2), "You feel an internal prick as as the bluespace starts ramping up!")
to_chat(imp_in, "You feel an internal prick as as the bluespace starts ramping up!")
if(!uses)
qdel(src)
@@ -86,4 +86,4 @@
healthstring = "Oxygen Deprivation Damage => [round(L.getOxyLoss())]
Fire Damage => [round(L.getFireLoss())]
Toxin Damage => [round(L.getToxLoss())]
Brute Force Damage => [round(L.getBruteLoss())]"
if (!healthstring)
healthstring = "ERROR"
- return healthstring
\ No newline at end of file
+ return healthstring
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm b/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm
index 89f2dd5370..138704067d 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm
+++ b/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"
diff --git a/html/changelog.html b/html/changelog.html
index da32c25786..9831498c56 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,20 @@
-->
+
11 August 2020
+
Hatterhat updated:
+
+ - PDA uplinks can now steal from pens. Properly. Just make sure to have a pen in your PDA, first.
+
+
kappa-sama updated:
+
+ - tracer no longer gives you full stamheals per use
+
+
zeroisthebiggay updated:
+
+
10 August 2020
Hatterhat updated:
@@ -1398,31 +1412,6 @@
- Mice can now breed using cheese wedges
- Royal cheese can be crafted to convert a mouse into king rat
-
-
09 June 2020
-
Anonymous updated:
-
- - Added Orville-inspired clothing as a worthy alternative to Trek stuff.
- - Adds chaplain role allowance to the TMP Service Uniform loadout.
- - Adds paramedic in every medsci mentioned uniform loadout.
-
-
DeltaFire15 updated:
-
- - Offstation AIs can once again only interact with their z-level
-
-
Ghommie updated:
-
- - Fixing IC material containers interaction with stacks, for real.
-
-
Trilbyspaceclone updated:
-
- - Gasses like BZ and Masiam seem to just sell for less in cargo, markets seem to change it seems
-
-
kevinz000 updated:
-
- - plantpeople should stop dying in the halls now
- - Modifier-independent hotkey bindings have been added.
-