shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] Adds defines for mouse_opacity (#2381)

Browse Source 
* Adds defines for mouse_opacity

* Delete misc.dm.rej

* Update misc.dm
This commit is contained in:
CitadelStationBot
2017-08-21 22:29:37 -05:00
committed by kevinz000
parent 61e6f2815b
commit b5e7f7f7fe
60 changed files with 89 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/admin/admin_verbs.dm
View File

@@ -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!

2
code/modules/atmospherics/environmental/LINDA_fire.dm
View File

@@ -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

2
code/modules/atmospherics/gasmixtures/gas_types.dm
View File

@@ -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

2
code/modules/clothing/spacesuits/chronosuit.dm
View File

@@ -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

2
code/modules/events/spacevine.dm
View File

@@ -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

2
code/modules/fields/peaceborg_dampener.dm
View File

@@ -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)

2
code/modules/fields/turf_objects.dm
View File

@@ -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)

2
code/modules/lighting/lighting_object.dm
View File

@@ -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

2
code/modules/mining/lavaland/necropolis_chests.dm
View File

@@ -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

2
code/modules/mining/minebot.dm
View File

@@ -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)

2
code/modules/mob/camera/camera.dm
View File

@@ -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

2
code/modules/mob/living/silicon/pai/pai.dm
View File

@@ -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

2
code/modules/mob/living/silicon/robot/inventory.dm
View File

@@ -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

2
code/modules/mob/living/silicon/robot/robot_modules.dm
View File

@@ -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)

2
code/modules/mob/living/simple_animal/hostile/bees.dm
View File

@@ -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

2
code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
View File

@@ -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)

2
code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm
View File

@@ -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()
. = ..()

2
code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
View File

@@ -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)
. = ..()

2
code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
View File

@@ -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

6
code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
View File

@@ -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

2
code/modules/mob/living/simple_animal/hostile/mushroom.dm
View File

@@ -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

2
code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
View File

@@ -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."

2
code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm
View File

@@ -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")

2
code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm
View File

@@ -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.

10
code/modules/power/singularity/particle_accelerator/particle_control.dm.rej Normal file
View File

@@ -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()
. = ..()

2
code/modules/projectiles/guns/beam_rifle.dm
View File

@@ -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

2
code/modules/projectiles/projectile.dm
View File

@@ -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 = ""

2
code/modules/research/xenobiology/xenobiology.dm
View File

@@ -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

2
code/modules/ruins/objects_and_mobs/necropolis_gate.dm
View File

@@ -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()

2
code/modules/shuttle/ripple.dm
View File

@@ -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