cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-04 22:43:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conflict fix.

Browse Source
This commit is contained in:
Segrain
2013-10-21 04:37:28 +03:00
parent 398e3c8099 07c4560ded
commit 121b10b16c
13 changed files with 426 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/reagents/dartgun.dm
View File

@@ -29,7 +29,7 @@
var/obj/item/weapon/dart_cartridge/cartridge = null //Container of darts.
var/max_beakers = 3
var/dart_reagent_amount = 15
var/container_type = /obj/item/weapon/reagent_containers/glass/beaker/vial
var/container_type = /obj/item/weapon/reagent_containers/glass/beaker
var/list/starting_chems = null
/obj/item/weapon/gun/dartgun/update_icon()
@@ -51,7 +51,7 @@
..()
if(starting_chems)
for(var/chem in starting_chems)
var/obj/item/weapon/reagent_containers/glass/beaker/vial/B = new(src)
var/obj/B = new container_type(src)
B.reagents.add_reagent(chem, 50)
beakers += B
cartridge = new /obj/item/weapon/dart_cartridge(src)
@@ -97,7 +97,7 @@
user << "\blue [I] doesn't seem to fit into [src]."
return
if(beakers.len >= max_beakers)
user << "\blue [src] already has [max_beakers] vials in it - another one isn't going to fit!"
user << "\blue [src] already has [max_beakers] beakers in it - another one isn't going to fit!"
return
var/obj/item/weapon/reagent_containers/glass/beaker/B = I
user.drop_item()