cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes botany some more (#25953)

Browse Source 
This is exactly what I thought might happen, and yet it didn't occur to me that it was what was happening. Fascinating.
This commit is contained in:
Exxion
2020-03-02 12:24:03 -05:00
committed by GitHub
parent dffa253d1b
commit af16a66a53
2 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
code/modules/hydroponics/grown_inedible.dm
View File

@@ -26,7 +26,7 @@
if(!S || !S.chems)
return
potency = round(S.potency)
changePotency(S.potency)
var/totalreagents = 0
for(var/rid in S.chems)
@@ -116,12 +116,14 @@
attack_verb = list("sears", "heats", "whacks", "steams")
fragrance = INCENSE_NOVAFLOWERS
/obj/item/weapon/grown/novaflower/New()
/obj/item/weapon/grown/novaflower/New(atom/loc, custom_plantname)
..()
spawn(5) // So potency can be set in the proc that creates these crops
reagents.add_reagent(NUTRIMENT, 1)
reagents.add_reagent(CAPSAICIN, round(potency, 1))
force = round((5 + potency / 5), 1)
reagents.add_reagent(NUTRIMENT, 1)
reagents.add_reagent(CAPSAICIN, round(potency, 1))
/obj/item/weapon/grown/novaflower/changePotency(newValue)
potency = newValue
force = round((5 + potency / 5), 1)
/obj/item/weapon/grown/novaflower/attack(mob/living/carbon/M as mob, mob/user as mob)
if(!..())
@@ -149,11 +151,6 @@
throw_range = 3
origin_tech = Tc_COMBAT + "=1"
/obj/item/weapon/grown/nettle/New()
..()
spawn(5)
force = round((5+potency/5), 1)
/obj/item/weapon/grown/nettle/pickup(mob/living/carbon/human/user as mob) //todo this
if(istype(user))
if(!user.gloves)
@@ -197,11 +194,6 @@
origin_tech = Tc_COMBAT + "=3"
attack_verb = list("stings, pricks")
/obj/item/weapon/grown/deathnettle/New()
..()
spawn(5)
force = round((5+potency/2.5), 1)
/obj/item/weapon/grown/deathnettle/suicide_act(mob/user)
to_chat(viewers(user), "<span class='danger'>[user] is eating some of the [src.name]! It looks like \he's trying to commit suicide.</span>")
return (SUICIDE_ACT_BRUTELOSS|SUICIDE_ACT_TOXLOSS)

4
code/modules/reagents/reagent_containers/food/snacks/grown.dm
View File

@@ -363,7 +363,7 @@ var/list/special_fruits = list()
plantname = "rocknut"
force = 10
/obj/item/weapon/reagent_containers/food/snacks/grown/rocknut/New()
/obj/item/weapon/reagent_containers/food/snacks/grown/rocknut/New(atom/loc, custom_plantname)
..()
throwforce = throwforce + round((5+potency/7.5), 1) ///it's a rock, add bonus damage that scales with potency
eatverb = pick("crunch","gnaw","bite")
@@ -901,7 +901,7 @@ var/list/special_fruits = list()
var/current_path = null
var/counter = 1
/obj/item/weapon/reagent_containers/food/snacks/grown/nofruit/New()
/obj/item/weapon/reagent_containers/food/snacks/grown/nofruit/New(atom/loc, custom_plantname)
..()
available_fruits = existing_typesof(/obj/item/weapon/reagent_containers/food/snacks/grown) - get_special_fruits()
available_fruits = shuffle(available_fruits)