From c1f16e080ecb7b757936f317aa5bbf800a931e4d Mon Sep 17 00:00:00 2001 From: Verkister Date: Mon, 13 Nov 2017 20:01:58 +0200 Subject: [PATCH 1/8] Adds 2 neutral gimmick traits and borgo feeding. -Trait 1, "Hard Feet" makes your feet glass shard resistant. -Trait 2, "Trash Can" lets you dispose of snack wrappings on the go without littering or having to quest out in search of a disposal bin. -Also adds trash feeding for janiborgo in a sibling snippet for the forementioned trait. -Also added the old citadel era "robo kibble" to give the custom trash code file a first custom "trash" as well. Only in the code for now, not mechfab printable yet. -I'm gonna toss Polaris an update that makes borgs not become sparkles on 0 force item paps brb. --- code/game/objects/items/trash_vr.dm | 33 +++++++++++++++++++ .../carbon/human/species/station/blank_vr.dm | 1 + .../species/station/traits_vr/neutral.dm | 14 +++++++- vorestation.dme | 1 + 4 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 code/game/objects/items/trash_vr.dm diff --git a/code/game/objects/items/trash_vr.dm b/code/game/objects/items/trash_vr.dm new file mode 100644 index 00000000000..8bf0120e1fb --- /dev/null +++ b/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.loc = H + selected.internal_contents += src + H << "You can taste the flavor of garbage. Wait what?" + 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.loc = R + selected.internal_contents += src // Too many hoops and obstacles to stick it into the sleeper module. + R.visible_message("[user] feeds [R] with [src]!") + return + ..() diff --git a/code/modules/mob/living/carbon/human/species/station/blank_vr.dm b/code/modules/mob/living/carbon/human/species/station/blank_vr.dm index 71fd0d7a617..3bd9763b8b7 100644 --- a/code/modules/mob/living/carbon/human/species/station/blank_vr.dm +++ b/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/trashcan = 0 //It's always sunny in the wrestling ring. /datum/species/custom name = "Custom Species" diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm index 38df2a92155..e3222388db0 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm @@ -81,4 +81,16 @@ 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 \ No newline at end of file + var_changes = list("hard_vore_enabled" = 1) //The verb is given in human.dm + +/datum/trait/trashcan + name = "Trash Can" + desc = "Someone thought it'd be hilarious to eat the snack wrappings too instead of having to look for a bin or just littering like an animal." + cost = 0 + var_changes = list("trashcan" = 1) + +/datum/trait/hardfeet + name = "Hard Feet" + desc = "Do you feel like your nice clawed, scaled, hooved, armored, or otherwise just hella calloused feet need more freedom without the fear of glass shards?" + cost = 0 + var_changes = list("flags" = NO_MINOR_CUT) //Checked the flag is only used by shard stepping. \ No newline at end of file diff --git a/vorestation.dme b/vorestation.dme index e75eec04a6c..07777061cbf 100644 --- a/vorestation.dme +++ b/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" From 2daec6bdc23c770fb1bc8ee26bcc18243ff7eedf Mon Sep 17 00:00:00 2001 From: Verkister Date: Tue, 14 Nov 2017 00:58:04 +0200 Subject: [PATCH 2/8] Update neutral.dm --- .../living/carbon/human/species/station/traits_vr/neutral.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm index e3222388db0..1878bd7061c 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm @@ -92,5 +92,5 @@ /datum/trait/hardfeet name = "Hard Feet" desc = "Do you feel like your nice clawed, scaled, hooved, armored, or otherwise just hella calloused feet need more freedom without the fear of glass shards?" - cost = 0 - var_changes = list("flags" = NO_MINOR_CUT) //Checked the flag is only used by shard stepping. \ No newline at end of file + cost = 1 + var_changes = list("flags" = NO_MINOR_CUT) //Checked the flag is only used by shard stepping. From b5b41ab187a95d213e4b0fba86df4d2e20054aaf Mon Sep 17 00:00:00 2001 From: Verkister Date: Tue, 14 Nov 2017 01:17:06 +0200 Subject: [PATCH 3/8] move ya feet --- .../carbon/human/species/station/traits_vr/neutral.dm | 6 ------ .../carbon/human/species/station/traits_vr/positive.dm | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm index 1878bd7061c..5a88782ba34 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm @@ -88,9 +88,3 @@ desc = "Someone thought it'd be hilarious to eat the snack wrappings too instead of having to look for a bin or just littering like an animal." cost = 0 var_changes = list("trashcan" = 1) - -/datum/trait/hardfeet - name = "Hard Feet" - desc = "Do you feel like your nice clawed, scaled, hooved, armored, or otherwise just hella calloused feet need more freedom without the fear of glass shards?" - cost = 1 - var_changes = list("flags" = NO_MINOR_CUT) //Checked the flag is only used by shard stepping. diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm index f2f1873a54d..b7800c67786 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm +++ b/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 = "Do you feel like your nice clawed, scaled, hooved, armored, or otherwise just hella calloused feet need more freedom without the fear of glass shards?" + cost = 1 + var_changes = list("flags" = NO_MINOR_CUT) //Checked the flag is only used by shard stepping. From 03121273a602873e39383223d311593c112d0ff3 Mon Sep 17 00:00:00 2001 From: Verkister Date: Tue, 14 Nov 2017 09:21:32 +0200 Subject: [PATCH 4/8] Update positive.dm --- .../living/carbon/human/species/station/traits_vr/positive.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm index b7800c67786..173b80f0218 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm @@ -128,6 +128,6 @@ /datum/trait/hardfeet name = "Hard Feet" - desc = "Do you feel like your nice clawed, scaled, hooved, armored, or otherwise just hella calloused feet need more freedom without the fear of glass shards?" + 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. From 540901e359e52f0dac918cc31a53deeddc1933f5 Mon Sep 17 00:00:00 2001 From: Verkister Date: Tue, 14 Nov 2017 09:23:08 +0200 Subject: [PATCH 5/8] Update neutral.dm --- .../living/carbon/human/species/station/traits_vr/neutral.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm index 5a88782ba34..61b70505f98 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm @@ -85,6 +85,6 @@ /datum/trait/trashcan name = "Trash Can" - desc = "Someone thought it'd be hilarious to eat the snack wrappings too instead of having to look for a bin or just littering like an animal." + 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) From ec413c1288044f17e9b55143f7eba5b5e117f9f2 Mon Sep 17 00:00:00 2001 From: Verkister Date: Tue, 14 Nov 2017 09:33:23 +0200 Subject: [PATCH 6/8] Update trash_vr.dm --- code/game/objects/items/trash_vr.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/trash_vr.dm b/code/game/objects/items/trash_vr.dm index 8bf0120e1fb..e096482a6b0 100644 --- a/code/game/objects/items/trash_vr.dm +++ b/code/game/objects/items/trash_vr.dm @@ -14,9 +14,9 @@ user.drop_item() var/belly = H.vore_selected var/datum/belly/selected = H.vore_organs[belly] - src.loc = H + src.forcemove(H) selected.internal_contents += src - H << "You can taste the flavor of garbage. Wait what?" + to_chat(H, "You can taste the flavor of garbage. Wait what?") return if(isrobot(M)) @@ -26,7 +26,7 @@ user.drop_item() var/belly = R.vore_selected var/datum/belly/selected = R.vore_organs[belly] - src.loc = R + src.forcemove(R) selected.internal_contents += src // Too many hoops and obstacles to stick it into the sleeper module. R.visible_message("[user] feeds [R] with [src]!") return From a5e3ddd94866b0fd02bab47385a81930abbbfbbb Mon Sep 17 00:00:00 2001 From: Verkister Date: Tue, 14 Nov 2017 09:42:38 +0200 Subject: [PATCH 7/8] items cannot forcemove? --- code/game/objects/items/trash_vr.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/trash_vr.dm b/code/game/objects/items/trash_vr.dm index e096482a6b0..1dc6afda0d5 100644 --- a/code/game/objects/items/trash_vr.dm +++ b/code/game/objects/items/trash_vr.dm @@ -14,7 +14,7 @@ user.drop_item() var/belly = H.vore_selected var/datum/belly/selected = H.vore_organs[belly] - src.forcemove(H) + src.loc = H selected.internal_contents += src to_chat(H, "You can taste the flavor of garbage. Wait what?") return @@ -26,7 +26,7 @@ user.drop_item() var/belly = R.vore_selected var/datum/belly/selected = R.vore_organs[belly] - src.forcemove(R) + src.loc = R selected.internal_contents += src // Too many hoops and obstacles to stick it into the sleeper module. R.visible_message("[user] feeds [R] with [src]!") return From fa48060644955efeea0f959cf8ac2895a269491d Mon Sep 17 00:00:00 2001 From: Verkister Date: Tue, 14 Nov 2017 09:43:52 +0200 Subject: [PATCH 8/8] darn capitalism --- code/game/objects/items/trash_vr.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/trash_vr.dm b/code/game/objects/items/trash_vr.dm index 1dc6afda0d5..57d3bbbef01 100644 --- a/code/game/objects/items/trash_vr.dm +++ b/code/game/objects/items/trash_vr.dm @@ -14,7 +14,7 @@ user.drop_item() var/belly = H.vore_selected var/datum/belly/selected = H.vore_organs[belly] - src.loc = H + src.forceMove(H) selected.internal_contents += src to_chat(H, "You can taste the flavor of garbage. Wait what?") return @@ -26,7 +26,7 @@ user.drop_item() var/belly = R.vore_selected var/datum/belly/selected = R.vore_organs[belly] - src.loc = R + src.forceMove(R) selected.internal_contents += src // Too many hoops and obstacles to stick it into the sleeper module. R.visible_message("[user] feeds [R] with [src]!") return