cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 12:08:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for nettles (#3854)

Browse Source 
* Fixes for nettles
Nettle plants can now spawn randomly from weeds - it was trying to spawn 'nettles', but the name of the plant is 'nettle', so it never spawned. Now it can.

You now hit people with food if you use it on harm intent. This is mostly so that you can use nettles as a weapon again, but hey, who wouldn't want to hit people over the head with a baguette.

Nettles and other stinging "fruits" can no longer be used to generate infinite chemicals by throwing them. Chemicals that the "fruits" inject are now properly removed when hitting a target.

* Fixes for nettles
Nettle plants can now spawn randomly from weeds - it was trying to spawn 'nettles', but the name of the plant is 'nettle', so it never spawned. Now it can.

You now hit people with food if you use it on harm intent. This is mostly so that you can use nettles as a weapon again, but hey, who wouldn't want to hit people over the head with a baguette.

Nettles and other stinging "fruits" can no longer be used to generate infinite chemicals by throwing them. Chemicals that the "fruits" inject are now properly removed when hitting a target.
This commit is contained in:
PrismaticGynoid
2017-09-17 23:45:29 -05:00
committed by Anewbe
parent 356d551ace
commit 2a866c4924
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/seed.dm
+6 -3
View File
@@ -158,10 +158,13 @@
if(!body_coverage)
return
target << "<span class='danger'>You are stung by \the [fruit]!</span>"
for(var/rid in chems)
if (fruit)
var/injecting = min(5,max(1,get_trait(TRAIT_POTENCY)/5))
target.reagents.add_reagent(rid,injecting)
to_chat(target, "<span class='danger'>You are stung by \the [fruit]!</span>")
for(var/chem in chems)
target.reagents.add_reagent(chem,injecting)
if (fruit.reagents)
fruit.reagents.remove_reagent(chem, injecting)
//Splatter a turf.
/datum/seed/proc/splatter(var/turf/T,var/obj/item/thrown)
code/modules/hydroponics/trays/tray.dm
+1 -1
View File
@@ -322,7 +322,7 @@
//Remove the seed if something is already planted.
if(seed) seed = null
seed = plant_controller.seeds[pick(list("reishi","nettles","amanita","mushrooms","plumphelmet","towercap","harebells","weeds"))]
seed = plant_controller.seeds[pick(list("reishi","nettle","amanita","mushrooms","plumphelmet","towercap","harebells","weeds"))]
if(!seed) return //Weed does not exist, someone fucked up.
dead = 0
code/modules/reagents/reagent_containers/food/snacks.dm
+5
View File
@@ -15,6 +15,7 @@
var/list/nutriment_desc = list("food" = 1)
center_of_mass = list("x"=16, "y"=16)
w_class = ITEMSIZE_SMALL
force = 1
/obj/item/weapon/reagent_containers/food/snacks/New()
..()
@@ -79,6 +80,10 @@
if (fullness > (550 * (1 + M.overeatduration / 2000))) // The more you eat - the more you can eat
M << "<span class='danger'>You cannot force any more of [src] to go down your throat.</span>"
return 0
else if(user.a_intent == I_HURT)
return ..()
else
if(istype(M,/mob/living/carbon/human))
var/mob/living/carbon/human/H = M