Baystation Update Merge 01

Mahoosive update. A lot of things.

code/modules/projectiles/ammunition.dm

@@ -21,6 +21,26 @@
 		dir = pick(cardinal)
 
 
+/obj/item/ammo_casing/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/screwdriver))
+		if(BB)
+			if(initial(BB.name) == "bullet")
+				var/tmp_label = ""
+				var/label_text = sanitize(input(user, "Inscribe some text into \the [initial(BB.name)]","Inscription",tmp_label))
+				if(length(label_text) > 20)
+					user << "\red The inscription can be at most 20 characters long."
+				else
+					if(label_text == "")
+						user << "\blue You scratch the inscription off of [initial(BB)]."
+						BB.name = initial(BB.name)
+					else
+						user << "\blue You inscribe \"[label_text]\" into \the [initial(BB.name)]."
+						BB.name = "[initial(BB.name)] \"[label_text]\""
+			else
+				user << "\blue You can only inscribe a metal bullet."	//because inscribing beanbags is silly
+		else
+			user << "\blue There is no bullet in the casing to inscribe anything into."
+
 
 //Boxes of ammo
 /obj/item/ammo_magazine

code/modules/projectiles/ammunition/bullets.dm

@@ -46,7 +46,7 @@
 /obj/item/ammo_casing/c45r
 	desc = "A .45 rubber bullet casing."
 	caliber = ".45"
-	projectile_type = "/obj/item/projectile/bullet/weakbullet"
+	projectile_type = "/obj/item/projectile/bullet/weakbullet/rubber"
 
 /obj/item/ammo_casing/a12mm
 	desc = "A 12mm bullet casing."
@@ -75,7 +75,7 @@
 	name = "beanbag shell"
 	desc = "A weak beanbag shell."
 	icon_state = "bshell"
-	projectile_type = "/obj/item/projectile/bullet/weakbullet"
+	projectile_type = "/obj/item/projectile/bullet/weakbullet/beanbag"
 	m_amt = 500
 
 

code/modules/projectiles/projectile/bullets.dm

@@ -18,6 +18,11 @@
 	weaken = 5
 	embed = 0
 
+/obj/item/projectile/bullet/weakbullet/beanbag		//because beanbags are not bullets
+	name = "beanbag"
+
+/obj/item/projectile/bullet/weakbullet/rubber
+	name = "rubber bullet"
 
 /obj/item/projectile/bullet/midbullet
 	damage = 20

code/modules/projectiles/targeting.dm

@@ -177,7 +177,7 @@ mob/living/proc/Targeted(var/obj/item/weapon/gun/I) //Self explanitory.
 					target_locked = image("icon" = 'icons/effects/Targeted.dmi', "icon_state" = "locked")
 					update_targeted()
 
-	//Adding the buttons to the controler person
+	//Adding the buttons to the controller person
 	var/mob/living/T = I.loc
 	if(T)
 		if(T.client)
@@ -269,7 +269,7 @@ client/proc/add_gun_icons()
 		screen += usr.gun_run_icon
 
 client/proc/remove_gun_icons()
-	if(isnull(usr)) return 1 // Runtime prevention on N00k agents spawning with SMG
+	if(!usr) return 1 // Runtime prevention on N00k agents spawning with SMG
 	screen -= usr.item_use_icon
 	screen -= usr.gun_move_icon
 	if (target_can_move)