cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-25 17:42:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/VOREStation/VOREStation

Browse Source 
# Conflicts:
#	config/custom_items.txt
This commit is contained in:
Kelshark
2017-11-07 08:17:53 -05:00
parent 92980edc93 fc80216336
commit 8b32b39c6f
148 changed files with 2032 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -258,8 +258,8 @@
new /obj/item/device/tape/random(src)
new /obj/item/device/tape/random(src)
new /obj/item/device/camera(src)
new /obj/item/toy/therapy_blue(src)
new /obj/item/weapon/storage/fancy/vials(src) //VOREStation Edit - adding vials for new hypo
new /obj/item/toy/plushie/therapy/blue(src)
return
/obj/structure/closet/secure_closet/psych