From 610965eaf9892b831e6d0fdeef8ecdaef8b13397 Mon Sep 17 00:00:00 2001 From: Anuv Date: Wed, 21 Jun 2023 21:15:14 -0700 Subject: [PATCH] Area sounds, tacmap, survs --- code/game/area/varadero.dm | 17 ++++++++++------- code/game/machinery/storm_siren.dm | 4 ++-- code/modules/gear_presets/survivors.dm | 15 +++++++++++++++ maps/new_varadero.json | 1 + 4 files changed, 28 insertions(+), 9 deletions(-) diff --git a/code/game/area/varadero.dm b/code/game/area/varadero.dm index 6f7e42b7db50..95ba88ec6fce 100644 --- a/code/game/area/varadero.dm +++ b/code/game/area/varadero.dm @@ -5,7 +5,6 @@ name = "New Varadero" icon = 'icons/turf/area_varadero.dmi' ambience_exterior = AMBIENCE_NV - sound_environment = SOUND_ENVIRONMENT_MOUNTAINS icon_state = "varadero" can_build_special = TRUE //T-Comms structure temperature = TROPICAL_TEMP @@ -39,7 +38,6 @@ lighting_use_dynamic = FALSE ambience_exterior = AMBIENCE_NV //soundscape_playlist - sound_environment = SOUND_ENVIRONMENT_MOUNTAINS /area/varadero/interior name = "New Varadero - Interior" @@ -51,6 +49,7 @@ /area/varadero/interior_protected name = "New Varadero - Interior" ceiling = CEILING_UNDERGROUND_BLOCK_CAS + sound_environment = SOUND_ENVIRONMENT_AUDITORIUM icon_state = "NV_no_CAS" /area/varadero/interior/comms1 @@ -171,6 +170,7 @@ name = "New Vardero - Chapel" icon_state = "offices1" is_resin_allowed = FALSE + minimap_color = MINIMAP_AREA_COMMAND_CAVE /area/varadero/interior/morgue name = "New Varadero - Morgue" @@ -195,7 +195,7 @@ /area/varadero/interior/maintenance/research name = "New Varadero - Research Maintenance" icon_state = "tunnels1" - minimap_color = MINIMAP_AREA_RESEARCH + minimap_color = MINIMAP_AREA_RESEARCH_CAVE /area/varadero/interior/maintenance/security name = "New Varadero - Security Maintenance" @@ -239,18 +239,22 @@ name = "New Varadero - Library" icon_state = "offices0" is_resin_allowed = FALSE + minimap_color = MINIMAP_AREA_COMMAND_CAVE /area/varadero/interior/court name = "New Varadero - Basketball Court" icon_state = "req4" + minimap_color = MINIMAP_AREA_COMMAND_CAVE /area/varadero/interior/mess name = "New Varadero - Mess Hall" icon_state = "req2" + minimap_color = MINIMAP_AREA_COMMAND_CAVE /area/varadero/interior/bunks name = "New Varadero - Level 1 Quarters" icon_state = "req3" + minimap_color = MINIMAP_AREA_JUNGLE /area/varadero/interior/security name = "New Varadero - Security Offices" @@ -273,17 +277,16 @@ power_environ = FALSE luminosity = 0 lighting_use_dynamic = 1 + sound_environment = SOUND_ENVIRONMENT_AUDITORIUM minimap_color = MINIMAP_AREA_CAVES /area/varadero/interior/caves/north_research name = "New Varadero - North Research Caves" icon_state = "tunnels4" - minimap_color = MINIMAP_AREA_RESEARCH_CAVE /area/varadero/interior/caves/east name = "New Varadero - Beach Caves" icon_state = "tunnels2" - minimap_color = MINIMAP_AREA_CAVES /area/varadero/interior_protected/caves name = "New Varadero - South Research Caves" @@ -293,12 +296,12 @@ power_environ = FALSE luminosity = 0 lighting_use_dynamic = 1 - minimap_color = MINIMAP_AREA_RESEARCH_CAVE /area/varadero/interior_protected/caves/central name = "New Varadero - Grass Caves" icon_state = "deepcaves2" + minimap_color = MINIMAP_AREA_CAVES /area/varadero/interior_protected/caves/digsite name = "New Varadero - Dig Site" @@ -307,11 +310,11 @@ /area/varadero/interior_protected/caves/swcaves name = "New Varadero - Southwest Caves" icon_state = "deepcaves3" - minimap_color = MINIMAP_AREA_CAVES /area/varadero/interior_protected/maintenance/south name = "New Varadero - Southern Maintenance" icon_state = "deepcaves4" + minimap_color = MINIMAP_AREA_CAVES /area/varadero/interior_protected/vessel name = "New Varadero - Unknown Vessel" diff --git a/code/game/machinery/storm_siren.dm b/code/game/machinery/storm_siren.dm index 8e0e50dba19c..0e67c6b5057c 100644 --- a/code/game/machinery/storm_siren.dm +++ b/code/game/machinery/storm_siren.dm @@ -22,5 +22,5 @@ return /obj/structure/machinery/storm_siren/proc/weather_warning() - playsound(loc, 'sound/effects/weather_warning_varadero.ogg', 75, 0) - visible_message(SPAN_DANGER("The [src] blares: ATTENTION. ATTENTION. INCOMING TROPICAL STORM DETECTED. SEEK SHELTER IMMEDIATELY.")) + playsound(loc, 'sound/effects/weather_warning_varadero.ogg', 50, 0) + visible_message(SPAN_DANGER("The storm siren blares: ATTENTION. ATTENTION. INCOMING TROPICAL STORM DETECTED. SEEK SHELTER IMMEDIATELY.")) diff --git a/code/modules/gear_presets/survivors.dm b/code/modules/gear_presets/survivors.dm index ab8ccd1555ff..391f45fe3c52 100644 --- a/code/modules/gear_presets/survivors.dm +++ b/code/modules/gear_presets/survivors.dm @@ -491,6 +491,21 @@ ..() +/datum/equipment_preset/survivor/security/nv + name = "Survivor - New Varadero Security Guard" + assignment = "United Americas Peacekeeper" + languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) + +/datum/equipment_preset/survivor/security/nv/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + + ..() + /datum/equipment_preset/survivor/security/shiva name = "Survivor - Shivas Snowball Security Guard" assignment = "United Americas Peacekeeper" diff --git a/maps/new_varadero.json b/maps/new_varadero.json index 2bb9957a3e18..fad2c66f6436 100644 --- a/maps/new_varadero.json +++ b/maps/new_varadero.json @@ -12,6 +12,7 @@ "/datum/equipment_preset/survivor/engineer/nv", "/datum/equipment_preset/survivor/trucker/nv", "/datum/equipment_preset/survivor/interstellar_commerce_commission_liason/nv", + "/datum/equipment_preset/survivor/security/nv", "/datum/equipment_preset/survivor/beachbum", "/datum/equipment_preset/survivor/miner", "/datum/equipment_preset/survivor/clf"