Merge branch 'master' into upstream-merge-26129

2017-04-29 11:45:37 -05:00
parent 991fb8335c fca3f200b3
commit 06bfa8770e
131 changed files with 1020 additions and 743 deletions
@@ -1,6 +1,7 @@
 /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 = 'icons/obj/guns/cit_guns.dmi'
 	icon_state = "lasernew"
 	item_state = "laser"
 	origin_tech = "combat=4;magnets=4"
@@ -76,6 +76,7 @@

 	refill_canister = /obj/item/weapon/vending_refill/soviet

+
 #undef STANDARD_CHARGE
 #undef CONTRABAND_CHARGE
 #undef COIN_CHARGE