cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-02 05:22:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Baystation12/Baystation12

Browse Source 
Conflicts:
	baystation12.dme
This commit is contained in:
cib
2012-02-24 06:41:38 -08:00
parent df8a6eb231 2fdc1c5ca7
commit 76cee10c6a
33 changed files with 8710 additions and 8023 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/defines/obj/hydro.dm
View File

@@ -387,7 +387,7 @@
icon_state = "seed-carrot"
mypath = "/obj/item/seeds/carrotseed"
species = "carrot"
plantname = "CURROTS MAN CURROTS"
plantname = "Carrot"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/carrot"
lifespan = 25
endurance = 15