From 904131be1e95575c4a3a7422815fb7ceefabecdd Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Fri, 23 Feb 2018 13:48:08 +0000 Subject: [PATCH 1/3] some more toys for psyche --- .../crates_lockers/closets/secure/medical.dm | 13 +++++++++++++ code/modules/reagents/reagent_containers/pill.dm | 6 ++++++ 2 files changed, 19 insertions(+) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 2805d0c0c51..0a7278efb1d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -111,8 +111,15 @@ ..() new /obj/item/weapon/reagent_containers/food/pill/haloperidol(src) new /obj/item/weapon/reagent_containers/food/pill/haloperidol(src) + new /obj/item/weapon/reagent_containers/food/pill/haloperidol(src) new /obj/item/weapon/reagent_containers/food/pill/methamphetamine(src) new /obj/item/weapon/reagent_containers/food/pill/methamphetamine(src) + new /obj/item/weapon/reagent_containers/food/pill/methamphetamine(src) + new /obj/item/weapon/reagent_containers/food/pill/patch/nicotine(src) + new /obj/item/weapon/reagent_containers/food/pill/patch/nicotine(src) + new /obj/item/weapon/reagent_containers/food/pill/patch/nicotine(src) + new /obj/item/weapon/reagent_containers/food/pill/hydrocodone(src) + new /obj/item/weapon/reagent_containers/food/pill/hydrocodone(src) /obj/structure/closet/secure_closet/psychiatrist name = "psychiatrist's locker" @@ -130,6 +137,12 @@ new /obj/item/weapon/reagent_containers/syringe(src) new /obj/item/weapon/reagent_containers/glass/bottle/ether(src) new /obj/item/weapon/storage/pill_bottle/psychiatrist(src) + new /obj/random/plushie(src) + var/i = 0 + while(i < 3) + var/candy = pick(subtypesof(/obj/item/weapon/reagent_containers/food/snacks/candy/fudge)) + new candy(src) + i++ /obj/structure/closet/secure_closet/CMO diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 68ab233ea16..c72fd342e7d 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -110,3 +110,9 @@ desc = "Used to treat respiratory distress." icon_state = "pill8" list_reagents = list("salbutamol" = 20) + +/obj/item/weapon/reagent_containers/food/pill/hydrocodone + name = "Hydrocodone pill" + desc = "Used to treat extreme pain." + icon_state = "pill6" + list_reagents = list("hydrocodone" = 15) \ No newline at end of file From dd3c11a757607fde86785b6acf3d723826f09d62 Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Fri, 23 Feb 2018 22:28:29 +0000 Subject: [PATCH 2/3] for loop --- .../structures/crates_lockers/closets/secure/medical.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 0a7278efb1d..d8f261c49e4 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -138,12 +138,9 @@ new /obj/item/weapon/reagent_containers/glass/bottle/ether(src) new /obj/item/weapon/storage/pill_bottle/psychiatrist(src) new /obj/random/plushie(src) - var/i = 0 - while(i < 3) + for(var/i = 0, i < 3, i++) var/candy = pick(subtypesof(/obj/item/weapon/reagent_containers/food/snacks/candy/fudge)) new candy(src) - i++ - /obj/structure/closet/secure_closet/CMO name = "chief medical officer's locker" From 3787190fb41e51567a3be3932ae97e6fa4f4a8c3 Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Tue, 27 Feb 2018 14:29:37 +0000 Subject: [PATCH 3/3] changes for loop --- .../objects/structures/crates_lockers/closets/secure/medical.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index d8f261c49e4..8cfcf776dc0 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -138,7 +138,7 @@ new /obj/item/weapon/reagent_containers/glass/bottle/ether(src) new /obj/item/weapon/storage/pill_bottle/psychiatrist(src) new /obj/random/plushie(src) - for(var/i = 0, i < 3, i++) + for(var/i in 0 to 3) var/candy = pick(subtypesof(/obj/item/weapon/reagent_containers/food/snacks/candy/fudge)) new candy(src)