Merge branch 'master' of https://github.com/PolarisSS13/Polaris into ProjectileUpkeep

code/modules/projectiles/ammunition.dm

@@ -9,6 +9,7 @@
 	w_class = ITEMSIZE_TINY
 	preserve_item = 1
 	drop_sound = 'sound/items/drop/ring.ogg'
+	pickup_sound = 'sound/items/pickup/ring.ogg'
 
 	var/leaves_residue = 1
 	var/caliber = ""					//Which kind of guns it can be loaded into

code/modules/projectiles/ammunition/rounds.dm

@@ -369,7 +369,7 @@
 	name = "rocket shell"
 	desc = "A high explosive designed to be fired from a launcher."
 	icon_state = "rocketshell"
-	projectile_type = /obj/item/missile
+	projectile_type = /obj/item/projectile/bullet/srmrocket
 	caliber = "rocket"
 	matter = list(DEFAULT_WALL_MATERIAL = 10000)
 

code/modules/projectiles/gun.dm

@@ -50,6 +50,7 @@
 	attack_verb = list("struck", "hit", "bashed")
 	zoomdevicename = "scope"
 	drop_sound = 'sound/items/drop/gun.ogg'
+	pickup_sound = 'sound/items/pickup/gun.ogg'
 
 	var/automatic = 0
 	var/burst = 1

code/modules/projectiles/guns/launcher/crossbow.dm

@@ -6,6 +6,8 @@
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "bolt"
 	item_state = "bolt"
+	drop_sound = 'sound/items/drop/sword.ogg'
+	pickup_sound = 'sound/items/pickup/sword.ogg'
 	throwforce = 8
 	w_class = ITEMSIZE_NORMAL
 	sharp = 1
@@ -24,6 +26,8 @@
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "metal-rod"
 	item_state = "bolt"
+	drop_sound = 'sound/items/drop/sword.ogg'
+	pickup_sound = 'sound/items/pickup/sword.ogg'
 
 /obj/item/weapon/arrow/quill
 	name = "alien quill"

code/modules/projectiles/guns/launcher/rocket.dm

@@ -35,10 +35,8 @@
 /obj/item/weapon/gun/launcher/rocket/consume_next_projectile()
 	if(rockets.len)
 		var/obj/item/ammo_casing/rocket/I = rockets[1]
-		var/obj/item/missile/M = new (src)
-		M.primed = 1
 		rockets -= I
-		return M
+		return
 	return null
 
 /obj/item/weapon/gun/launcher/rocket/handle_post_fire(mob/user, atom/target)

code/modules/projectiles/guns/magnetic/gasthrower.dm

@@ -37,7 +37,7 @@
 	var/phoron_amt = Tank.air_contents.gas["phoron"]
 	var/co2_amt = Tank.air_contents.gas["carbon_dioxide"]
 	var/oxy_amt = Tank.air_contents.gas["oxygen"]
-	var/n2o_amt = Tank.air_contents.gas["sleeping_agent"]
+	var/n2o_amt = Tank.air_contents.gas["nitrous_oxide"]
 
 	if(isnull(co2_amt))
 		co2_amt = 0

code/modules/projectiles/projectile/explosive.dm

@@ -0,0 +1,33 @@
+
+
+/obj/item/projectile/bullet/srmrocket
+	name ="SRM-8 Rocket"
+	desc = "Boom"
+	icon = 'icons/obj/grenade.dmi'
+	icon_state = "missile"
+	damage = 30	//Meaty whack. *Chuckles*
+	does_spin = 0
+
+/obj/item/projectile/bullet/srmrocket/on_hit(atom/target, blocked=0)
+	..()
+	if(!isliving(target)) //if the target isn't alive, so is a wall or something
+		explosion(target, 0, 1, 2, 4)
+	else
+		explosion(target, 0, 0, 2, 4)
+	return 1
+
+
+/obj/item/projectile/bullet/srmrocket/weak	//Used in the jury rigged one.
+	damage = 10
+
+/obj/item/projectile/bullet/srmrocket/weak/on_hit(atom/target, blocked=0)
+	..()
+	explosion(target, 0, 0, 2, 4)//No need to have a question.
+	return 1
+
+/*Old vars here for reference.
+	var/devastation = 0
+	var/heavy_blast = 1
+	var/light_blast = 2
+	var/flash_blast = 4
+*/