Merge pull request #2469 from Verkister/gimmicktraits

Adds 2 gimmick traits and borgo feeding.

code/game/objects/items/trash_vr.dm

@@ -0,0 +1,33 @@
+// Custom garbage or whatever
+
+/obj/item/trash/rkibble
+	name = "bowl of Borg-O's"
+	desc = "Contains every type of scrap material your robot puppy needs to grow big and strong."
+	icon = 'icons/mob/dogborg_vr.dmi'
+	icon_state = "kibble"
+
+/obj/item/trash/attack(mob/living/M as mob, mob/living/user as mob)
+	if(ishuman(M))
+		var/mob/living/carbon/human/H = M
+		if(H.species.trashcan == 1)
+			playsound(H.loc,'sound/items/eatfood.ogg', rand(10,50), 1)
+			user.drop_item()
+			var/belly = H.vore_selected
+			var/datum/belly/selected = H.vore_organs[belly]
+			src.forceMove(H)
+			selected.internal_contents += src
+			to_chat(H, "<span class='notice'>You can taste the flavor of garbage. Wait what?</span>")
+			return
+
+	if(isrobot(M))
+		var/mob/living/silicon/robot/R = M
+		if(R.module.type == /obj/item/weapon/robot_module/scrubpup) // You can now feed the trash borg yay.
+			playsound(R.loc,'sound/items/eatfood.ogg', rand(10,50), 1)
+			user.drop_item()
+			var/belly = R.vore_selected
+			var/datum/belly/selected = R.vore_organs[belly]
+			src.forceMove(R)
+			selected.internal_contents += src // Too many hoops and obstacles to stick it into the sleeper module.
+			R.visible_message("<span class='warning'>[user] feeds [R] with [src]!</span>")
+			return
+	..()

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

@@ -7,6 +7,7 @@
 	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
 	name = "Custom Species"

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

@@ -81,4 +81,10 @@
 	name = "Brutal Predation"
 	desc = "Allows you to tear off limbs & tear out internal organs."
 	cost = 0 //I would make this cost a point, since it has some in game value, but there are easier, less damaging ways to perform the same functions.
-	var_changes = list("hard_vore_enabled" = 1) //The verb is given in human.dm
+	var_changes = list("hard_vore_enabled" = 1) //The verb is given in human.dm
+
+/datum/trait/trashcan
+	name = "Trash Can"
+	desc = "Allows you to dispose of the snack wrappings on the go instead of having to look for a bin or littering like an animal."
+	cost = 0
+	var_changes = list("trashcan" = 1)

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

@@ -125,3 +125,9 @@
 	desc = "Allows you to fly by using your wings."
 	cost = 2 //Some in game value.
 	var_changes = list("can_fly" = 1)
+
+/datum/trait/hardfeet
+	name = "Hard Feet"
+	desc = "Makes your nice clawed, scaled, hooved, armored, or otherwise just awfully calloused feet immune to glass shards."
+	cost = 1
+	var_changes = list("flags" = NO_MINOR_CUT) //Checked the flag is only used by shard stepping.

vorestation.dme

@@ -876,6 +876,7 @@
 #include "code\game\objects\items\shooting_range.dm"
 #include "code\game\objects\items\toys.dm"
 #include "code\game\objects\items\trash.dm"
+#include "code\game\objects\items\trash_vr.dm"
 #include "code\game\objects\items\devices\ai_detector.dm"
 #include "code\game\objects\items\devices\aicard.dm"
 #include "code\game\objects\items\devices\binoculars.dm"