cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into medtweaks

Browse Source
This commit is contained in:
comma
2013-08-01 10:03:46 +04:00
parent bbdcb81868 50e7d9b450
commit 95f00d0523
85 changed files with 4012 additions and 2992 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/dartgun.dm
+2 -2
View File
@@ -28,7 +28,7 @@
var/list/mixing = list() //Containers being used for mixing.
var/obj/item/weapon/dart_cartridge/cartridge = null //Container of darts.
var/max_beakers = 3
var/dart_reagent_amount = 5
var/dart_reagent_amount = 15
var/container_type = /obj/item/weapon/reagent_containers/glass/beaker/vial
var/list/starting_chems = null
@@ -52,7 +52,7 @@
if(starting_chems)
for(var/chem in starting_chems)
var/obj/item/weapon/reagent_containers/glass/beaker/vial/B = new(src)
B.reagents.add_reagent(chem, 25)
B.reagents.add_reagent(chem, 50)
beakers += B
cartridge = new /obj/item/weapon/dart_cartridge(src)
update_icon()