Merge pull request #409 from Bone-White/master

Traitor Station added

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

@@ -1806,6 +1806,47 @@ var/list/ghostteleportlocs = list()
 	icon_state = "dancebar"
 
 
+//Traitor Station
+/area/traitor/rnd
+	name = "\improper Syndicate Research and Development"
+	icon_state = "syndie_rnd"
+
+/area/traitor/chem
+	name = "\improper Syndicate Chemistry"
+	icon_state = "syndie_chem"
+
+/area/traitor/tox
+	name = "\improper Syndicate Toxins"
+	icon_state = "syndie_tox"
+
+/area/traitor/atmos
+	name = "\improper Syndicate Atmos"
+	icon_state = "syndie_atmo"
+
+/area/traitor/inter
+	name = "\improper Syndicate Interrogation"
+	icon_state = "syndie_inter"
+
+/area/traitor/radio
+	name = "\improper Syndicate Eavesdropping Booth"
+	icon_state = "syndie_radio"
+
+/area/traitor/surgery
+	name = "\improper Syndicate Surgery Theatre"
+	icon_state = "syndie_surgery"
+
+/area/traitor/hall
+	name = "\improper Syndicate Station"
+	icon_state = "syndie_hall"
+
+/area/traitor/kitchen
+	name = "\improper Syndicate Kitchen"
+	icon_state = "syndie_kitchen"
+
+/area/traitor/empty
+	name = "\improper Syndicate Project Room"
+	icon_state = "syndie_empty"
+
 
 //AI
 

code/game/machinery/computer/telescience.dm

@@ -190,8 +190,11 @@
 		usr << "\red Error: Y is less than 11 or greater than 245."
 		fail = 1
 	if(z_co == 2 || z_co < 1 || z_co > 6)
-		usr << "\red Error: Z is less than 1, greater than 6, or equal to 2."
-		fail = 1
+		if (z_co == 7 & src.emagged == 1)
+		// This should be empty, allows for it to continue if the z-level is 7 and the machine is emagged.
+		else
+			usr << "\red Error: Z is less than 1, greater than [src.emagged ? "7" : "6"], or equal to 2."
+			fail = 1
 	if(istype(get_area(locate(x_co,y_co,z_co)), /area/security/armoury/gamma))
 		usr << "\red Error: Attempting to access telescience-protected area."
 		fail = 1
@@ -238,3 +241,13 @@
 		s.start()
 		usr << "\blue Calibration successful."
 		return
+
+/obj/machinery/computer/telescience/attackby(I as obj, user as mob)		//Emagging.
+	if(istype(I,/obj/item/weapon/card/emag))
+		if (src.emagged == 0)
+			user << "\blue You scramble the Telescience authentication key to an unknown signal, you should be able to teleport to more places now!"
+			src.emagged = 1
+		else
+			user << "\red The machine seems unaffected by the card swipe..."
+	else
+		return attack_hand(user)

code/modules/clothing/clothing.dm

@@ -7,42 +7,7 @@
 
 //BS12: Species-restricted clothing check.
 /obj/item/clothing/mob_can_equip(M as mob, slot)
-/*
-	if(istype(M,/mob/living/carbon/human))
-		var/mob/living/carbon/human/H = M
-		if(istype(src, /obj/item/clothing/head/helmet/space/rig)) // If the item to be equipped is a rigid suit helmet
-			if(istype(H.wear_suit, /obj/item/clothing/suit/space/rig)) // If the person is wearing a rigid suit
-				var/tempX = H.x
-				var/tempY = H.y
-				H << "\blue You start securing the [src] to your suit.  (This will take a while)."
-				var/obj/item/clothing/head/helmet/space/rig/this_helmet = src
-				var/equip_time = round(this_helmet.equip_time/10)
-				var/i
-				for(i=1; i<=equip_time; i++)
-					sleep (10) // Check if they've moved every 10 time units
-					if ((tempX != usr.x) || (tempY != usr.y))
-						H << "\red \The [src] is too fiddly to fasten whilst moving. \..."
-						return 0
-				H << "\blue \The [src] clicks into place, sealing the suit to be space-proof."
 
-			else
-				M << "\red \The [src] is too heavy too wear without a rigid suit to support it. \..."
-				return 0
-
-		if(istype(src, /obj/item/clothing/suit/space/rig)) // If the equipped item is a rigid suit
-			var/tempX = H.x
-			var/tempY = H.y
-			M << "\blue You start climbing into the [src] and fasten the seals."
-			var/obj/item/clothing/suit/space/rig/this_rig = src
-			var/equip_time = round(this_rig.equip_time/10)
-			var/i
-			for(i=1; i<=equip_time; i++)
-				sleep (10) // Check if they've moved every 10 time units
-				if ((tempX != usr.x) || (tempY != usr.y))
-					H << "\red \The [src] is too fiddly to fasten whilst moving. \..."
-					return 0
-			M << "\blue You have finished fastening the [src]'s seals."
-*/
 	//if we can equip the item anyway, don't bother with species_restricted (aslo cuts down on spam)
 	if (!..())
 		return 0

code/modules/mob/living/carbon/human/inventory.dm

@@ -9,6 +9,18 @@
 		if(!I)
 			H << "<span class='notice'>You are not holding anything to equip.</span>"
 			return
+
+		if(istype(I, /obj/item/clothing/head/helmet/space/rig)) // If the item to be equipped is a rigid suit helmet
+			src << "\red You must fasten the helmet to a hardsuit first. (Target the head)" // Stop eva helms equipping.
+			return 0
+
+
+		if(istype(I, /obj/item/clothing/suit/space/rig)) // If the item to be equipped is a rigid suit
+			var/obj/item/clothing/suit/space/rig/J = I
+			if(J.equip_time > 0)
+				delay_clothing_equip_to_slot_if_possible(J, 13)  // 13 = suit slot
+				return 0
+
 		if(H.equip_to_appropriate_slot(I))
 			if(hand)
 				update_inv_l_hand(0)

code/setup.dm

@@ -451,7 +451,7 @@ var/MAX_EXPLOSION_RANGE = 14
 #define GAS_N2O	(1 << 4)
 
 
-var/list/accessable_z_levels = list("1" = 5, "3" = 10, "4" = 15, "5" = 10, "6" = 60)
+var/list/accessable_z_levels = list("1" = 5, "3" = 10, "4" = 15, "5" = 10, "6" = 60, "7" = 0)
 //This list contains the z-level numbers which can be accessed via space travel and the percentile chances to get there.
 //(Exceptions: extended, sandbox and nuke) -Errorage
 //Was list("3" = 30, "4" = 70).