Updated Vermin Infestation

code/modules/events/infestation.dm

@@ -3,10 +3,12 @@
 #define LOC_CHAPEL 2
 #define LOC_LIBRARY 3
 #define LOC_HYDRO 4
-#define LOC_VAULT 5
-#define LOC_CONSTR 6
-#define LOC_TECH 7
-#define LOC_GARDEN 8
+#define LOC_CONSTR 5
+#define LOC_TECH 6
+#define LOC_GARDEN 7
+#define LOC_STEMNGR 8
+#define LOC_RESEARCH 9
+#define LOC_TRIAGE 10
 
 #define VERM_MICE 0
 #define VERM_LIZARDS 1
@@ -22,7 +24,7 @@
 
 /datum/event/infestation/start()
 
-	location = rand(0,8)
+	location = rand(0,10)
 	var/list/turf/simulated/floor/turfs = list()
 	var/spawn_area_type
 	switch(location)
@@ -41,9 +43,6 @@
 		if(LOC_HYDRO)
 			spawn_area_type = /area/hydroponics
 			locstring = "hydroponics"
-		if(LOC_VAULT)
-			spawn_area_type = /area/security/nuke_storage
-			locstring = "the vault"
 		if(LOC_CONSTR)
 			spawn_area_type = /area/construction
 			locstring = "the construction area"
@@ -53,6 +52,15 @@
 		if(LOC_GARDEN)
 			spawn_area_type = /area/hydroponics/garden
 			locstring = "the public garden"
+		if(LOC_STEMNGR)
+			spawn_area_type = /area/crew_quarters/captain
+			locstring = "the site manager's office"
+		if(LOC_RESEARCH)
+			spawn_area_type = /area/rnd/research
+			locstring = "the research division"
+		if(LOC_TRIAGE)
+			spawn_area_type = /area/tether/surfacebase/medical/triage
+			locstring = "triage"
 
 	for(var/areapath in typesof(spawn_area_type))
 		var/area/A = locate(areapath)
@@ -109,6 +117,9 @@
 #undef LOC_VAULT
 #undef LOC_TECH
 #undef LOC_GARDEN
+#undef LOC_STEMNGR
+#undef LOC_RESEARCH
+#undef LOC_TRIAGE
 
 #undef VERM_MICE
 #undef VERM_LIZARDS