Merge pull request #8563 from VOREStation/upstream-merge-7366

[MIRROR] Ambiance and Sound Updates
This commit is contained in:
Novacat
2020-08-02 01:58:19 -04:00
committed by GitHub
41 changed files with 48 additions and 4 deletions

View File

@@ -45,7 +45,10 @@
//Check if we're on fire
handle_fire()
// Handle re-running ambience to mobs if they've remained in an area.
handle_ambience()
//stuff in the stomach
//handle_stomach() //VOREStation Code
@@ -89,6 +92,12 @@
/mob/living/proc/handle_stomach()
return
/mob/living/proc/handle_ambience() // If you're in an ambient area and have not moved out of it for x time, we're going to play ambience again to you, to help break up the silence.
if(world.time >= (lastareachange + 30 SECONDS)) // Every 30 seconds, we're going to run a 35% chance to play ambience.
var/area/A = get_area(src)
if(A)
A.play_ambience(src)
/mob/living/proc/update_pulling()
if(pulling)
if(incapacitated())

View File

@@ -181,6 +181,7 @@
var/status_flags = CANSTUN|CANWEAKEN|CANPARALYSE|CANPUSH //bitflags defining which status effects can be inflicted (replaces canweaken, canstun, etc)
var/area/lastarea = null
var/lastareachange = null
var/digitalcamo = 0 // Can they be tracked by the AI?