cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

split teleportation changes out into another PR

Browse Source
This commit is contained in:
Kyep
2018-08-02 09:36:10 -07:00
parent 9091d4cd9c
commit 45a88d4f3f
2 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/plant_genes.dm
+2 -9
View File
@@ -307,21 +307,14 @@
/datum/plant_gene/trait/teleport/on_squash(obj/item/reagent_containers/food/snacks/grown/G, atom/target)
if(isliving(target))
var/turf/T = get_turf(target)
var/area/A = get_area(T)
if(!T || !is_teleport_allowed(T.z) || A.tele_proof)
return
var/teleport_radius = max(round(G.seed.potency / 10), 1)
var/turf/T = get_turf(target)
new /obj/effect/decal/cleanable/molten_object(T) //Leave a pile of goo behind for dramatic effect...
do_teleport(target, T, teleport_radius)
/datum/plant_gene/trait/teleport/on_slip(obj/item/reagent_containers/food/snacks/grown/G, mob/living/carbon/C)
var/turf/T = get_turf(C)
var/area/A = get_area(T)
if(!T || !is_teleport_allowed(T.z) || A.tele_proof)
qdel(G)
return
var/teleport_radius = max(round(G.seed.potency / 10), 1)
var/turf/T = get_turf(C)
to_chat(C, "<span class='warning'>You slip through spacetime!</span>")
do_teleport(C, T, teleport_radius)
if(prob(50))