cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 19:17:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes the second holywater

Browse Source 
Deletes the second kind of holy water that doesn't do anything. Lemme
know if I should do the opposite of this.

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
This commit is contained in:
Furlucis
2014-01-17 08:57:11 -05:00
committed by ZomgPonies
parent eb76256f04
commit 208f5fd592
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Reagents.dm
+3
View File
@@ -1931,6 +1931,7 @@ datum
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
<<<<<<< HEAD
holywater
name = "Holy Water"
id = "holywater"
@@ -1938,6 +1939,8 @@ datum
reagent_state = LIQUID
color = "#535E66" // rgb: 83, 94, 102
=======
>>>>>>> 5268e4f... Removes the second holywater
nanites
name = "Nanomachines"
id = "nanites"