Skip to content

Commit

Permalink
New Varadero revamp (#3676)
Browse files Browse the repository at this point in the history
# About the pull request

Current revamp of New Varadero with a number of additions, balance
changes, and adjustments/removals to address previous problems. Tested
for DS and seems to work fine. Most changes were just to map assets with
some minor additions/removals to code.

# Explain why it's good for the game

New Varadero is a really cool and unique map with a refreshing break
from the darker and more inhospitable colonies currently available. A
lot of the gripes that caused it to be removed are straightforward and
readily adjusted/changed here. Hopefully this will help increase map
diversity and add another map choice to the current pool.

# Testing Photographs and Procedure

<details>
<summary>Screenshots & Videos</summary>

Current SDMM:

https://cdn.discordapp.com/attachments/1119410465181814844/1120218810750861392/2023-06-18_22.08.47.png

Current Tacmap:

https://cdn.discordapp.com/attachments/1119410465181814844/1120218689673900162/webmap.png

</details>

# Changelog

:cl: Anuv
fixes: #3775
add: Added a new storm siren unique to NV, new survivor types
spellcheck: Updates to the waking distress call notif.
code: Weather-related code changes. Update to the handheld maps.
soundadd: Added new monsoon weather sfx, new map-unique ambience, new
storm siren sfx.
maptweak: New LZ (LZ2 Palm Airfield) in the NE with a construction zone.
Removed a number of rocks around cave areas. Increased hive location
choices from 3 to 4. Added glass ceilings to facility areas (deep caves
are still protected, can be OB'd). Slightly widened the 45 minute weed
protection areas around LZs. Added a fog monsoon to the SE beach that
dissipates after an hour. Expanded east beach. New SW cave section.
Opened up the walkway west of LZ1. Enhanced survivor loot and mats to a
comparable degree to current maps. Many small changes to lessen chokes
and offer more route choice for xenos and marines alike. Removed
Spearhead/Rival and laser pistols. Swapped fawras for monkeys. Added
more survivor-type choices. Added a bar area and decrepit truck to the
north beach.
config: Enabled NV again as a map in maps.txt.
/:cl:
  • Loading branch information
AnuvKH authored Jul 19, 2023
1 parent 3085da0 commit 126ef45
Show file tree
Hide file tree
Showing 16 changed files with 34,286 additions and 23,896 deletions.
1 change: 1 addition & 0 deletions code/__DEFINES/sounds.dm
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
#define AMBIENCE_ALMAYER 'sound/ambience/almayerambience.ogg'
#define AMBIENCE_LV624 'sound/ambience/ambienceLV624.ogg'
#define AMBIENCE_BIGRED 'sound/ambience/desert.ogg'
#define AMBIENCE_NV 'sound/ambience/ambienceNV.ogg'
#define AMBIENCE_PRISON 'sound/ambience/shipambience.ogg'
#define AMBIENCE_TRIJENT 'sound/ambience/desert.ogg'

Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/weather.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#define PROB_WEATHER_SOROKYNE 100 //Map specific defines go here.
#define PROB_WEATHER_BIG_RED 30
#define PROB_WEATHER_LV624 30
#define PROB_WEATHER_NEW_VARADERO 100

#define WEATHER_TYPE_NO_WEATHER 0
#define WEATHER_TYPE_SNOW 1
Expand Down
38 changes: 38 additions & 0 deletions code/datums/weather/weather_events/new_varadero.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/datum/weather_event/light_rain
name = "Tropical Storm"
display_name = "Tropical Storm"
length = 4 MINUTES
fullscreen_type = /atom/movable/screen/fullscreen/weather/low

turf_overlay_icon_state = "strata_storm"
turf_overlay_alpha = 40

effect_message = null
damage_per_tick = 0

has_process = TRUE
lightning_chance = 1

ambience = 'sound/ambience/rainforest.ogg'

fire_smothering_strength = 1

/datum/weather_event/monsoon
name = "Monsoon Warning"
display_name = "Monsoon Warning"
length = 6 MINUTES
fullscreen_type = /atom/movable/screen/fullscreen/weather/high

turf_overlay_icon_state = "strata_storm"
turf_overlay_alpha = 115

effect_message = null
damage_per_tick = 0


ambience = 'sound/ambience/varadero_storm.ogg'

has_process = TRUE
lightning_chance = 6

fire_smothering_strength = 4
20 changes: 20 additions & 0 deletions code/datums/weather/weather_map_holders/new_varadero.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/datum/weather_ss_map_holder/new_varadero
name = "New Varadero Map Holder"

min_time_between_events = 15 MINUTES
no_weather_turf_icon_state = "strata_clearsky"

potential_weather_events = list(
/datum/weather_event/light_rain,
/datum/weather_event/monsoon,
)

/datum/weather_ss_map_holder/new_varadero/should_affect_area(area/A)
return !CEILING_IS_PROTECTED(A.ceiling, CEILING_GLASS)

/datum/weather_ss_map_holder/new_varadero/should_start_event()
return prob(PROB_WEATHER_NEW_VARADERO)

/datum/weather_ss_map_holder/new_varadero/weather_warning()
for (var/obj/structure/machinery/storm_siren/WS in weather_notify_objects)
WS.weather_warning()
105 changes: 83 additions & 22 deletions code/game/area/varadero.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
/area/varadero
name = "New Varadero"
icon = 'icons/turf/area_varadero.dmi'
ambience_exterior = AMBIENCE_LV624
sound_environment = SOUND_ENVIRONMENT_MOUNTAINS
ambience_exterior = AMBIENCE_NV
icon_state = "varadero"
can_build_special = TRUE //T-Comms structure
temperature = TROPICAL_TEMP
Expand Down Expand Up @@ -36,49 +35,44 @@
/area/varadero/exterior
name = "New Varadero - Exterior"
ceiling = CEILING_NONE
ambience_exterior = AMBIENCE_LV624
lighting_use_dynamic = TRUE
ambience_exterior = AMBIENCE_NV
//soundscape_playlist
sound_environment = SOUND_ENVIRONMENT_MOUNTAINS

/area/varadero/interior
name = "New Varadero - Interior"
ceiling = CEILING_UNDERGROUND_ALLOW_CAS
ceiling = CEILING_GLASS
ambience_exterior = AMBIENCE_PRISON
//soundscape_playlist
sound_environment = SOUND_ENVIRONMENT_ROOM

/area/varadero/interior_protected
name = "New Varadero - Interior"
ceiling = CEILING_DEEP_UNDERGROUND
icon_state = "NV_no_OB"
ceiling = CEILING_UNDERGROUND_BLOCK_CAS
sound_environment = SOUND_ENVIRONMENT_AUDITORIUM
icon_state = "NV_no_CAS"

/area/varadero/interior/comms1
name = "New Varadero - Cargo Generator"
is_resin_allowed = FALSE
icon_state = "comms1"
minimap_color = MINIMAP_AREA_ENGI_CAVE

/area/varadero/interior/comms2
name = "New Varadero - Communications Project Site"
is_resin_allowed = FALSE
icon_state = "comms2"
minimap_color = MINIMAP_AREA_ENGI_CAVE

/area/varadero/interior/comms3
name = "New Varadero - Fishing Hole"
is_resin_allowed = FALSE
name = "New Varadero - Engineering Communications"
icon_state = "comms3"
minimap_color = MINIMAP_AREA_ENGI_CAVE

/area/varadero/exterior/comms4
name = "New Varadero - Walkway Extension"
icon_state = "comms4"

/area/varadero/exterior/eastbeach
name = "New Varadero - East Beach"
icon_state = "varadero1"

/area/varadero/exterior/eastocean
name = "New Varadero - East Ocean"
is_resin_allowed = FALSE
flags_area = AREA_NOTUNNEL
icon_state = "varadero2"
icon_state = "comms4"
minimap_color = MINIMAP_AREA_ENGI_CAVE

/area/varadero/interior/oob
name = "New Varadero - Out Of Bounds"
Expand Down Expand Up @@ -119,9 +113,57 @@
name = "New Varadero - Rockabilly Beach"
icon_state = "varadero0"
is_resin_allowed = FALSE
minimap_color = MINIMAP_AREA_JUNGLE

/area/varadero/exterior/eastbeach
name = "New Varadero - East Beach"
is_resin_allowed = FALSE
icon_state = "varadero1"
lighting_use_dynamic = TRUE
minimap_color = MINIMAP_AREA_JUNGLE

/area/varadero/exterior/monsoon
name = "New Varadero - Monsoon"
icon_state = "varadero1"
minimap_color = MINIMAP_AREA_JUNGLE

/area/varadero/exterior/pool
name = "New Varadero - Interior Pool"
icon_state = "varadero1"
lighting_use_dynamic = TRUE
minimap_color = MINIMAP_AREA_COMMAND_CAVE

/area/varadero/exterior/eastocean
name = "New Varadero - East Ocean"
is_resin_allowed = FALSE
flags_area = AREA_NOTUNNEL
icon_state = "varadero2"
minimap_color = MINIMAP_AREA_CONTESTED_ZONE

/area/varadero/exterior/farocean
name = "New Varadero - Far Ocean"
is_resin_allowed = FALSE
flags_area = AREA_NOTUNNEL
icon_state = "varadero3"
minimap_color = MINIMAP_AREA_CONTESTED_ZONE

//interior areas


/area/varadero/interior/beach_bar
name = "New Varadero - Beach Bar"
icon_state = "varadero4"
is_resin_allowed = FALSE
minimap_color = MINIMAP_AREA_JUNGLE
sound_environment = SOUND_ENVIRONMENT_ROOM

/area/varadero/interior/dock_control
name = "New Varadero - Dock Control"
icon_state = "varadero3"
is_resin_allowed = FALSE
minimap_color = MINIMAP_AREA_JUNGLE
sound_environment = SOUND_ENVIRONMENT_ROOM

/area/varadero/interior/cargo
name = "New Varadero - Cargo"
icon_state = "req0"
Expand All @@ -145,15 +187,18 @@
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"
icon_state = "offices0"
is_resin_allowed = FALSE
minimap_color = MINIMAP_AREA_MEDBAY_CAVE

/area/varadero/interior/medical
name = "New Varadero - Medical"
icon_state = "offices2"
minimap_color = MINIMAP_AREA_MEDBAY

/area/varadero/interior/maintenance
name = "New Varadero - Central Maintenance"
Expand All @@ -167,10 +212,12 @@
/area/varadero/interior/maintenance/research
name = "New Varadero - Research Maintenance"
icon_state = "tunnels1"
minimap_color = MINIMAP_AREA_RESEARCH_CAVE

/area/varadero/interior/maintenance/security
name = "New Varadero - Security Maintenance"
icon_state = "tunnels2"
minimap_color = MINIMAP_AREA_SEC_CAVE

/area/varadero/interior/research
name = "New Varadero - Research Offices"
Expand All @@ -180,6 +227,7 @@
/area/varadero/interior/electrical
name = "New Varadero - Electrical Annex"
icon_state = "req4"
minimap_color = MINIMAP_AREA_ENGI

/area/varadero/interior/toilets
name = "New Varadero - Restrooms"
Expand All @@ -188,6 +236,7 @@
/area/varadero/interior/technical_storage
name = "New Varadero - Technical Storage"
icon_state = "req3"
minimap_color = MINIMAP_AREA_ENGI

/area/varadero/interior/laundry
name = "New Varadero - Laundry"
Expand All @@ -196,31 +245,38 @@
/area/varadero/interior/disposals
name = "New Varadero - Disposals"
icon_state = "offices4"
minimap_color = MINIMAP_AREA_ENGI

/area/varadero/interior/administration
name = "New Varadero - Administrative Offices"
icon_state = "offices2"
minimap_color = MINIMAP_AREA_COMMAND

/area/varadero/interior/library
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"
icon_state = "offices0"
minimap_color = MINIMAP_AREA_SEC

/area/varadero/interior/records
name = "New Varadero - Records"
Expand All @@ -238,12 +294,12 @@
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"
Expand All @@ -257,20 +313,25 @@
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"
icon_state = "deepcaves3"

/area/varadero/interior_protected/caves/swcaves
name = "New Varadero - Southwest Caves"
icon_state = "deepcaves3"

/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"
Expand Down
26 changes: 26 additions & 0 deletions code/game/machinery/storm_siren.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/obj/structure/machinery/storm_siren
name = "storm siren"
desc = "A siren used to announce storm warnings for the colony."
icon = 'icons/obj/structures/machinery/loudspeaker.dmi'
icon_state = "loudspeaker"
density = FALSE
anchored = TRUE
unacidable = 1
unslashable = 1
use_power = USE_POWER_NONE
health = 0

/obj/structure/machinery/storm_siren/Initialize()
weather_notify_objects += src
return ..()

/obj/structure/machinery/storm_siren/Destroy()
weather_notify_objects -= src
. = ..()

/obj/structure/machinery/storm_siren/power_change()
return

/obj/structure/machinery/storm_siren/proc/weather_warning()
playsound(loc, 'sound/effects/weather_warning_varadero.ogg', 60, 0)
visible_message(SPAN_DANGER("The storm siren blares: ATTENTION. ATTENTION. INCOMING TROPICAL STORM DETECTED. SEEK SHELTER IMMEDIATELY."))
2 changes: 1 addition & 1 deletion code/game/turfs/turf.dm
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@
var/area/A = get_area(src)
switch(A.ceiling)
if(CEILING_GLASS)
return "The ceiling above is glass. That's not going stop anything."
return "The ceiling above is glass. That's not going to stop anything."
if(CEILING_METAL)
return "The ceiling above is metal. You can't see through it with a camera from above, but that's not going to stop anything."
if(CEILING_UNDERGROUND_ALLOW_CAS)
Expand Down
8 changes: 4 additions & 4 deletions code/modules/cm_marines/equipment/maps.dm
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,10 @@
desc = "An overview of LV-522 schematics."
html_link = "images/b/bb/C_claim.png"
color = "cyan"
/obj/item/map/new_varadero//to-do actually finish this map
/obj/item/map/new_varadero
name = "\improper New Varadero map"
desc = "The blueprint and readout of the UA outpost New Varadero"
html_link = "images/0/0d/Kutjevo_a1.jpg"//replace later
desc = "A labeled blueprint of the UA outpost New Varadero"
html_link = "images/9/94/New_Varadero.png"
color = "red"

//used by marine equipment machines to spawn the correct map.
Expand Down Expand Up @@ -195,7 +195,7 @@
if (MAP_NEW_VARADERO)
name = "\improper New Varadero map"
desc = "The blueprint and readout of the UA outpost New Varadero"
html_link = "images/0/0d/Kutjevo_a1.jpg"//replace later
html_link = "images/9/94/New_Varadero.png"//replace later
color = "red"

else
Expand Down
Loading

0 comments on commit 126ef45

Please sign in to comment.