cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-29 16:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into you_have_ligma

Browse Source
This commit is contained in:
Werner
2019-12-22 02:38:07 +01:00
committed by GitHub
parent 1c0923ec38 584f49f33b
commit 995e922b98
6 changed files with 2478 additions and 1962 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/uplink/stealthy and inconspicuous weapons.dm
+2 -2
View File
@@ -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
+1 -3
View File
@@ -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
+1 -1
View File
@@ -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