Merge branch 'master' into you_have_ligma

code/datums/uplink/stealthy and inconspicuous weapons.dm

@@ -26,8 +26,8 @@
 
 /datum/uplink_item/item/stealthy_weapons/pens
 	name = "Pen-jector Kit"
-	desc = "A kit that contains four differently coloured pens. A red poison pen, a blue pacifying pen, a green pen containing healing chemicals, and a yellow hyperzine pen."
-	item_cost = 6
+	desc = "A kit that contains four differently coloured pens. A blue pacifying pen, a green pen containing healing chemicals, and a yellow hyperzine pen."
+	item_cost = 5
 	path = /obj/item/storage/box/syndie_kit/special_pens
 
 /datum/uplink_item/item/stealthy_weapons/parapen

code/game/objects/items/weapons/storage/uplink_kits.dm

@@ -144,9 +144,7 @@
 	starts_with = list(
 		/obj/item/pen/reagent/healing = 1,
 		/obj/item/pen/reagent/pacifier = 1,
-		/obj/item/pen/reagent/hyperzine = 1,
-		/obj/item/pen/reagent/poison = 1
-
+		/obj/item/pen/reagent/hyperzine = 1
 	)
 
 /obj/item/storage/box/syndie_kit/spy

code/modules/shuttles/departmental.dm

@@ -13,7 +13,7 @@
 /obj/machinery/computer/shuttle_control/research
 	name = "research shuttle control console"
 	shuttle_tag = "Research"
-	//req_access = list(access_research)
+	req_access = list(access_research)
 	circuit = /obj/item/circuitboard/research_shuttle
 
 /obj/machinery/computer/shuttle_control/merchant

html/changelog.html

@@ -35,6 +35,13 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">22 December 2019</h2>
+			<h3 class="author">Alberyk updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">Removed the highly lethal poison pen from the pen kit at the traitor uplink.</li>
+				<li class="rscadd">Added basic research access to the research shuttle.</li>
+			</ul>
+
 			<h2 class="date">21 December 2019</h2>
 			<h3 class="author">Alberyk, Coalf, Kyres, Menown, Memescopemcgee and Suethecake updated:</h3>
 			<ul class="changes bgimages16">
@@ -60,6 +67,10 @@
 				<li class="tweak">The Bishop frame has been resprited.</li>
 				<li class="rscadd">The Bishop frame now has body markings called Bishop Lights, which is used to change the lights of the Bishop.</li>
 			</ul>
+			<h3 class="author">Leudoberct1 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="maptweak">Resizes xenoarch to be larger, adds a chem dispenser, chem master, sink, another anomaly suit, portable scrubber, portable air pump, A/C heater. Moves a few things around too.</li>
+			</ul>
 			<h3 class="author">Wowzewow (Wezzy) updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Adds two new masks - dust masks and cloth masks. They can be found in the loadout in a new tab. Sterile masks have been renamed to surgical masks to match their real-life counterpart.</li>

html/changelogs/.all_changelog.yml

@@ -10792,6 +10792,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: The Bishop frame has been resprited.
   - rscadd: The Bishop frame now has body markings called Bishop Lights, which is
       used to change the lights of the Bishop.
+  Leudoberct1:
+  - maptweak: Resizes xenoarch to be larger, adds a chem dispenser, chem master, sink,
+      another anomaly suit, portable scrubber, portable air pump, A/C heater. Moves
+      a few things around too.
   Wowzewow (Wezzy):
   - rscadd: Adds two new masks - dust masks and cloth masks. They can be found in
       the loadout in a new tab. Sterile masks have been renamed to surgical masks
@@ -10801,3 +10805,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Grammar has been fixed with adjusting masks, and the top left action icon
       should update properly.
   - imageadd: New sprites for breathmasks and gas masks.
+2019-12-22:
+  Alberyk:
+  - rscdel: Removed the highly lethal poison pen from the pen kit at the traitor uplink.
+  - rscadd: Added basic research access to the research shuttle.