Skip to content

Commit

Permalink
Эмбиенты хуембиенты
Browse files Browse the repository at this point in the history
  • Loading branch information
Krashly committed Dec 4, 2024
1 parent 8c386d5 commit 62f5df7
Show file tree
Hide file tree
Showing 9 changed files with 44 additions and 15 deletions.
2 changes: 1 addition & 1 deletion code/_globalvars/lists/ambience.dm
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ GLOBAL_LIST_INIT(ambience_assoc,list(
AMBIENCE_ICEMOON = GLOB.icemoon_ambience,
AMBIENCE_REEBE = GLOB.reebe_ambience,
AMBIENCE_RUINS = GLOB.ruins_ambience,
AMBIENCE_SPACE = GLOB.space_ambience,
AMBIENCE_SPACE = GLOB.space_ambience_ark, // ARK STATIOM EDIT
AMBIENCE_SPOOKY = GLOB.spooky_ambience,
AMBIENCE_OMEGA = GLOB.omega_ambience, // ARK STATION ADDITION
AMBIENCE_MUSHROOM = GLOB.mushroom_ambience, // NOVA EDIT - Mushroom caves!
Expand Down
2 changes: 1 addition & 1 deletion code/game/sound.dm
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
pressure_factor = 0

if(distance <= 1)
pressure_factor = max(pressure_factor, 0.15) //touching the source of the sound
pressure_factor = max(pressure_factor, 0.1) //touching the source of the sound // 0.15 - ARK STATION EDIT

sound_to_use.volume *= pressure_factor
//End Atmosphere affecting sound
Expand Down
16 changes: 8 additions & 8 deletions modularz_arkstation/modules/dynamic_vote/code/gamemode_vote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -67,31 +67,31 @@ GLOBAL_VAR_INIT(dynamic_forced_secret, FALSE)
message_admins("Game has set Forced Extended for round.", 1)
else if(prob(6))
// Nuke
gamemode_rule += /datum/dynamic_ruleset/roundstart/nuclear
gamemode_rule = /datum/dynamic_ruleset/roundstart/nuclear
GLOB.dynamic_forced_threat_level = 0
else if(prob(4))
// Wiz
gamemode_rule += /datum/dynamic_ruleset/roundstart/wizard
gamemode_rule = /datum/dynamic_ruleset/roundstart/wizard
GLOB.dynamic_forced_threat_level = 0
else if(prob(4))
// Malf
gamemode_rule += /datum/dynamic_ruleset/roundstart/malf_ai
gamemode_rule = /datum/dynamic_ruleset/roundstart/malf_ai
GLOB.dynamic_forced_threat_level = 0
else if(prob(10))
// Revolution
gamemode_rule += /datum/dynamic_ruleset/roundstart/revs
gamemode_rule = /datum/dynamic_ruleset/roundstart/revs
GLOB.dynamic_forced_threat_level = 0
else if(prob(10))
// Blood Cult
gamemode_rule += /datum/dynamic_ruleset/roundstart/bloodcult
gamemode_rule = /datum/dynamic_ruleset/roundstart/bloodcult
GLOB.dynamic_forced_threat_level = 0
else if(prob(10))
// Spies
gamemode_rule += /datum/dynamic_ruleset/roundstart/spies
gamemode_rule = /datum/dynamic_ruleset/roundstart/spies
GLOB.dynamic_forced_threat_level = 0
else if(prob(20))
// Traitors
gamemode_rule += /datum/dynamic_ruleset/roundstart/traitor
gamemode_rule = /datum/dynamic_ruleset/roundstart/traitor
GLOB.dynamic_forced_threat_level = 0
else
// Random Dynamic
Expand All @@ -100,7 +100,7 @@ GLOBAL_VAR_INIT(dynamic_forced_secret, FALSE)
message_admins("Game has set [GLOB.dynamic_forced_threat_level] threat for round.", 1)

if(gamemode_rule)
GLOB.dynamic_forced_roundstart_ruleset += gamemode_rule
GLOB.dynamic_forced_rulesets[gamemode_rule] = RULESET_FORCE_ENABLED
log_admin("Game has set [gamemode_rule] to be a forced roundstart ruleset.")
message_admins("Game has set [gamemode_rule] to be a forced roundstart ruleset.", 1)

Expand Down
39 changes: 34 additions & 5 deletions modularz_arkstation/modules/sounds-renewal/code/generic_sounds.dm
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
ambient_buzz = 'sound/ambience/maintenance/maintambience.ogg'
ambient_buzz_vol = 20

// SCI
// SCIENCE
/area/station/science
ambient_buzz = 'modularz_arkstation/modules/sounds-renewal/sound/ambience/sci.ogg'
ambient_buzz_vol = 20
Expand All @@ -132,7 +132,7 @@
ambient_buzz = 'modularz_arkstation/modules/sounds-renewal/sound/ambience/sci.ogg'
ambient_buzz_vol = 20

// MED
// MEDICAL
/area/station/medical
ambient_buzz = 'modularz_arkstation/modules/sounds-renewal/sound/ambience/med.ogg'
ambient_buzz_vol = 20
Expand Down Expand Up @@ -163,15 +163,44 @@
min_ambience_cooldown = 35 SECONDS
max_ambience_cooldown = 65 SECONDS

// SEC
// SECURITY
/area/station/security
ambient_buzz = 'modularz_arkstation/modules/sounds-renewal/sound/ambience/ambidanger6.ogg'
ambient_buzz = 'modularz_arkstation/modules/sounds-renewal/sound/ambience/security.ogg'
ambient_buzz_vol = 15

/area/station/command/heads_quarters/hos
ambient_buzz = 'modularz_arkstation/modules/sounds-renewal/sound/ambience/ambidanger6.ogg'
ambient_buzz = 'modularz_arkstation/modules/sounds-renewal/sound/ambience/security.ogg'
ambient_buzz_vol = 15

// ENGINEERING
/area/station/engineering
ambient_buzz = 'modularz_arkstation/modules/sounds-renewal/sound/ambience/engineering.ogg'
ambient_buzz_vol = 15

/area/station/construction
ambient_buzz = 'modularz_arkstation/modules/sounds-renewal/sound/ambience/engineering.ogg'
ambient_buzz_vol = 15

// ATMOS
/area/station/engineering/atmos
ambient_buzz = 'modularz_arkstation/modules/sounds-renewal/sound/ambience/atmos.ogg'
ambient_buzz_vol = 10

/area/space

GLOBAL_LIST_INIT(space_ambience_ark,list(
'modular_nova/master_files/sound/ambience/starlight.ogg', //NOVA EDIT ADDITION
'sound/ambience/engineering/ambiatmos.ogg',
'sound/ambience/space/ambispace.ogg',
'sound/ambience/space/ambispace2.ogg',
'sound/ambience/space/ambispace3.ogg',
'sound/ambience/space/ambispace4.ogg',
'sound/ambience/space/ambispace5.ogg',
'sound/ambience/space/ambispace6.ogg',
'modularz_arkstation/modules/sounds-renewal/sound/ambience/space/space1.ogg',
'modularz_arkstation/modules/sounds-renewal/sound/ambience/space/space2.ogg',
))

// MISC
/area/shuttle
ambient_buzz = 'modular_nova/modules/encounters/sounds/amb_ship_01.ogg'
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 62f5df7

Please sign in to comment.