From 24bd42fc8080b3c0304fe22e775d2d37de3fdab5 Mon Sep 17 00:00:00 2001 From: Useroth Date: Tue, 19 Nov 2019 19:19:40 +0100 Subject: [PATCH 1/4] Adds strange seeds as a buyable traitor botanist item. --- code/modules/uplink/uplink_items.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 8f3fb6f979..30e437598b 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -1794,6 +1794,13 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes cost = 4 restricted_roles = list("Cook", "Botanist", "Clown", "Mime") +/datum/uplink_item/role_restricted/strange_seeds + name = "Pack of strange seeds" + desc = "Mysterious seeds as strange as their name implies. Spooky." + item = /obj/item/seeds/random + cost = 2 + restricted_roles = list("Botanist") + /datum/uplink_item/role_restricted/ez_clean_bundle name = "EZ Clean Grenade Bundle" desc = "A box with three cleaner grenades using the trademark Waffle Co. formula. Serves as a cleaner and causes acid damage to anyone standing nearby. \ From 5169205a191d289f863ebcf194574a8708cfdd8c Mon Sep 17 00:00:00 2001 From: Useroth Date: Tue, 19 Nov 2019 19:35:37 +0100 Subject: [PATCH 2/4] Added a 10pack as well --- code/game/objects/items/storage/uplink_kits.dm | 16 ++++++++++++++++ code/modules/uplink/uplink_items.dm | 7 +++++++ 2 files changed, 23 insertions(+) diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index 84ebc28afa..e5048d99cf 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -381,3 +381,19 @@ new /obj/item/gun/ballistic/automatic/pistol/m1911/kitchengun(src) new /obj/item/ammo_box/magazine/m45/kitchengun(src) new /obj/item/ammo_box/magazine/m45/kitchengun(src) + + +/obj/item/storage/box/strange_seeds_10pack + +/obj/item/storage/box/strange_seeds_10pack/PopulateContents() + new /obj/item/seeds/random(src) + new /obj/item/seeds/random(src) + new /obj/item/seeds/random(src) + new /obj/item/seeds/random(src) + new /obj/item/seeds/random(src) + new /obj/item/seeds/random(src) + new /obj/item/seeds/random(src) + new /obj/item/seeds/random(src) + new /obj/item/seeds/random(src) + new /obj/item/seeds/random(src) + \ No newline at end of file diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 30e437598b..0d435b0c05 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -1801,6 +1801,13 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes cost = 2 restricted_roles = list("Botanist") +/datum/uplink_item/role_restricted/strange_seeds_10pack + name = "Pack of strange seeds x10" + desc = "Mysterious seeds as strange as their name implies. Spooky. These come in bulk" + item = /obj/item/storage/box/strange_seeds_10pack + cost = 20 + restricted_roles = list("Botanist") + /datum/uplink_item/role_restricted/ez_clean_bundle name = "EZ Clean Grenade Bundle" desc = "A box with three cleaner grenades using the trademark Waffle Co. formula. Serves as a cleaner and causes acid damage to anyone standing nearby. \ From 2a8152c835a7d7b1b7c6ec448b6754b9b86f1f0c Mon Sep 17 00:00:00 2001 From: Useroth Date: Wed, 20 Nov 2019 15:15:10 +0100 Subject: [PATCH 3/4] Applied suggestions. --- code/game/objects/items/storage/uplink_kits.dm | 16 +++++----------- code/modules/uplink/uplink_items.dm | 1 + 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index e5048d99cf..13da738801 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -386,14 +386,8 @@ /obj/item/storage/box/strange_seeds_10pack /obj/item/storage/box/strange_seeds_10pack/PopulateContents() - new /obj/item/seeds/random(src) - new /obj/item/seeds/random(src) - new /obj/item/seeds/random(src) - new /obj/item/seeds/random(src) - new /obj/item/seeds/random(src) - new /obj/item/seeds/random(src) - new /obj/item/seeds/random(src) - new /obj/item/seeds/random(src) - new /obj/item/seeds/random(src) - new /obj/item/seeds/random(src) - \ No newline at end of file + for(var/i in 1 to 10) + new /obj/item/seeds/random(src) + + if prob(50) + new /obj/item/seeds/random(src) //oops, an additional packet might have slipped its way into the box \ No newline at end of file diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 0d435b0c05..89bb862237 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -1800,6 +1800,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes item = /obj/item/seeds/random cost = 2 restricted_roles = list("Botanist") + illegal_tech = FALSE /datum/uplink_item/role_restricted/strange_seeds_10pack name = "Pack of strange seeds x10" From e2c8efa8241840d1d58cee9b5454d0599dfdd68e Mon Sep 17 00:00:00 2001 From: Useroth Date: Wed, 20 Nov 2019 15:36:55 +0100 Subject: [PATCH 4/4] Oopsie. I need to stop committing code without comipiling. --- code/game/objects/items/storage/uplink_kits.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index 13da738801..223c8e9cf6 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -389,5 +389,5 @@ for(var/i in 1 to 10) new /obj/item/seeds/random(src) - if prob(50) + if(prob(50)) new /obj/item/seeds/random(src) //oops, an additional packet might have slipped its way into the box \ No newline at end of file