From b5e7f7f7fe98815e29ab5ebbb796ff889b7a0069 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 21 Aug 2017 22:29:37 -0500 Subject: [PATCH] [MIRROR] Adds defines for mouse_opacity (#2381) * Adds defines for mouse_opacity * Delete misc.dm.rej * Update misc.dm --- code/__DEFINES/misc.dm | 5 +++++ code/_onclick/click.dm | 2 +- code/_onclick/hud/alert.dm | 2 +- code/_onclick/hud/blob_overmind.dm | 2 +- code/_onclick/hud/fullscreen.dm | 2 +- code/_onclick/hud/parallax.dm | 2 +- code/_onclick/hud/plane_master.dm | 4 ++-- code/_onclick/hud/screen_objects.dm | 14 +++++++------- code/controllers/subsystem/ticker.dm | 2 +- code/datums/beam.dm | 2 +- code/game/area/areas.dm | 10 +++++----- code/game/gamemodes/blob/overmind.dm | 2 +- .../clock_cult/clock_effects/clock_overlay.dm | 2 +- .../ark_of_the_clockwork_justicar.dm | 2 +- .../clock_structures/prolonging_prism.dm | 2 +- code/game/machinery/hologram.dm | 2 +- code/game/machinery/shieldgen.dm | 2 +- code/game/objects/effects/anomalies.dm | 2 +- code/game/objects/effects/decals/cleanable/misc.dm | 2 +- .../objects/effects/effect_system/effect_system.dm | 2 +- .../effects/effect_system/effects_explosion.dm | 2 +- .../objects/effects/effect_system/effects_foam.dm | 2 +- .../objects/effects/effect_system/effects_smoke.dm | 2 +- .../objects/effects/effect_system/effects_water.dm | 2 +- .../effects/temporary_visuals/miscellaneous.dm | 4 ++-- .../effects/temporary_visuals/temporary_visual.dm | 2 +- .../objects/items/devices/forcefieldprojector.dm | 2 +- code/game/objects/items/weapons/storage/storage.dm | 6 +++--- code/game/objects/items/weapons/tanks/watertank.dm | 2 +- code/game/objects/structures/watercloset.dm | 2 +- code/modules/admin/admin_verbs.dm | 2 +- .../atmospherics/environmental/LINDA_fire.dm | 2 +- code/modules/atmospherics/gasmixtures/gas_types.dm | 2 +- code/modules/clothing/spacesuits/chronosuit.dm | 2 +- code/modules/events/spacevine.dm | 2 +- code/modules/fields/peaceborg_dampener.dm | 2 +- code/modules/fields/turf_objects.dm | 2 +- code/modules/lighting/lighting_object.dm | 2 +- code/modules/mining/lavaland/necropolis_chests.dm | 2 +- code/modules/mining/minebot.dm | 2 +- code/modules/mob/camera/camera.dm | 2 +- code/modules/mob/living/silicon/pai/pai.dm | 2 +- code/modules/mob/living/silicon/robot/inventory.dm | 2 +- .../mob/living/silicon/robot/robot_modules.dm | 2 +- .../mob/living/simple_animal/hostile/bees.dm | 2 +- .../simple_animal/hostile/megafauna/dragon.dm | 2 +- .../simple_animal/hostile/megafauna/legion.dm | 2 +- .../simple_animal/hostile/megafauna/megafauna.dm | 2 +- .../simple_animal/hostile/mining_mobs/goliath.dm | 2 +- .../simple_animal/hostile/mining_mobs/hivelord.dm | 6 +++--- .../mob/living/simple_animal/hostile/mushroom.dm | 2 +- .../simple_animal/hostile/venus_human_trap.dm | 2 +- .../living/simple_animal/hostile/wumborian_fugu.dm | 2 +- .../ninja/suit/n_suit_verbs/energy_net_nets.dm | 2 +- .../particle_accelerator/particle_control.dm.rej | 10 ++++++++++ code/modules/projectiles/guns/beam_rifle.dm | 2 +- code/modules/projectiles/projectile.dm | 2 +- code/modules/research/xenobiology/xenobiology.dm | 2 +- .../ruins/objects_and_mobs/necropolis_gate.dm | 2 +- code/modules/shuttle/ripple.dm | 2 +- 60 files changed, 89 insertions(+), 74 deletions(-) create mode 100644 code/modules/power/singularity/particle_accelerator/particle_control.dm.rej diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 4342766be7..cca88750b5 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -441,3 +441,8 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE #define BEAT_NONE 0 #define BEAT_CHANNEL 150 + +//http://www.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 7e38d59998..18671fd9ae 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -434,7 +434,7 @@ icon = 'icons/mob/screen_gen.dmi' icon_state = "flash" plane = CLICKCATCHER_PLANE - mouse_opacity = 2 + mouse_opacity = MOUSE_OPACITY_OPAQUE screen_loc = "CENTER" /obj/screen/click_catcher/proc/UpdateGreed(view_size_x = 7, view_size_y = 7) diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 573c923db5..69deb2cb58 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -92,7 +92,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/blob_overmind.dm b/code/_onclick/hud/blob_overmind.dm index c3cc3851dc..d6dc5f8a0a 100644 --- a/code/_onclick/hud/blob_overmind.dm +++ b/code/_onclick/hud/blob_overmind.dm @@ -130,7 +130,7 @@ blobpwrdisplay.name = "blob power" blobpwrdisplay.icon_state = "block" blobpwrdisplay.screen_loc = ui_health - blobpwrdisplay.mouse_opacity = 0 + blobpwrdisplay.mouse_opacity = MOUSE_OPACITY_TRANSPARENT blobpwrdisplay.layer = ABOVE_HUD_LAYER blobpwrdisplay.plane = ABOVE_HUD_PLANE infodisplay += blobpwrdisplay diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm index 9031983875..6c18ad0e07 100644 --- a/code/_onclick/hud/fullscreen.dm +++ b/code/_onclick/hud/fullscreen.dm @@ -67,7 +67,7 @@ screen_loc = "CENTER-7,CENTER-7" layer = FULLSCREEN_LAYER plane = FULLSCREEN_PLANE - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT var/severity = 0 var/show_when_dead = FALSE diff --git a/code/_onclick/hud/parallax.dm b/code/_onclick/hud/parallax.dm index 74f8761863..f364bac76f 100755 --- a/code/_onclick/hud/parallax.dm +++ b/code/_onclick/hud/parallax.dm @@ -243,7 +243,7 @@ blend_mode = BLEND_ADD plane = PLANE_SPACE_PARALLAX screen_loc = "CENTER-7,CENTER-7" - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT /obj/screen/parallax_layer/Initialize(mapload, view) diff --git a/code/_onclick/hud/plane_master.dm b/code/_onclick/hud/plane_master.dm index 33f35eab57..f0c56b84ac 100644 --- a/code/_onclick/hud/plane_master.dm +++ b/code/_onclick/hud/plane_master.dm @@ -26,13 +26,13 @@ name = "lighting plane master" plane = LIGHTING_PLANE blend_mode = BLEND_MULTIPLY - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT /obj/screen/plane_master/parallax name = "parallax plane master" plane = PLANE_SPACE_PARALLAX blend_mode = BLEND_MULTIPLY - mouse_opacity = FALSE + mouse_opacity = MOUSE_OPACITY_TRANSPARENT /obj/screen/plane_master/parallax_white name = "parallax whitifier plane master" diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 14b7323ce3..35d8948c2a 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -33,7 +33,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 @@ -468,7 +468,7 @@ name = "dmg" blend_mode = BLEND_MULTIPLY screen_loc = "CENTER-7,CENTER-7" - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT layer = UI_DAMAGE_LAYER plane = FULLSCREEN_PLANE @@ -494,7 +494,7 @@ name = "blob health" icon_state = "block" screen_loc = ui_internal - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT /obj/screen/healths/blob/naut name = "health" @@ -511,13 +511,13 @@ icon = 'icons/mob/guardian.dmi' icon_state = "base" screen_loc = ui_health - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT /obj/screen/healths/clock icon = 'icons/mob/actions.dmi' icon_state = "bg_clock" screen_loc = ui_health - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT /obj/screen/healths/clock/gear icon = 'icons/mob/clockwork_mobs.dmi' @@ -529,13 +529,13 @@ icon = 'icons/mob/actions.dmi' icon_state = "bg_revenant" screen_loc = ui_health - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT /obj/screen/healths/construct icon = 'icons/mob/screen_construct.dmi' icon_state = "artificer_health0" screen_loc = ui_construct_health - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT /obj/screen/healthdoll name = "health doll" diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index e07d2db001..d196c9cb10 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -283,7 +283,7 @@ SUBSYSTEM_DEF(ticker) SSshuttle.lockdown = TRUE //initialise our cinematic screen object - cinematic = new /obj/screen{icon='icons/effects/station_explosion.dmi';icon_state="station_intact";layer=21;mouse_opacity=0;screen_loc="1,0";}(src) + cinematic = new /obj/screen{icon='icons/effects/station_explosion.dmi';icon_state="station_intact";layer=21;mouse_opacity = MOUSE_OPACITY_TRANSPARENT;screen_loc="1,0";}(src) for(var/mob/M in GLOB.mob_list) M.notransform = TRUE //stop everything moving diff --git a/code/datums/beam.dm b/code/datums/beam.dm index fa38e1530d..3276a5f5b9 100644 --- a/code/datums/beam.dm +++ b/code/datums/beam.dm @@ -141,7 +141,7 @@ afterDraw() /obj/effect/ebeam - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT anchored = TRUE var/datum/beam/owner diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 218cb59f41..9a3832290e 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -7,7 +7,7 @@ icon = 'icons/turf/areas.dmi' icon_state = "unknown" layer = AREA_LAYER - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT invisibility = INVISIBILITY_LIGHTING var/map_name // Set in New(); preserves the name set by the map maker, even if renamed by the Blueprints. @@ -242,7 +242,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) for(var/area/RA in related) if (RA.fire) RA.fire = 0 - RA.mouse_opacity = 0 + RA.mouse_opacity = MOUSE_OPACITY_TRANSPARENT RA.updateicon() RA.ModifyFiredoors(TRUE) for(var/obj/machinery/firealarm/F in RA) @@ -293,7 +293,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) /area/proc/set_fire_alarm_effect() fire = 1 updateicon() - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT /area/proc/readyalert() if(name == "Space") @@ -313,12 +313,12 @@ GLOBAL_LIST_EMPTY(teleportlocs) if (!( src.party )) src.party = 1 src.updateicon() - src.mouse_opacity = 0 + src.mouse_opacity = MOUSE_OPACITY_TRANSPARENT /area/proc/partyreset() if (src.party) src.party = 0 - src.mouse_opacity = 0 + src.mouse_opacity = MOUSE_OPACITY_TRANSPARENT src.updateicon() for(var/obj/machinery/door/firedoor/D in src) if(!D.welded) diff --git a/code/game/gamemodes/blob/overmind.dm b/code/game/gamemodes/blob/overmind.dm index 7fa09f3978..247b660dbc 100644 --- a/code/game/gamemodes/blob/overmind.dm +++ b/code/game/gamemodes/blob/overmind.dm @@ -4,7 +4,7 @@ desc = "The overmind. It controls the blob." icon = 'icons/mob/blob.dmi' icon_state = "marker" - mouse_opacity = 1 + mouse_opacity = MOUSE_OPACITY_ICON move_on_shuttle = 1 see_in_dark = 8 invisibility = INVISIBILITY_OBSERVER diff --git a/code/game/gamemodes/clock_cult/clock_effects/clock_overlay.dm b/code/game/gamemodes/clock_cult/clock_effects/clock_overlay.dm index 0d7a5b799c..e8cba1a39d 100644 --- a/code/game/gamemodes/clock_cult/clock_effects/clock_overlay.dm +++ b/code/game/gamemodes/clock_cult/clock_effects/clock_overlay.dm @@ -1,6 +1,6 @@ //an "overlay" used by clockwork walls and floors to appear normal to mesons. /obj/effect/clockwork/overlay - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT var/atom/linked /obj/effect/clockwork/overlay/examine(mob/user) diff --git a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm b/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm index 5bf9738eb7..2c7d666cbf 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm @@ -4,7 +4,7 @@ desc = "A massive, thrumming rip in spacetime." clockwork_desc = "A portal to the Celestial Derelict. Massive and intimidating, it is the only thing that can both transport Ratvar and withstand the massive amount of energy he emits." max_integrity = 500 - mouse_opacity = 2 + mouse_opacity = MOUSE_OPACITY_OPAQUE icon = 'icons/effects/clockwork_effects.dmi' icon_state = "nothing" density = FALSE diff --git a/code/game/gamemodes/clock_cult/clock_structures/prolonging_prism.dm b/code/game/gamemodes/clock_cult/clock_structures/prolonging_prism.dm index aae18ba175..cf730189e3 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/prolonging_prism.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/prolonging_prism.dm @@ -130,6 +130,6 @@ if(hex_combo) //YOU BUILT A HEXAGON hex_combo.pixel_x = -16 hex_combo.pixel_y = -16 - hex_combo.mouse_opacity = 0 + hex_combo.mouse_opacity = MOUSE_OPACITY_TRANSPARENT hex_combo.plane = GAME_PLANE new /obj/effect/temp_visual/ratvar/prolonging_prism(T, hex_combo) diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 9a88086d13..335210382e 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -292,7 +292,7 @@ Possible to do for anyone motivated enough: Hologram.Impersonation = user Hologram.copy_known_languages_from(user,replace = TRUE) - 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 = TRUE//So space wind cannot drag it. Hologram.name = "[user.name] (Hologram)"//If someone decides to right click. diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index c857ddaf16..1de9f5f403 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -58,7 +58,7 @@ desc = "A weak shield summoned by cultists to protect them while they carry out delicate rituals" color = "#FF0000" max_integrity = 20 - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT /obj/structure/emergency_shield/invoker/emp_act(severity) return diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index 2bf3b525ac..3692af855b 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -238,7 +238,7 @@ blueeffect.icon_state = "shieldsparkles" blueeffect.layer = FLASH_LAYER blueeffect.plane = FULLSCREEN_PLANE - blueeffect.mouse_opacity = 0 + blueeffect.mouse_opacity = MOUSE_OPACITY_TRANSPARENT M.client.screen += blueeffect sleep(20) M.client.screen -= blueeffect diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm index 98a9782600..35c32b26e6 100644 --- a/code/game/objects/effects/decals/cleanable/misc.dm +++ b/code/game/objects/effects/decals/cleanable/misc.dm @@ -30,7 +30,7 @@ name = "dirt" desc = "Someone should clean that up." icon_state = "dirt" - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT /obj/effect/decal/cleanable/flour name = "flour" diff --git a/code/game/objects/effects/effect_system/effect_system.dm b/code/game/objects/effects/effect_system/effect_system.dm index 6c841080d5..20b59b678e 100644 --- a/code/game/objects/effects/effect_system/effect_system.dm +++ b/code/game/objects/effects/effect_system/effect_system.dm @@ -8,7 +8,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 pass_flags = PASSTABLE | PASSGRILLE /obj/effect/particle_effect/New() diff --git a/code/game/objects/effects/effect_system/effects_explosion.dm b/code/game/objects/effects/effect_system/effects_explosion.dm index 24674e96a6..8e7f2dfd12 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 = TRUE - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT pixel_x = -32 pixel_y = -32 diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm index 48260e02e1..7e48e919ca 100644 --- a/code/game/objects/effects/effect_system/effects_foam.dm +++ b/code/game/objects/effects/effect_system/effects_foam.dm @@ -12,7 +12,7 @@ anchored = TRUE density = FALSE layer = WALL_OBJ_LAYER - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT var/amount = 3 animate_movement = 0 var/metal = 0 diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm index 46fe4e5e8e..f09ae53e31 100644 --- a/code/game/objects/effects/effect_system/effects_smoke.dm +++ b/code/game/objects/effects/effect_system/effects_smoke.dm @@ -11,7 +11,7 @@ opacity = 0 layer = FLY_LAYER anchored = TRUE - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT animate_movement = 0 var/amount = 4 var/lifetime = 5 diff --git a/code/game/objects/effects/effect_system/effects_water.dm b/code/game/objects/effects/effect_system/effects_water.dm index 7e746f7866..4c84c97650 100644 --- a/code/game/objects/effects/effect_system/effects_water.dm +++ b/code/game/objects/effects/effect_system/effects_water.dm @@ -4,7 +4,7 @@ name = "water" icon_state = "extinguish" var/life = 15 - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT /obj/effect/particle_effect/water/New() diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index 6951ac350d..b0049fc3fd 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -188,7 +188,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/Initialize(mapload, atom/mimiced_atom) . = ..() @@ -397,7 +397,7 @@ if(warp_color) color = list(warp_color, warp_color, warp_color, list(0,0,0)) set_light(1.4, 1, warp_color) - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT var/matrix/skew = transform skew = skew.Turn(180) skew = skew.Interpolate(transform, 0.5) diff --git a/code/game/objects/effects/temporary_visuals/temporary_visual.dm b/code/game/objects/effects/temporary_visuals/temporary_visual.dm index 1eb427cfb6..6a1bbc4437 100644 --- a/code/game/objects/effects/temporary_visuals/temporary_visual.dm +++ b/code/game/objects/effects/temporary_visuals/temporary_visual.dm @@ -3,7 +3,7 @@ icon_state = "nothing" anchored = TRUE layer = ABOVE_MOB_LAYER - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT var/duration = 10 //in deciseconds var/randomdir = TRUE var/timerid diff --git a/code/game/objects/items/devices/forcefieldprojector.dm b/code/game/objects/items/devices/forcefieldprojector.dm index cafa9e581c..b4d66ac5e6 100644 --- a/code/game/objects/items/devices/forcefieldprojector.dm +++ b/code/game/objects/items/devices/forcefieldprojector.dm @@ -77,7 +77,7 @@ layer = ABOVE_ALL_MOB_LAYER anchored = TRUE density = TRUE - mouse_opacity = 2 + mouse_opacity = MOUSE_OPACITY_OPAQUE resistance_flags = INDESTRUCTIBLE CanAtmosPass = ATMOS_PASS_DENSITY armor = list(melee = 0, bullet = 25, laser = 50, energy = 50, bomb = 25, bio = 100, rad = 100, fire = 100, acid = 100) diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index cc4bee233b..226cea104f 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -196,7 +196,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 = ABOVE_HUD_LAYER @@ -207,7 +207,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 = ABOVE_HUD_LAYER @@ -350,7 +350,7 @@ orient2hud(usr) for(var/mob/M in can_see_contents()) show_to(M) - 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 9eac23c55c..64fa2ee68e 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -319,7 +319,7 @@ desc = "A compacted ball of expansive resin, used to repair the atmosphere in a room, or seal off breaches." icon = 'icons/effects/effects.dmi' icon_state = "frozen_smoke_capsule" - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT pass_flags = PASSTABLE /obj/effect/resin_container/proc/Smoke() diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 1b8a6635ee..5e9997478f 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -209,7 +209,7 @@ icon_state = "mist" layer = FLY_LAYER anchored = TRUE - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT /obj/machinery/shower/attack_hand(mob/M) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 3276a319db..b99f9228b9 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -457,7 +457,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list( mob.invisibility = INVISIBILITY_MAXIMUM //JUST IN CASE mob.alpha = 0 //JUUUUST IN CASE mob.name = " " - mob.mouse_opacity = 0 + mob.mouse_opacity = MOUSE_OPACITY_TRANSPARENT log_admin("[key_name(usr)] has turned stealth mode [holder.fakekey ? "ON" : "OFF"]") message_admins("[key_name_admin(usr)] has turned stealth mode [holder.fakekey ? "ON" : "OFF"]") SSblackbox.add_details("admin_verb","Stealth Mode") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/atmospherics/environmental/LINDA_fire.dm b/code/modules/atmospherics/environmental/LINDA_fire.dm index 12d012e3f8..a39a9059f3 100644 --- a/code/modules/atmospherics/environmental/LINDA_fire.dm +++ b/code/modules/atmospherics/environmental/LINDA_fire.dm @@ -45,7 +45,7 @@ //This is the icon for fire on turfs, also helps for nurturing small fires until they are full tile /obj/effect/hotspot anchored = TRUE - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT icon = 'icons/effects/fire.dmi' icon_state = "1" layer = ABOVE_OPEN_TURF_LAYER diff --git a/code/modules/atmospherics/gasmixtures/gas_types.dm b/code/modules/atmospherics/gasmixtures/gas_types.dm index 60364086a5..2135b9fbd0 100644 --- a/code/modules/atmospherics/gasmixtures/gas_types.dm +++ b/code/modules/atmospherics/gasmixtures/gas_types.dm @@ -95,7 +95,7 @@ GLOBAL_LIST_INIT(hardcoded_gases, list("o2","n2","co2","plasma")) //the main fou /obj/effect/overlay/gas icon = 'icons/effects/tile_effects.dmi' - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT layer = FLY_LAYER appearance_flags = TILE_BOUND diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm index 23ea5bc5ff..aefb7c4d98 100644 --- a/code/modules/clothing/spacesuits/chronosuit.dm +++ b/code/modules/clothing/spacesuits/chronosuit.dm @@ -245,7 +245,7 @@ anchored = TRUE invisibility = INVISIBILITY_ABSTRACT opacity = 0 - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT var/mob/holder = null var/phase_time = 0 var/phase_time_length = 3 diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index dc318cd2a1..5fe3d018fb 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -314,7 +314,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/fields/peaceborg_dampener.dm b/code/modules/fields/peaceborg_dampener.dm index cedce76369..a480459f38 100644 --- a/code/modules/fields/peaceborg_dampener.dm +++ b/code/modules/fields/peaceborg_dampener.dm @@ -54,7 +54,7 @@ var/obj/effect/abstract/proximity_checker/advanced/F = edge_turfs[T] F.appearance = I.appearance F.invisibility = 0 - F.mouse_opacity = 0 + F.mouse_opacity = MOUSE_OPACITY_TRANSPARENT F.layer = 5 /datum/proximity_monitor/advanced/peaceborg_dampener/cleanup_edge_turf(turf/T) diff --git a/code/modules/fields/turf_objects.dm b/code/modules/fields/turf_objects.dm index e50be26ff1..c1efef1ed4 100644 --- a/code/modules/fields/turf_objects.dm +++ b/code/modules/fields/turf_objects.dm @@ -7,7 +7,7 @@ alpha = 0 invisibility = INVISIBILITY_ABSTRACT flags = ABSTRACT|ON_BORDER - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT var/datum/proximity_monitor/advanced/parent = null /obj/effect/abstract/proximity_checker/advanced/Initialize(mapload, _monitor) diff --git a/code/modules/lighting/lighting_object.dm b/code/modules/lighting/lighting_object.dm index b5d5a2bab1..d0fbf029b8 100644 --- a/code/modules/lighting/lighting_object.dm +++ b/code/modules/lighting/lighting_object.dm @@ -9,7 +9,7 @@ GLOBAL_LIST_EMPTY(all_lighting_objects) // Global list of lighting objects. icon_state = "transparent" color = LIGHTING_BASE_MATRIX plane = LIGHTING_PLANE - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT layer = LIGHTING_LAYER invisibility = INVISIBILITY_LIGHTING diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index b2e474957c..8671504bfb 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -249,7 +249,7 @@ blue.linked = src /obj/effect/warp_cube - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT /obj/effect/warp_cube/ex_act(severity, target) return diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm index 8029cc1416..aa2c85cb8f 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|CANKNOCKDOWN|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 be0daebbd9..e058782be1 100644 --- a/code/modules/mob/camera/camera.dm +++ b/code/modules/mob/camera/camera.dm @@ -5,7 +5,7 @@ density = FALSE anchored = TRUE status_flags = GODMODE // You can't damage it. - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT see_in_dark = 7 invisibility = INVISIBILITY_ABSTRACT // No one can see us sight = SEE_SELF diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index c6dd372532..e3186005c7 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -4,7 +4,7 @@ var/obj/machinery/camera/current = null icon = 'icons/mob/pai.dmi' icon_state = "repairbot" - mouse_opacity = 2 + mouse_opacity = MOUSE_OPACITY_OPAQUE density = FALSE luminosity = 0 pass_flags = PASSTABLE | PASSMOB diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm index ef42a85632..7d1bd0da02 100644 --- a/code/modules/mob/living/silicon/robot/inventory.dm +++ b/code/modules/mob/living/silicon/robot/inventory.dm @@ -11,7 +11,7 @@ /mob/living/silicon/robot/proc/uneq_module(obj/item/O) if(!O) return 0 - O.mouse_opacity = 2 + O.mouse_opacity = MOUSE_OPACITY_OPAQUE if(istype(O, /obj/item/borg/sight)) var/obj/item/borg/sight/S = O sight_mode &= ~S.sight_mode diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index fd7d209604..54d698a60b 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -122,7 +122,7 @@ I.forceMove(src) modules += I I.flags |= NODROP - I.mouse_opacity = 2 + I.mouse_opacity = MOUSE_OPACITY_OPAQUE if(nonstandard) added_modules += I if(requires_rebuild) diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm index d70055779c..f59b5332da 100644 --- a/code/modules/mob/living/simple_animal/hostile/bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -32,7 +32,7 @@ move_to_delay = 0 obj_damage = 0 environment_smash = ENVIRONMENT_SMASH_NONE - mouse_opacity = 2 + mouse_opacity = MOUSE_OPACITY_OPAQUE pass_flags = PASSTABLE | PASSGRILLE | PASSMOB mob_size = MOB_SIZE_TINY movement_type = FLYING diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm index f9a6575d1e..fa79630c28 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm @@ -197,7 +197,7 @@ Difficulty: Medium return animate(src, alpha = 100, transform = matrix()*0.7, time = 7) swooping |= SWOOP_INVULNERABLE - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT sleep(7) var/list/flame_hit = list() while(swoop_duration > 0) 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 dc20e97e0d..620dd19706 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm @@ -49,7 +49,7 @@ Difficulty: Medium elimination = 1 idle_vision_range = 13 appearance_flags = 0 - mouse_opacity = 1 + mouse_opacity = MOUSE_OPACITY_ICON /mob/living/simple_animal/hostile/megafauna/legion/Initialize() . = ..() 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 3e2be10d79..c214ee0490 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm @@ -44,7 +44,7 @@ anchored = TRUE mob_size = MOB_SIZE_LARGE layer = LARGE_MOB_LAYER //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/Initialize(mapload) . = ..() diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm index cf2dd5c1f9..fb91af84f6 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm @@ -8,7 +8,7 @@ icon_aggro = "Goliath_alert" icon_dead = "Goliath_dead" icon_gib = "syndicate_gib" - mouse_opacity = 2 + mouse_opacity = MOUSE_OPACITY_OPAQUE move_to_delay = 40 ranged = 1 ranged_cooldown_time = 120 diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 7f38bebcfb..bfc7979cb3 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/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 @@ loot += crusher_loot //we don't butcher /mob/living/simple_animal/hostile/asteroid/hivelord/death(gibbed) - mouse_opacity = 1 + mouse_opacity = MOUSE_OPACITY_ICON ..(gibbed) //A fragile but rapidly produced creature @@ -63,7 +63,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/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm index 74bfff8456..ceb6e814a7 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 = ENVIRONMENT_SMASH_NONE stat_attack = 2 - mouse_opacity = 1 + mouse_opacity = MOUSE_OPACITY_ICON speed = 1 ventcrawler = VENTCRAWLER_ALWAYS 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 cff532b62b..8355bd2e27 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 @@ -33,7 +33,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/mob/living/simple_animal/hostile/wumborian_fugu.dm b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm index 80fc8f366f..d5d4b096b9 100644 --- a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm +++ b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm @@ -8,7 +8,7 @@ icon_aggro = "Fugu" icon_dead = "Fugu_dead" icon_gib = "syndicate_gib" - mouse_opacity = 2 + mouse_opacity = MOUSE_OPACITY_OPAQUE move_to_delay = 5 friendly = "floats near" speak_emote = list("puffs") 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 49dedd0cd3..76cacc00ef 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 @@ -11,7 +11,7 @@ It is possible to destroy the net by the occupant or someone else. density = TRUE//Can't pass through. opacity = 0//Can see through. - mouse_opacity = 1//So you can hit it with stuff. + mouse_opacity = MOUSE_OPACITY_ICON//So you can hit it with stuff. anchored = TRUE//Can't drag/grab the trapped mob. layer = ABOVE_ALL_MOB_LAYER max_integrity = 25 //How much health it has. diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm.rej b/code/modules/power/singularity/particle_accelerator/particle_control.dm.rej new file mode 100644 index 0000000000..c8e42a734f --- /dev/null +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm.rej @@ -0,0 +1,10 @@ +diff a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm (rejected hunks) +@@ -17,7 +17,7 @@ + var/active = 0 + var/strength = 0 + var/powered = 0 +- mouse_opacity = 2 ++ mouse_opacity = MOUSE_OPACITY_OPAQUE + + /obj/machinery/particle_accelerator/control_box/Initialize() + . = ..() diff --git a/code/modules/projectiles/guns/beam_rifle.dm b/code/modules/projectiles/guns/beam_rifle.dm index 7617c57100..ac9508138c 100644 --- a/code/modules/projectiles/guns/beam_rifle.dm +++ b/code/modules/projectiles/guns/beam_rifle.dm @@ -714,7 +714,7 @@ light_power = 1 light_range = 2 light_color = "#00ffff" - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT flags = ABSTRACT appearance_flags = 0 diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 50f00478e2..bd023cc51b 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -6,7 +6,7 @@ anchored = TRUE flags = ABSTRACT pass_flags = PASSTABLE - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT hitsound = 'sound/weapons/pierce.ogg' var/hitsound_wall = "" diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index f4b262f858..029d641958 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -554,7 +554,7 @@ layer = FLY_LAYER pixel_x = -64 pixel_y = -64 - 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/ruins/objects_and_mobs/necropolis_gate.dm b/code/modules/ruins/objects_and_mobs/necropolis_gate.dm index 3bda50c221..681a334a44 100644 --- a/code/modules/ruins/objects_and_mobs/necropolis_gate.dm +++ b/code/modules/ruins/objects_and_mobs/necropolis_gate.dm @@ -72,7 +72,7 @@ layer = EDGED_TURF_LAYER pixel_x = -32 pixel_y = -32 - mouse_opacity = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT opacity = TRUE /obj/structure/opacity_blocker/singularity_pull() diff --git a/code/modules/shuttle/ripple.dm b/code/modules/shuttle/ripple.dm index a757a86430..06675c39a3 100644 --- a/code/modules/shuttle/ripple.dm +++ b/code/modules/shuttle/ripple.dm @@ -8,7 +8,7 @@ anchored = TRUE density = FALSE layer = RIPPLE_LAYER - mouse_opacity = 1 + mouse_opacity = MOUSE_OPACITY_ICON alpha = 0 duration = 3 * SHUTTLE_RIPPLE_TIME