cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8710 from Birdtalon/pschye-toys

Browse Source 
A few more things for the Psyche locker.
This commit is contained in:
tigercat2000
2018-03-03 09:59:40 -08:00
committed by GitHub
parent 0e63911f7c 3787190fb4
commit 2887c4a62f
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+11 -1
View File
@@ -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,7 +137,10 @@
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)
for(var/i in 0 to 3)
var/candy = pick(subtypesof(/obj/item/weapon/reagent_containers/food/snacks/candy/fudge))
new candy(src)
/obj/structure/closet/secure_closet/CMO
name = "chief medical officer's locker"
code/modules/reagents/reagent_containers/pill.dm
+6
View File
@@ -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)