From d5af5ca696d19f00f6604e13d83554d376f4b65b Mon Sep 17 00:00:00 2001 From: phil235 Date: Fri, 29 Apr 2016 00:04:40 +0200 Subject: [PATCH] Objects with invisibility = 101 are ignored by procs like view() that are used for say() and visible_message(). Objects that are simply hidden (instead of being abstract things) now always use invisibility = 100. This fixes not being able to hear what you say while inside a hidden gas/disposal pipe. Fixes the t-ray scanner revealing abstract object that should never be seen, like spacevine controller. Fixes not hearing anything during a mob transformation. --- code/game/machinery/Beacon.dm | 2 +- code/game/machinery/magnet.dm | 2 +- code/game/machinery/navbeacon.dm | 2 +- code/game/objects/items/devices/scanners.dm | 4 ++-- .../objects/items/weapons/storage/backpack.dm | 2 +- code/game/objects/structures/safe.dm | 2 +- .../atmospherics/machinery/pipes/pipes.dm | 2 +- code/modules/clothing/glasses/engine_goggles.dm | 2 +- code/modules/mob/transform_procs.dm | 16 ++++++++-------- code/modules/power/cable.dm | 2 +- code/modules/power/terminal.dm | 2 +- code/modules/recycling/disposal-construction.dm | 2 +- code/modules/recycling/disposal-structures.dm | 6 +++--- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm index 77d87856371..ef133ede61e 100644 --- a/code/game/machinery/Beacon.dm +++ b/code/game/machinery/Beacon.dm @@ -28,7 +28,7 @@ // update the invisibility and icon /obj/machinery/bluespace_beacon/hide(intact) - invisibility = intact ? 101 : 0 + invisibility = intact ? 100 : 0 updateicon() // update the icon_state diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index 54bd13d35dc..9997cd3a041 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -50,7 +50,7 @@ // update the invisibility and icon /obj/machinery/magnetic_module/hide(intact) - invisibility = intact ? 101 : 0 + invisibility = intact ? 100 : 0 updateicon() // update the icon_state diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index 147c97324b7..4b9f2917b99 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -62,7 +62,7 @@ // called when turf state changes // hide the object if turf is intact /obj/machinery/navbeacon/hide(intact) - invisibility = intact ? 101 : 0 + invisibility = intact ? 100 : 0 updateicon() // update the icon_state diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 90ffa647c49..ff0f8a819be 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -52,7 +52,7 @@ MASS SPECTROMETER var/mob/living/L = locate() in O - if(O.invisibility == 101) + if(O.invisibility == 100) O.invisibility = 0 if(L) flick_sonar(O) @@ -60,7 +60,7 @@ MASS SPECTROMETER if(O && O.loc) var/turf/U = O.loc if(U.intact) - O.invisibility = 101 + O.invisibility = 100 else if(L) flick_sonar(O) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 0110a6ac2cf..acce9ce72cf 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -280,7 +280,7 @@ /obj/item/weapon/storage/backpack/satchel_flat/hide(var/intact) if(intact) - invisibility = 101 + invisibility = 100 anchored = 1 //otherwise you can start pulling, cover it, and drag around an invisible backpack. icon_state = "[initial(icon_state)]2" else diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index f06ef7a8b34..da567c274a3 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -187,4 +187,4 @@ obj/structure/safe/ex_act(severity, target) /obj/structure/safe/floor/hide(var/intact) - invisibility = intact ? 101 : 0 \ No newline at end of file + invisibility = intact ? 100 : 0 \ No newline at end of file diff --git a/code/modules/atmospherics/machinery/pipes/pipes.dm b/code/modules/atmospherics/machinery/pipes/pipes.dm index edcdc2fbce9..9de465bc1a6 100644 --- a/code/modules/atmospherics/machinery/pipes/pipes.dm +++ b/code/modules/atmospherics/machinery/pipes/pipes.dm @@ -40,7 +40,7 @@ /obj/machinery/atmospherics/pipe/hide(i) if(level == 1 && istype(loc, /turf)) - invisibility = i ? 101 : 0 + invisibility = i ? 100 : 0 update_icon() /obj/machinery/atmospherics/pipe/proc/check_pressure(pressure) diff --git a/code/modules/clothing/glasses/engine_goggles.dm b/code/modules/clothing/glasses/engine_goggles.dm index c5e4954152c..b681067aabf 100644 --- a/code/modules/clothing/glasses/engine_goggles.dm +++ b/code/modules/clothing/glasses/engine_goggles.dm @@ -75,7 +75,7 @@ invis_objects -= O var/turf/T = O.loc if(T && T.intact) - O.invisibility = 101 + O.invisibility = 100 /obj/item/clothing/glasses/meson/engine/proc/t_ray_on() if(!istype(loc,/mob/living/carbon/human)) diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 9a5aae78ea7..6c814f2d4df 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -26,7 +26,7 @@ stunned = 1 icon = null overlays.Cut() - invisibility = 101 + invisibility = 100 var/atom/movable/overlay/animation = new( loc ) animation.icon_state = "blank" @@ -140,7 +140,7 @@ stunned = 1 icon = null overlays.Cut() - invisibility = 101 + invisibility = 100 var/atom/movable/overlay/animation = new( loc ) animation.icon_state = "blank" animation.icon = 'icons/mob/mob.dmi' @@ -244,7 +244,7 @@ notransform = 1 canmove = 0 icon = null - invisibility = 101 + invisibility = 100 return ..() /mob/proc/AIize() @@ -314,7 +314,7 @@ notransform = 1 canmove = 0 icon = null - invisibility = 101 + invisibility = 100 for(var/t in organs) qdel(t) @@ -365,7 +365,7 @@ notransform = 1 canmove = 0 icon = null - invisibility = 101 + invisibility = 100 for(var/t in organs) qdel(t) @@ -395,7 +395,7 @@ notransform = 1 canmove = 0 icon = null - invisibility = 101 + invisibility = 100 for(var/t in organs) qdel(t) @@ -454,7 +454,7 @@ notransform = 1 canmove = 0 icon = null - invisibility = 101 + invisibility = 100 for(var/t in organs) //this really should not be necessary qdel(t) @@ -484,7 +484,7 @@ notransform = 1 canmove = 0 icon = null - invisibility = 101 + invisibility = 100 for(var/t in organs) qdel(t) diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 0b6631a9fda..5d4f71a110c 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -106,7 +106,7 @@ By design, d1 is the smallest direction and d2 is the highest /obj/structure/cable/hide(i) if(level == 1 && istype(loc, /turf)) - invisibility = i ? 101 : 0 + invisibility = i ? 100 : 0 updateicon() /obj/structure/cable/proc/updateicon() diff --git a/code/modules/power/terminal.dm b/code/modules/power/terminal.dm index bd469e1853b..c7646bcafa6 100644 --- a/code/modules/power/terminal.dm +++ b/code/modules/power/terminal.dm @@ -27,7 +27,7 @@ /obj/machinery/power/terminal/hide(i) if(i) - invisibility = 101 + invisibility = 100 icon_state = "term-f" else invisibility = 0 diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm index dd7ae2b0f36..5540cffaa2f 100644 --- a/code/modules/recycling/disposal-construction.dm +++ b/code/modules/recycling/disposal-construction.dm @@ -86,7 +86,7 @@ // hide called by levelupdate if turf intact status changes // change visibility status and force update of icon /obj/structure/disposalconstruct/hide(var/intact) - invisibility = (intact && level==1) ? 101: 0 // hide if floor is intact + invisibility = (intact && level==1) ? 100: 0 // hide if floor is intact update_icon() diff --git a/code/modules/recycling/disposal-structures.dm b/code/modules/recycling/disposal-structures.dm index 3f00548adba..4d432b7831a 100644 --- a/code/modules/recycling/disposal-structures.dm +++ b/code/modules/recycling/disposal-structures.dm @@ -5,7 +5,7 @@ // this allows the gas flushed to be tracked /obj/structure/disposalholder - invisibility = 101 + invisibility = 100 var/datum/gas_mixture/gas = null // gas used to flush, will appear at exit point var/active = 0 // true if the holder is moving, otherwise inactive dir = 0 @@ -233,7 +233,7 @@ // hide called by levelupdate if turf intact status changes // change visibility status and force update of icon /obj/structure/disposalpipe/hide(var/intact) - invisibility = intact ? 101: 0 // hide if floor is intact + invisibility = intact ? 100: 0 // hide if floor is intact updateicon() // update actual icon_state depending on visibility @@ -300,7 +300,7 @@ var/obj/structure/disposalpipe/broken/P = new(src.loc) P.dir = D - src.invisibility = 101 // make invisible (since we won't delete the pipe immediately) + src.invisibility = 100 // make invisible (since we won't delete the pipe immediately) var/obj/structure/disposalholder/H = locate() in src if(H) // holder was present