cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

-Modified effect of blue-space tomatoes somewhat. If they're not strong enough to do anything, they just splat.

Browse Source 
-Both Ambrosia forms have had their reagent contents modified to prevent going over the 50-unit cap at high potencies. Fixes issue 469. Ambrosia Deus now contains space drugs instead of poison, as it ended up being more deadly in practice than I intended.
-Drinking milk removes capsaicin from your body~
-Frost oil should hurt less upon consumption.
-Liquid plasma can be converted back into solid plasma sheets, by mixing 20 plasma, 5 iron, and 5 frost oil.
-Pumpkins can be carved with knives now.
-Added additional checks to prevent hydro tray stats from going out of bounds when injected with certain chemicals.
-Added effects for holy water on hydro trays.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3883 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
d_h2005@yahoo.com
2012-06-21 03:16:29 +00:00
parent 3688028ba0
commit 040d885a9a
6 changed files with 76 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj/hydro.dm
+34 -22
View File
@@ -1038,7 +1038,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/corn
seed = "/obj/item/seeds/cornseed"
name = "cob of corn"
name = "ear of corn"
desc = "Needs some butter!"
icon_state = "corn"
potency = 40
@@ -1217,10 +1217,10 @@
New()
..()
reagents.add_reagent("nutriment", 1)
reagents.add_reagent("space_drugs", 3+round(potency / 5, 1))
reagents.add_reagent("kelotane", 3+round(potency / 5, 1))
reagents.add_reagent("bicaridine", 3+round(potency / 5, 1))
reagents.add_reagent("toxin", 3+round(potency / 5, 1))
reagents.add_reagent("space_drugs", 1+round(potency / 8, 1))
reagents.add_reagent("kelotane", 1+round(potency / 8, 1))
reagents.add_reagent("bicaridine", 1+round(potency / 10, 1))
reagents.add_reagent("toxin", 1+round(potency / 10, 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus
@@ -1232,11 +1232,10 @@
New()
..()
reagents.add_reagent("nutriment", 1)
reagents.add_reagent("bicaridine", 3+round(potency / 5, 1))
reagents.add_reagent("synaptizine", 3+round(potency / 5, 1))
reagents.add_reagent("hyperzine", 3+round(potency / 8, 1))
reagents.add_reagent("kelotane", 3+round(potency / 8, 1))
reagents.add_reagent("toxin", 1+round(potency / 8, 1))
reagents.add_reagent("bicaridine", 1+round(potency / 8, 1))
reagents.add_reagent("synaptizine", 1+round(potency / 8, 1))
reagents.add_reagent("hyperzine", 1+round(potency / 10, 1))
reagents.add_reagent("space_drugs", 1+round(potency / 10, 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/apple
@@ -2031,7 +2030,7 @@
name = "blue-space tomato"
desc = "So lubricated, you might slip through space-time."
icon_state = "bluespacetomato"
potency = 10
potency = 20
origin_tech = "bluespace=3"
New()
..()
@@ -2045,6 +2044,12 @@
var/outer_teleport_radius = potency/10 //Plant potency determines radius of teleport.
var/inner_teleport_radius = potency/15
var/list/turfs = new/list()
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
if(inner_teleport_radius < 1) //Wasn't potent enough, it just splats.
new/obj/effect/decal/cleanable/oil(src.loc)
src.visible_message("<span class='notice'>The [src.name] has been squashed.</span>","<span class='moderate'>You hear a smack.</span>")
del(src)
return
for(var/turf/T in orange(M,outer_teleport_radius))
if(T in orange(M,inner_teleport_radius)) continue
if(istype(T,/turf/space)) continue
@@ -2060,18 +2065,25 @@
turfs += pick(/turf in turfs_to_pick_from)
var/turf/picked = pick(turfs)
if(!isturf(picked)) return
switch(rand(1,2))//Allows for easy addition of more bluespace weirdness.
switch(rand(1,2))//Decides randomly to teleport the thrower or the throwee.
if(1) // Teleports the person who threw the tomato.
new/obj/effect/effect/sparks(M.loc)
new/obj/effect/decal/ash(M.loc) //Leaves a pile of ash behind for dramatic effect.
M.loc = picked
new/obj/effect/effect/sparks(M.loc) //Two set of sparks, one before the teleport and one after.
s.set_up(3, 1, M)
s.start()
new/obj/effect/decal/cleanable/molten_item(M.loc) //Leaves a pile of goo behind for dramatic effect.
M.loc = picked //
sleep(1)
s.set_up(3, 1, M)
s.start() //Two set of sparks, one before the teleport and one after.
if(2) //Teleports mob the tomato hit instead.
for(var/mob/A in get_turf(hit_atom))
new/obj/effect/effect/sparks(A.loc)
new/obj/effect/decal/ash(A.loc)
A.loc = picked
new/obj/effect/effect/sparks(A.loc)
src.visible_message("<span class='notice'>The [src.name] has been squashed, causing a distortion in space-time.</span>","<span class='moderate'>You hear a smack.</span>")
for(var/mob/A in get_turf(hit_atom))//For the mobs in the tile that was hit...
s.set_up(3, 1, A)
s.start()
new/obj/effect/decal/cleanable/molten_item(A.loc) //Leave a pile of goo behind for dramatic effect...
A.loc = picked//And teleport them to the chosen location.
sleep(1)
s.set_up(3, 1, A)
s.start()
new/obj/effect/decal/cleanable/oil(src.loc)
src.visible_message("<span class='notice'>The [src.name] has been squashed, causing a distortion in space-time.</span>","<span class='moderate'>You hear a splat and a crackle.</span>")
del(src)
return