cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fuck this pr PART TWO

Browse Source
This commit is contained in:
mistyLuminescence
2017-11-03 23:58:28 +00:00
parent a0c5ecb8d5
commit 41f332df42
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
View File

@@ -244,16 +244,16 @@
New() New()
..() ..()
new /obj/item/weapon/storage/box/pillbottles(src) new /obj/item/weapon/storage/box/pillbottles(src)
new /obj/item/weapon/storage/box/pillbottles(src) new /obj/item/weapon/storage/box/pillbottles(src)
new /obj/item/weapon/storage/box/beakers(src) new /obj/item/weapon/storage/box/beakers(src)
new /obj/item/weapon/storage/box/autoinjectors(src) new /obj/item/weapon/storage/box/autoinjectors(src)
new /obj/item/weapon/storage/box/syringes(src) new /obj/item/weapon/storage/box/syringes(src)
new /obj/item/weapon/reagent_containers/dropper(src) new /obj/item/weapon/reagent_containers/dropper(src)
new /obj/item/weapon/reagent_containers/dropper(src) new /obj/item/weapon/reagent_containers/dropper(src)
new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src) new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src)
new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src) new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src)
new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src) new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src)
new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src) new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src)
return return
/obj/structure/closet/secure_closet/psych /obj/structure/closet/secure_closet/psych
@@ -271,20 +271,20 @@
New() New()
..() ..()
new /obj/item/clothing/under/rank/psych(src) new /obj/item/clothing/under/rank/psych(src)
new /obj/item/clothing/under/rank/psych/turtleneck(src) new /obj/item/clothing/under/rank/psych/turtleneck(src)
new /obj/item/clothing/suit/straight_jacket(src) new /obj/item/clothing/suit/straight_jacket(src)
new /obj/item/weapon/reagent_containers/glass/bottle/stoxin(src) new /obj/item/weapon/reagent_containers/glass/bottle/stoxin(src)
new /obj/item/weapon/reagent_containers/syringe(src) new /obj/item/weapon/reagent_containers/syringe(src)
new /obj/item/weapon/storage/pill_bottle/citalopram(src) new /obj/item/weapon/storage/pill_bottle/citalopram(src)
new /obj/item/weapon/reagent_containers/pill/methylphenidate(src) new /obj/item/weapon/reagent_containers/pill/methylphenidate(src)
new /obj/item/weapon/clipboard(src) new /obj/item/weapon/clipboard(src)
new /obj/item/weapon/folder/white(src) new /obj/item/weapon/folder/white(src)
new /obj/item/device/taperecorder(src) new /obj/item/device/taperecorder(src)
new /obj/item/device/tape/random(src) new /obj/item/device/tape/random(src)
new /obj/item/device/tape/random(src) new /obj/item/device/tape/random(src)
new /obj/item/device/tape/random(src) new /obj/item/device/tape/random(src)
new /obj/item/device/camera(src) new /obj/item/device/camera(src)
new /obj/item/toy/plushie/therapy/blue(src) new /obj/item/toy/plushie/therapy/blue(src)
return return
/obj/structure/closet/secure_closet/medical_wall /obj/structure/closet/secure_closet/medical_wall

2
code/modules/reagents/reagent_containers/glass.dm
View File

@@ -209,8 +209,8 @@
desc = "A small glass vial." desc = "A small glass vial."
icon_state = "vial" icon_state = "vial"
matter = list("glass" = 250) matter = list("glass" = 250)
w_class = ITEMSIZE_TINY
volume = 30 volume = 30
w_class = ITEMSIZE_TINY
amount_per_transfer_from_this = 10 amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,25) possible_transfer_amounts = list(5,10,15,25)
flags = OPENCONTAINER flags = OPENCONTAINER