Merge branch 'master' into master

code/game/objects/items/weapons/storage/backpack.dm

@@ -422,3 +422,10 @@
 			H.visible_message("<span class='notice'>\The [src] decides not to unpack \the [src]!</span>", \
 					"<span class='notice'>You decide not to unpack \the [src]!</span>")
 	return
+
+/obj/item/weapon/storage/backpack/satchel/ranger
+	name = "ranger satchel"
+	desc = "A satchel designed for the Go Go ERT Rangers series to allow for slightly bigger carry capacity for the ERT-Rangers.\
+	 Unlike the show claims, it is not a phoron-enhanced satchel of holding with plot-relevant content."
+	icon = 'icons/obj/clothing/ranger.dmi'
+	icon_state = "ranger_satchel"

code/game/objects/items/weapons/storage/belt.dm

@@ -435,3 +435,8 @@
  	icon_state = "fannypack_yellow"
  	item_state = "fannypack_yellow"
 
+/obj/item/weapon/storage/belt/ranger
+	name = "ranger belt"
+	desc = "The fancy utility-belt holding the tools, cuffs and gadgets of the Go Go ERT-Rangers. The belt buckle is not real phoron, but it is still surprisingly comfortable to wear."
+	icon = 'icons/obj/clothing/ranger.dmi'
+	icon_state = "ranger_belt"

code/modules/clothing/gloves/miscellaneous.dm

@@ -127,3 +127,35 @@
 	overgloves = 1
 	force = 5
 	punch_force = 5
+
+/obj/item/clothing/gloves/ranger
+	var/glovecolor = "white"
+	name = "ranger gloves"
+	desc = "The gloves of the Rangers are the least memorable part. They're not even insulated in the show, so children \
+	don't try and take apart a toaster with inadequate protection. They only serve to complete the fancy outfit."
+	icon = 'icons/obj/clothing/ranger.dmi'
+	icon_state = "ranger_gloves"
+
+/obj/item/clothing/gloves/ranger/Initialize()
+	. = ..()
+	if(icon_state == "ranger_gloves")
+		name = "[glovecolor] ranger gloves"
+		icon_state = "[glovecolor]_ranger_gloves"
+
+/obj/item/clothing/gloves/ranger/black
+	glovecolor = "black"
+
+/obj/item/clothing/gloves/ranger/pink
+	glovecolor = "pink"
+
+/obj/item/clothing/gloves/ranger/green
+	glovecolor = "green"
+
+/obj/item/clothing/gloves/ranger/cyan
+	glovecolor = "cyan"
+
+/obj/item/clothing/gloves/ranger/orange
+	glovecolor = "orange"
+
+/obj/item/clothing/gloves/ranger/yellow
+	glovecolor = "yellow"

code/modules/clothing/head/hardhat.dm

@@ -35,3 +35,37 @@
 /obj/item/clothing/head/hardhat/dblue
 	name = "blue hard hat"
 	icon_state = "hardhat0_dblue"
+
+/obj/item/clothing/head/hardhat/ranger
+	var/hatcolor = "white"
+	name = "ranger helmet"
+	desc = "A special helmet designed for the Go Go ERT-Rangers, able to withstand a pressureless environment, filter gas and provide air. It has thermal vision and sometimes \
+	mesons to find breaches, as well as an integrated radio... well, only in the show, of course. This one has none of those features- it just has a flashlight instead."
+	icon = 'icons/obj/clothing/ranger.dmi'
+	icon_state = "ranger_helmet"
+	light_overlay = "helmet_light"
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR
+
+/obj/item/clothing/head/hardhat/ranger/Initialize()
+	. = ..()
+	if(icon_state == "ranger_helmet")
+		name = "[hatcolor] ranger helmet"
+		icon_state = "[hatcolor]_ranger_helmet"
+
+/obj/item/clothing/head/hardhat/ranger/black
+	hatcolor = "black"
+
+/obj/item/clothing/head/hardhat/ranger/pink
+	hatcolor = "pink"
+
+/obj/item/clothing/head/hardhat/ranger/green
+	hatcolor = "green"
+
+/obj/item/clothing/head/hardhat/ranger/cyan
+	hatcolor = "cyan"
+
+/obj/item/clothing/head/hardhat/ranger/orange
+	hatcolor = "orange"
+
+/obj/item/clothing/head/hardhat/ranger/yellow
+	hatcolor = "yellow"

code/modules/clothing/shoes/miscellaneous.dm

@@ -155,3 +155,35 @@
 	force = 0
 	w_class = ITEMSIZE_SMALL
 	species_restricted = null
+
+/obj/item/clothing/shoes/boots/ranger
+	var/bootcolor = "white"
+	name = "ranger boots"
+	desc = "The Rangers special lightweight hybrid magboots-jetboots perfect for EVA. If only these functions were so easy to copy in reality.\
+	 These ones are just a well-made pair of boots in appropriate colours."
+	icon = 'icons/obj/clothing/ranger.dmi'
+	icon_state = "ranger_boots"
+
+/obj/item/clothing/shoes/boots/ranger/Initialize()
+	. = ..()
+	if(icon_state == "ranger_boots")
+		name = "[bootcolor] ranger boots"
+		icon_state = "[bootcolor]_ranger_boots"
+
+/obj/item/clothing/shoes/boots/ranger/black
+	bootcolor = "black"
+
+/obj/item/clothing/shoes/boots/ranger/pink
+	bootcolor = "pink"
+
+/obj/item/clothing/shoes/boots/ranger/green
+	bootcolor = "green"
+
+/obj/item/clothing/shoes/boots/ranger/cyan
+	bootcolor = "cyan"
+
+/obj/item/clothing/shoes/boots/ranger/orange
+	bootcolor = "orange"
+
+/obj/item/clothing/shoes/boots/ranger/yellow
+	bootcolor = "yellow"

code/modules/clothing/under/miscellaneous.dm

@@ -908,3 +908,40 @@
 	name = "hazard cohesion suit"
 	desc = "An orange cohesion suit with yellow hazard stripes intended to assist Prometheans in maintaining their form and prevent direct skin exposure."
 	icon_state = "cohesionsuit_hazard"
+
+//Uniforms
+//On-mob sprites go in icons\mob\uniform.dmi with the format "white_ranger_uniform_s" - with 'white' replaced with green, cyan, etc... of course! Note the _s - this is not optional.
+//Item sprites go in icons\obj\clothing\ranger.dmi with the format "white_ranger_uniform"
+/obj/item/clothing/under/color/ranger
+	var/unicolor = "white"
+	name = "ranger uniform"
+	desc = "Made from a space-proof fibre and tight fitting, this uniform usually gives the agile Rangers all kinds of protection while not inhibiting their movement. \
+	This costume is instead made from genuine cotton fibre and is based on the season three uniform."
+	icon = 'icons/obj/clothing/ranger.dmi'
+	icon_state = "ranger_uniform"
+	rolled_down = 0
+	rolled_sleeves = 0
+
+/obj/item/clothing/under/color/ranger/Initialize()
+	. = ..()
+	if(icon_state == "ranger_uniform") //allows for custom items
+		name = "[unicolor] ranger uniform"
+		icon_state = "[unicolor]_ranger_uniform"
+
+/obj/item/clothing/under/color/ranger/black
+	unicolor = "black"
+
+/obj/item/clothing/under/color/ranger/pink
+	unicolor = "pink"
+
+/obj/item/clothing/under/color/ranger/green
+	unicolor = "green"
+
+/obj/item/clothing/under/color/ranger/cyan
+	unicolor = "cyan"
+
+/obj/item/clothing/under/color/ranger/orange
+	unicolor = "orange"
+
+/obj/item/clothing/under/color/ranger/yellow
+	unicolor = "yellow"

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

@@ -158,7 +158,7 @@
 			. += turf_move_cost
 
 	// Wind makes it easier or harder to move, depending on if you're with or against the wind.
-	if(T.outdoors)
+	if(T.outdoors && (T.z <= SSplanets.z_to_planet.len))
 		var/datum/planet/P = SSplanets.z_to_planet[z]
 		if(P)
 			var/datum/weather_holder/WH = P.weather_holder

config/alienwhitelist.txt

@@ -22,6 +22,7 @@ killerdragn - Xenomorph Hybrid
 ktccd - Diona
 mewchild - Diona
 mewchild - Vox
+mrsebbi - Xenochimera
 natje - Xenochimera
 oreganovulgaris - Xenochimera
 paradoxspace - Xenochimera

maps/tether/submaps/aerostat/submaps/DoomP.dmm

@@ -18,10 +18,6 @@
 "af" = (
 /turf/simulated/floor/lava,
 /area/submap/virgo2/DoomP)
-"ag" = (
-/obj/structure/flora/tree/sif,
-/turf/simulated/floor/outdoors/rocks,
-/area/submap/virgo2/DoomP)
 "ah" = (
 /obj/random/landmine,
 /turf/simulated/mineral/floor/ignore_mapgen/virgo2,
@@ -47,20 +43,14 @@
 /obj/random/landmine,
 /turf/simulated/mineral/floor/ignore_mapgen/virgo2,
 /area/submap/virgo2/DoomP)
-"ap" = (
-/obj/structure/flora/tree/sif,
-/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
-/area/submap/virgo2/DoomP)
 "aq" = (
 /obj/machinery/light/small,
 /turf/simulated/mineral/floor/ignore_mapgen/virgo2,
 /area/submap/virgo2/DoomP)
-"ar" = (
-/mob/living/simple_mob/mechanical/mecha/combat/gygax/dark/advanced,
-/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
-/area/submap/virgo2/DoomP)
 "as" = (
-/obj/machinery/porta_turret/poi,
+/obj/machinery/porta_turret/poi{
+	faction = "syndicate"
+	},
 /turf/simulated/floor/plating,
 /area/submap/virgo2/DoomP)
 "at" = (
@@ -273,10 +263,6 @@
 /mob/living/simple_mob/humanoid/merc/melee/sword/space,
 /turf/simulated/floor/tiled,
 /area/submap/virgo2/DoomP)
-"aY" = (
-/obj/structure/lattice,
-/turf/simulated/floor/lava,
-/area/submap/virgo2/DoomP)
 "aZ" = (
 /obj/machinery/vending/cola,
 /obj/effect/floor_decal/borderfloor/corner{
@@ -352,6 +338,7 @@
 "bn" = (
 /obj/structure/table/standard,
 /obj/item/weapon/storage/box/syndie_kit/spy,
+/obj/item/weapon/card/id/syndicate,
 /turf/simulated/floor/tiled/techfloor,
 /area/submap/virgo2/DoomP)
 "bo" = (
@@ -368,6 +355,8 @@
 /obj/structure/table/rack,
 /obj/item/weapon/cell/device/weapon,
 /obj/item/weapon/cell/device/weapon,
+/obj/item/weapon/cell/device/weapon,
+/obj/item/weapon/cell/device/weapon,
 /turf/simulated/floor/tiled/techfloor,
 /area/submap/virgo2/DoomP)
 "br" = (
@@ -542,6 +531,19 @@
 /obj/machinery/crystal/lava,
 /turf/simulated/mineral/floor/ignore_mapgen/virgo2,
 /area/submap/virgo2/DoomP)
+"mi" = (
+/obj/structure/barricade,
+/turf/simulated/floor/outdoors/rocks,
+/area/submap/virgo2/DoomP)
+"El" = (
+/obj/structure/barricade,
+/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
+/area/submap/virgo2/DoomP)
+"Hh" = (
+/obj/effect/floor_decal/industrial/warning,
+/mob/living/simple_mob/mechanical/mecha/combat/gygax/dark/advanced,
+/turf/simulated/floor/plating,
+/area/submap/virgo2/DoomP)
 
 (1,1,1) = {"
 aa
@@ -656,7 +658,7 @@ ac
 ac
 ac
 ab
-ag
+ac
 ac
 ac
 ac
@@ -1089,7 +1091,7 @@ ac
 aL
 af
 af
-aY
+bM
 af
 af
 af
@@ -1406,7 +1408,7 @@ af
 af
 ac
 ad
-ap
+ad
 ad
 ad
 ad
@@ -1548,7 +1550,7 @@ af
 ac
 ad
 ad
-ap
+ad
 ad
 ad
 ad
@@ -1599,11 +1601,11 @@ ad
 ad
 ad
 ad
-ar
-av
+ad
+Hh
 aw
 aD
-aX
+aP
 ba
 aP
 at
@@ -1734,10 +1736,10 @@ af
 af
 af
 af
-ac
-ad
-ah
-ad
+mi
+El
+El
+El
 ad
 ad
 aq
@@ -1784,7 +1786,7 @@ ac
 ac
 ad
 ad
-ad
+El
 ad
 ad
 ad
@@ -1829,9 +1831,9 @@ af
 ac
 am
 ad
+ah
 ad
-ad
-ad
+El
 ad
 ad
 ad
@@ -1878,7 +1880,7 @@ ad
 ad
 ad
 ad
-ac
+mi
 ad
 ad
 ad
@@ -1925,7 +1927,7 @@ ai
 ac
 ac
 am
-ac
+mi
 ac
 ad
 ad
@@ -1968,7 +1970,7 @@ ac
 ac
 ah
 ad
-ac
+am
 ac
 af
 af
@@ -2167,10 +2169,10 @@ af
 af
 af
 af
-aY
+bM
 af
 af
-aY
+bM
 af
 af
 af

maps/tether/submaps/underdark_pois/puzzle_corridor.dmm

@@ -9,61 +9,74 @@
 /obj/tether_away_spawner/underdark_normal,
 /turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
 /area/mine/explored/underdark)
-"d" = (
-/turf/template_noop,
-/area/mine/explored/underdark)
 
 (1,1,1) = {"
-d
-d
-d
 b
-a
+b
+b
+b
+b
 a
 b
 a
 b
 a
 b
-d
-d
-d
+b
+b
+b
 "}
 (2,1,1) = {"
 b
 b
 b
-a
+b
 a
 a
 b
 a
 b
 a
-c
+b
 b
 b
 b
 "}
 (3,1,1) = {"
-a
-a
+b
+b
+b
 a
 a
 a
 b
 a
-a
-b
-b
-b
 b
 a
-a
+c
+b
+b
+b
 "}
 (4,1,1) = {"
 a
 a
+a
+a
+a
+b
+a
+a
+b
+b
+b
+b
+a
+a
+"}
+(5,1,1) = {"
+a
+a
 b
 a
 b
@@ -77,7 +90,7 @@ a
 a
 a
 "}
-(5,1,1) = {"
+(6,1,1) = {"
 b
 b
 b
@@ -93,9 +106,9 @@ b
 b
 b
 "}
-(6,1,1) = {"
-d
-d
+(7,1,1) = {"
+b
+b
 b
 a
 a
@@ -106,6 +119,22 @@ a
 b
 a
 b
-d
-d
+b
+b
+"}
+(8,1,1) = {"
+b
+b
+b
+b
+a
+b
+b
+a
+b
+b
+b
+b
+b
+b
 "}