Merge pull request #7137 from Citadel-Station-13/upstream-merge-38496

[MIRROR] Fix being able to pull mirage borders, others
This commit is contained in:
LetterJay
2018-06-18 10:09:20 -05:00
committed by GitHub
7 changed files with 14 additions and 5 deletions
+2 -1
View File
@@ -7,7 +7,7 @@
if(!target || !istype(target) || !direction)
. = COMPONENT_INCOMPATIBLE
CRASH("[type] improperly instanced with the following args: target=\[[target]\], direction=\[[direction]\], range=\[[range]\]")
holder = new(parent)
var/x = target.x
@@ -37,4 +37,5 @@
/obj/effect/abstract/mirage_holder
name = "Mirage holder"
anchored = TRUE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
@@ -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))
@@ -43,6 +43,7 @@ GLOBAL_LIST_INIT(nonreactive_gases, typecacheof(list(/datum/gas/oxygen, /datum/g
var/moles_visible = null
var/dangerous = FALSE //currently used by canisters
var/fusion_power = 0 //How much the gas accelerates a fusion reaction
/datum/gas/oxygen
id = "o2"
specific_heat = 20
@@ -131,6 +132,7 @@ GLOBAL_LIST_INIT(nonreactive_gases, typecacheof(list(/datum/gas/oxygen, /datum/g
/obj/effect/overlay/gas
icon = 'icons/effects/tile_effects.dmi'
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
anchored = TRUE // should only appear in vis_contents, but to be safe
layer = FLY_LAYER
appearance_flags = TILE_BOUND
@@ -372,6 +372,7 @@
/obj/effect/warp_cube
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
anchored = TRUE
/obj/effect/warp_cube/ex_act(severity, target)
return
@@ -74,6 +74,7 @@
pixel_y = -32
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
opacity = TRUE
anchored = TRUE
/obj/structure/opacity_blocker/singularity_pull()
return 0