From d5af5ca696d19f00f6604e13d83554d376f4b65b Mon Sep 17 00:00:00 2001 From: phil235 Date: Fri, 29 Apr 2016 00:04:40 +0200 Subject: [PATCH 1/2] 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 From 750eaa4a57c7723ded6d8e2049695ea38e274de2 Mon Sep 17 00:00:00 2001 From: phil235 Date: Fri, 29 Apr 2016 01:00:05 +0200 Subject: [PATCH 2/2] invisibility = 100 and 101 now use defines. --- code/__DEFINES/sight.dm | 5 ++++- code/_onclick/hud/human.dm | 2 +- code/datums/diseases/transformation.dm | 2 +- code/game/atoms_movable.dm | 2 +- code/game/gamemodes/changeling/evolution_menu.dm | 2 +- .../gamemodes/changeling/powers/tiny_prick.dm | 2 +- .../gamemodes/shadowling/shadowling_abilities.dm | 2 +- code/game/gamemodes/wizard/soulstone.dm | 2 +- code/game/machinery/Beacon.dm | 2 +- code/game/machinery/magnet.dm | 2 +- code/game/machinery/navbeacon.dm | 2 +- code/game/objects/effects/bump_teleporter.dm | 2 +- code/game/objects/effects/landmarks.dm | 4 ++-- code/game/objects/effects/manifest.dm | 2 +- code/game/objects/effects/mines.dm | 2 +- code/game/objects/effects/step_triggers.dm | 2 +- code/game/objects/items/devices/scanners.dm | 4 ++-- .../objects/items/weapons/storage/backpack.dm | 2 +- code/game/objects/structures/safe.dm | 2 +- code/game/turfs/simulated/river.dm | 2 +- code/game/turfs/turf.dm | 2 +- code/modules/admin/admin_verbs.dm | 2 +- code/modules/assembly/infrared.dm | 2 +- .../atmospherics/machinery/pipes/pipes.dm | 2 +- .../mission_code/stationCollision.dm | 2 +- code/modules/clothing/glasses/engine_goggles.dm | 4 ++-- code/modules/clothing/spacesuits/chronosuit.dm | 2 +- code/modules/events/spacevine.dm | 2 +- code/modules/holodeck/holo_effect.dm | 2 +- code/modules/mining/lavaland/weather.dm | 2 +- code/modules/mining/lavaland/weather_types.dm | 2 +- code/modules/mob/camera/camera.dm | 2 +- code/modules/mob/living/carbon/life.dm | 2 +- code/modules/mob/living/death.dm | 2 +- .../mob/living/silicon/ai/freelook/eye.dm | 2 +- .../simple_animal/guardian/types/ranged.dm | 2 +- .../mob/living/simple_animal/hostile/zombie.dm | 2 +- code/modules/mob/new_player/new_player.dm | 2 +- code/modules/mob/transform_procs.dm | 16 ++++++++-------- .../ninja/suit/n_suit_verbs/energy_net_nets.dm | 2 +- code/modules/power/cable.dm | 2 +- code/modules/power/terminal.dm | 2 +- code/modules/projectiles/projectile/magic.dm | 2 +- code/modules/recycling/disposal-construction.dm | 2 +- code/modules/recycling/disposal-structures.dm | 6 +++--- code/modules/shuttle/shuttle.dm | 4 ++-- code/modules/telesci/gps.dm | 2 +- 47 files changed, 63 insertions(+), 60 deletions(-) diff --git a/code/__DEFINES/sight.dm b/code/__DEFINES/sight.dm index 097ac213004..bd7af5a9e0a 100644 --- a/code/__DEFINES/sight.dm +++ b/code/__DEFINES/sight.dm @@ -16,7 +16,10 @@ #define INVISIBILITY_OBSERVER 60 #define SEE_INVISIBLE_OBSERVER 60 -#define INVISIBILITY_MAXIMUM 100 +#define INVISIBILITY_MAXIMUM 100 //the maximum allowed for "real" objects + +#define INVISIBILITY_ABSTRACT 101 //only used for abstract objects (e.g. spacevine_controller), things that are not really there. + #define BORGMESON 1 #define BORGTHERM 2 diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index 40bb0c2d7d0..e7baed52506 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -26,7 +26,7 @@ H.quick_equip() /obj/screen/ling - invisibility = 101 + invisibility = INVISIBILITY_ABSTRACT /obj/screen/ling/sting name = "current sting" diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm index b814687318a..0eedaa98f70 100644 --- a/code/datums/diseases/transformation.dm +++ b/code/datums/diseases/transformation.dm @@ -48,7 +48,7 @@ affected_mob.canmove = 0 affected_mob.icon = null affected_mob.overlays.Cut() - affected_mob.invisibility = 101 + affected_mob.invisibility = INVISIBILITY_ABSTRACT for(var/obj/item/W in affected_mob) if(istype(W, /obj/item/weapon/implant)) qdel(W) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 0c3f60be2b4..63c03c9c2dd 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -79,7 +79,7 @@ for(var/atom/movable/AM in contents) qdel(AM) loc = null - invisibility = 101 + invisibility = INVISIBILITY_ABSTRACT if (pulledby) if (pulledby.pulling == src) pulledby.pulling = null diff --git a/code/game/gamemodes/changeling/evolution_menu.dm b/code/game/gamemodes/changeling/evolution_menu.dm index af9cd88b91b..7aa3a7c0d5c 100644 --- a/code/game/gamemodes/changeling/evolution_menu.dm +++ b/code/game/gamemodes/changeling/evolution_menu.dm @@ -398,7 +398,7 @@ var/list/sting_paths p.on_refund(src) if(hud_used) hud_used.lingstingdisplay.icon_state = null - hud_used.lingstingdisplay.invisibility = 101 + hud_used.lingstingdisplay.invisibility = INVISIBILITY_ABSTRACT /datum/changeling/proc/has_sting(obj/effect/proc_holder/changeling/power) for(var/obj/effect/proc_holder/changeling/P in purchasedpowers) diff --git a/code/game/gamemodes/changeling/powers/tiny_prick.dm b/code/game/gamemodes/changeling/powers/tiny_prick.dm index e32b4a2150d..3307b18cebe 100644 --- a/code/game/gamemodes/changeling/powers/tiny_prick.dm +++ b/code/game/gamemodes/changeling/powers/tiny_prick.dm @@ -23,7 +23,7 @@ user << "We retract our sting, we can't sting anyone for now." user.mind.changeling.chosen_sting = null user.hud_used.lingstingdisplay.icon_state = null - user.hud_used.lingstingdisplay.invisibility = 101 + user.hud_used.lingstingdisplay.invisibility = INVISIBILITY_ABSTRACT /mob/living/carbon/proc/unset_sting() if(mind && mind.changeling && mind.changeling.chosen_sting) diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm index cefa07ddb4a..4a4860b3dcd 100644 --- a/code/game/gamemodes/shadowling/shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm @@ -413,7 +413,7 @@ user << "You regurgitate a vast cloud of blinding smoke." var/obj/item/weapon/reagent_containers/glass/beaker/large/B = new /obj/item/weapon/reagent_containers/glass/beaker/large(user.loc) //hacky B.reagents.clear_reagents() //Just in case! - B.invisibility = INFINITY //This ought to do the trick + B.invisibility = INVISIBILITY_ABSTRACT //This ought to do the trick B.reagents.add_reagent("blindness_smoke", 10) var/datum/effect_system/smoke_spread/chem/S = new S.attach(B) diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 09e306ed31a..3ecff372826 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -217,7 +217,7 @@ /obj/item/device/soulstone/proc/init_shade(obj/item/device/soulstone/C, mob/living/carbon/human/T, mob/U, vic = 0) new /obj/effect/decal/remains/human(T.loc) //Spawns a skeleton - T.invisibility = 101 + T.invisibility = INVISIBILITY_ABSTRACT var/atom/movable/overlay/animation = new /atom/movable/overlay( T.loc ) animation.icon_state = "blank" animation.icon = 'icons/mob/mob.dmi' diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm index ef133ede61e..4121a1baefd 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 ? 100 : 0 + invisibility = intact ? INVISIBILITY_MAXIMUM : 0 updateicon() // update the icon_state diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index 9997cd3a041..0eb8c805d4c 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 ? 100 : 0 + invisibility = intact ? INVISIBILITY_MAXIMUM : 0 updateicon() // update the icon_state diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index 4b9f2917b99..0bf936413c2 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 ? 100 : 0 + invisibility = intact ? INVISIBILITY_MAXIMUM : 0 updateicon() // update the icon_state diff --git a/code/game/objects/effects/bump_teleporter.dm b/code/game/objects/effects/bump_teleporter.dm index bb9a34010c9..722f29e9132 100644 --- a/code/game/objects/effects/bump_teleporter.dm +++ b/code/game/objects/effects/bump_teleporter.dm @@ -6,7 +6,7 @@ var/list/obj/effect/bump_teleporter/BUMP_TELEPORTERS = list() icon_state = "x2" var/id = null //id of this bump_teleporter. var/id_target = null //id of bump_teleporter which this moves you to. - invisibility = 101 //nope, can't see this + invisibility = INVISIBILITY_ABSTRACT //nope, can't see this anchored = 1 density = 1 opacity = 0 diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index db576ada67a..f7b79c7b8d0 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -8,7 +8,7 @@ /obj/effect/landmark/New() ..() tag = text("landmark*[]", name) - invisibility = 101 + invisibility = INVISIBILITY_ABSTRACT landmarks_list += src switch(name) //some of these are probably obsolete @@ -77,7 +77,7 @@ /obj/effect/landmark/start/New() ..() tag = "start*[name]" - invisibility = 101 + invisibility = INVISIBILITY_ABSTRACT start_landmarks_list += src return 1 diff --git a/code/game/objects/effects/manifest.dm b/code/game/objects/effects/manifest.dm index 4b5a2eebb7b..b898b2d9dc3 100644 --- a/code/game/objects/effects/manifest.dm +++ b/code/game/objects/effects/manifest.dm @@ -6,7 +6,7 @@ /obj/effect/manifest/New() - src.invisibility = 101 + src.invisibility = INVISIBILITY_ABSTRACT return /obj/effect/manifest/proc/manifest() diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index c9ce3dcb94d..d39257edbcf 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -106,7 +106,7 @@ if(triggered) return triggered = 1 - invisibility = 101 + invisibility = INVISIBILITY_ABSTRACT mineEffect(victim) qdel(src) diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm index ea28eef5d5c..3dd18ba5420 100644 --- a/code/game/objects/effects/step_triggers.dm +++ b/code/game/objects/effects/step_triggers.dm @@ -4,7 +4,7 @@ var/affect_ghosts = 0 var/stopper = 1 // stops throwers var/mobs_only = 0 - invisibility = 101 // nope cant see this shit + invisibility = INVISIBILITY_ABSTRACT // nope cant see this shit anchored = 1 /obj/effect/step_trigger/proc/Trigger(atom/movable/A) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index ff0f8a819be..7b1fa5d630e 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 == 100) + if(O.invisibility == INVISIBILITY_MAXIMUM) 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 = 100 + O.invisibility = INVISIBILITY_MAXIMUM 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 acce9ce72cf..bdea527638a 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 = 100 + invisibility = INVISIBILITY_MAXIMUM 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 da567c274a3..2951e379844 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 ? 100 : 0 \ No newline at end of file + invisibility = intact ? INVISIBILITY_MAXIMUM : 0 \ No newline at end of file diff --git a/code/game/turfs/simulated/river.dm b/code/game/turfs/simulated/river.dm index 1220a760a9a..b102cb7ce75 100644 --- a/code/game/turfs/simulated/river.dm +++ b/code/game/turfs/simulated/river.dm @@ -59,7 +59,7 @@ /obj/effect/landmark/river_waypoint name = "river waypoint" var/connected = 0 - invisibility = 101 + invisibility = INVISIBILITY_ABSTRACT /turf/proc/Spread(probability = 30, prob_loss = 25) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index f9adb04c45f..d59cc3f0462 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -244,7 +244,7 @@ for(var/obj/O in contents) //this is for deleting things like wires contained in the turf if(O.level != 1) continue - if(O.invisibility == 101) + if(O.invisibility == INVISIBILITY_MAXIMUM) O.singularity_act() ChangeTurf(src.baseturf) return(2) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 51176fd8b1f..11c21972abb 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -462,7 +462,7 @@ var/list/admin_verbs_hideable = list( holder.fakekey = new_key createStealthKey() if(isobserver(mob)) - mob.invisibility = INVISIBILITY_MAXIMUM + 1 //JUST IN CASE + mob.invisibility = INVISIBILITY_ABSTRACT //JUST IN CASE mob.alpha = 0 //JUUUUST IN CASE mob.name = " " mob.mouse_opacity = 0 diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index 9f63519f10f..84e212cd2e0 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -193,7 +193,7 @@ left-- if(left < 1) if(!(visible)) - invisibility = 101 + invisibility = INVISIBILITY_ABSTRACT else invisibility = 0 else diff --git a/code/modules/atmospherics/machinery/pipes/pipes.dm b/code/modules/atmospherics/machinery/pipes/pipes.dm index 9de465bc1a6..94898fcd009 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 ? 100 : 0 + invisibility = i ? INVISIBILITY_MAXIMUM : 0 update_icon() /obj/machinery/atmospherics/pipe/proc/check_pressure(pressure) diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm index db769b132cc..79c29d2b705 100644 --- a/code/modules/awaymissions/mission_code/stationCollision.dm +++ b/code/modules/awaymissions/mission_code/stationCollision.dm @@ -189,7 +189,7 @@ var/sc_safecode5 = "[rand(0,9)]" for(var/obj/O in T.contents) if(O.level != 1) continue - if(O.invisibility == 101) + if(O.invisibility == INVISIBILITY_MAXIMUM) src.consume(O) T.ChangeTurf(/turf/open/space) return diff --git a/code/modules/clothing/glasses/engine_goggles.dm b/code/modules/clothing/glasses/engine_goggles.dm index b681067aabf..e3d60ce2028 100644 --- a/code/modules/clothing/glasses/engine_goggles.dm +++ b/code/modules/clothing/glasses/engine_goggles.dm @@ -62,7 +62,7 @@ if(O.level != 1) continue - if(O.invisibility == 101) + if(O.invisibility == INVISIBILITY_MAXIMUM) O.invisibility = 0 invis_objects += O @@ -75,7 +75,7 @@ invis_objects -= O var/turf/T = O.loc if(T && T.intact) - O.invisibility = 100 + O.invisibility = INVISIBILITY_MAXIMUM /obj/item/clothing/glasses/meson/engine/proc/t_ray_on() if(!istype(loc,/mob/living/carbon/human)) diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm index e039b6f5125..b08a0da4518 100644 --- a/code/modules/clothing/spacesuits/chronosuit.dm +++ b/code/modules/clothing/spacesuits/chronosuit.dm @@ -251,7 +251,7 @@ name = "Chronosuit View" density = 0 anchored = 1 - invisibility = 101 + invisibility = INVISIBILITY_ABSTRACT opacity = 0 mouse_opacity = 0 var/mob/holder = null diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 3b34c7a89dc..793f267c948 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -438,7 +438,7 @@ /obj/effect/spacevine_controller - invisibility = 101 + invisibility = INVISIBILITY_ABSTRACT var/list/obj/effect/spacevine/vines = list() var/list/growth_queue = list() var/spread_multiplier = 5 diff --git a/code/modules/holodeck/holo_effect.dm b/code/modules/holodeck/holo_effect.dm index d0beeca9d4d..dbed389e78a 100644 --- a/code/modules/holodeck/holo_effect.dm +++ b/code/modules/holodeck/holo_effect.dm @@ -7,7 +7,7 @@ /obj/effect/holodeck_effect icon = 'icons/mob/screen_gen.dmi' icon_state = "x2" - invisibility = 101 + invisibility = INVISIBILITY_ABSTRACT /obj/effect/holodeck_effect/proc/activate(var/obj/machinery/computer/holodeck/HC) return diff --git a/code/modules/mining/lavaland/weather.dm b/code/modules/mining/lavaland/weather.dm index 4e5ded6d903..d0572ff0531 100644 --- a/code/modules/mining/lavaland/weather.dm +++ b/code/modules/mining/lavaland/weather.dm @@ -96,5 +96,5 @@ N.icon_state = initial(N.icon_state) N.icon = 'icons/turf/areas.dmi' N.layer = 10 //Just default back to normal area stuff since I assume setting a var is faster than initial - N.invisibility = 100 + N.invisibility = INVISIBILITY_MAXIMUM N.opacity = 0 \ No newline at end of file diff --git a/code/modules/mining/lavaland/weather_types.dm b/code/modules/mining/lavaland/weather_types.dm index 5f8b8553457..181569c8792 100644 --- a/code/modules/mining/lavaland/weather_types.dm +++ b/code/modules/mining/lavaland/weather_types.dm @@ -56,7 +56,7 @@ A.icon = 'icons/effects/weather_effects.dmi' A.icon_state = start_up_overlay else - A.invisibility = 100 + A.invisibility = INVISIBILITY_MAXIMUM A.opacity = 0 //Ash storms diff --git a/code/modules/mob/camera/camera.dm b/code/modules/mob/camera/camera.dm index 3f67ba3ddc6..f960c5390b9 100644 --- a/code/modules/mob/camera/camera.dm +++ b/code/modules/mob/camera/camera.dm @@ -7,7 +7,7 @@ status_flags = GODMODE // You can't damage it. mouse_opacity = 0 see_in_dark = 7 - invisibility = 101 // No one can see us + invisibility = INVISIBILITY_ABSTRACT // No one can see us sight = SEE_SELF move_on_shuttle = 0 diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index bc3c607c8b4..5e7aee2d4c2 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -218,7 +218,7 @@ hud_used.lingchemdisplay.invisibility = 0 hud_used.lingchemdisplay.maptext = "
[round(mind.changeling.chem_charges)]
" else - hud_used.lingchemdisplay.invisibility = 101 + hud_used.lingchemdisplay.invisibility = INVISIBILITY_ABSTRACT /mob/living/carbon/handle_mutations_and_radiation() diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm index 18d6cc56f2b..ba06848006b 100644 --- a/code/modules/mob/living/death.dm +++ b/code/modules/mob/living/death.dm @@ -64,7 +64,7 @@ notransform = 1 canmove = 0 icon = null - invisibility = 101 + invisibility = INVISIBILITY_ABSTRACT alpha = 0 if(!prev_lying && animation) diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm index d03587fd26d..03cbf964dea 100644 --- a/code/modules/mob/living/silicon/ai/freelook/eye.dm +++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm @@ -6,7 +6,7 @@ /mob/camera/aiEye name = "Inactive AI Eye" - invisibility = 100 + invisibility = INVISIBILITY_MAXIMUM var/list/visibleCameraChunks = list() var/mob/living/silicon/ai/ai = null var/relay_speech = FALSE diff --git a/code/modules/mob/living/simple_animal/guardian/types/ranged.dm b/code/modules/mob/living/simple_animal/guardian/types/ranged.dm index 4aea0048075..3e5756baa6a 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/ranged.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/ranged.dm @@ -95,7 +95,7 @@ name = "snare" desc = "You shouldn't be seeing this!" var/mob/living/simple_animal/hostile/guardian/spawner - invisibility = 101 + invisibility = INVISIBILITY_ABSTRACT /obj/item/effect/snare/Crossed(AM as mob|obj) diff --git a/code/modules/mob/living/simple_animal/hostile/zombie.dm b/code/modules/mob/living/simple_animal/hostile/zombie.dm index 069e80adda0..dd2e54c8bfd 100644 --- a/code/modules/mob/living/simple_animal/hostile/zombie.dm +++ b/code/modules/mob/living/simple_animal/hostile/zombie.dm @@ -173,7 +173,7 @@ icon_living = "none" icon_dead = "none" desc = "You shouldn't be seeing this." - invisibility = 101 + invisibility = INVISIBILITY_ABSTRACT unsuitable_atmos_damage = 0 stat_attack = 2 gold_core_spawnable = 0 diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 5ca261d34b0..1971867a5ae 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -6,7 +6,7 @@ flags = NONE - invisibility = 101 + invisibility = INVISIBILITY_ABSTRACT density = 0 stat = DEAD diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 6c814f2d4df..3f47e465f66 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 = 100 + invisibility = INVISIBILITY_MAXIMUM var/atom/movable/overlay/animation = new( loc ) animation.icon_state = "blank" @@ -140,7 +140,7 @@ stunned = 1 icon = null overlays.Cut() - invisibility = 100 + invisibility = INVISIBILITY_MAXIMUM 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 = 100 + invisibility = INVISIBILITY_MAXIMUM return ..() /mob/proc/AIize() @@ -314,7 +314,7 @@ notransform = 1 canmove = 0 icon = null - invisibility = 100 + invisibility = INVISIBILITY_MAXIMUM for(var/t in organs) qdel(t) @@ -365,7 +365,7 @@ notransform = 1 canmove = 0 icon = null - invisibility = 100 + invisibility = INVISIBILITY_MAXIMUM for(var/t in organs) qdel(t) @@ -395,7 +395,7 @@ notransform = 1 canmove = 0 icon = null - invisibility = 100 + invisibility = INVISIBILITY_MAXIMUM for(var/t in organs) qdel(t) @@ -454,7 +454,7 @@ notransform = 1 canmove = 0 icon = null - invisibility = 100 + invisibility = INVISIBILITY_MAXIMUM for(var/t in organs) //this really should not be necessary qdel(t) @@ -484,7 +484,7 @@ notransform = 1 canmove = 0 icon = null - invisibility = 100 + invisibility = INVISIBILITY_MAXIMUM for(var/t in organs) qdel(t) diff --git a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm index a2b9add6e23..474b7558267 100644 --- a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm +++ b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm @@ -66,7 +66,7 @@ It is possible to destroy the net by the occupant or someone else. //No need to check for countdown here since while() broke, it's implicit that it finished. density = 0//Make the net pass-through. - invisibility = 101//Make the net invisible so all the animations can play out. + invisibility = INVISIBILITY_ABSTRACT//Make the net invisible so all the animations can play out. health = INFINITY//Make the net invincible so that an explosion/something else won't kill it while, spawn() is running. for(var/obj/item/W in M) if(istype(M,/mob/living/carbon/human)) diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 5d4f71a110c..e4ac46f4b8e 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 ? 100 : 0 + invisibility = i ? INVISIBILITY_MAXIMUM : 0 updateicon() /obj/structure/cable/proc/updateicon() diff --git a/code/modules/power/terminal.dm b/code/modules/power/terminal.dm index c7646bcafa6..229c59f9d03 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 = 100 + invisibility = INVISIBILITY_MAXIMUM icon_state = "term-f" else invisibility = 0 diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index 82646434ca9..124ee6adf8d 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -132,7 +132,7 @@ M.canmove = 0 M.icon = null M.overlays.Cut() - M.invisibility = 101 + M.invisibility = INVISIBILITY_ABSTRACT if(istype(M, /mob/living/silicon/robot)) var/mob/living/silicon/robot/Robot = M diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm index 5540cffaa2f..bd774cb08be 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) ? 100: 0 // hide if floor is intact + invisibility = (intact && level==1) ? INVISIBILITY_MAXIMUM: 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 4d432b7831a..d5c7403d185 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 = 100 + invisibility = INVISIBILITY_MAXIMUM 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 ? 100: 0 // hide if floor is intact + invisibility = intact ? INVISIBILITY_MAXIMUM: 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 = 100 // make invisible (since we won't delete the pipe immediately) + src.invisibility = INVISIBILITY_MAXIMUM // make invisible (since we won't delete the pipe immediately) var/obj/structure/disposalholder/H = locate() in src if(H) // holder was present diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index e32e7fdea57..156eaea5e2d 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -3,7 +3,7 @@ //NORTH default dir /obj/docking_port - invisibility = 101 + invisibility = INVISIBILITY_ABSTRACT icon = 'icons/obj/device.dmi' //icon = 'icons/dirsquare.dmi' icon_state = "pinonfar" @@ -385,7 +385,7 @@ return 1 /obj/onShuttleMove() - if(invisibility >= 101) + if(invisibility >= INVISIBILITY_ABSTRACT) return 0 . = ..() diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm index e7648cc9b7b..540f9e68f66 100644 --- a/code/modules/telesci/gps.dm +++ b/code/modules/telesci/gps.dm @@ -103,4 +103,4 @@ var/list/GPS_list = list() icon_state = null gpstag = "Eerie Signal" desc = "Report to a coder immediately." - invisibility = 100 \ No newline at end of file + invisibility = INVISIBILITY_MAXIMUM \ No newline at end of file