diff --git a/code/datums/diseases/heart_failure.dm b/code/datums/diseases/heart_failure.dm index 19beb4b3..196cd95f 100644 --- a/code/datums/diseases/heart_failure.dm +++ b/code/datums/diseases/heart_failure.dm @@ -37,7 +37,7 @@ to_chat(H, "You feel [pick("full", "nauseated", "sweaty", "weak", "tired", "short on breath", "uneasy")].") if(3 to 4) if(!sound) - H.playsound_local(H, 'sound/health/slowbeat.ogg',channel = CHANNEL_HEARTBEAT, use_reverb = FALSE) + H.playsound_local(H, 'sound/health/slowbeat.ogg',40,0, channel = CHANNEL_HEARTBEAT) sound = TRUE if(prob(3)) to_chat(H, "You feel a sharp pain in your chest!") @@ -53,7 +53,7 @@ H.emote("cough") if(5) H.stop_sound_channel(CHANNEL_HEARTBEAT) - H.playsound_local(H, 'sound/effects/singlebeat.ogg', 100, FALSE, use_reverb = FALSE) + H.playsound_local(H, 'sound/effects/singlebeat.ogg', 100, 0) if(H.stat == CONSCIOUS) H.visible_message("[H] clutches at [H.p_their()] chest as if [H.p_their()] heart is stopping!") H.adjustStaminaLoss(60) diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index af0230ea..77735847 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -307,7 +307,7 @@ last_staminaloss = owner.getStaminaLoss() owner.log_message("gained blood-drunk stun immunity", LOG_ATTACK) owner.add_stun_absorption("blooddrunk", INFINITY, 4) - owner.playsound_local(get_turf(owner), 'sound/effects/singlebeat.ogg', 40, 1, use_reverb = FALSE) + owner.playsound_local(get_turf(owner), 'sound/effects/singlebeat.ogg', 40, 1) /datum/status_effect/blooddrunk/tick() //multiply the effect of healing by 10 if(owner.health > last_health) @@ -362,7 +362,7 @@ if(needs_health_update) owner.updatehealth() - owner.playsound_local(get_turf(owner), 'sound/effects/singlebeat.ogg', 40, 1, use_reverb = FALSE) + owner.playsound_local(get_turf(owner), 'sound/effects/singlebeat.ogg', 40, 1) last_health = owner.health /datum/status_effect/blooddrunk/on_remove() diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm index 28d9310e..f5c2b368 100644 --- a/code/game/area/Space_Station_13_areas.dm +++ b/code/game/area/Space_Station_13_areas.dm @@ -43,7 +43,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station outdoors = TRUE ambientsounds = SPACE blob_allowed = FALSE //Eating up space doesn't count for victory as a blob. - sound_environment = SOUND_AREA_SPACE /area/space/nearstation icon_state = "space_near" @@ -67,7 +66,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station blob_allowed = FALSE //Nope, no winning on the asteroid as a blob. Gotta eat the station. valid_territory = FALSE ambientsounds = MINING - sound_environment = SOUND_AREA_ASTEROID /area/asteroid/nearstation dynamic_lighting = DYNAMIC_LIGHTING_FORCED @@ -75,7 +73,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station always_unpowered = FALSE requires_power = TRUE blob_allowed = TRUE - sound_environment = SOUND_AREA_TUNNEL_ENCLOSED /area/asteroid/nearstation/bomb_site name = "Bomb Testing Asteroid" @@ -125,7 +122,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/maintenance/department/crew_quarters/dorms name = "Dormitory Maintenance" icon_state = "maint_dorms" - sound_environment = SOUND_AREA_WOODFLOOR /area/maintenance/department/crew_quarters/locker name = "Locker Room Maintenance" @@ -258,9 +254,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station //Hallway -/area/hallway - sound_environment = SOUND_AREA_STANDARD_STATION - /area/hallway/primary/aft name = "Aft Primary Hallway" icon_state = "hallA" @@ -327,35 +320,29 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Bridge" icon_state = "bridge" music = "signal" - sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR /area/bridge/meeting_room name = "Heads of Staff Meeting Room" icon_state = "meeting" music = null - sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR /area/bridge/meeting_room/council name = "Council Chamber" icon_state = "meeting" music = null - sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR /area/bridge/showroom/corporate name = "Corporate Showroom" icon_state = "showroom" music = null - sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR /area/crew_quarters/heads/captain name = "Captain's Office" icon_state = "captain" - sound_environment = SOUND_AREA_WOODFLOOR /area/crew_quarters/heads/captain/private name = "Captain's Quarters" icon_state = "captain" - sound_environment = SOUND_AREA_WOODFLOOR /area/crew_quarters/heads/chief name = "Chief Engineer's Office" @@ -400,16 +387,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/comms name = "Communications Relay" icon_state = "tcomsatcham" - sound_environment = SOUND_AREA_STANDARD_STATION /area/server name = "Messaging Server Room" icon_state = "server" - sound_environment = SOUND_AREA_STANDARD_STATION //Crew -/area/crew_quarters - sound_environment = SOUND_AREA_STANDARD_STATION /area/crew_quarters/dorms name = "Dormitories" @@ -431,7 +414,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/crew_quarters/toilet name = "Dormitory Toilets" icon_state = "toilet" - sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/crew_quarters/toilet/auxiliary name = "Auxiliary Restrooms" @@ -464,7 +446,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/crew_quarters/lounge name = "Lounge" icon_state = "yellow" - sound_environment = SOUND_AREA_SMALL_SOFTFLOOR /area/crew_quarters/fitness name = "Fitness Room" @@ -489,17 +470,14 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/crew_quarters/kitchen/backroom name = "Kitchen Coldroom" icon_state = "kitchen" - sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/crew_quarters/bar name = "Bar" icon_state = "bar" - sound_environment = SOUND_AREA_WOODFLOOR /area/crew_quarters/bar/atrium name = "Atrium" icon_state = "bar" - sound_environment = SOUND_AREA_WOODFLOOR /area/crew_quarters/electronic_marketing_den name = "Electronic Marketing Den" @@ -515,7 +493,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/crew_quarters/theatre name = "Theatre" icon_state = "Theatre" - sound_environment = SOUND_AREA_WOODFLOOR /area/crew_quarters/theatre/abandoned name = "Abandoned Theatre" @@ -525,12 +502,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Library" icon_state = "library" flags_1 = NONE - sound_environment = SOUND_AREA_LARGE_SOFTFLOOR /area/library/lounge name = "Library Lounge" icon_state = "library" - sound_environment = SOUND_AREA_SMALL_SOFTFLOOR /area/library/abandoned name = "Abandoned Library" @@ -546,11 +521,9 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/chapel/main name = "Chapel" - sound_environment = SOUND_AREA_LARGE_ENCLOSED /area/chapel/main/monastery name = "Monastery" - sound_environment = SOUND_AREA_SMALL_SOFTFLOOR /area/chapel/office name = "Chapel Office" @@ -576,7 +549,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/engine ambientsounds = ENGINEERING - sound_environment = SOUND_AREA_LARGE_ENCLOSED /area/engine/engine_smes name = "Engineering SMES" @@ -594,17 +566,14 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/engine/atmospherics_engine name = "Atmospherics Engine" icon_state = "atmos_engine" - sound_environment = SOUND_AREA_LARGE_ENCLOSED /area/engine/supermatter name = "Supermatter Engine" icon_state = "engine_sm" - sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/engine/break_room name = "Engineering Foyer" icon_state = "engine_foyer" - sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/engine/gravity_generator name = "Gravity Generator Room" @@ -619,12 +588,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/engine/storage name = "Engineering Storage" icon_state = "engi_storage" - sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/engine/storage_shared name = "Shared Engineering Storage" icon_state = "engi_storage" - sound_environment = SOUND_AREA_SPACE /area/engine/transit_tube name = "Transit Tube" @@ -644,7 +611,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/solar/fore name = "Fore Solar Array" icon_state = "yellow" - sound_environment = SOUND_AREA_STANDARD_STATION /area/solar/aft name = "Aft Solar Array" @@ -750,7 +716,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "gateway" music = "signal" ambientsounds = ENGINEERING - sound_environment = SOUND_AREA_STANDARD_STATION //MedBay @@ -758,19 +723,16 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Medical" icon_state = "medbay3" ambientsounds = MEDICAL - sound_environment = SOUND_AREA_STANDARD_STATION /area/medical/abandoned name = "Abandoned Medbay" icon_state = "medbay3" music = 'sound/ambience/signal.ogg' - sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/medical/medbay/central name = "Medbay Central" icon_state = "medbay" music = 'sound/ambience/signal.ogg' - sound_environment = SOUND_AREA_SMALL_SOFTFLOOR /area/medical/medbay/front_office name = "Medbay Front Office" @@ -825,7 +787,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Morgue" icon_state = "morgue" ambientsounds = SPOOKY - sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/medical/chemistry name = "Chemistry" @@ -866,7 +827,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Security" icon_state = "security" ambientsounds = HIGHSEC - sound_environment = SOUND_AREA_STANDARD_STATION /area/security/main name = "Security Office" @@ -879,12 +839,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/security/courtroom name = "Courtroom" icon_state = "courtroom" - sound_environment = SOUND_AREA_LARGE_ENCLOSED /area/security/prison name = "Prison Wing" icon_state = "sec_prison" - sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/security/processing name = "Labor Shuttle Dock" @@ -897,7 +855,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/security/warden name = "Brig Control" icon_state = "Warden" - sound_environment = SOUND_AREA_SMALL_SOFTFLOOR /area/security/armory name = "Armory" @@ -907,7 +864,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Detective's Office" icon_state = "detective" ambientsounds = list('sound/ambience/ambidet1.ogg','sound/ambience/ambidet2.ogg') - sound_environment = SOUND_AREA_SMALL_SOFTFLOOR /area/security/detectives_office/private_investigators_office name = "Private Investigator's Office" @@ -989,19 +945,16 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/quartermaster name = "Quartermasters" icon_state = "quart" - sound_environment = SOUND_AREA_STANDARD_STATION ///////////WORK IN PROGRESS////////// /area/quartermaster/sorting name = "Delivery Office" icon_state = "cargo_delivery" - sound_environment = SOUND_AREA_STANDARD_STATION /area/quartermaster/warehouse name = "Warehouse" icon_state = "cargo_warehouse" - sound_environment = SOUND_AREA_LARGE_ENCLOSED ////////////WORK IN PROGRESS////////// @@ -1012,12 +965,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/quartermaster/storage name = "Cargo Bay" icon_state = "cargo_bay" - sound_environment = SOUND_AREA_LARGE_ENCLOSED /area/quartermaster/qm name = "Quartermaster's Office" icon_state = "quart" - sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/quartermaster/qm/private name = "Quartermaster's Private Quarters" @@ -1047,7 +998,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/hydroponics name = "Hydroponics" icon_state = "hydro" - sound_environment = SOUND_AREA_STANDARD_STATION /area/hydroponics/garden name = "Garden" @@ -1056,12 +1006,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/hydroponics/garden/abandoned name = "Abandoned Garden" icon_state = "abandoned_garden" - sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/hydroponics/garden/monastery name = "Monastery Garden" icon_state = "hydro" - sound_environment = SOUND_AREA_STANDARD_STATION //Science @@ -1073,7 +1021,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/science/lab name = "Research and Development" icon_state = "toxlab" - sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/science/xenobiology name = "Xenobiology Lab" @@ -1158,8 +1105,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "toxmisc" //Storage -/area/storage - sound_environment = SOUND_AREA_STANDARD_STATION /area/storage/tools name = "Auxiliary Tool Storage" @@ -1225,7 +1170,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Construction Area" icon_state = "yellow" ambientsounds = ENGINEERING - sound_environment = SOUND_AREA_STANDARD_STATION /area/construction/minisat_exterior name = "Minisat Exterior" @@ -1234,7 +1178,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/construction/mining/aux_base name = "Auxiliary Base Construction" icon_state = "yellow" - sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR /area/construction/mining/aux_base/closet name = "Auxiliary Closet Construction" @@ -1275,9 +1218,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station //AI -/area/ai_monitored - sound_environment = SOUND_AREA_STANDARD_STATION - /area/ai_monitored/security/armory name = "Armory" icon_state = "armory" @@ -1301,17 +1241,14 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/ai_monitored/turret_protected/ai_upload name = "AI Upload Chamber" icon_state = "ai_upload" - sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/ai_monitored/turret_protected/ai_upload_foyer name = "AI Upload Access" icon_state = "ai_foyer" - sound_environment = SOUND_AREA_SMALL_ENCLOSED /area/ai_monitored/turret_protected/ai name = "AI Chamber" icon_state = "ai_chamber" - sound_environment = SOUND_ENVIRONMENT_ROOM /area/ai_monitored/turret_protected/aisat name = "AI Satellite" @@ -1393,7 +1330,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/tcommsat/computer name = "Telecomms Control Room" icon_state = "tcomsatcomp" - sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR /area/tcommsat/server name = "Telecomms Server Room" @@ -1429,11 +1365,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/xenoarch/sec name = "Xenoarchaeology Security" - icon_state = "xenosec" + icon_state = "xenosec" /area/xenoarch/med name = "Xenoarchaeology Medical" - icon_state = "xenomed" + icon_state = "xenomed" //Pool /area/crew_quarters/fitness/pool diff --git a/code/game/area/ai_monitored.dm b/code/game/area/ai_monitored.dm index ee8012af..87b44291 100644 --- a/code/game/area/ai_monitored.dm +++ b/code/game/area/ai_monitored.dm @@ -3,7 +3,6 @@ clockwork_warp_allowed = FALSE var/list/obj/machinery/camera/motioncameras = list() var/list/datum/weakref/motionTargets = list() - sound_environment = SOUND_ENVIRONMENT_ROOM /area/ai_monitored/Initialize(mapload) . = ..() diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index ab693fae..544d7983 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -70,9 +70,6 @@ var/xenobiology_compatible = FALSE //Can the Xenobio management console transverse this area by default? var/list/canSmoothWithAreas //typecache to limit the areas that atoms in this area can smooth with - ///Used to decide what kind of reverb the area makes sound have - var/sound_environment = SOUND_ENVIRONMENT_NONE - /*Adding a wizard area teleport list because motherfucking lag -- Urist*/ /*I am far too lazy to make it a proper list of areas so I'll just make it run the usual telepot routine at the start of the game*/ GLOBAL_LIST_EMPTY(teleportlocs) diff --git a/code/game/area/areas/away_content.dm b/code/game/area/areas/away_content.dm index bb3182ee..b724c926 100644 --- a/code/game/area/areas/away_content.dm +++ b/code/game/area/areas/away_content.dm @@ -9,7 +9,6 @@ Unused icons for new areas are "awaycontent1" ~ "awaycontent30" icon_state = "away" has_gravity = STANDARD_GRAVITY ambientsounds = AWAY_MISSION - sound_environment = SOUND_ENVIRONMENT_ROOM /area/awaymission/beach name = "Beach" diff --git a/code/game/area/areas/holodeck.dm b/code/game/area/areas/holodeck.dm index 497b51eb..10e3249d 100644 --- a/code/game/area/areas/holodeck.dm +++ b/code/game/area/areas/holodeck.dm @@ -4,7 +4,6 @@ dynamic_lighting = DYNAMIC_LIGHTING_DISABLED flags_1 = 0 hidden = TRUE - sound_environment = SOUND_ENVIRONMENT_PADDED_CELL var/obj/machinery/computer/holodeck/linked var/restricted = 0 // if true, program goes on emag list diff --git a/code/game/area/areas/mining.dm b/code/game/area/areas/mining.dm index 908c83d7..6497ca54 100644 --- a/code/game/area/areas/mining.dm +++ b/code/game/area/areas/mining.dm @@ -17,7 +17,6 @@ outdoors = TRUE flags_1 = NONE ambientsounds = MINING - sound_environment = SOUND_AREA_STANDARD_STATION /area/mine/unexplored name = "Mine" @@ -32,7 +31,6 @@ outdoors = TRUE flags_1 = NONE ambientsounds = MINING - sound_environment = SOUND_AREA_LAVALAND /area/mine/lobby name = "Mining Station" diff --git a/code/game/area/areas/ruins/_ruins.dm b/code/game/area/areas/ruins/_ruins.dm index 17ba4f77..b97c3f0e 100644 --- a/code/game/area/areas/ruins/_ruins.dm +++ b/code/game/area/areas/ruins/_ruins.dm @@ -7,7 +7,6 @@ hidden = TRUE dynamic_lighting = DYNAMIC_LIGHTING_FORCED ambientsounds = RUINS - sound_environment = SOUND_ENVIRONMENT_STONEROOM /area/ruin/unpowered diff --git a/code/game/area/areas/shuttles.dm b/code/game/area/areas/shuttles.dm index 99dc1afc..ab4fa10d 100644 --- a/code/game/area/areas/shuttles.dm +++ b/code/game/area/areas/shuttles.dm @@ -12,7 +12,6 @@ icon_state = "shuttle" // Loading the same shuttle map at a different time will produce distinct area instances. unique = FALSE - sound_environment = SOUND_ENVIRONMENT_ROOM /area/shuttle/Initialize() if(!canSmoothWithAreas) diff --git a/code/game/sound.dm b/code/game/sound.dm index d2c6f165..11e02610 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -1,29 +1,4 @@ -///Default override for echo -/sound - echo = list( - 0, // Direct - 0, // DirectHF - -10000, // Room, -10000 means no low frequency sound reverb - -10000, // RoomHF, -10000 means no high frequency sound reverb - 0, // Obstruction - 0, // ObstructionLFRatio - 0, // Occlusion - 0.25, // OcclusionLFRatio - 1.5, // OcclusionRoomRatio - 1.0, // OcclusionDirectRatio - 0, // Exclusion - 1.0, // ExclusionLFRatio - 0, // OutsideVolumeHF - 0, // DopplerFactor - 0, // RolloffFactor - 0, // RoomRolloffFactor - 1.0, // AirAbsorptionFactor - 0, // Flags (1 = Auto Direct, 2 = Auto Room, 4 = Auto RoomHF) - ) - environment = SOUND_ENVIRONMENT_NONE //Default to none so sounds without overrides dont get reverb - - -/proc/playsound(atom/source, soundin, vol as num, vary, extrarange as num, falloff, frequency = null, channel = 0, pressure_affected = TRUE, ignore_walls = TRUE, soundenvwet = -10000, soundenvdry = 0, use_reverb = TRUE) +/proc/playsound(atom/source, soundin, vol as num, vary, extrarange as num, falloff, frequency = null, channel = 0, pressure_affected = TRUE, ignore_walls = TRUE, soundenvwet = -10000, soundenvdry = 0) if(isarea(source)) throw EXCEPTION("playsound(): source is an area") return @@ -52,7 +27,7 @@ if(get_dist(M, turf_source) <= maxdistance) M.playsound_local(turf_source, soundin, vol, vary, frequency, falloff, channel, pressure_affected, S, soundenvwet, soundenvdry) -/mob/proc/playsound_local(turf/turf_source, soundin, vol as num, vary, frequency, falloff, channel = 0, pressure_affected = TRUE, sound/S, envwet = -10000, envdry = 0, manual_x, manual_y, use_reverb = TRUE) +/mob/proc/playsound_local(turf/turf_source, soundin, vol as num, vary, frequency, falloff, channel = 0, pressure_affected = TRUE, sound/S, envwet = -10000, envdry = 0, manual_x, manual_y) if(audiovisual_redirect) var/turf/T = get_turf(src) audiovisual_redirect.playsound_local(turf_source, soundin, vol, vary, frequency, falloff, channel, pressure_affected, S, 0, -1000, turf_source.x - T.x, turf_source.y - T.y) @@ -123,18 +98,6 @@ S.y = 1 S.falloff = (falloff ? falloff : FALLOFF_SOUNDS) - if(S.environment == SOUND_ENVIRONMENT_NONE) - if(sound_environment_override != SOUND_ENVIRONMENT_NONE) - S.environment = sound_environment_override - else - var/area/A = get_area(src) - if(A.sound_environment != SOUND_ENVIRONMENT_NONE) - S.environment = A.sound_environment - - if(use_reverb && S.environment != SOUND_ENVIRONMENT_NONE) //We have reverb, reset our echo setting - S.echo[3] = 0 //Room setting, 0 means normal reverb - S.echo[4] = 0 //RoomHF setting, 0 means normal reverb. - SEND_SOUND(src, S) /proc/sound_to_playing_players(soundin, volume = 100, vary = FALSE, frequency = 0, falloff = FALSE, channel = 0, pressure_affected = FALSE, sound/S) diff --git a/code/modules/mob/living/carbon/status_procs.dm b/code/modules/mob/living/carbon/status_procs.dm index 353e196f..766bd376 100644 --- a/code/modules/mob/living/carbon/status_procs.dm +++ b/code/modules/mob/living/carbon/status_procs.dm @@ -46,12 +46,10 @@ overlay_fullscreen("high", /obj/screen/fullscreen/high) throw_alert("high", /obj/screen/alert/high) SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "high", /datum/mood_event/high) - sound_environment_override = SOUND_ENVIRONMENT_DRUGGED else clear_fullscreen("high") clear_alert("high") SEND_SIGNAL(src, COMSIG_CLEAR_MOOD_EVENT, "high") - sound_environment_override = SOUND_ENVIRONMENT_NONE /mob/living/carbon/set_drugginess(amount) druggy = max(amount, 0) diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index a63b569e..ed901ee6 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -129,9 +129,6 @@ ///Whether the mob is updating glide size when movespeed updates or not var/updating_glide_size = TRUE - ///Override for sound_environments. If this is set the user will always hear a specific type of reverb (Instead of the area defined reverb) - var/sound_environment_override = SOUND_ENVIRONMENT_NONE - var/flavor_text = "" var/ooc_text = "" var/flavor_text_2 = "" //version of the above that only lasts for the current round.