-Moved engineering and bridge delivery chutes as windoors are now breakable

-Fitness equipment moved into closets
-Added a couple more syndicate shuttle spawn locations

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3697 316c924e-a436-60f5-8080-3fe189b3f50e

code/defines/area/Space Station 13 areas.dm

@@ -455,6 +455,14 @@ proc/process_ghost_teleport_locs()
 	name = "Syndicate Station Location 4"
 	icon_state = "green"
 
+/area/syndicate_station/five
+	name = "Syndicate Station Location 5"
+	icon_state = "green"
+
+/area/syndicate_station/six
+	name = "Syndicate Station Location 6"
+	icon_state = "green"
+
 /area/wizard_station
 	name = "Wizard's Den"
 	icon_state = "yellow"

code/defines/obj/closet.dm

@@ -103,6 +103,32 @@
 	icon_state = "blue"
 	icon_closed = "blue"
 
+/obj/structure/closet/boxinggloves
+	name = "boxing gloves"
+	desc = "It's a storage unit for gloves for use in the boxing ring."
+
+/obj/structure/closet/masks
+	name = "mask closet"
+	desc = "IT'S A STORAGE UNIT FOR FIGHTER MASKS OLE!."
+
+/obj/structure/closet/lasertag/red
+	name = "red laser tag equipment"
+	desc = "It's a storage unit for laser tag equipment."
+	icon_state = "red"
+	icon_closed = "red"
+
+/obj/structure/closet/lasertag/blue
+	name = "blue laser tag equipment"
+	desc = "It's a storage unit for laser tag equipment."
+	icon_state = "blue"
+	icon_closed = "blue"
+
+/obj/structure/closet/athletic_mixed
+	name = "athletic wardrobe"
+	desc = "It's a storage unit for athletic wear."
+	icon_state = "mixed"
+	icon_closed = "mixed"
+
 /obj/structure/closet/coffin
 	name = "coffin"
 	desc = "It's a burial receptacle for the dearly departed."

code/game/syndicate_shuttle.dm

@@ -26,7 +26,7 @@ var/bomb_set = 1
 	var/syndicate_break = 0
 
 /proc/syndicate_begin()
-	switch(rand(1,4))
+	switch(rand(1,6))
 		if(1)
 			syndicate_loc = locate(/area/syndicate_station/one)
 		if(2)
@@ -35,6 +35,10 @@ var/bomb_set = 1
 			syndicate_loc = locate(/area/syndicate_station/three)
 		if(4)
 			syndicate_loc = locate(/area/syndicate_station/four)
+		if(5)
+			syndicate_loc = locate(/area/syndicate_station/five)
+		if(6)
+			syndicate_loc = locate(/area/syndicate_station/six)
 
 /proc/syndicate_process()
 	while(syndicate_station_time - world.timeofday > 0)

tgstation.dme

@@ -622,6 +622,7 @@
 #include "code\game\objects\closets\extinguisher.dm"
 #include "code\game\objects\closets\fireaxe.dm"
 #include "code\game\objects\closets\firecloset.dm"
+#include "code\game\objects\closets\fitnesscloset.dm"
 #include "code\game\objects\closets\gimmick.dm"
 #include "code\game\objects\closets\gmcloset.dm"
 #include "code\game\objects\closets\janitor.dm"