Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23

# Conflicts:
#	code/game/jobs/job_controller.dm
#	code/game/machinery/oxygen_pump.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/organs/internal/eyes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme

code/game/objects/items/stacks/rods.dm

@@ -61,8 +61,7 @@ var/global/list/datum/stack_recipe/rods_recipes = list( \
 		return
 
 	if (istype(W, /obj/item/weapon/tape_roll))
-		var/obj/item/stack/medical/splint/ghetto/new_splint = new(user.loc)
-		new_splint.loc = src.loc
+		var/obj/item/stack/medical/splint/ghetto/new_splint = new(get_turf(user))
 		new_splint.add_fingerprint(user)
 
 		user.visible_message("<span class='notice'>\The [user] constructs \a [new_splint] out of a [singular_name].</span>", \

code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm

@@ -8,13 +8,17 @@
 	name = "stack of wood"
 	type_to_spawn = /obj/item/stack/tile/wood
 
+/obj/fiftyspawner/wood/sif
+	name = "stack of alien wood"
+	type_to_spawn = /obj/item/stack/tile/sifwood
+
 /obj/fiftyspawner/carpet
 	name = "stack of carpet"
 	type_to_spawn = /obj/item/stack/tile/carpet
 
-/obj/fiftyspawner/bluecarpet
-	name = "stack of blue carpet"
-	type_to_spawn = /obj/item/stack/tile/carpet/blue
+/obj/fiftyspawner/tealcarpet
+	name = "stack of teal carpet"
+	type_to_spawn = /obj/item/stack/tile/carpet/teal
 
 /obj/fiftyspawner/floor
 	name = "stack of floor tiles"

code/game/objects/items/stacks/tiles/tile_types.dm

@@ -55,9 +55,24 @@
 	flags = 0
 	no_variants = FALSE
 
+/obj/item/stack/tile/sifwood
+	name = "alien wood tile"
+	singular_name = "alien wood tile"
+	desc = "An easy to fit wooden floor tile. It's blue!"
+	icon_state = "tile-sifwood"
+	force = 1.0
+	throwforce = 1.0
+	throw_speed = 5
+	throw_range = 20
+	flags = 0
+	no_variants = FALSE
+
 /obj/item/stack/tile/wood/fifty
 	amount = 50
 
+/obj/item/stack/tile/sifwood/fifty
+	amount = 50
+
 /obj/item/stack/tile/wood/cyborg
 	name = "wood floor tile synthesizer"
 	desc = "A device that makes wood floor tiles."
@@ -81,11 +96,11 @@
 	flags = 0
 	no_variants = FALSE
 
-/obj/item/stack/tile/carpet/blue
-	name = "blue carpet"
-	singular_name = "blue carpet"
-	desc = "A piece of blue carpet. It is the same size as a normal floor tile!"
-	icon_state = "tile-bluecarpet"
+/obj/item/stack/tile/carpet/teal
+	name = "teal carpet"
+	singular_name = "teal carpet"
+	desc = "A piece of teal carpet. It is the same size as a normal floor tile!"
+	icon_state = "tile-tealcarpet"
 	no_variants = FALSE
 
 /obj/item/stack/tile/carpet/bcarpet
@@ -106,7 +121,7 @@
 /obj/item/stack/tile/floor
 	name = "floor tile"
 	singular_name = "floor tile"
-	desc = "Those could work as a pretty decent throwing weapon" //why?
+	desc = "A metal tile fit for covering a section of floor."
 	icon_state = "tile"
 	force = 6.0
 	matter = list(DEFAULT_WALL_MATERIAL = SHEET_MATERIAL_AMOUNT / 4)