diff --git a/code/datums/uplink/stealthy and inconspicuous weapons.dm b/code/datums/uplink/stealthy and inconspicuous weapons.dm index e6b8eb14f52..8ae2dbd187d 100644 --- a/code/datums/uplink/stealthy and inconspicuous weapons.dm +++ b/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 diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 1c1e5dace5e..3bcd63abeb8 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/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 diff --git a/code/modules/shuttles/departmental.dm b/code/modules/shuttles/departmental.dm index aa682c71db8..4bdaf0f8e62 100644 --- a/code/modules/shuttles/departmental.dm +++ b/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 diff --git a/html/changelog.html b/html/changelog.html index 20d574c4fd2..87905b75a9e 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -35,6 +35,13 @@ -->
+

22 December 2019

+

Alberyk updated:

+ +

21 December 2019

Alberyk, Coalf, Kyres, Menown, Memescopemcgee and Suethecake updated:

+

Leudoberct1 updated:

+

Wowzewow (Wezzy) updated: