Revert "Bay update."

code/modules/projectiles/gun.dm

@@ -284,7 +284,7 @@
 			for(var/obj/item/weapon/grab/G in M.grabbed_by)
 				grabstate = max(grabstate, G.state)
 			if(grabstate >= GRAB_NECK)
-				damage_mult = 2.5
+				damage_mult = 3.0
 			else if(grabstate >= GRAB_AGGRESSIVE)
 				damage_mult = 1.5
 	P.damage *= damage_mult
@@ -363,8 +363,7 @@
 
 		in_chamber.on_hit(M)
 		if (in_chamber.damage_type != HALLOSS)
-			log_and_message_admins("[key_name(user)] commited suicide using \a [src]")
-			user.apply_damage(in_chamber.damage*2.5, in_chamber.damage_type, "head", used_weapon = "Point blank shot in the mouth with \a [in_chamber]", sharp=1)
+			user.apply_damage(in_chamber.damage*2.5, in_chamber.damage_type, BP_HEAD, used_weapon = "Point blank shot in the mouth with \a [in_chamber]", sharp=1)
 			user.death()
 		else
 			user << "<span class = 'notice'>Ow...</span>"

code/modules/projectiles/guns/energy/special.dm

@@ -156,3 +156,55 @@ obj/item/weapon/gun/energy/staff/focus
 			user << "<span class='warning'>The [src.name] will now strike only a single person.</span>"
 			projectile_type = "/obj/item/projectile/forcebolt"
 	*/
+
+/* Adminbus guns */
+
+// Serves as a target spotter for the Icarus.
+/obj/item/weapon/gun/energy/icarus
+	name = "rubber ducky"
+	desc = "It's a cute rubber duck.  With an evil gleam in it's eye."
+	projectile_type = /obj/item/projectile/icarus/pointdefense
+	icon = 'icons/obj/watercloset.dmi'
+	item_icons = null
+	icon_state = "rubberducky"
+	item_state = "rubberducky"
+	charge_cost = 0
+	silenced = 1
+
+/obj/item/weapon/gun/energy/icarus/attack_self(mob/living/user as mob)
+	if(projectile_type == /obj/item/projectile/icarus/pointdefense)
+		projectile_type = /obj/item/projectile/icarus/guns
+		user << "You inform the Icarus to switch to the main guns."
+	else
+		projectile_type = /obj/item/projectile/icarus/pointdefense
+		user << "You inform the Icarus to switch to the point-defense lasers."
+
+	. = ..()
+
+/obj/item/weapon/gun/energy/icarus/update_icon()
+	return
+
+/obj/item/weapon/gun/energy/icarus/verb/SetIcarusAngle()
+	set src in usr
+	set name = "Set Firing Angle"
+	set desc = "Sets the angle from which the icarus will fire."
+	set category = "Object"
+
+	Icarus_SetPosition(usr)
+
+
+/obj/item/weapon/gun/energy/variable
+	name = "abstract weapon"
+	desc = "It seems to shift and flow as you watch."
+	charge_cost = 0
+	silenced = 1
+
+/obj/item/weapon/gun/energy/variable/update_icon()
+	return
+
+/obj/item/weapon/gun/energy/variable/attack_self(mob/living/user as mob)
+	var/type = input(user,"What projectile type?","Projectile", null) as null|anything in typesof(/obj/item/projectile)
+	if(!type)
+		return ..()
+	projectile_type = type
+	. = ..()

code/modules/projectiles/projectile/special.dm

@@ -136,6 +136,20 @@
 		if(ishuman(target))
 			var/mob/living/carbon/human/M = target
 			M.confused += rand(5,8)
+
+/obj/item/projectile/icarus/pointdefense/process()
+	Icarus_FireLaser(get_turf(original))
+	spawn
+		qdel(src)
+
+	return
+
+/obj/item/projectile/icarus/guns/process()
+	Icarus_FireCannon(get_turf(original))
+	spawn
+		qdel(src)
+	return
+
 /obj/item/projectile/chameleon
 	name = "bullet"
 	icon_state = "bullet"
@@ -144,4 +158,3 @@
 	nodamage = 1
 	damage_type = HALLOSS
 	muzzle_type = /obj/effect/projectile/bullet/muzzle
-