cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 11:38:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source 
Conflicts:
	code/modules/spells/mind_transfer.dm
This commit is contained in:
PsiOmega
2015-03-29 16:23:06 +02:00
parent 6ec0c2e504 84e4f6315f
commit 710abd0921
8 changed files with 168 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/pill.dm
+1 -1
View File
@@ -196,7 +196,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"