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

Moved Supermatter.dm out of the WorkInProgress directory.

Browse Source 
Conflicts:
	baystation12.dme
This commit is contained in:
Ccomp5950
2014-01-17 09:01:09 -05:00
committed by ZomgPonies
parent d7bb62fc90
commit 7541463e01
3 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Reagents.dm
-10
View File
@@ -1931,16 +1931,6 @@ datum
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
<<<<<<< HEAD
holywater
name = "Holy Water"
id = "holywater"
description = "A ubiquitous chemical substance that is composed of hydrogen and oxygen."
reagent_state = LIQUID
color = "#535E66" // rgb: 83, 94, 102
=======
>>>>>>> 5268e4f... Removes the second holywater
nanites
name = "Nanomachines"
id = "nanites"