diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index e2362abb278..d299396f79d 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -537,4 +537,19 @@
desc = "A marine helmet prop from the popular game 'Ruin'."
icon_state = "marine"
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR
- body_parts_covered = HEAD|FACE|EYES
\ No newline at end of file
+ body_parts_covered = HEAD|FACE|EYES
+
+//Laser Tag Helmets
+/obj/item/clothing/head/bluetag
+ name = "blue laser tag helmet"
+ desc = "Blue Pride, Station Wide."
+ icon_state = "bluetag"
+ flags_inv = HIDEEARS|BLOCKHEADHAIR
+ body_parts_covered = HEAD|EYES
+
+/obj/item/clothing/head/redtag
+ name = "red laser tag helmet"
+ desc = "Reputed to go faster."
+ icon_state = "redtag"
+ flags_inv = HIDEEARS|BLOCKHEADHAIR
+ body_parts_covered = HEAD|EYES
\ No newline at end of file
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index cee3fcec328..61825a6e5dd 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -13,7 +13,7 @@
*/
/obj/item/clothing/suit/bluetag
- name = "blue laser tag armour"
+ name = "blue laser tag armor"
desc = "Blue Pride, Station Wide."
icon_state = "bluetag"
item_state_slots = list(slot_r_hand_str = "tdblue", slot_l_hand_str = "tdblue")
@@ -22,8 +22,13 @@
allowed = list (/obj/item/weapon/gun/energy/lasertag/blue)
siemens_coefficient = 3.0
+/obj/item/clothing/suit/bluetag/sub
+ name = "Brigader Armor"
+ desc = "Repilca rmor commonly worn by Spacer Union Brigade members from the hit series Spacer Trail. Modified for Laser Tag (Blue Team)."
+ icon_state = "bluetag2"
+
/obj/item/clothing/suit/redtag
- name = "red laser tag armour"
+ name = "red laser tag armor"
desc = "Reputed to go faster."
icon_state = "redtag"
item_state_slots = list(slot_r_hand_str = "tdred", slot_l_hand_str = "tdred")
@@ -32,6 +37,11 @@
allowed = list (/obj/item/weapon/gun/energy/lasertag/red)
siemens_coefficient = 3.0
+/obj/item/clothing/suit/redtag/dom
+ name = "Mu'tu'bi Armor"
+ desc = "Repilca rmor commonly worn by Dominion Of Mu'tu'bi soldiers from the hit series Spacer Trail. Modified for Laser Tag (Red Team)."
+ icon_state = "redtag2"
+
/*
* Costume
*/
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index e0f4b936b8e..e4cd464663e 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -278,41 +278,6 @@
accuracy = 0
scoped_accuracy = 20
-////////Laser Tag////////////////////
-
-/obj/item/weapon/gun/energy/lasertag
- name = "laser tag gun"
- item_state = "laser"
- desc = "Standard issue weapon of the Imperial Guard"
- origin_tech = list(TECH_COMBAT = 1, TECH_MAGNET = 2)
- matter = list(MAT_STEEL = 2000)
- projectile_type = /obj/item/projectile/beam/lasertag/blue
- cell_type = /obj/item/weapon/cell/device/weapon/recharge
- battery_lock = 1
- var/required_vest
-
-/obj/item/weapon/gun/energy/lasertag/special_check(var/mob/living/carbon/human/M)
- if(ishuman(M))
- if(!istype(M.wear_suit, required_vest))
- to_chat(M, "You need to be wearing your laser tag vest!")
- return 0
- return ..()
-
-/obj/item/weapon/gun/energy/lasertag/blue
- icon_state = "bluetag"
- item_state = "bluetag"
- projectile_type = /obj/item/projectile/beam/lasertag/blue
- required_vest = /obj/item/clothing/suit/bluetag
-
-/obj/item/weapon/gun/energy/lasertag/red
- icon_state = "redtag"
- item_state = "redtag"
- projectile_type = /obj/item/projectile/beam/lasertag/red
- required_vest = /obj/item/clothing/suit/redtag
-
-/obj/item/weapon/gun/energy/lasertag/omni
- projectile_type = /obj/item/projectile/beam/lasertag/omni
-
// Laser scattergun, proof of concept.
/obj/item/weapon/gun/energy/lasershotgun
diff --git a/code/modules/projectiles/guns/projectile/toy.dm b/code/modules/projectiles/guns/toy.dm
similarity index 76%
rename from code/modules/projectiles/guns/projectile/toy.dm
rename to code/modules/projectiles/guns/toy.dm
index 9231b0316c3..e3b90bd1be0 100644
--- a/code/modules/projectiles/guns/projectile/toy.dm
+++ b/code/modules/projectiles/guns/toy.dm
@@ -12,6 +12,7 @@
* Crossbow (Halloween)
* Sawn Off
* SMG
+ * Laser Tag
*/
/*
@@ -197,4 +198,54 @@
if(ammo_magazine)
icon_state = initial(icon_state)
else
- icon_state = "[initial(icon_state)]-e"
\ No newline at end of file
+ icon_state = "[initial(icon_state)]-e"
+
+/*
+ * Laser Tag
+ */
+/obj/item/weapon/gun/energy/lasertag
+ name = "laser tag gun"
+ desc = "Standard issue weapon of the Imperial Guard"
+ icon = 'icons/obj/gun_toy.dmi'
+ item_state = "omnitag"
+ item_state = "retro"
+ origin_tech = list(TECH_COMBAT = 1, TECH_MAGNET = 2)
+ matter = list(MAT_STEEL = 2000)
+ projectile_type = /obj/item/projectile/beam/lasertag/blue
+ cell_type = /obj/item/weapon/cell/device/weapon/recharge
+ battery_lock = 1
+ var/required_vest
+
+/obj/item/weapon/gun/energy/lasertag/special_check(var/mob/living/carbon/human/M)
+ if(ishuman(M))
+ if(!istype(M.wear_suit, required_vest))
+ to_chat(M, "You need to be wearing your laser tag vest!")
+ return 0
+ return ..()
+
+/obj/item/weapon/gun/energy/lasertag/blue
+ icon_state = "bluetag"
+ item_state = "bluetag"
+ projectile_type = /obj/item/projectile/beam/lasertag/blue
+ required_vest = /obj/item/clothing/suit/bluetag
+
+/obj/item/weapon/gun/energy/lasertag/blue/sub
+ name = "Brigader Sidearm"
+ desc = "A laser tag replica of the standard issue weapon for the Spacer Union Brigade from the hit series Spacer Trail (Blue Team)."
+ icon_state = "bluetwo"
+ item_state = "retro"
+
+/obj/item/weapon/gun/energy/lasertag/red
+ icon_state = "redtag"
+ item_state = "redtag"
+ projectile_type = /obj/item/projectile/beam/lasertag/red
+ required_vest = /obj/item/clothing/suit/redtag
+
+/obj/item/weapon/gun/energy/lasertag/red/dom
+ name = "Mu'tu'bi sidearm"
+ desc = "A laser tag replica of the Mu'tu'bi sidearm from the hit series Spacer Trail (Red Team)."
+ icon_state = "redtwo"
+ item_state = "retro"
+
+/obj/item/weapon/gun/energy/lasertag/omni
+ projectile_type = /obj/item/projectile/beam/lasertag/omni
\ No newline at end of file
diff --git a/icons/inventory/head/item.dmi b/icons/inventory/head/item.dmi
index 31d2a38cc53..76b81184092 100644
Binary files a/icons/inventory/head/item.dmi and b/icons/inventory/head/item.dmi differ
diff --git a/icons/inventory/head/mob.dmi b/icons/inventory/head/mob.dmi
index 6289d6b9d4f..0917a414bd5 100644
Binary files a/icons/inventory/head/mob.dmi and b/icons/inventory/head/mob.dmi differ
diff --git a/icons/inventory/suit/item.dmi b/icons/inventory/suit/item.dmi
index 659401d5a6a..e5d75cd19ea 100644
Binary files a/icons/inventory/suit/item.dmi and b/icons/inventory/suit/item.dmi differ
diff --git a/icons/inventory/suit/mob.dmi b/icons/inventory/suit/mob.dmi
index 36e91cbcf15..0eb7b2b6e13 100644
Binary files a/icons/inventory/suit/mob.dmi and b/icons/inventory/suit/mob.dmi differ
diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi
index c94a289290b..9de92931db4 100644
Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ
diff --git a/icons/obj/gun_toy.dmi b/icons/obj/gun_toy.dmi
index 5afb4263f34..3f9c1f53322 100644
Binary files a/icons/obj/gun_toy.dmi and b/icons/obj/gun_toy.dmi differ
diff --git a/vorestation.dme b/vorestation.dme
index a46a481efd3..c03aab5deb8 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -3502,6 +3502,7 @@
#include "code\modules\projectiles\guns\magic.dm"
#include "code\modules\projectiles\guns\modular_guns.dm"
#include "code\modules\projectiles\guns\projectile.dm"
+#include "code\modules\projectiles\guns\toy.dm"
#include "code\modules\projectiles\guns\vox.dm"
#include "code\modules\projectiles\guns\energy\bsharpoon_vr.dm"
#include "code\modules\projectiles\guns\energy\crestrose_vr.dm"
@@ -3562,7 +3563,6 @@
#include "code\modules\projectiles\guns\projectile\shotgun_vr.dm"
#include "code\modules\projectiles\guns\projectile\smartgun.dm"
#include "code\modules\projectiles\guns\projectile\sniper.dm"
-#include "code\modules\projectiles\guns\projectile\toy.dm"
#include "code\modules\projectiles\guns\projectile\sniper\collapsible_sniper.dm"
#include "code\modules\projectiles\projectile\arc.dm"
#include "code\modules\projectiles\projectile\beams.dm"