cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-26 18:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into ofChemistryAndStuff

Browse Source 
Conflicts:
	maps/exodus-1.dmm
This commit is contained in:
Kelenius
2015-03-30 10:35:37 +03:00
parent 24ef7752cd 3bc2b03982
commit c3312be968
11 changed files with 2315 additions and 2294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/reagents/reagent_containers/pill.dm
View File

@@ -189,7 +189,7 @@
icon_state = "pill8"
New()
..()
reagents.add_reagent("dexalin", 15)
reagents.add_reagent("dexalinp", 15)
/obj/item/weapon/reagent_containers/pill/dermaline
name = "Dermaline pill"