From b5f337a3b00ea2c3e0d0bd01d93a1ff234931525 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 16 Feb 2020 10:54:55 -0500 Subject: [PATCH] Replaces Tramadol maint pills with Paracetamol --- code/game/objects/items/weapons/storage/firstaid_vr.dm | 8 +++++++- code/game/objects/random/misc.dm | 2 +- code/game/objects/random/mob_vr.dm | 2 +- code/game/objects/structures/loot_piles.dm | 2 +- code/game/objects/structures/trash_pile.dm | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/weapons/storage/firstaid_vr.dm b/code/game/objects/items/weapons/storage/firstaid_vr.dm index 71e9db0faba..4693a3b07b6 100644 --- a/code/game/objects/items/weapons/storage/firstaid_vr.dm +++ b/code/game/objects/items/weapons/storage/firstaid_vr.dm @@ -114,4 +114,10 @@ /obj/item/weapon/storage/mrebag/pill/sleevingcure name = "vacuum-sealed pill (Kitsuhanan Cure)" desc = "A small vacuum-sealed package containing a singular pill. For emergencies only." - starts_with = list(/obj/item/weapon/reagent_containers/pill/sleevingcure) \ No newline at end of file + starts_with = list(/obj/item/weapon/reagent_containers/pill/sleevingcure) + +/obj/item/weapon/storage/pill_bottle/paracetamol + name = "pill bottle (Paracetamol)" + desc = "Contains over the counter medicine to treat pain." + starts_with = list(/obj/item/weapon/reagent_containers/pill/paracetamol = 7) + wrapper_color = COLOR_GRAY diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index c39bc36c8db..4e29ac66ecc 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -229,7 +229,7 @@ icon_state = "purplecomb" spawn_nothing_percentage = 50 /obj/random/contraband/item_to_spawn() - return pick(prob(6);/obj/item/weapon/storage/pill_bottle/tramadol, + return pick(prob(6);/obj/item/weapon/storage/pill_bottle/paracetamol, //VOREStation Edit, prob(8);/obj/item/weapon/haircomb, prob(4);/obj/item/weapon/storage/pill_bottle/happy, prob(4);/obj/item/weapon/storage/pill_bottle/zoom, diff --git a/code/game/objects/random/mob_vr.dm b/code/game/objects/random/mob_vr.dm index 303a3046fa3..3db11f0626e 100644 --- a/code/game/objects/random/mob_vr.dm +++ b/code/game/objects/random/mob_vr.dm @@ -146,7 +146,7 @@ return pick(prob(10);/obj/item/weapon/contraband/poster,\ prob(8);/obj/item/weapon/haircomb,\ prob(6);/obj/item/weapon/material/wirerod,\ - prob(6);/obj/item/weapon/storage/pill_bottle/tramadol,\ + prob(6);/obj/item/weapon/storage/pill_bottle/paracetamol,\ prob(6);/obj/item/weapon/material/butterflyblade,\ prob(6);/obj/item/weapon/material/butterflyhandle,\ prob(4);/obj/item/weapon/storage/pill_bottle/happy,\ diff --git a/code/game/objects/structures/loot_piles.dm b/code/game/objects/structures/loot_piles.dm index e3607fdeea6..e14c9ba9e38 100644 --- a/code/game/objects/structures/loot_piles.dm +++ b/code/game/objects/structures/loot_piles.dm @@ -258,7 +258,7 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/weapon/reagent_containers/syringe/steroid, /obj/item/weapon/storage/pill_bottle/zoom, /obj/item/weapon/storage/pill_bottle/happy, - /obj/item/weapon/storage/pill_bottle/tramadol + /obj/item/weapon/storage/pill_bottle/paracetamol //VOREStation Edit ) // Contains loads of different types of boxes, which may have items inside! diff --git a/code/game/objects/structures/trash_pile.dm b/code/game/objects/structures/trash_pile.dm index fd9a0bff511..ec2b0eaefab 100644 --- a/code/game/objects/structures/trash_pile.dm +++ b/code/game/objects/structures/trash_pile.dm @@ -219,7 +219,7 @@ return I /obj/structure/trash_pile/proc/produce_beta_item() - var/path = pick(prob(6);/obj/item/weapon/storage/pill_bottle/tramadol, + var/path = pick(prob(6);/obj/item/weapon/storage/pill_bottle/paracetamol, prob(4);/obj/item/weapon/storage/pill_bottle/happy, prob(4);/obj/item/weapon/storage/pill_bottle/zoom, prob(4);/obj/item/seeds/ambrosiavulgarisseed,