cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 22:47:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Seeds and nutrients can now be pocketed.

Browse Source 
Plant-b-gone a bit more effective (range increased to 3)
Added some more nutrients into the vending machine, for now.
Added new announcer sounds for remaining command reports/alerts and adjusted existing ones.
You can now sometimes hear ghosts groan at you.
Removed some goon authentication stuff from the game launch phase.
Made harvested nettle icons a bit smaller so you can see other stuff as well.
Removed unused files, merged some defines, moved files to places they belong.
Updated changelog.html

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@98 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
Skiedrake
2010-09-13 18:18:07 +00:00
parent a63f701330
commit 6d2be2604f
23 changed files with 178 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj/hydro.dm
+47 -1
View File
@@ -18,6 +18,7 @@
icon = 'hydroponics.dmi'
icon_state = "seed" // unknown plant seed - these shouldn't exist in-game
flags = FPRINT | TABLEPASS
w_class = 1.0 // Makes them pocketable
var/mypath = "/obj/item/seeds"
var/plantname = ""
var/productname = ""
@@ -637,4 +638,49 @@ obj/item/weapon/grown/attackby(var/obj/item/O as obj, var/mob/user as mob)
icon_state = "bottle15"
flags = FPRINT | TABLEPASS
toxicity = 8
WeedKillStr = 7
WeedKillStr = 7
// *************************************
// Nutrient defines for hydroponics
// *************************************
/obj/item/nutrient
name = ""
icon = 'chemical.dmi'
icon_state = "bottle16"
flags = FPRINT | TABLEPASS
w_class = 1.0
var/mutmod = 0
var/yieldmod = 0
/obj/item/nutrient/ez
name = "E-Z-Nutrient"
icon = 'chemical.dmi'
icon_state = "bottle16"
flags = FPRINT | TABLEPASS
mutmod = 1
yieldmod = 1
/obj/item/nutrient/l4z
name = "Left 4 Zed"
icon = 'chemical.dmi'
icon_state = "bottle18"
flags = FPRINT | TABLEPASS
mutmod = 2
yieldmod = 0
/obj/item/nutrient/rh
name = "Robust Harvest"
icon = 'chemical.dmi'
icon_state = "bottle15"
flags = FPRINT | TABLEPASS
mutmod = 0
yieldmod = 2
code/defines/obj/machinery.dm
+5 -5
View File
@@ -617,18 +617,18 @@
icon_state = "nutri"
icon_deny = "nutri-deny"
product_paths = "/obj/item/nutrient/ez;/obj/item/nutrient/l4z;/obj/item/nutrient/rh"
product_amounts = "25;15;15"
product_amounts = "35;25;15"
product_slogans = "Aren't you glad you don't have to fertilize the natural way?;Now with 50% less stink!;Plants are people too!"
/obj/machinery/vending/hydroseeds
name = "MegaSeed Servitor"
desc = "When you need seeds fast!"
icon_state = "seeds"
product_paths = "/obj/item/seeds/chiliseed;/obj/item/seeds/berryseed;/obj/item/seeds/eggplantseed;/obj/item/seeds/tomatoseed;/obj/item/seeds/wheatseed;/obj/item/seeds/soyaseed;/obj/item/seeds/carrotseed;/obj/item/seeds/chantermycelium;/obj/item/seeds/nettleseed"
product_amounts = "2;2;2;2;2;2;2;2;1"
product_paths = "/obj/item/seeds/chiliseed;/obj/item/seeds/berryseed;/obj/item/seeds/eggplantseed;/obj/item/seeds/tomatoseed;/obj/item/seeds/wheatseed;/obj/item/seeds/soyaseed;/obj/item/seeds/carrotseed;/obj/item/seeds/chantermycelium"
product_amounts = "2;2;2;2;2;2;2;2"
product_slogans = "THIS'S WHERE TH' SEEDS LIVE! GIT YOU SOME!;Hands down the best seed selection on the station!;Also certain mushroom varieties available, more for experts! Get certified today!"
product_hidden = "/obj/item/seeds/amanitamycelium;/obj/item/seeds/libertymycelium;/obj/item/seeds/nettleseed;/obj/item/seeds/plumpmycelium;/obj/item/seeds/towermycelium"
product_hideamt = "1;2;2;2;2"
product_hidden = "/obj/item/seeds/amanitamycelium;/obj/item/seeds/libertymycelium;/obj/item/seeds/nettleseed;/obj/item/seeds/plumpmycelium"
product_hideamt = "1;2;2;2"
/obj/machinery/microwave
name = "Microwave"