Merge pull request StoneAndStar#9 from fallout-13/Testing2

The Death of Steel.

Author: SeeminglyTypicalUsername

_maps/map_files/Pahrump/Pahrump-Above-3.dmm

@@ -115,6 +115,8 @@ also be like that but I can't be arsed to go back and change them all*/
 #define ACCESS_COTC			145 //General Church
 #define ACCESS_COTC_ARMORY	146 //Church Armory
 #define ACCESS_COTC_SECRET	147 //Church Special Rooms
+#define ACCESS_CENTVAULT	148 //Legion treasury
+#define ACCESS_CAPVAULT		149 //NCR treasury
 
 
 	//The Syndicate

_maps/map_files/Pahrump/Pahrump-Surface-2.dmm

@@ -295,7 +295,7 @@ GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi'))
 #define MAP_MAXZ 6
 
 // Defib stats
-#define DEFIB_TIME_LIMIT 1500
+#define DEFIB_TIME_LIMIT 300
 #define DEFIB_TIME_LOSS 60
 
 // Diagonal movement

_maps/map_files/Pahrump/Pahrump-Underground-1.dmm

@@ -351,7 +351,7 @@
 #define HIDE_OFFLINE_INDICATOR (1<<0)
 
 //Respawn timer
-#define RESPAWN_TIMER 3000
+#define RESPAWN_TIMER 300
 
 ///Define for spawning megafauna instead of a mob for cave gen
 #define SPAWN_MEGAFAUNA "bluh bluh huge boss"

_maps/map_files/ravine/ravine.dmm

@@ -81,3 +81,5 @@
 	'sound/f13ambience/music/invisible_ghosts_ambience.ogg',\
 	'sound/f13ambience/music/mole_miners_ambience.ogg',\
 	'sound/f13ambience/music/portaltothepast_ambience.ogg','sound/f13ambience/music/wind_and_the_reeds_ambience.ogg')
+
+#define COTC_AMBIENCE list('sound/f13ambience/cotc.ogg','sound/f13ambience/cotc2.ogg')

code/__DEFINES/access.dm

@@ -82,7 +82,7 @@
 
 /// Minimum time before a game-ending vote can be started by players.
 /datum/config_entry/number/min_end_vote_time
-	config_entry_value = 150 MINUTES
+	config_entry_value = 60 MINUTES
 	min_val = 0
 
 /datum/config_entry/number/vote_delay	// minimum time between voting sessions (deciseconds, 10 minute default)

code/__DEFINES/misc.dm

@@ -562,7 +562,7 @@ obj/effect/landmark/start/f13/ncrlogisticsofficer
 	icon_state = "NCR Trooper"
 
 /obj/effect/landmark/start/f13/ncrcombatengineer
-	name = "NCR Combat Engineer"
+	name = "NCR Specialist"
 	icon_state = "NCR Trooper"
 
 /obj/effect/landmark/start/f13/ncrcombatmedic