Merge branch 'master' of git://github.com/Abi79/tgstation13-git

Conflicts:
	baystation12.dme
	code/defines/obj/vending.dm
	code/game/machinery/vending.dm
	html/changelog.html
	maps/tgstation.2.0.8.dmm

code/defines/mob/living/carbon/alien.dm

@@ -6,7 +6,7 @@
 	icon = 'alien.dmi'
 	gender = NEUTER
 
-	toxloss = 250
+	var/storedPlasma = 250
 	var/alien_invis = 0.0
 	var/max_plasma = 500
 

code/defines/mob/living/carbon/alien_humanoid.dm

@@ -22,7 +22,7 @@
 	name = "alien hunter"
 
 	health = 150
-	toxloss = 100
+	storedPlasma = 100
 	max_plasma = 150
 	icon_state = "alien_s"
 
@@ -30,7 +30,7 @@
 	name = "alien sentinel"
 
 	health = 125
-	toxloss = 100
+	storedPlasma = 100
 	max_plasma = 250
 	icon_state = "alien_s"
 

code/defines/obj.dm

@@ -1068,9 +1068,9 @@
 	flags = FPRINT | TABLEPASS | CONDUCT
 
 /obj/item/stack/sheet/r_metal
-	name = "reinforced metal"
-	singular_name = "reinforced metal sheet"
-	desc = "A very heavy sheet of metal."
+	name = "steel"
+	singular_name = "steel sheet"
+	desc = "This sheet is an alloy of iron and plasma."
 	icon_state = "sheet-r_metal"
 	item_state = "sheet-metal"
 	m_amt = 7500
@@ -1079,8 +1079,8 @@
 	origin_tech = "materials=2"
 
 /obj/item/stack/tile/steel
-	name = "Steel floor tile"
-	singular_name = "S	teel floor tile"
+	name = "Metal floor tile"
+	singular_name = "Steel floor tile"
 	desc = "Those could work as a pretty decent throwing weapon"
 	icon_state = "tile"
 	w_class = 3.0

code/defines/obj/hydro.dm

@@ -1093,6 +1093,7 @@
 		reagents.add_reagent("coco", 4+round((potency / 5), 1))
 		bitesize = 1+round(reagents.total_volume / 2, 1)
 
+//This object is just a transition object. All it does is make a grass tile and delete itself.
 /obj/item/weapon/reagent_containers/food/snacks/grown/grass
 	seed = "/obj/item/seeds/grassseed"
 	name = "Grass"
@@ -1100,8 +1101,8 @@
 	icon_state = "grass"
 	potency = 20
 	New()
-		..()
-		reagents.add_reagent("nutriment", round((potency / 20), 1))
+		new/obj/item/stack/tile/grass(src.loc)
+		del(src)
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/sugarcane
 	seed = "/obj/item/seeds/sugarcaneseed"

code/defines/obj/vending.dm

@@ -185,6 +185,8 @@
 	product_slogans = "THIS'S WHERE TH' SEEDS LIVE! GIT YOU SOME!;Hands down the best seed selection on the station!;Also certain mushroom varieties available, more for experts! Get certified today!"
 	product_hidden = "/obj/item/seeds/amanitamycelium;/obj/item/seeds/glowshroom;/obj/item/seeds/libertymycelium;/obj/item/seeds/nettleseed;/obj/item/seeds/plumpmycelium"
 	product_hideamt = "2;2;2;2;2"
+	product_coin = "/obj/item/toy/waterflower"
+	product_coin_amt = "1"
 	charge_type = "hydroponics"
 
 /obj/machinery/vending/magivend

code/defines/obj/weapon.dm

@@ -524,6 +524,18 @@
 	throw_range = 10
 	origin_tech = "combat=3;materials=3;engineering=3"
 
+/obj/item/weapon/pepperspray
+	desc = "Manufactred by UhangInc., used to blind and down an opponent quickly."
+	icon = 'weapons.dmi'
+	name = "pepperspray"
+	icon_state = "pepperspray"
+	item_state = "pepperspray"
+	flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
+	throwforce = 3
+	w_class = 2.0
+	throw_speed = 2
+	throw_range = 10
+
 /obj/item/weapon/clipboard
 	name = "clipboard"
 	desc = "Apply paper to this to write better. Can also hold pens."

code/defines/turf.dm

@@ -102,6 +102,10 @@
 	name = "floor"
 	icon_state = "floor"
 
+/turf/simulated/shuttle/floor4 // Added this floor tile so that I have a seperate turf to check in the shuttle -- Polymorph
+	name = "Brig floor"        // Also added it into the 2x3 brig area of the shuttle.
+	icon_state = "floor4"
+
 /turf/unsimulated
 	intact = 1
 	name = "command"