Merge branch 'master' of https://github.com/VOREStation/VOREStation into gimmicktraits

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/blank_vr.dm

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

@@ -91,4 +91,15 @@
 	icon_override = 'icons/mob/back_vr.dmi'
 	item_state = "robustsaddle"
 	icon_state = "robustsaddle"
-	icon_base = "robustsaddle"
+	icon_base = "robustsaddle"
+
+/obj/item/weapon/storage/backpack/saddlebag_common/vest //Shared bag for other taurs with sturdy backs
+	name = "Taur Duty Vest"
+	desc = "An armored vest with the armor modules replaced with various handy compartments with decent storage capacity. Useless for protection though."
+	icon = 'icons/obj/storage_vr.dmi'
+	icon_override = 'icons/mob/back_vr.dmi'
+	item_state = "taurvest"
+	icon_state = "taurvest"
+	icon_base = "taurvest"
+	max_storage_space = INVENTORY_STANDARD_SPACE
+	slowdown = 0

code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm

@@ -50,6 +50,11 @@
     path = /obj/item/weapon/storage/backpack/saddlebag_common/robust
     slot = slot_back
 
+/datum/gear/accessory/saddlebag_common/vest
+    display_name = "Taur Duty Vest (backpack)"
+    path = /obj/item/weapon/storage/backpack/saddlebag_common/vest
+    slot = slot_back
+
 /datum/gear/accessory/khcrystal
 	display_name = "KH Life Crystal"
 	path = /obj/item/weapon/storage/box/khcrystal

code/modules/events/ion_storm.dm

@@ -1,7 +1,7 @@
 //This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04
 
 /datum/event/ionstorm
-	var/botEmagChance = 0.5
+	var/botEmagChance = 0 //VOREStation Edit
 	var/list/players = list()
 
 /datum/event/ionstorm/announce()

code/modules/mob/living/carbon/human/species/station/blank_vr.dm

@@ -6,6 +6,7 @@
 	var/hard_vore_enabled = 0 //Determines if the person has the hardvore verb or not.
 	var/metabolism = 0.0015
 	var/can_fly = 0 //Determines if the species can fly if they have wings.
+	var/lightweight = 0 //Oof! Nonhelpful bump stumbles.
 	var/trashcan = 0 //It's always sunny in the wrestling ring.
 
 /datum/species/custom

code/modules/mob/living/carbon/human/species/station/station_vr.dm

@@ -386,3 +386,6 @@ datum/species/harpy
 		"You feel uncomfortably warm.",
 		"Your overheated skin itches."
 		)
+
+/datum/species/human/vatgrown
+	spawn_flags = SPECIES_IS_RESTRICTED

code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm

@@ -35,7 +35,7 @@
 /datum/trait/endurance_very_low
 	name = "Extremely Low Endurance"
 	desc = "Reduces your maximum total hitpoints to 50."
-	cost = -3 //Teshari HP. This makes the person a lot more suseptable to getting stunned, killed, etc. 
+	cost = -3 //Teshari HP. This makes the person a lot more suseptable to getting stunned, killed, etc.
 	var_changes = list("total_health" = 50)
 
 	apply(var/datum/species/S,var/mob/living/carbon/human/H)
@@ -95,3 +95,9 @@
 	desc = "Increases stun duration from flashes and other light-based stuns."
 	cost = -1
 	var_changes = list("flash_mod" = 2.0)
+
+/datum/trait/lightweight
+	name = "Lightweight"
+	desc = "Your light weight and poor balance make you very susceptible to unhelpful bumping. Think of it like a bowling ball versus a pin."
+	cost = -4
+	var_changes = list("lightweight" = 1)

code/modules/mob/living/living.dm

@@ -120,6 +120,14 @@ default behaviour is:
 			// VOREStation Edit - Begin
 			// Handle grabbing, stomping, and such of micros!
 			if(handle_micro_bump_other(tmob)) return
+			// Plow that nerd.
+			if(ishuman(tmob))
+				var/mob/living/carbon/human/H = tmob
+				if(H.species.lightweight == 1 && prob(50))
+					H.visible_message("<span class='warning'>[src] bumps into [H], knocking them off balance!</span>")
+					H.Weaken(20)
+					now_pushing = 0
+					return
 			// VOREStation Edit - End
 
 			if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))