cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-28 07:20:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add new chemicals (#5168)

Browse Source 
Adds new drugs:
-Red Nightshade: a drug that induce a berserk-like status, you see only red, can smash windows, stuns go away slower and etc
-Paxazide: a medicine that induces pacifism on the target, like the mutation
-Spectrocybin: a hallucinogenic that has a small chance of giving a glipse of the other hidden to mere mortals, can be found in a mushroom variety

Adds a new secret chem:
-Bottled Lightning: causes a tesla zap when in contact with someone's blood or when splashed on the ground

Also removes some broken/unused plants.
This commit is contained in:
Alberyk
2018-08-30 20:09:08 +02:00
committed by Werner
parent ce28eb8f20
commit e950f6b5fd
24 changed files with 221 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/grown.dm
-8
View File
@@ -321,14 +321,6 @@
seed.do_thorns(H,src)
seed.do_sting(H,src,pick("r_hand","l_hand"))
// Predefined types for placing on the map.
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap
plantname = "libertycap"
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris
plantname = "ambrosia"
/obj/item/weapon/reagent_containers/food/snacks/fruit_slice
name = "fruit slice"
desc = "A slice of some tasty fruit."
code/modules/hydroponics/grown_predefined.dm
+21 -1
View File
@@ -1,3 +1,23 @@
// Predefined types for placing on the map.
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom
plantname = "amanita"
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap
plantname = "libertycap"
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom
plantname = "glowshroom"
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi
plantname = "reishi"
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/destroyingangel
plantname = "destroyingangel"
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/ghostmushroom
plantname = "ghostmushroom"
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris
plantname = "ambrosia"
@@ -6,6 +26,6 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/kois
plantname = "koisspore"
/obj/item/weapon/reagent_containers/food/snacks/grown/banana
plantname = "banana"
code/modules/hydroponics/seed_datums.dm
+21 -106
View File
@@ -497,7 +497,7 @@
name = "libertycap"
seed_name = "liberty cap"
display_name = "liberty cap mushrooms"
mutants = null
mutants = list("ghostmushroom")
chems = list("nutriment" = list(1), "stoxin" = list(3,3), "space_drugs" = list(1,25))
/datum/seed/mushroom/hallucinogenic/strong/setup_traits()
@@ -614,6 +614,26 @@
set_trait(TRAIT_PLANT_COLOUR,"#E6E6E6")
set_trait(TRAIT_PLANT_ICON,"mushroom10")
/datum/seed/mushroom/ghost
name = "ghostmushroom"
seed_name = "ghost mushroom"
display_name = "ghost mushroom"
mutants = null
chems = list("spectrocybin" = list(5,15))
/datum/seed/mushroom/ghost/setup_traits()
..()
set_trait(TRAIT_MATURATION,5)
set_trait(TRAIT_PRODUCTION,4)
set_trait(TRAIT_YIELD,2)
set_trait(TRAIT_POTENCY,8)
set_trait(TRAIT_BIOLUM,1)
set_trait(TRAIT_BIOLUM_COLOUR,"#64B8C9")
set_trait(TRAIT_PRODUCT_ICON,"mushroom8")
set_trait(TRAIT_PRODUCT_COLOUR,"#64B8C9")
set_trait(TRAIT_PLANT_COLOUR,"#64B8C9")
set_trait(TRAIT_PLANT_ICON,"mushroom3")
//Flowers/varieties
/datum/seed/flower
name = "harebells"
@@ -1165,111 +1185,6 @@
set_trait(TRAIT_IDEAL_HEAT, 283)
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
/datum/seed/telriis
name = "telriis"
seed_name = "telriis"
display_name = "telriis grass"
chems = list("pwine" = list(1,5), "nutriment" = list(1,6))
/datum/seed/telriis/setup_traits()
..()
set_trait(TRAIT_PLANT_ICON,"telriis")
set_trait(TRAIT_ENDURANCE,50)
set_trait(TRAIT_MATURATION,5)
set_trait(TRAIT_PRODUCTION,5)
set_trait(TRAIT_YIELD,4)
set_trait(TRAIT_POTENCY,5)
/datum/seed/thaadra
name = "thaadra"
seed_name = "thaa'dra"
display_name = "thaa'dra lichen"
chems = list("frostoil" = list(1,5),"nutriment" = list(1,5))
/datum/seed/thaadra/setup_traits()
..()
set_trait(TRAIT_PLANT_ICON,"thaadra")
set_trait(TRAIT_ENDURANCE,10)
set_trait(TRAIT_MATURATION,5)
set_trait(TRAIT_PRODUCTION,9)
set_trait(TRAIT_YIELD,2)
set_trait(TRAIT_POTENCY,5)
/datum/seed/jurlmah
name = "jurlmah"
seed_name = "jurl'mah"
display_name = "jurl'mah reeds"
chems = list("serotrotium" = list(1,5),"nutriment" = list(1,5))
/datum/seed/jurlmah/setup_traits()
..()
set_trait(TRAIT_PLANT_ICON,"jurlmah")
set_trait(TRAIT_ENDURANCE,12)
set_trait(TRAIT_MATURATION,8)
set_trait(TRAIT_PRODUCTION,9)
set_trait(TRAIT_YIELD,3)
set_trait(TRAIT_POTENCY,10)
/datum/seed/amauri
name = "amauri"
seed_name = "amauri"
display_name = "amauri plant"
chems = list("zombiepowder" = list(1,10),"condensedcapsaicin" = list(1,5),"nutriment" = list(1,5))
/datum/seed/amauri/setup_traits()
..()
set_trait(TRAIT_PLANT_ICON,"amauri")
set_trait(TRAIT_ENDURANCE,10)
set_trait(TRAIT_MATURATION,8)
set_trait(TRAIT_PRODUCTION,9)
set_trait(TRAIT_YIELD,4)
set_trait(TRAIT_POTENCY,10)
/datum/seed/gelthi
name = "gelthi"
seed_name = "gelthi"
display_name = "gelthi plant"
chems = list("stoxin" = list(1,5),"capsaicin" = list(1,5),"nutriment" = list(1,5))
/datum/seed/gelthi/setup_traits()
..()
set_trait(TRAIT_PLANT_ICON,"gelthi")
set_trait(TRAIT_ENDURANCE,15)
set_trait(TRAIT_MATURATION,6)
set_trait(TRAIT_PRODUCTION,6)
set_trait(TRAIT_YIELD,2)
set_trait(TRAIT_POTENCY,1)
/datum/seed/vale
name = "vale"
seed_name = "vale"
display_name = "vale bush"
chems = list("paracetamol" = list(1,5),"dexalin" = list(1,2),"nutriment"= list(1,5))
/datum/seed/vale/setup_traits()
..()
set_trait(TRAIT_PLANT_ICON,"vale")
set_trait(TRAIT_ENDURANCE,15)
set_trait(TRAIT_MATURATION,8)
set_trait(TRAIT_PRODUCTION,10)
set_trait(TRAIT_YIELD,3)
set_trait(TRAIT_POTENCY,3)
/datum/seed/surik
name = "surik"
seed_name = "surik"
display_name = "surik vine"
chems = list("impedrezene" = list(1,3),"synaptizine" = list(1,2),"nutriment" = list(1,5))
/datum/seed/surik/setup_traits()
..()
set_trait(TRAIT_PLANT_ICON,"surik")
set_trait(TRAIT_ENDURANCE,18)
set_trait(TRAIT_MATURATION,7)
set_trait(TRAIT_PRODUCTION,7)
set_trait(TRAIT_YIELD,3)
set_trait(TRAIT_POTENCY,3)
// Alien weeds.
/datum/seed/xenomorph
name = "xenomorph"
code/modules/hydroponics/seed_packets.dm
+3 -21
View File
@@ -261,27 +261,6 @@ var/global/list/plant_seed_sprites = list()
/obj/item/seeds/kudzuseed
seed_type = "kudzu"
/obj/item/seeds/jurlmah
seed_type = "jurlmah"
/obj/item/seeds/amauri
seed_type = "amauri"
/obj/item/seeds/gelthi
seed_type = "gelthi"
/obj/item/seeds/vale
seed_type = "vale"
/obj/item/seeds/surik
seed_type = "surik"
/obj/item/seeds/telriis
seed_type = "telriis"
/obj/item/seeds/thaadra
seed_type = "thaadra"
/obj/item/seeds/koisspore
seed_type = "koisspore"
@@ -308,3 +287,6 @@ var/global/list/plant_seed_sprites = list()
/obj/item/seeds/onionseed
seed_type = "onion"
/obj/item/seeds/ghostmushroomseed
seed_type = "ghostmushroom"