Merge remote-tracking branch 'upstream/dev' into gun-rewrite

Conflicts:
	code/modules/clothing/under/ties.dm
	code/modules/projectiles/projectile.dm

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

@@ -18,19 +18,19 @@
 				mode = 0
 				charge_cost = 100
 				fire_sound = 'sound/weapons/Taser.ogg'
-				user << "\red [src.name] is now set to stun."
+				user << "\red \The [src] is now set to stun."
 				projectile_type = /obj/item/projectile/beam/stun
 			if(0)
 				mode = 1
 				charge_cost = 100
 				fire_sound = 'sound/weapons/Laser.ogg'
-				user << "\red [src.name] is now set to kill."
+				user << "\red \The [src] is now set to kill."
 				projectile_type = /obj/item/projectile/beam
 			if(1)
 				mode = 2
 				charge_cost = 200
 				fire_sound = 'sound/weapons/pulse.ogg'
-				user << "\red [src.name] is now set to DESTROY."
+				user << "\red \The [name] is now set to DESTROY."
 				projectile_type = /obj/item/projectile/beam/pulse
 		return
 
@@ -53,7 +53,7 @@
 	fire_delay = 10
 
 	attack_self(mob/living/user as mob)
-		user << "\red [src.name] has three settings, and they are all DESTROY."
+		user << "\red \The [src] has three settings, and they are all DESTROY."
 
 
 

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

@@ -238,3 +238,53 @@ obj/item/weapon/gun/energy/staff/focus
 	set popup_menu = 1
 
 	zoom()
+
+
+// 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'
+	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 ..()
+
+	. = ..()

code/modules/projectiles/guns/projectile.dm

@@ -108,7 +108,7 @@
 
 		user.remove_from_mob(C)
 		C.loc = src
-		loaded.Insert(C, 1) //add to the head of the list
+		loaded.Insert(1, C) //add to the head of the list
 		user.visible_message("[user] inserts \a [C] into [src].", "<span class='notice'>You insert \a [C] into [src]!</span>")
 		update_icon()
 		return