Merge pull request tgstation#17218 from phil235/FixTalkingInPipes

No longer deaf while inside pipes
new525 · Apr 30, 2016 · d662b0e · d662b0e
2 parents 8964eae + 750eaa4
commit d662b0e
Show file tree

Hide file tree

Showing 47 changed files with 63 additions and 60 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -23,7 +23,7 @@
 	user << "<span class='warning'>We retract our sting, we can't sting anyone for now.</span>"
 	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
@@ -413,7 +413,7 @@
 	user << "<span class='shadowling'>You regurgitate a vast cloud of blinding smoke.</span>"
 	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
@@ -220,7 +220,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
@@ -28,7 +28,7 @@
 
 // update the invisibility and icon
 /obj/machinery/bluespace_beacon/hide(intact)
-	invisibility = intact ? 101 : 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
@@ -50,7 +50,7 @@
 
 // update the invisibility and icon
 /obj/machinery/magnetic_module/hide(intact)
-	invisibility = intact ? 101 : 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
@@ -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 ? 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -52,15 +52,15 @@ MASS SPECTROMETER
 
 			var/mob/living/L = locate() in O
 
-			if(O.invisibility == 101)
+			if(O.invisibility == INVISIBILITY_MAXIMUM)
 				O.invisibility = 0
 				if(L)
 					flick_sonar(O)
 				spawn(10)
 					if(O && O.loc)
 						var/turf/U = O.loc
 						if(U.intact)
-							O.invisibility = 101
+							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
@@ -280,7 +280,7 @@
 
 /obj/item/weapon/storage/backpack/satchel_flat/hide(var/intact)
 	if(intact)
-		invisibility = 101
+		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
@@ -187,4 +187,4 @@ obj/structure/safe/ex_act(severity, target)
 
 
 /obj/structure/safe/floor/hide(var/intact)
-	invisibility = intact ? 101 : 0
+	invisibility = intact ? INVISIBILITY_MAXIMUM : 0
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -40,7 +40,7 @@
 
 /obj/machinery/atmospherics/pipe/hide(i)
 	if(level == 1 && istype(loc, /turf))
-		invisibility = i ? 101 : 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
@@ -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
@@ -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 = 101
+				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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -218,7 +218,7 @@
 			hud_used.lingchemdisplay.invisibility = 0
 			hud_used.lingchemdisplay.maptext = "<div align='center' valign='middle' style='position:relative; top:0px; left:6px'><font color='#dd66dd'>[round(mind.changeling.chem_charges)]</font></div>"
 		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
@@ -65,7 +65,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
@@ -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
@@ -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
@@ -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
@@ -6,7 +6,7 @@
 
 	flags = NONE
 
-	invisibility = 101
+	invisibility = INVISIBILITY_ABSTRACT
 
 	density = 0
 	stat = DEAD
Original file line number	Diff line number	Diff line change
Expand Up		@@ -187,4 +187,4 @@ obj/structure/safe/ex_act(severity, target)


		/obj/structure/safe/floor/hide(var/intact)
		invisibility = intact ? 101 : 0
		invisibility = intact ? INVISIBILITY_MAXIMUM : 0