New sprites and inhands for eguns and lasers! (#5741)

2018-03-03 08:32:32 +08:00
parent d0afd7aee8
commit 9c87deac06
7 changed files with 21 additions and 1 deletions
@@ -1,5 +1,7 @@
 /obj/item/gun/energy/e_gun
-	icon = 'modular_citadel/icons/obj/guns/energy.dmi'
+	icon = 'modular_citadel/icons/obj/guns/OVERRIDE_energy.dmi'
+	lefthand_file = 'modular_citadel/icons/mob/inhands/OVERRIDE_guns_lefthand.dmi'
+	righthand_file = 'modular_citadel/icons/mob/inhands/OVERRIDE_guns_righthand.dmi'
 	ammo_x_offset = 2
 	flight_x_offset = 17
 	flight_y_offset = 11
@@ -0,0 +1,17 @@
+/obj/item/gun/energy/laser
+	icon = 'modular_citadel/icons/obj/guns/OVERRIDE_energy.dmi'
+	ammo_x_offset = 1
+	shaded_charge = 1
+	lefthand_file = 'modular_citadel/icons/mob/inhands/OVERRIDE_guns_lefthand.dmi'
+	righthand_file = 'modular_citadel/icons/mob/inhands/OVERRIDE_guns_righthand.dmi'
+
+/obj/item/gun/energy/laser/practice
+	icon_state = "laser-p"
+
+/obj/item/gun/energy/laser/bluetag
+	lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
+
+/obj/item/gun/energy/laser/redtag
+	lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
@@ -2620,6 +2620,7 @@
 #include "modular_citadel\code\modules\power\lighting.dm"
 #include "modular_citadel\code\modules\projectiles\guns\ballistic\revolver.dm"
 #include "modular_citadel\code\modules\projectiles\guns\energy\energy_gun.dm"
+#include "modular_citadel\code\modules\projectiles\guns\energy\laser.dm"
 #include "modular_citadel\code\modules\research\designs\autoylathe_designs.dm"
 #include "modular_citadel\code\modules\research\designs\machine_designs.dm"
 #include "modular_citadel\code\modules\research\techweb\_techweb.dm"