Merge branch 'master' into cleanupTwo

This commit is contained in:
Kelenius
2016-04-21 11:41:32 +03:00
386 changed files with 7149 additions and 4820 deletions

View File

@@ -8,16 +8,18 @@
/obj/item/weapon/storage/box/swabs/New()
..()
for(var/i=0;i<storage_slots,i++) // Fill 'er up.
for(var/i = 1 to storage_slots) // Fill 'er up.
new /obj/item/weapon/forensics/swab(src)
/obj/item/weapon/storage/box/evidence
name = "evidence bag box"
desc = "A box claiming to contain evidence bags."
storage_slots = 7
can_hold = list(/obj/item/weapon/evidencebag)
/obj/item/weapon/storage/box/evidence/New()
..()
for(var/i=0;i<storage_slots,i++)
for(var/i = 1 to storage_slots)
new /obj/item/weapon/evidencebag(src)
/obj/item/weapon/storage/box/fingerprints
@@ -30,5 +32,5 @@
/obj/item/weapon/storage/box/fingerprints/New()
..()
for(var/i=0;i<storage_slots,i++)
for(var/i = 1 to storage_slots)
new /obj/item/weapon/sample/print(src)