Merge pull request #5 from ZomgPonies/master

Downstream update

code/game/machinery/teleporter.dm

@@ -113,8 +113,11 @@
 		var/turf/T = get_turf(R)
 		if (!T)
 			continue
-		if(T.z == 2 || T.z > 7)
-			continue
+		if(T.z == 2 || T.z > 6)
+			if (T.z == 7 & src.emagged == 1)
+				// This should be empty, allows for it to continue if the z-level is 7 and the machine.
+			else
+				continue
 		var/tmpname = T.loc.name
 		if(areaindex[tmpname])
 			tmpname = "[tmpname] ([++areaindex[tmpname]])"
@@ -401,3 +404,14 @@
 
 /atom/proc/laserhit(L as obj)
 	return 1
+
+
+/obj/machinery/computer/teleporter/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 Teleporter's circuits. 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/game/objects/items/weapons/teleportation.dm

@@ -137,7 +137,7 @@ Frequency:
 
 /obj/item/weapon/hand_tele/attack_self(mob/user as mob)
 	var/turf/current_location = get_turf(user)//What turf is the user on?
-	if(!current_location||current_location.z==2||current_location.z>=7)//If turf was not found or they're on z level 2 or >7 which does not currently exist.
+	if(!current_location||current_location.z==2||current_location.z>=8)//If turf was not found or they're on z level 2 or >8 which does not currently exist.
 		user << "<span class='notice'>\The [src] is malfunctioning.</span>"
 		return
 	var/list/L = list(  )

code/game/turfs/space/space.dm

@@ -81,7 +81,7 @@
 
 		// Okay, so let's make it so that people can travel z levels but not nuke disks!
 		// if(ticker.mode.name == "nuclear emergency")	return
-		if(A.z > 6) return
+		if(A.z > MAX_Z) return // For "Unenterable" z levels, they have their own entrance/exit code, eg: Away missions
 		if (A.x <= TRANSITIONEDGE || A.x >= (world.maxx - TRANSITIONEDGE - 1) || A.y <= TRANSITIONEDGE || A.y >= (world.maxy - TRANSITIONEDGE - 1))
 			if(istype(A, /obj/effect/meteor)||istype(A, /obj/effect/space_dust))
 				del(A)

code/modules/clothing/masks/miscellaneous.dm

@@ -143,3 +143,11 @@
 	item_state = "fawkes"
 	flags_inv = HIDEFACE
 	w_class = 2
+
+/obj/item/clothing/mask/gas/clown_hat/pennywise
+	name = "Pennywise Mask"
+	desc = "It's the eater of worlds, and of children."
+	icon_state = "pennywise_mask"
+	item_state = "pennywise_mask"
+	species_fit = list("Vox")
+	flags = FPRINT | TABLEPASS | MASKCOVERSMOUTH | MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS | BLOCKHAIR

code/modules/clothing/under/miscellaneous.dm

@@ -518,3 +518,11 @@
 	icon_state = "soldieruniform"
 	_color = "soldieruniform"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
+
+/obj/item/clothing/under/sexyclown
+	name = "sexy-clown suit"
+	desc = "It makes you look HONKable!"
+	icon_state = "pennywise"
+	item_state = "pennywise"
+	_color = "pennywise"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO

code/modules/mob/living/simple_animal/friendly/cat.dm

@@ -76,3 +76,13 @@
 	icon_living = "kitten"
 	icon_dead = "kitten_dead"
 	gender = NEUTER
+
+/mob/living/simple_animal/cat/Syndi
+	name = "SyndiCat"
+	desc = "It's a SyndiCat droid."
+	icon_state = "Syndicat"
+	icon_living = "Syndicat"
+	icon_dead = "Syndicat_dead"
+	gender = FEMALE
+	var/turns_since_scan = 0
+	var/mob/living/simple_animal/mouse/movement_target

code/modules/mob/mob.dm

@@ -109,14 +109,17 @@
 	//	equip_to_slot_if_possible(W, slot)
 
 	if(istype(W))
-
-		if(W:rig_restrict_helmet)
-			src << "\red You must fasten the helmet to a hardsuit first. (Target the head)" // Stop eva helms equipping.
-		else
-			if(W:equip_time > 0)
-				delay_clothing_equip_to_slot_if_possible(W, slot)
+		if (istype(W, /obj/item/clothing))
+			var/obj/item/clothing/C = W
+			if(C.rig_restrict_helmet)
+				src << "\red You must fasten the helmet to a hardsuit first. (Target the head)" // Stop eva helms equipping.
 			else
-				equip_to_slot_if_possible(W, slot)
+				if(C.equip_time > 0)
+					delay_clothing_equip_to_slot_if_possible(C, slot)
+				else
+					equip_to_slot_if_possible(C, slot)
+		else
+			equip_to_slot_if_possible(W, slot)
 
 	if(ishuman(src) && W == src:head)
 		src:update_hair()

code/setup.dm

@@ -450,8 +450,8 @@ var/MAX_EXPLOSION_RANGE = 14
 #define GAS_CO2	(1 << 3)
 #define GAS_N2O	(1 << 4)
 
-
-var/list/accessable_z_levels = list("1" = 5, "3" = 10, "4" = 15, "5" = 10, "6" = 60, "7" = 0)
+#define MAX_Z	7 // Used in space.dm to defince which Z-levels cannot be exited via space.
+var/list/accessable_z_levels = list("1" = 5, "3" = 10, "4" = 15, "5" = 10, "6" = 60)
 //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).