Merge pull request #38496 from AutomaticFrenzy/patch/mirage-borders

Fix being able to pull mirage borders, others
This commit is contained in:
Jordan Brown
2018-06-16 16:49:02 -04:00
committed by letterjay
parent 4780f3a20b
commit 9acc97dabe
7 changed files with 14 additions and 5 deletions
@@ -10,6 +10,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
name = "particle effect"
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
pass_flags = PASSTABLE | PASSGRILLE
anchored = TRUE
/obj/effect/particle_effect/New()
..()
+6 -4
View File
@@ -1,6 +1,5 @@
/obj/effect/overlay
name = "overlay"
var/i_attached//Added for possible image attachments to objects. For hallucinations and the like.
/obj/effect/overlay/singularity_act()
return
@@ -19,7 +18,7 @@
QDEL_IN(src, 10)
/obj/effect/overlay/palmtree_r
name = "Palm tree"
name = "palm tree"
icon = 'icons/misc/beach2.dmi'
icon_state = "palm1"
density = TRUE
@@ -27,7 +26,7 @@
anchored = TRUE
/obj/effect/overlay/palmtree_l
name = "Palm tree"
name = "palm tree"
icon = 'icons/misc/beach2.dmi'
icon_state = "palm2"
density = TRUE
@@ -35,11 +34,14 @@
anchored = TRUE
/obj/effect/overlay/coconut
name = "Coconuts"
gender = PLURAL
name = "coconuts"
icon = 'icons/misc/beach.dmi'
icon_state = "coconuts"
/obj/effect/overlay/sparkles
gender = PLURAL
name = "sparkles"
icon = 'icons/effects/effects.dmi'
icon_state = "shieldsparkles"
anchored = TRUE
@@ -325,6 +325,7 @@
icon_state = "frozen_smoke_capsule"
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
pass_flags = PASSTABLE
anchored = TRUE
/obj/effect/resin_container/proc/Smoke()
var/obj/effect/particle_effect/foam/metal/resin/S = new /obj/effect/particle_effect/foam/metal/resin(get_turf(loc))