shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2499

Browse Source
This commit is contained in:
kevinz000
2017-08-29 22:43:54 -07:00
parent e96a529d8b 1b0bbb8c86
commit 28ea6f3ad2
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/reagents/reagent_containers/bottle.dm
View File

@@ -162,6 +162,12 @@
icon_state = "bottle16"
list_reagents = list("polonium" = 30)
/obj/item/reagent_containers/glass/bottle/magillitis
name = "magillitis bottle"
desc = "A small bottle. Contains a serum known only as 'magillitis'."
icon_state = "bottle16"
list_reagents = list("magillitis" = 5)
/obj/item/reagent_containers/glass/bottle/venom
name = "venom bottle"
desc = "A small bottle. Contains Venom."

7
code/modules/uplink/uplink_item.dm
View File

@@ -1314,6 +1314,13 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
cost = 14
restricted_roles = list("Geneticist", "Chief Medical Officer")
/datum/uplink_item/role_restricted/magillitis_serum
name = "Magillitis Serum Autoinjector"
desc = "A single-use autoinjector which contains an experimental serum that causes rapid muscular growth in basic primates."
item = /obj/item/reagent_containers/hypospray/magillitis
cost = 15
restricted_roles = list("Geneticist", "Chief Medical Officer")
/datum/uplink_item/role_restricted/pressure_mod
name = "Kinetic Accelerator Pressure Mod"
desc = "A modification kit which allows Kinetic Accelerators to do greatly increased damage while indoors. Occupies 35% mod capacity."