cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 00:29:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17218 from phil235/FixTalkingInPipes

Browse Source 
No longer deaf while inside pipes
This commit is contained in:
Cheridan
2016-04-29 20:34:03 -05:00
parent 8964eaebb7 750eaa4a57
commit d662b0e455
47 changed files with 63 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin_verbs.dm
+1 -1
View File
@@ -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
code/modules/assembly/infrared.dm
+1 -1
View File
@@ -193,7 +193,7 @@
left--
if(left < 1)
if(!(visible))
invisibility = 101
invisibility = INVISIBILITY_ABSTRACT
else
invisibility = 0
else
code/modules/atmospherics/machinery/pipes/pipes.dm
+1 -1
View File
@@ -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)
code/modules/awaymissions/mission_code/stationCollision.dm
+1 -1
View File
@@ -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
code/modules/clothing/glasses/engine_goggles.dm
+2 -2
View File
@@ -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))
code/modules/clothing/spacesuits/chronosuit.dm
+1 -1
View File
@@ -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
code/modules/events/spacevine.dm
+1 -1
View File
@@ -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
code/modules/holodeck/holo_effect.dm
+1 -1
View File
@@ -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
code/modules/mining/lavaland/weather.dm
+1 -1
View File
@@ -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
code/modules/mining/lavaland/weather_types.dm
+1 -1
View File
@@ -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
code/modules/mob/camera/camera.dm
+1 -1
View File
@@ -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
code/modules/mob/living/carbon/life.dm
+1 -1
View File
@@ -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()
code/modules/mob/living/death.dm
+1 -1
View File
@@ -65,7 +65,7 @@
notransform = 1
canmove = 0
icon = null
invisibility = 101
invisibility = INVISIBILITY_ABSTRACT
alpha = 0
if(!prev_lying && animation)
code/modules/mob/living/silicon/ai/freelook/eye.dm
+1 -1
View File
@@ -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
code/modules/mob/living/simple_animal/guardian/types/ranged.dm
+1 -1
View File
@@ -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)
code/modules/mob/living/simple_animal/hostile/zombie.dm
+1 -1
View File
@@ -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
code/modules/mob/new_player/new_player.dm
+1 -1
View File
@@ -6,7 +6,7 @@
flags = NONE
invisibility = 101
invisibility = INVISIBILITY_ABSTRACT
density = 0
stat = DEAD
code/modules/mob/transform_procs.dm
+8 -8
View File
@@ -26,7 +26,7 @@
stunned = 1
icon = null
overlays.Cut()
invisibility = 101
invisibility = INVISIBILITY_MAXIMUM
var/atom/movable/overlay/animation = new( loc )
animation.icon_state = "blank"
@@ -139,7 +139,7 @@
stunned = 1
icon = null
overlays.Cut()
invisibility = 101
invisibility = INVISIBILITY_MAXIMUM
var/atom/movable/overlay/animation = new( loc )
animation.icon_state = "blank"
animation.icon = 'icons/mob/mob.dmi'
@@ -243,7 +243,7 @@
notransform = 1
canmove = 0
icon = null
invisibility = 101
invisibility = INVISIBILITY_MAXIMUM
return ..()
/mob/proc/AIize()
@@ -313,7 +313,7 @@
notransform = 1
canmove = 0
icon = null
invisibility = 101
invisibility = INVISIBILITY_MAXIMUM
for(var/t in organs)
qdel(t)
@@ -364,7 +364,7 @@
notransform = 1
canmove = 0
icon = null
invisibility = 101
invisibility = INVISIBILITY_MAXIMUM
for(var/t in organs)
qdel(t)
@@ -394,7 +394,7 @@
notransform = 1
canmove = 0
icon = null
invisibility = 101
invisibility = INVISIBILITY_MAXIMUM
for(var/t in organs)
qdel(t)
@@ -453,7 +453,7 @@
notransform = 1
canmove = 0
icon = null
invisibility = 101
invisibility = INVISIBILITY_MAXIMUM
for(var/t in organs) //this really should not be necessary
qdel(t)
@@ -483,7 +483,7 @@
notransform = 1
canmove = 0
icon = null
invisibility = 101
invisibility = INVISIBILITY_MAXIMUM
for(var/t in organs)
qdel(t)
code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm
+1 -1
View File
@@ -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))
code/modules/power/cable.dm
+1 -1
View File
@@ -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 ? INVISIBILITY_MAXIMUM : 0
updateicon()
/obj/structure/cable/proc/updateicon()
code/modules/power/terminal.dm
+1 -1
View File
@@ -27,7 +27,7 @@
/obj/machinery/power/terminal/hide(i)
if(i)
invisibility = 101
invisibility = INVISIBILITY_MAXIMUM
icon_state = "term-f"
else
invisibility = 0
code/modules/projectiles/projectile/magic.dm
+1 -1
View File
@@ -141,7 +141,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
code/modules/recycling/disposal-construction.dm
+1 -1
View File
@@ -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) ? INVISIBILITY_MAXIMUM: 0 // hide if floor is intact
update_icon()
code/modules/recycling/disposal-structures.dm
+3 -3
View File
@@ -5,7 +5,7 @@
// this allows the gas flushed to be tracked
/obj/structure/disposalholder
invisibility = 101
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 ? 101: 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 = 101 // 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
code/modules/shuttle/shuttle.dm
+2 -2
View File
@@ -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
. = ..()
code/modules/telesci/gps.dm
+1 -1
View File
@@ -104,4 +104,4 @@ var/list/GPS_list = list()
flags = ABSTRACT
gpstag = "Eerie Signal"
desc = "Report to a coder immediately."
invisibility = 100
invisibility = INVISIBILITY_MAXIMUM