cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 16:44:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature' of https://github.com/CIB/Baystation12 into cibderp

Browse Source 
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
This commit is contained in:
Chinsky
2013-02-24 20:29:59 +04:00
parent 7bbb9e0be9 7acadc98eb
commit 83fdf57540
5 changed files with 8575 additions and 8517 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/pill.dm
+18
View File
@@ -134,6 +134,24 @@
..()
reagents.add_reagent("tramadol", 15)
/obj/item/weapon/reagent_containers/pill/methylphenidate
name = "Methylphenidate pill"
desc = "Improves the ability to concentrate."
icon_state = "pill8"
New()
..()
reagents.add_reagent("methylphenidate", 15)
/obj/item/weapon/reagent_containers/pill/citalopram
name = "Citalopram pill"
desc = "Mild anti-depressant."
icon_state = "pill8"
New()
..()
reagents.add_reagent("citalopram", 15)
/obj/item/weapon/reagent_containers/pill/inaprovaline
name = "Inaprovaline pill"
desc = "Used to stabilize patients."