From 9acc97dabe5fb805a729d85ea7d5dad820a16b7b Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 16 Jun 2018 16:49:02 -0400 Subject: [PATCH 1/2] Merge pull request #38496 from AutomaticFrenzy/patch/mirage-borders Fix being able to pull mirage borders, others --- code/datums/components/mirage_border.dm | 3 ++- .../objects/effects/effect_system/effect_system.dm | 1 + code/game/objects/effects/overlays.dm | 10 ++++++---- code/game/objects/items/tanks/watertank.dm | 1 + code/modules/atmospherics/gasmixtures/gas_types.dm | 2 ++ code/modules/mining/lavaland/necropolis_chests.dm | 1 + code/modules/ruins/objects_and_mobs/necropolis_gate.dm | 1 + 7 files changed, 14 insertions(+), 5 deletions(-) diff --git a/code/datums/components/mirage_border.dm b/code/datums/components/mirage_border.dm index f91c5c8965..f435a21f49 100644 --- a/code/datums/components/mirage_border.dm +++ b/code/datums/components/mirage_border.dm @@ -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 diff --git a/code/game/objects/effects/effect_system/effect_system.dm b/code/game/objects/effects/effect_system/effect_system.dm index 918cf5886c..8c31847f78 100644 --- a/code/game/objects/effects/effect_system/effect_system.dm +++ b/code/game/objects/effects/effect_system/effect_system.dm @@ -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() ..() diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm index 811fed84ca..c1abc2c02e 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -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 diff --git a/code/game/objects/items/tanks/watertank.dm b/code/game/objects/items/tanks/watertank.dm index 70ec8243b2..1cf61ab651 100644 --- a/code/game/objects/items/tanks/watertank.dm +++ b/code/game/objects/items/tanks/watertank.dm @@ -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)) diff --git a/code/modules/atmospherics/gasmixtures/gas_types.dm b/code/modules/atmospherics/gasmixtures/gas_types.dm index 12ad70a9e3..7b643cf2b0 100644 --- a/code/modules/atmospherics/gasmixtures/gas_types.dm +++ b/code/modules/atmospherics/gasmixtures/gas_types.dm @@ -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 @@ -129,6 +130,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 diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index aa6f749c3f..17476c1618 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -372,6 +372,7 @@ /obj/effect/warp_cube mouse_opacity = MOUSE_OPACITY_TRANSPARENT + anchored = TRUE /obj/effect/warp_cube/ex_act(severity, target) return diff --git a/code/modules/ruins/objects_and_mobs/necropolis_gate.dm b/code/modules/ruins/objects_and_mobs/necropolis_gate.dm index 047f9639e4..26e5f1a9c0 100644 --- a/code/modules/ruins/objects_and_mobs/necropolis_gate.dm +++ b/code/modules/ruins/objects_and_mobs/necropolis_gate.dm @@ -74,6 +74,7 @@ pixel_y = -32 mouse_opacity = MOUSE_OPACITY_TRANSPARENT opacity = TRUE + anchored = TRUE /obj/structure/opacity_blocker/singularity_pull() return 0