Merge pull request DS-13-Dev-Team#212 from MisterGrimm/misc

Final final gun tweak

deadspace/code/modules/weapons/guns/javelin_gun.dm

@@ -9,8 +9,9 @@
 	righthand_file = 'deadspace/icons/mob/onmob/items/righthand_guns.dmi'
 	worn_icon = 'deadspace/icons/mob/onmob/back.dmi'
 	worn_icon_state = null
-	empty_alarm = TRUE
+	empty_alarm = FALSE
 	mag_display = TRUE
+	internal_magazine = FALSE
 	show_bolt_icon = FALSE
 	gun_flags = NO_AKIMBO
 	w_class = WEIGHT_CLASS_BULKY
@@ -21,7 +22,7 @@
 	unwielded_spread_bonus = 50
 	recoil = 2
 	burst_size = 1
-	bolt = /datum/gun_bolt/open
+	bolt = /datum/gun_bolt/locking
 	semi_auto = TRUE
 	actions_types = list()
 	fire_sound = 'deadspace/sound/weapons/guns/fire/jav_fire.ogg'

deadspace/code/modules/weapons/guns/scl_shotgun.dm

@@ -37,6 +37,7 @@ DS SCL Shotgun
 	name = "SCL underbarrel bola launcher"
 	icon_state = "dshotgun_sawn" //You won't normally see this sprite, unless a admin manually spawns it in
 	inhand_icon_state = "gun"
+	fire_sound = 'sound/weapons/bolathrow.ogg'
 	mag_type = /obj/item/ammo_box/magazine/internal/bola
 	w_class = WEIGHT_CLASS_NORMAL
 	bolt = /datum/gun_bolt/no_bolt
@@ -156,6 +157,7 @@ Ammo casings for the mags
 	desc = "A shotgun casing that is somehow filled with a tightly packed bola, that expands once it leaves the barrel."
 	icon_state = "stunshell"
 	fire_sound = 'sound/weapons/bolathrow.ogg'
+	caliber = CALIBER_12GAUGE_BOLA
 	projectile_type = /obj/projectile/bullet/shotgun_bola
 
 /**