Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
This commit is contained in:
Putnam
@@ -205,6 +205,11 @@
|
||||
popup.set_content(dat)
|
||||
popup.open()
|
||||
|
||||
/obj/machinery/biogenerator/AltClick(mob/living/user)
|
||||
. = ..()
|
||||
if(istype(user) && user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
|
||||
detach(user)
|
||||
|
||||
/obj/machinery/biogenerator/proc/activate()
|
||||
if (usr.stat != CONSCIOUS)
|
||||
return
|
||||
@@ -293,9 +298,9 @@
|
||||
update_icon()
|
||||
return .
|
||||
|
||||
/obj/machinery/biogenerator/proc/detach()
|
||||
/obj/machinery/biogenerator/proc/detach(mob/living/user)
|
||||
if(beaker)
|
||||
beaker.forceMove(drop_location())
|
||||
user.put_in_hands(beaker)
|
||||
beaker = null
|
||||
update_icon()
|
||||
|
||||
@@ -310,7 +315,7 @@
|
||||
updateUsrDialog()
|
||||
|
||||
else if(href_list["detach"])
|
||||
detach()
|
||||
detach(usr)
|
||||
updateUsrDialog()
|
||||
|
||||
else if(href_list["create"])
|
||||
|
||||
@@ -195,7 +195,7 @@
|
||||
/obj/item/reagent_containers/food/snacks/grown/firelemon/ex_act(severity)
|
||||
qdel(src) //Ensuring that it's deleted by its own explosion
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/grown/firelemon/proc/prime()
|
||||
/obj/item/reagent_containers/food/snacks/grown/firelemon/proc/prime(mob/living/lanced_by)
|
||||
switch(seed.potency) //Combustible lemons are alot like IEDs, lots of flame, very little bang.
|
||||
if(0 to 30)
|
||||
update_mob()
|
||||
|
||||
@@ -277,7 +277,7 @@
|
||||
growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
|
||||
icon_grow = "bee_balm-grow"
|
||||
icon_dead = "bee_balm-dead"
|
||||
mutatelist = list(/obj/item/seeds/poppy/geranium, /obj/item/seeds/bee_balm/honey) //Lower odds of becoming honey
|
||||
mutatelist = list(/obj/item/seeds/poppy/geranium, /obj/item/seeds/bee_balm/honey_balm) //Lower odds of becoming honey
|
||||
reagents_add = list(/datum/reagent/medicine/spaceacillin = 0.1, /datum/reagent/space_cleaner/sterilizine = 0.05)
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/grown/bee_balm
|
||||
@@ -291,11 +291,11 @@
|
||||
foodtype = GROSS
|
||||
|
||||
// Beebalm
|
||||
/obj/item/seeds/bee_balm/honey
|
||||
/obj/item/seeds/bee_balm/honey_balm
|
||||
name = "pack of Honey Balm seeds"
|
||||
desc = "These seeds grow into Honey Balms."
|
||||
icon_state = "seed-bee_balmalt"
|
||||
species = "seed-bee_balm_alt"
|
||||
icon_state = "seed-honey_balm"
|
||||
species = "honey_balm"
|
||||
plantname = "Honey Balm Pods"
|
||||
product = /obj/item/reagent_containers/food/snacks/grown/bee_balm/honey
|
||||
endurance = 1
|
||||
@@ -304,16 +304,16 @@
|
||||
potency = 1
|
||||
growthstages = 3
|
||||
growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
|
||||
icon_grow = "bee_balmalt-grow"
|
||||
icon_dead = "bee_balmalt-dead"
|
||||
icon_grow = "honey_balm-grow"
|
||||
icon_dead = "honey_balm-dead"
|
||||
reagents_add = list(/datum/reagent/consumable/honey = 0.1, /datum/reagent/lye = 0.3) //To make wax
|
||||
rarity = 30
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/grown/bee_balm/honey
|
||||
seed = /obj/item/seeds/bee_balm/honey
|
||||
seed = /obj/item/seeds/bee_balm/honey_balm
|
||||
name = "honey balm"
|
||||
desc = "A large honey filled pod of a flower."
|
||||
icon_state = "bee_balmalt"
|
||||
icon_state = "honey_balm"
|
||||
filling_color = "#FF6347"
|
||||
bitesize_mod = 8
|
||||
tastes = list("wax" = 1)
|
||||
|
||||
@@ -223,7 +223,7 @@
|
||||
/obj/item/reagent_containers/food/snacks/grown/cherry_bomb/ex_act(severity)
|
||||
qdel(src) //Ensuring that it's deleted by its own explosion. Also prevents mass chain reaction with piles of cherry bombs
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/grown/cherry_bomb/proc/prime()
|
||||
/obj/item/reagent_containers/food/snacks/grown/cherry_bomb/proc/prime(mob/living/lanced_by)
|
||||
icon_state = "cherry_bomb_lit"
|
||||
playsound(src, 'sound/effects/fuse.ogg', seed.potency, 0)
|
||||
addtimer(CALLBACK(src, /obj/item/reagent_containers/food/snacks/grown/cherry_bomb/proc/detonate), rand(50, 100))
|
||||
|
||||
@@ -0,0 +1,102 @@
|
||||
// Finally, peas. Base plant.
|
||||
/obj/item/seeds/peas
|
||||
name = "pack of pea pods"
|
||||
desc = "These seeds grows into vitamin rich peas!"
|
||||
icon_state = "seed-peas"
|
||||
species = "peas"
|
||||
plantname = "Pea Vines"
|
||||
product = /obj/item/reagent_containers/food/snacks/grown/peas
|
||||
maturation = 3
|
||||
potency = 25
|
||||
growthstages = 3
|
||||
growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
|
||||
icon_grow = "peas-grow"
|
||||
icon_dead = "peas-dead"
|
||||
genes = list(/datum/plant_gene/trait/repeated_harvest)
|
||||
mutatelist = list(/obj/item/seeds/peas/laugh) // TODO: Add /obj/item/seeds/peas/shoot at a later date, for the peashooter mutation line
|
||||
reagents_add = list (/datum/reagent/consumable/nutriment/vitamin = 0.1, /datum/reagent/consumable/nutriment = 0.05, /datum/reagent/water = 0.05)
|
||||
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/grown/peas
|
||||
seed = /obj/item/seeds/peas
|
||||
name = "peapod"
|
||||
desc = "Finally... peas."
|
||||
icon_state = "peas"
|
||||
filling_color = "#739122"
|
||||
bitesize_mod = 1
|
||||
foodtype = VEGETABLES
|
||||
tastes = list ("peas" = 1, "chalky saltiness" = 1)
|
||||
wine_power = 50
|
||||
wine_flavor = "what is, distressingly, fermented peas."
|
||||
// distill_regeant = /datum/reagent/saltpetre //if allowed, remove wine_power, ya dingus.
|
||||
|
||||
|
||||
// Laughin' Peas
|
||||
/obj/item/seeds/peas/laugh
|
||||
name = "pack of laughin' peas"
|
||||
desc = "These seeds give off a very soft purple glow.. they should grow into Laughin' Peas."
|
||||
icon_state = "seed-laughpeas"
|
||||
species = "laughpeas"
|
||||
plantname = "Laughin' Peas"
|
||||
product = /obj/item/reagent_containers/food/snacks/grown/laugh
|
||||
maturation = 7
|
||||
potency = 10
|
||||
yield = 7
|
||||
production = 5
|
||||
growthstages = 3
|
||||
growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
|
||||
icon_grow = "laughpeas-grow"
|
||||
icon_dead = "laughpeas-dead"
|
||||
genes = list (/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/glow/purple)
|
||||
mutatelist = list (/obj/item/seeds/peas/laugh/peace)
|
||||
reagents_add = list (/datum/reagent/consumable/laughter = 0.05, /datum/reagent/consumable/sugar = 0.05, /datum/reagent/consumable/nutriment = 0.07)
|
||||
rarity = 25 //It actually might make Central Command Officials loosen up a smidge, eh?
|
||||
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/grown/laugh
|
||||
seed = /obj/item/seeds/peas/laugh
|
||||
name = "pod of laughin' peas"
|
||||
desc = "Ridens Cicer, guaranteed to improve your mood dramatically upon consumption!"
|
||||
icon_state = "laughpeas"
|
||||
filling_color = "#ee7bee"
|
||||
bitesize_mod = 2
|
||||
foodtype = VEGETABLES
|
||||
tastes = list ("a prancing rabbit" = 1) //Vib Ribbon sends her regards.. wherever she is.
|
||||
wine_power = 90
|
||||
wine_flavor = "a vector-graphic rabbit dancing on your tongue"
|
||||
|
||||
|
||||
// World Peas - Peace at last, peace at last...
|
||||
/obj/item/seeds/peas/laugh/peace
|
||||
name = "pack of world peas"
|
||||
desc = "These rather large seeds give off a soothing blue glow..."
|
||||
icon_state = "seed-worldpeas"
|
||||
species = "worldpeas"
|
||||
plantname = "World Peas"
|
||||
product = /obj/item/reagent_containers/food/snacks/grown/peace
|
||||
maturation = 20
|
||||
potency = 75
|
||||
yield = 1
|
||||
production = 10
|
||||
growthstages = 3
|
||||
growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
|
||||
icon_grow = "worldpeas-grow"
|
||||
icon_dead = "worldpeas-dead"
|
||||
genes = list (/datum/plant_gene/trait/glow/blue)
|
||||
reagents_add = list (/datum/reagent/pax = 0.1, /datum/reagent/drug/happiness = 0.1, /datum/reagent/consumable/nutriment = 0.15)
|
||||
rarity = 50 // This absolutely will make even the most hardened Syndicate Operators relax, and lay down their arms.
|
||||
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/grown/peace
|
||||
seed = /obj/item/seeds/peas/laugh/peace
|
||||
name = "cluster of world peas"
|
||||
desc = "A plant discovered through extensive genetic engineering, and iterative graft work. It's rumored to bring peace to any who consume it. In the wider AgSci community, it's attained the nickname of 'Pax Mundi'." //at last... world peas. I'm not sorry.
|
||||
icon_state = "worldpeas"
|
||||
filling_color = "#0099CC"
|
||||
bitesize_mod = 4
|
||||
foodtype = VEGETABLES
|
||||
tastes = list ("numbing tranquility" = 2, "warmth" = 1)
|
||||
wine_power = 100
|
||||
wine_flavor = "mind-numbing peace and warmth"
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
/obj/item/seeds/tea/catnip
|
||||
name = "pack of catnip seeds"
|
||||
icon_state = "seed-catnip"
|
||||
desc = "Long stocks with flowering tips that has a chemical to make feline attracted to it."
|
||||
desc = "Long stocks with flowering tips that contain a chemical to make felines attracted to it."
|
||||
species = "catnip"
|
||||
plantname = "Catnip Plant"
|
||||
growthstages = 3
|
||||
|
||||
@@ -392,7 +392,7 @@
|
||||
|
||||
/datum/plant_gene/trait/battery/on_attackby(obj/item/reagent_containers/food/snacks/grown/G, obj/item/I, mob/user)
|
||||
if(istype(I, /obj/item/stack/cable_coil))
|
||||
if(I.use_tool(src, user, 0, 5, max_level = JOB_SKILL_EXPERT))
|
||||
if(I.use_tool(src, user, 0, 5, skill_gain_mult = TRIVIAL_USE_TOOL_MULT))
|
||||
to_chat(user, "<span class='notice'>You add some cable to [G] and slide it inside the battery encasing.</span>")
|
||||
var/obj/item/stock_parts/cell/potato/pocell = new /obj/item/stock_parts/cell/potato(user.loc)
|
||||
pocell.icon_state = G.icon_state
|
||||
|
||||
Reference in New Issue
Block a user