Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

code/citadel/cit_guns.dm

@@ -0,0 +1,25 @@
+/obj/item/weapon/gun/energy/laser/carbine
+	name = "laser carbine"
+	desc = "A ruggedized laser carbine featuring much higher capacity and improved handling when compared to a normal laser gun."
+	icon_state = "lasernew"
+	item_state = "laser"
+	origin_tech = "combat=4;magnets=4"
+	force = 10
+	throwforce = 10
+	ammo_type = list(/obj/item/ammo_casing/energy/lasergun)
+	cell_type = /obj/item/weapon/stock_parts/cell/lascarbine
+	resistance_flags = FIRE_PROOF | ACID_PROOF
+
+/obj/item/weapon/stock_parts/cell/lascarbine
+	name = "laser carbine power supply"
+	maxcharge = 2500
+
+/datum/design/lasercarbine
+	name = "Laser Carbine"
+	desc = "Beefed up version of a standard laser gun."
+	id = "lasercarbine"
+	req_tech = list("combat" = 5, "magnets" = 5, "powerstorage" = 4)
+	build_type = PROTOLATHE
+	materials = list(MAT_GOLD = 2500, MAT_METAL = 5000, MAT_GLASS = 5000)
+	build_path = /obj/item/weapon/gun/energy/laser/carbine
+	category = list("Weapons")

code/modules/mob/living/carbon/update_icons.dm

@@ -225,8 +225,9 @@
 	//CHECK FOR UPDATE
 	var/oldkey = icon_render_key
 	var/istaur = 0
-	if("taur" in dna.species.mutant_bodyparts && dna.features["taur"] != "None")
-		istaur = 0
+	if(ishuman(src))
+		if("taur" in dna.species.mutant_bodyparts && dna.features["taur"] != "None")
+			istaur = 1
 	icon_render_key = generate_icon_render_key()
 	if(oldkey == icon_render_key)
 		return

code/modules/projectiles/guns/ballistic/revolver.dm

@@ -100,6 +100,7 @@
 	options["Black Panther"] = "detective_panther"
 	options["Gold Trim"] = "detective_gold"
 	options["The Peacemaker"] = "detective_peacemaker"
+	options["The Spacemaker"] = "detective_future"
 	options["Cancel"] = null
 
 /obj/item/weapon/gun/ballistic/revolver/detective/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params, zone_override = "")

code/modules/reagents/chemistry/reagents/alcohol_reagents.dm

@@ -43,14 +43,14 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	if(istype(O,/obj/item/weapon/paper))
 		var/obj/item/weapon/paper/paperaffected = O
 		paperaffected.clearpaper()
-		usr << "<span class='notice'>[paperaffected]'s ink washes away.</span>"
+		O.visible_message("<span class='notice'>[paperaffected]'s ink washes away.</span>")
 	if(istype(O,/obj/item/weapon/book))
 		if(reac_volume >= 5)
 			var/obj/item/weapon/book/affectedbook = O
 			affectedbook.dat = null
-			usr << "<span class='notice'>Through thorough application, you wash away [affectedbook]'s writing.</span>"
+			O.visible_message("<span class='notice'>[affectedbook]'s writing washes away.</span>")
 		else
-			usr << "<span class='warning'>The ink smears, but doesn't wash away!</span>"
+			O.visible_message("<span class='warning'>The ink smears, but doesn't wash away!</span>")
 	return
 
 /datum/reagent/consumable/ethanol/reaction_mob(mob/living/M, method=TOUCH, reac_volume)//Splashing people with ethanol isn't quite as good as fuel.

tgstation.dme

@@ -147,6 +147,7 @@
 #include "code\citadel\cit_areas.dm"
 #include "code\citadel\cit_arousal.dm"
 #include "code\citadel\cit_genemods.dm"
+#include "code\citadel\cit_guns.dm"
 #include "code\citadel\cit_kegs.dm"
 #include "code\citadel\cit_reagents.dm"
 #include "code\citadel\cit_uniforms.dm"