cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-23 08:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into 151210-TapeTape

Browse Source 
Conflicts:
	code/__defines/misc.dm
This commit is contained in:
PsiOmegaDelta
2015-12-13 11:50:06 +01:00
parent eda4a5d595 3996c2a57a
commit bbe65baf5c
91 changed files with 3150 additions and 2217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
View File

@@ -85,6 +85,7 @@
new /obj/item/weapon/storage/backpack/cultpack (src)
new /obj/item/weapon/storage/fancy/candle_box(src)
new /obj/item/weapon/storage/fancy/candle_box(src)
new /obj/item/weapon/deck/tarot(src)
return