Merge pull request #34 from Tk420634/Foxing-the-currency

Foxing the currency

code/__DEFINES/weather.dm

@@ -133,6 +133,4 @@ GLOBAL_LIST_INIT(z2name, list(
 	WEATHER_RADS
 
 /// All weather tags
-#define WEATHER_SAFE WEATHER_SNOW,\
-	WEATHER_RAIN,\
-	WEATHER_SAND
+#define WEATHER_SAFE WEATHER_RAIN

code/datums/looping_sounds/ambient_sounds.dm

@@ -142,6 +142,24 @@
 		SOUND_LOOP_ENTRY('sound/f13ambience/bird_8.ogg', 10 SECONDS, 1),
 	)
 
+/datum/looping_sound/ambient/critters/birds/two/birdharder
+	chance = 40
+	vary = FALSE
+	vary_direction = TRUE
+	volume = SOUND_LOOP_VOL_RANGE(30, 50)
+	direct = TRUE
+	loop_delay = 2 MINUTES
+	mid_sounds = list(
+		SOUND_LOOP_ENTRY('sound/f13ambience/bird_1.ogg', 10 SECONDS, 1),
+		SOUND_LOOP_ENTRY('sound/f13ambience/bird_2.ogg', 10 SECONDS, 1),
+		SOUND_LOOP_ENTRY('sound/f13ambience/bird_3.ogg', 10 SECONDS, 1),
+		SOUND_LOOP_ENTRY('sound/f13ambience/bird_4.ogg', 10 SECONDS, 1),
+		SOUND_LOOP_ENTRY('sound/f13ambience/bird_5.ogg', 10 SECONDS, 1),
+		SOUND_LOOP_ENTRY('sound/f13ambience/bird_6.ogg', 10 SECONDS, 1),
+		SOUND_LOOP_ENTRY('sound/f13ambience/bird_7.ogg', 10 SECONDS, 1),
+		SOUND_LOOP_ENTRY('sound/f13ambience/bird_8.ogg', 10 SECONDS, 1),
+	)
+
 /datum/looping_sound/ambient/critters/birds/louder
 	chance = 80
 	loop_delay = 0
@@ -519,3 +537,15 @@
 		SOUND_LOOP_ENTRY('sound/f13ambience/creek_07.ogg', 2 SECONDS, 10),
 		SOUND_LOOP_ENTRY('sound/f13ambience/creek_08.ogg', 2 SECONDS, 10),
 		)
+
+/datum/looping_sound/ambient/kf/forestmusic
+	chance = 80
+	vary = FALSE
+	volume = SOUND_LOOP_VOL_RANGE(40, 70)
+	direct = TRUE
+	loop_delay = 1 MINUTES
+	mid_sounds = list(
+		SOUND_LOOP_ENTRY('modular_coyote/sound/kfmusic/kf-ambimusic-1.ogg', 130 SECONDS, 1),
+		SOUND_LOOP_ENTRY('modular_coyote/sound/kfmusic/kf-ambimusic-2.ogg', 130 SECONDS, 1),
+
+	)

code/game/area/areas.dm

@@ -16,7 +16,7 @@ GLOBAL_LIST_INIT(area_weather_list, list(WEATHER_ALL))
 	plane = BLACKNESS_PLANE //Keeping this on the default plane, GAME_PLANE, will make area overlays fail to render on FLOOR_PLANE.
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	invisibility = INVISIBILITY_LIGHTING
-
+	alpha = 50
 	var/safe_town
 
 	/// Set in New(); preserves the name set by the map maker, even if renamed by the Blueprints.
@@ -46,7 +46,7 @@ GLOBAL_LIST_INIT(area_weather_list, list(WEATHER_ALL))
 	var/considered_hull_exterior = FALSE
 
 	var/fire = null
-	var/atmos = TRUE
+	var/atmos = FALSE
 	var/atmosalm = FALSE
 	var/poweralm = TRUE
 	var/lightswitch = TRUE
@@ -55,7 +55,7 @@ GLOBAL_LIST_INIT(area_weather_list, list(WEATHER_ALL))
 	var/beauty = 0 // Beauty average per open turf in the area
 	var/beauty_threshold = 150 //If a room is too big it doesn't have beauty.
 
-	var/requires_power = TRUE
+	var/requires_power = FALSE
 	/// This gets overridden to 1 for space in area/Initialize().
 	var/always_unpowered = FALSE
 

code/game/area/kf_areas.dm

@@ -0,0 +1,47 @@
+/area/kf	
+	name = "knottingham base area"
+	icon = 'icons/turf/areas.dmi'
+	icon_state = "kfbase"
+	color = "#FFFFFF" 
+	has_gravity = STANDARD_GRAVITY
+	dynamic_lighting = DYNAMIC_LIGHTING_FORCED
+
+/area/kf/knottinghamtown
+	name = "Knottingham Town"
+	color = "#CCAA00"
+	ambience_area = list()
+	outdoors = 1
+	open_space = 1
+	blob_allowed = 0
+	environment = 16
+	weather_tags = list(WEATHER_SAFE)
+	ambientmusic = list()
+
+/area/kf/knottinghamforest
+	name = "Knottingham Forest"
+	color = "#009900"
+	ambience_area = list(
+		/datum/looping_sound/ambient/critters,
+		/datum/looping_sound/ambient/swamp,
+		/datum/looping_sound/ambient/critters/birds,
+		/datum/looping_sound/ambient/critters/birds/two/birdharder,
+		/datum/looping_sound/ambient/critters/birds/crow,
+		/datum/looping_sound/ambient/forest,
+		/datum/looping_sound/ambient/kf/forestmusic
+						)
+	outdoors = 1
+	open_space = 1
+	blob_allowed = 0
+	environment = 15
+	weather_tags = list(WEATHER_SAFE)
+	ambientmusic = list()
+
+/area/kf/knottinghamdungeon
+	name = "Dungeon Level 0"
+	color = "#800080"
+	name = "Knottingham Town"
+	color = "#CCAA00"
+	ambience_area = list()
+	blob_allowed = 0
+	environment = 8
+	ambientmusic = list()

fortune13.dme

@@ -829,6 +829,7 @@
 #include "code\game\world.dm"
 #include "code\game\area\ai_monitored.dm"
 #include "code\game\area\areas.dm"
+#include "code\game\area\kf_areas.dm"
 #include "code\game\area\Space_Station_13_areas.dm"
 #include "code\game\area\areas\away_content.dm"
 #include "code\game\area\areas\centcom.dm"