diff --git a/code/LINDA/LINDA_fire.dm b/code/LINDA/LINDA_fire.dm index df4e8b47f31..ada5e6a9e5f 100644 --- a/code/LINDA/LINDA_fire.dm +++ b/code/LINDA/LINDA_fire.dm @@ -42,7 +42,7 @@ //This is the icon for fire on turfs, also helps for nurturing small fires until they are full tile /obj/effect/hotspot anchored = 1 - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT unacidable = 1//So you can't melt fire with acid. icon = 'icons/effects/fire.dmi' icon_state = "1" diff --git a/code/LINDA/LINDA_turf_tile.dm b/code/LINDA/LINDA_turf_tile.dm index f1475bb2605..bb212b17138 100644 --- a/code/LINDA/LINDA_turf_tile.dm +++ b/code/LINDA/LINDA_turf_tile.dm @@ -250,7 +250,7 @@ var/atmos_overlay = get_atmos_overlay_by_name(atmos_overlay_type) if(atmos_overlay) overlays -= atmos_overlay - mouse_opacity = 1 + mouse_opacity = MOUSE_OPACITY_ICON atmos_overlay = get_atmos_overlay_by_name(new_overlay_type) if(atmos_overlay) @@ -267,12 +267,12 @@ /turf/simulated/proc/tile_graphic() if(air.toxins > MOLES_PLASMA_VISIBLE) - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT return "plasma" var/datum/gas/sleeping_agent = locate(/datum/gas/sleeping_agent) in air.trace_gases if(sleeping_agent && (sleeping_agent.moles > 1)) - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT return "sleeping_agent" return null diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index a4bcbcadc4b..1f0768ba9b0 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -378,3 +378,8 @@ // Area selection defines #define AREASELECT_CORNERA "corner A" #define AREASELECT_CORNERB "corner B" + +//https://secure.byond.com/docs/ref/info.html#/atom/var/mouse_opacity +#define MOUSE_OPACITY_TRANSPARENT 0 +#define MOUSE_OPACITY_ICON 1 +#define MOUSE_OPACITY_OPAQUE 2 diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 9679935bdaa..006f350873b 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -392,7 +392,7 @@ icon = 'icons/mob/screen_full.dmi' icon_state = "passage0" plane = CLICKCATCHER_PLANE - mouse_opacity = 2 + mouse_opacity = MOUSE_OPACITY_OPAQUE screen_loc = "CENTER-7,CENTER-7" /obj/screen/click_catcher/Click(location, control, params) diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 803901ae668..a187dfe3648 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -89,7 +89,7 @@ icon_state = "default" name = "Alert" desc = "Something seems to have gone wrong with this alert, so report this bug please" - mouse_opacity = 1 + mouse_opacity = MOUSE_OPACITY_ICON var/timeout = 0 //If set to a number, this alert will clear itself after that many deciseconds var/severity = 0 var/alerttooltipstyle = "" diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm index a44f5d2e5a8..673a49ffd22 100644 --- a/code/_onclick/hud/fullscreen.dm +++ b/code/_onclick/hud/fullscreen.dm @@ -54,7 +54,7 @@ icon_state = "default" screen_loc = "CENTER-7,CENTER-7" layer = FULLSCREEN_LAYER - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT var/severity = 0 /obj/screen/fullscreen/Destroy() diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index b61cb69e0e4..67f2db660f8 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -26,7 +26,7 @@ /obj/screen/text icon = null icon_state = null - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT screen_loc = "CENTER-7,CENTER-7" maptext_height = 480 maptext_width = 480 @@ -379,7 +379,7 @@ icon = 'icons/mob/guardian.dmi' icon_state = "base" screen_loc = ui_health - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT /obj/screen/healthdoll name = "health doll" diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index 16193241ca8..986467fc74a 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -363,19 +363,19 @@ SUBSYSTEM_DEF(air) plmaster.icon = 'icons/effects/tile_effects.dmi' plmaster.icon_state = "plasma" plmaster.layer = FLY_LAYER - plmaster.mouse_opacity = 0 + plmaster.mouse_opacity = MOUSE_OPACITY_TRANSPARENT slmaster = new /obj/effect/overlay() slmaster.icon = 'icons/effects/tile_effects.dmi' slmaster.icon_state = "sleeping_agent" slmaster.layer = FLY_LAYER - slmaster.mouse_opacity = 0 + slmaster.mouse_opacity = MOUSE_OPACITY_TRANSPARENT icemaster = new /obj/effect/overlay() icemaster.icon = 'icons/turf/overlays.dmi' icemaster.icon_state = "snowfloor" icemaster.layer = TURF_LAYER + 0.1 - icemaster.mouse_opacity = 0 + icemaster.mouse_opacity = MOUSE_OPACITY_TRANSPARENT #undef SSAIR_PIPENETS #undef SSAIR_ATMOSMACHINERY diff --git a/code/datums/beam.dm b/code/datums/beam.dm index bb1cef167d6..e3a3ca6033a 100644 --- a/code/datums/beam.dm +++ b/code/datums/beam.dm @@ -111,7 +111,7 @@ X.pixel_y = Pixel_y /obj/effect/ebeam - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT anchored = 1 var/datum/beam/owner diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 5ac50b5a8dc..068fe991a9d 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -27,7 +27,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "unknown" layer = AREA_LAYER luminosity = 0 - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT invisibility = INVISIBILITY_LIGHTING var/valid_territory = TRUE //used for cult summoning areas on station zlevel var/map_name // Set in New(); preserves the name set by the map maker, even if renamed by the Blueprints. diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 39064d1cf3b..a9bdb68c0ad 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -132,14 +132,14 @@ if(!fire) fire = 1 //used for firedoor checks updateicon() - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT air_doors_close() /area/proc/fire_reset() if(fire) fire = 0 //used for firedoor checks updateicon() - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT air_doors_open() return @@ -165,7 +165,7 @@ /area/proc/set_fire_alarm_effect() fire = 1 updateicon() - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT /area/proc/readyalert() if(!eject) @@ -181,12 +181,12 @@ if(!party) party = 1 updateicon() - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT /area/proc/partyreset() if(party) party = 0 - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT updateicon() /area/proc/updateicon() diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 7790d5b8885..f1409e1e53d 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -487,7 +487,7 @@ var/list/teleport_runes = list() icon_state = "rune_large" pixel_x = -32 //So the big ol' 96x96 sprite shows up right pixel_y = -32 - mouse_opacity = 1 //we're huge and easy to click + mouse_opacity = MOUSE_OPACITY_ICON //we're huge and easy to click scribe_delay = 450 //how long the rune takes to create scribe_damage = 40.1 //how much damage you take doing it var/used @@ -1031,7 +1031,7 @@ var/list/teleport_runes = list() N.desc = "A weak shield summoned by cultists to protect them while they carry out delicate rituals" N.color = "red" N.health = 20 - N.mouse_opacity = 0 + N.mouse_opacity = MOUSE_OPACITY_TRANSPARENT new_human.key = ghost_to_spawn.key ticker.mode.add_cultist(new_human.mind, 0) summoned_guys |= new_human diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index a05fdef243d..1941c0c323f 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -256,7 +256,7 @@ var/round_start_time = 0 cinematic.icon = 'icons/effects/station_explosion.dmi' cinematic.icon_state = "station_intact" cinematic.layer = 21 - cinematic.mouse_opacity = 0 + cinematic.mouse_opacity = MOUSE_OPACITY_TRANSPARENT cinematic.screen_loc = "1,0" var/obj/structure/stool/bed/temp_buckle = new(src) diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm index 6b976ad7f05..a3a029005d5 100644 --- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm +++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm @@ -424,7 +424,7 @@ anchored = 1 unacidable = 1 light_range = 1 - mouse_opacity = 1 + mouse_opacity = MOUSE_OPACITY_ICON var/health = 30 light_color = LIGHT_COLOR_CYAN var/lon_range = 1 diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 405182d8874..95d39aa06e6 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -348,7 +348,7 @@ var/list/holopads = list() hologram.alpha = 100 hologram.Impersonation = user - hologram.mouse_opacity = 0//So you can't click on it. + hologram.mouse_opacity = MOUSE_OPACITY_TRANSPARENT//So you can't click on it. hologram.layer = FLY_LAYER//Above all the other objects/mobs. Or the vast majority of them. hologram.anchored = 1//So space wind cannot drag it. hologram.name = "[user.name] (hologram)"//If someone decides to right click. @@ -481,7 +481,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ layer = FLY_LAYER density = FALSE anchored = TRUE - mouse_opacity = 1 + mouse_opacity = MOUSE_OPACITY_ICON pixel_x = -32 pixel_y = -32 alpha = 100 diff --git a/code/game/objects/effects/decals/Cleanable/misc.dm b/code/game/objects/effects/decals/Cleanable/misc.dm index 5b9ba645bf1..f9ac4e6ae36 100644 --- a/code/game/objects/effects/decals/Cleanable/misc.dm +++ b/code/game/objects/effects/decals/Cleanable/misc.dm @@ -29,11 +29,11 @@ layer = TURF_LAYER icon = 'icons/effects/effects.dmi' icon_state = "dirt" - mouse_opacity = FALSE + mouse_opacity = MOUSE_OPACITY_TRANSPARENT /obj/effect/decal/cleanable/dirt/blackpowder name = "black powder" - mouse_opacity = TRUE + mouse_opacity = MOUSE_OPACITY_ICON noscoop = TRUE /obj/effect/decal/cleanable/dirt/blackpowder/Initialize() diff --git a/code/game/objects/effects/effect_system/effect_system.dm b/code/game/objects/effects/effect_system/effect_system.dm index 7fb397297d7..d71e7631565 100644 --- a/code/game/objects/effects/effect_system/effect_system.dm +++ b/code/game/objects/effects/effect_system/effect_system.dm @@ -7,7 +7,7 @@ would spawn and follow the beaker, even if it is carried or thrown. /obj/effect/particle_effect name = "particle effect" - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT unacidable = 1//So effects are not targeted by alien acid. pass_flags = PASSTABLE | PASSGRILLE diff --git a/code/game/objects/effects/effect_system/effects_explosion.dm b/code/game/objects/effects/effect_system/effects_explosion.dm index 5ad00157a02..1080f975135 100644 --- a/code/game/objects/effects/effect_system/effects_explosion.dm +++ b/code/game/objects/effects/effect_system/effects_explosion.dm @@ -27,7 +27,7 @@ icon_state = "explosion" opacity = 1 anchored = 1 - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT pixel_x = -32 pixel_y = -32 diff --git a/code/game/objects/effects/misc.dm b/code/game/objects/effects/misc.dm index 30358870814..3ea1fc0c3d6 100644 --- a/code/game/objects/effects/misc.dm +++ b/code/game/objects/effects/misc.dm @@ -32,7 +32,7 @@ anchored = 1 layer = 99 plane = HUD_PLANE - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT unacidable = 1//Just to be sure. /obj/effect/beam diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm index 830d12cfd12..312826d3ddb 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -58,7 +58,7 @@ anchored = 1 density = 1 layer = 5 - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT /obj/effect/overlay/wall_rot/New() ..() diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index 03e8ea8fcd9..8b9314e9a6f 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -134,7 +134,7 @@ name = mimiced_atom.name appearance = mimiced_atom.appearance setDir(mimiced_atom.dir) - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT /obj/effect/temp_visual/decoy/fading/New(loc, atom/mimiced_atom) ..() diff --git a/code/game/objects/effects/temporary_visuals/temporary_visual.dm b/code/game/objects/effects/temporary_visuals/temporary_visual.dm index c9c88861ae2..bb6cca92644 100644 --- a/code/game/objects/effects/temporary_visuals/temporary_visual.dm +++ b/code/game/objects/effects/temporary_visuals/temporary_visual.dm @@ -2,7 +2,7 @@ /obj/effect/temp_visual anchored = 1 layer = ABOVE_MOB_LAYER - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT var/duration = 10 var/randomdir = TRUE diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index f24b60c62d0..4defb3b4aae 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -166,7 +166,7 @@ if(display_contents_with_number) for(var/datum/numbered_display/ND in display_contents) - ND.sample_object.mouse_opacity = 2 + ND.sample_object.mouse_opacity = MOUSE_OPACITY_OPAQUE ND.sample_object.screen_loc = "[cx]:16,[cy]:16" ND.sample_object.maptext = "[(ND.number > 1)? "[ND.number]" : ""]" ND.sample_object.layer = 20 @@ -177,7 +177,7 @@ cy-- else for(var/obj/O in contents) - O.mouse_opacity = 2 //This is here so storage items that spawn with contents correctly have the "click around item to equip" + O.mouse_opacity = MOUSE_OPACITY_OPAQUE //This is here so storage items that spawn with contents correctly have the "click around item to equip" O.screen_loc = "[cx]:16,[cy]:16" O.maptext = "" O.layer = 20 @@ -309,7 +309,7 @@ src.orient2hud(usr) if(usr.s_active) usr.s_active.show_to(usr) - W.mouse_opacity = 2 //So you can click on the area around the item to equip it, instead of having to pixel hunt + W.mouse_opacity = MOUSE_OPACITY_OPAQUE //So you can click on the area around the item to equip it, instead of having to pixel hunt update_icon() return 1 diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index 64a5c95f5c0..364fd49847b 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -315,7 +315,7 @@ desc = "A frozen shell of ice containing nanofrost that freezes the surrounding area after activation." icon = 'icons/effects/effects.dmi' icon_state = "frozen_smoke_capsule" - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT pass_flags = PASSTABLE /obj/effect/nanofrost_container/proc/Smoke() diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 31bfadee7d7..751ade6081f 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -278,7 +278,7 @@ icon_state = "mist" layer = MOB_LAYER + 1 anchored = 1 - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT /obj/machinery/shower/attack_hand(mob/M as mob) on = !on diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm index de42f454202..39d4e19034c 100644 --- a/code/game/turfs/simulated/floor/misc_floor.dm +++ b/code/game/turfs/simulated/floor/misc_floor.dm @@ -51,7 +51,7 @@ /turf/simulated/floor/beach/water name = "water" icon_state = "water" - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT /turf/simulated/floor/beach/water/pry_tile(obj/item/C, mob/user, silent = FALSE) return //cannot pry off tiles of water diff --git a/code/game/turfs/unsimulated/beach.dm b/code/game/turfs/unsimulated/beach.dm index e3fad855558..aeea1e27659 100644 --- a/code/game/turfs/unsimulated/beach.dm +++ b/code/game/turfs/unsimulated/beach.dm @@ -2,7 +2,7 @@ name = "Beach" icon = 'icons/misc/beach.dmi' var/water_overlay_image = null - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT /turf/unsimulated/beach/New() ..() @@ -12,7 +12,7 @@ /turf/unsimulated/beach/sand name = "Sand" icon_state = "desert" - mouse_opacity = 1 + mouse_opacity = MOUSE_OPACITY_ICON /turf/unsimulated/beach/sand/New() //adds some aesthetic randomness to the beach sand icon_state = pick("desert", "desert0", "desert1", "desert2", "desert3", "desert4") @@ -101,4 +101,4 @@ density = 1 opacity = 1 explosion_block = 2 - mouse_opacity = 1 + mouse_opacity = MOUSE_OPACITY_ICON diff --git a/code/modules/awaymissions/mission_code/beach.dm b/code/modules/awaymissions/mission_code/beach.dm index 4d2384ceb67..2da10ecbd98 100644 --- a/code/modules/awaymissions/mission_code/beach.dm +++ b/code/modules/awaymissions/mission_code/beach.dm @@ -3,7 +3,7 @@ icon = 'icons/effects/effects.dmi' icon_state = "extinguish" opacity = 0 - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT density = 0 anchored = 1 invisibility = 101 diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm index 6348f32aa11..3be698eee1e 100644 --- a/code/modules/clothing/spacesuits/chronosuit.dm +++ b/code/modules/clothing/spacesuits/chronosuit.dm @@ -183,7 +183,7 @@ anchored = 1 invisibility = 101 opacity = 0 - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT var/mob/holder = null /obj/effect/chronos_cam/relaymove(var/mob/user, direction) diff --git a/code/modules/events/anomaly_bluespace.dm b/code/modules/events/anomaly_bluespace.dm index 1ecc62e5b5f..29baf834bb5 100644 --- a/code/modules/events/anomaly_bluespace.dm +++ b/code/modules/events/anomaly_bluespace.dm @@ -59,7 +59,7 @@ blueeffect.icon = 'icons/effects/effects.dmi' blueeffect.icon_state = "shieldsparkles" blueeffect.layer = 17 - blueeffect.mouse_opacity = 0 + blueeffect.mouse_opacity = MOUSE_OPACITY_TRANSPARENT M.client.screen += blueeffect sleep(20) M.client.screen -= blueeffect diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 176b6679604..55e87f575b0 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -411,7 +411,7 @@ anchored = TRUE density = FALSE layer = SPACEVINE_LAYER - mouse_opacity = 2 //Clicking anywhere on the turf is good enough + mouse_opacity = MOUSE_OPACITY_OPAQUE //Clicking anywhere on the turf is good enough pass_flags = PASSTABLE | PASSGRILLE max_integrity = 50 var/energy = 0 diff --git a/code/modules/lighting/lighting_overlay.dm b/code/modules/lighting/lighting_overlay.dm index 1a421e6d1ad..dd28f990322 100644 --- a/code/modules/lighting/lighting_overlay.dm +++ b/code/modules/lighting/lighting_overlay.dm @@ -1,7 +1,7 @@ /var/total_lighting_overlays = 0 /atom/movable/lighting_overlay name = "" - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT simulated = 0 anchored = 1 icon = LIGHTING_ICON diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index 852bcd3edf3..3d3c67701e8 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -722,7 +722,7 @@ icon = 'icons/effects/effects.dmi' icon_state = "shield1" layer = 4.1 - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT var/resonance_damage = 20 /obj/effect/resonance/New(loc, var/creator = null, var/timetoburst) @@ -975,7 +975,7 @@ layer = 18 icon = 'icons/turf/mining.dmi' anchored = 1 - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT duration = 30 pixel_x = -4 pixel_y = -4 diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm index 32671d598c9..490d8c8fe0d 100644 --- a/code/modules/mining/minebot.dm +++ b/code/modules/mining/minebot.dm @@ -9,7 +9,7 @@ icon_state = "mining_drone" icon_living = "mining_drone" status_flags = CANSTUN|CANWEAKEN|CANPUSH - mouse_opacity = 1 + mouse_opacity = MOUSE_OPACITY_ICON faction = list("neutral") a_intent = INTENT_HARM atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) diff --git a/code/modules/mob/camera/camera.dm b/code/modules/mob/camera/camera.dm index f9cb1123ca3..38b5e81a87b 100644 --- a/code/modules/mob/camera/camera.dm +++ b/code/modules/mob/camera/camera.dm @@ -5,7 +5,7 @@ density = 0 anchored = 1 status_flags = GODMODE // You can't damage it. - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT see_in_dark = 7 invisibility = 101 // No one can see us sight = SEE_SELF diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm index d590892cc01..8eb8bb80763 100644 --- a/code/modules/mob/living/silicon/robot/inventory.dm +++ b/code/modules/mob/living/silicon/robot/inventory.dm @@ -13,7 +13,7 @@ if(!O) return 0 - O.mouse_opacity = 2 + O.mouse_opacity = MOUSE_OPACITY_OPAQUE if(client) client.screen -= O diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index d72220946d2..2330d0ecd64 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -40,10 +40,10 @@ /obj/item/robot_module/proc/fix_modules() for(var/obj/item/I in modules) I.flags |= NODROP - I.mouse_opacity = 2 + I.mouse_opacity = MOUSE_OPACITY_OPAQUE if(emag) emag.flags |= NODROP - emag.mouse_opacity = 2 + emag.mouse_opacity = MOUSE_OPACITY_OPAQUE /obj/item/robot_module/proc/respawn_consumable(mob/living/silicon/robot/R) if(!stacktypes || !stacktypes.len) diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm index 06176add94d..0b10513b7cd 100644 --- a/code/modules/mob/living/simple_animal/hostile/bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -31,7 +31,7 @@ move_to_delay = 0 obj_damage = 0 environment_smash = 0 - mouse_opacity = 2 + mouse_opacity = MOUSE_OPACITY_OPAQUE pass_flags = PASSTABLE | PASSGRILLE | PASSMOB flying = 1 search_objects = 1 //have to find those plant trays! diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm index 43be29ada66..ae37f388b8a 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm @@ -48,7 +48,7 @@ Difficulty: Medium elimination = 1 idle_vision_range = 13 appearance_flags = 0 - mouse_opacity = 1 + mouse_opacity = MOUSE_OPACITY_ICON stat_attack = 1 // Overriden from /tg/ - otherwise Legion starts chasing its minions /mob/living/simple_animal/hostile/megafauna/legion/New() diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm index 74d6513364b..118ee54e858 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm @@ -41,7 +41,7 @@ anchored = TRUE mob_size = MOB_SIZE_LARGE layer = MOB_LAYER + 0.5 //Looks weird with them slipping under mineral walls and cameras and shit otherwise - mouse_opacity = 2 // Easier to click on in melee, they're giant targets anyway + mouse_opacity = MOUSE_OPACITY_OPAQUE // Easier to click on in melee, they're giant targets anyway /mob/living/simple_animal/hostile/megafauna/Destroy() QDEL_NULL(internal_gps) diff --git a/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm index 45bb40ede14..4041e95c6c7 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm @@ -7,7 +7,7 @@ icon_aggro = "Hivelord_alert" icon_dead = "Hivelord_dead" icon_gib = "syndicate_gib" - mouse_opacity = 2 + mouse_opacity = MOUSE_OPACITY_OPAQUE move_to_delay = 14 ranged = 1 vision_range = 5 @@ -50,7 +50,7 @@ . = ..(gibbed) if(!.) return FALSE - mouse_opacity = 1 + mouse_opacity = MOUSE_OPACITY_ICON /obj/item/organ/internal/hivelord_core name = "hivelord remains" @@ -135,7 +135,7 @@ icon_aggro = "Hivelordbrood" icon_dead = "Hivelordbrood" icon_gib = "syndicate_gib" - mouse_opacity = 2 + mouse_opacity = MOUSE_OPACITY_OPAQUE move_to_delay = 1 friendly = "buzzes near" vision_range = 10 diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm index 97c3d0592bc..2edfb7cea5d 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm @@ -116,7 +116,7 @@ icon_dead = "Goliath_dead" icon_gib = "syndicate_gib" attack_sound = 'sound/weapons/punch4.ogg' - mouse_opacity = 2 + mouse_opacity = MOUSE_OPACITY_OPAQUE move_to_delay = 40 ranged = 1 ranged_cooldown = 2 //By default, start the Goliath with his cooldown off so that people can run away quickly on first sight diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm index a866e0540b3..59c23953e6b 100644 --- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm +++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm @@ -22,7 +22,7 @@ faction = list("mushroom") environment_smash = 0 stat_attack = 2 - mouse_opacity = 1 + mouse_opacity = MOUSE_OPACITY_ICON speed = 1 ventcrawler = 2 robust_searching = 1 diff --git a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm index 57412eb5a0d..e2c9194abc5 100644 --- a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm +++ b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm @@ -32,7 +32,7 @@ /obj/effect/ebeam/vine name = "thick vine" - mouse_opacity = 1 + mouse_opacity = MOUSE_OPACITY_ICON desc = "A thick vine, painful to the touch." diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 3aa2252ac92..868317177bd 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -7,7 +7,7 @@ anchored = 1 //There's a reason this is here, Mport. God fucking damn it -Agouri. Find&Fix by Pete. The reason this is here is to stop the curving of emitter shots. flags = ABSTRACT pass_flags = PASSTABLE - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT hitsound = 'sound/weapons/pierce.ogg' var/hitsound_wall = "" pressure_resistance = INFINITY diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index 35bdb18caae..dd672e7938d 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -476,7 +476,7 @@ pixel_x = -64 pixel_y = -64 unacidable = 1 - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT var/mob/living/immune = list() // the one who creates the timestop is immune var/list/stopped_atoms = list() var/freezerange = 2 diff --git a/code/modules/shuttle/ripple.dm b/code/modules/shuttle/ripple.dm index 3489394671b..ef3b18d2e39 100644 --- a/code/modules/shuttle/ripple.dm +++ b/code/modules/shuttle/ripple.dm @@ -11,7 +11,7 @@ layer = RIPPLE_LAYER alpha = 0 duration = 3 * SHUTTLE_RIPPLE_TIME - mouse_opacity = 1 + mouse_opacity = MOUSE_OPACITY_ICON /obj/effect/temp_visual/ripple/New() . = ..()