cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 08:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew()

Browse Source 
Conflicts:
	code/modules/reagents/reagent_containers/bottle.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	code/modules/reagents/reagent_containers/patch.dm
	code/modules/reagents/reagent_containers/pill.dm
This commit is contained in:
Jordie0608
2015-01-19 18:28:38 +11:00
parent a643ecdfcc 98ecd7ffdc
commit 3bd637b186
75 changed files with 966 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/patch.dm
+2 -2
View File
@@ -24,9 +24,9 @@
/obj/item/weapon/reagent_containers/pill/patch/styptic
name = "styptic powder patch"
desc = "Helps with brute injuries."
list_reagents = list("styptic_powder" = 25)
list_reagents = list("styptic_powder" = 50)
/obj/item/weapon/reagent_containers/pill/patch/silver_sulf
name = "silver sulfadiazine patch"
desc = "Helps with burn injuries."
list_reagents = list("silver_sulfadiazine" = 25)
list_reagents = list("silver_sulfadiazine" = 50)