cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge github.com:Baystation12/Baystation12

Browse Source 
Conflicts:
	html/changelog.html
This commit is contained in:
cib
2012-05-22 14:50:00 +02:00
parent 79e2cdef86 ebc2b0ed1f
commit 615871b0ce
144 changed files with 7400 additions and 5721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/admin/verbs/debug.dm
View File

@@ -733,7 +733,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
for(var/obj/item/briefcase_item in sec_briefcase)
del(briefcase_item)
for(var/i=3, i>0, i--)
sec_briefcase.contents += new /obj/item/weapon/spacecash/c1000
sec_briefcase.contents += new /obj/item/weapon/money/c1000
sec_briefcase.contents += new /obj/item/weapon/gun/energy/crossbow
sec_briefcase.contents += new /obj/item/weapon/gun/projectile/mateba
sec_briefcase.contents += new /obj/item/ammo_magazine/a357