diff --git a/code/game/objects/structures/crates_lockers/closets/fitness.dm b/code/game/objects/structures/crates_lockers/closets/fitness.dm index 9d01a4efbe7..6b104f7cac6 100644 --- a/code/game/objects/structures/crates_lockers/closets/fitness.dm +++ b/code/game/objects/structures/crates_lockers/closets/fitness.dm @@ -92,3 +92,29 @@ starts_with = list( /obj/item/weapon/gun/energy/lasertag/blue = 5, /obj/item/clothing/suit/bluetag = 5) + +/obj/structure/closet/lasertag/red/laserdome + name = "red team laserdome equipment" + desc = "It's a storage unit for laser tag equipment." + closet_appearance = /decl/closet_appearance/wardrobe/red + + starts_with = list( + /obj/item/device/encryptionkey/ent = 3, + /obj/item/clothing/gloves/bluespace = 3, + /obj/item/clothing/under/color/red = 3, + /obj/item/weapon/gun/energy/lasertag/red = 3, + /obj/item/clothing/head/redtag = 3, + /obj/item/clothing/suit/redtag = 3) + +/obj/structure/closet/lasertag/blue/laserdome + name = "blue team laserdome equipment" + desc = "It's a storage unit for laser tag equipment." + closet_appearance = /decl/closet_appearance/wardrobe/blue + + starts_with = list( + /obj/item/device/encryptionkey/ent = 3, + /obj/item/clothing/gloves/bluespace = 3, + /obj/item/clothing/under/color/blue = 3, + /obj/item/weapon/gun/energy/lasertag/blue = 3, + /obj/item/clothing/head/bluetag = 3, + /obj/item/clothing/suit/bluetag = 3) diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 6c114b471fc..e7de3d361fb 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -12,6 +12,8 @@ * Lasertag */ +#define LASER_TAG_HEALTH 3 //how many strikes do we get? + /obj/item/clothing/suit/bluetag name = "blue laser tag armor" desc = "Blue Pride, Station Wide." @@ -21,10 +23,11 @@ body_parts_covered = UPPER_TORSO allowed = list (/obj/item/weapon/gun/energy/lasertag/blue) siemens_coefficient = 3.0 + var/lasertag_health = LASER_TAG_HEALTH /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)." + desc = "Replica armor 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 @@ -36,10 +39,11 @@ body_parts_covered = UPPER_TORSO allowed = list (/obj/item/weapon/gun/energy/lasertag/red) siemens_coefficient = 3.0 + var/lasertag_health = LASER_TAG_HEALTH /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)." + desc = "Replica armor commonly worn by Dominion Of Mu'tu'bi soldiers from the hit series Spacer Trail. Modified for Laser Tag (Red Team)." icon_state = "redtag2" /* diff --git a/code/modules/mob/living/carbon/human/human_species.dm b/code/modules/mob/living/carbon/human/human_species.dm index ea2d2981d70..1051bc4d540 100644 --- a/code/modules/mob/living/carbon/human/human_species.dm +++ b/code/modules/mob/living/carbon/human/human_species.dm @@ -25,6 +25,7 @@ /mob/living/carbon/human/dummy/mannequin/autoequip icon = 'icons/mob/human_races/r_human.dmi' icon_state = "preview" + var/autorotate = TRUE /mob/living/carbon/human/dummy/mannequin/autoequip/Initialize() icon = null @@ -32,7 +33,8 @@ . = ..() dress_up() - turntable() + if(autorotate) + turntable() /mob/living/carbon/human/dummy/mannequin/autoequip/proc/dress_up() set waitfor = FALSE diff --git a/code/modules/projectiles/guns/toy.dm b/code/modules/projectiles/guns/toy.dm index 22f8ef9f740..16d9526cd1a 100644 --- a/code/modules/projectiles/guns/toy.dm +++ b/code/modules/projectiles/guns/toy.dm @@ -263,7 +263,7 @@ */ /obj/item/weapon/gun/energy/lasertag name = "laser tag gun" - desc = "Standard issue weapon of the Imperial Guard" + desc = "Standard issue weapon of the Imperial Guard." icon = 'icons/obj/gun_toy.dmi' item_state = "omnitag" item_state = "retro" @@ -286,6 +286,12 @@ item_state = "bluetag" projectile_type = /obj/item/projectile/beam/lasertag/blue required_vest = /obj/item/clothing/suit/bluetag + fire_delay = 10 + + firemodes = list( + list(mode_name="instagib rules", fire_delay=10, projectile_type=/obj/item/projectile/beam/lasertag/blue, charge_cost = 240), + list(mode_name="multi-hit rules", fire_delay=5, projectile_type=/obj/item/projectile/beam/lasertag/blue/multihit, charge_cost = 120), + ) /obj/item/weapon/gun/energy/lasertag/blue/sub name = "Brigader Sidearm" @@ -298,6 +304,12 @@ item_state = "redtag" projectile_type = /obj/item/projectile/beam/lasertag/red required_vest = /obj/item/clothing/suit/redtag + fire_delay = 10 + + firemodes = list( + list(mode_name="instagib rules", fire_delay=12, projectile_type=/obj/item/projectile/beam/lasertag/red, charge_cost = 240), + list(mode_name="multi-hit rules", fire_delay=5, projectile_type=/obj/item/projectile/beam/lasertag/red/multihit, charge_cost = 120), + ) /obj/item/weapon/gun/energy/lasertag/red/dom name = "Mu'tu'bi sidearm" diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 40be78330bf..40f9c9dad03 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -242,6 +242,23 @@ M.Weaken(5) return 1 +/obj/item/projectile/beam/lasertag/blue/multhit + name = "blue multi-hit lasertag beam" + +/obj/item/projectile/beam/lasertag/blue/multihit/on_hit(var/atom/target, var/blocked = 0) + if(ishuman(target)) + var/mob/living/carbon/human/M = target + if(istype(M.wear_suit, /obj/item/clothing/suit/redtag)) + var/obj/item/clothing/suit/redtag/S = M.wear_suit + if (S.lasertag_health <= 1) + M.Weaken(5) + to_chat(M,"You have been defeated!") + S.lasertag_health = initial(S.lasertag_health) + else + S.lasertag_health-- + to_chat(M,"Danger! You have [num2text(S.lasertag_health)] hits remaining!") + return 1 + /obj/item/projectile/beam/lasertag/red icon_state = "laser" light_color = "#FF0D00" @@ -254,6 +271,23 @@ M.Weaken(5) return 1 +/obj/item/projectile/beam/lasertag/red/multhit + name = "red multi-hit lasertag beam" + +/obj/item/projectile/beam/lasertag/red/multihit/on_hit(var/atom/target, var/blocked = 0) + if(ishuman(target)) + var/mob/living/carbon/human/M = target + if(istype(M.wear_suit, /obj/item/clothing/suit/bluetag)) + var/obj/item/clothing/suit/bluetag/S = M.wear_suit + if(S.lasertag_health <= 1) + M.Weaken(5) + to_chat(M,"You have been defeated!") + S.lasertag_health = initial(S.lasertag_health) + else + S.lasertag_health-- + to_chat(M,"Danger! You have [num2text(S.lasertag_health)] hits remaining!") + return 1 + /obj/item/projectile/beam/lasertag/omni//A laser tag bolt that stuns EVERYONE icon_state = "omnilaser" light_color = "#00C6FF" diff --git a/maps/offmap_vr/common_offmaps.dm b/maps/offmap_vr/common_offmaps.dm index 2fb10220e16..f155051ef1b 100644 --- a/maps/offmap_vr/common_offmaps.dm +++ b/maps/offmap_vr/common_offmaps.dm @@ -329,7 +329,7 @@ /datum/map_template/common_lateload/redgate/laserdome name = "Redgate - Laserdome" - desc = "A classic (if rather large!) laser tag arena." + desc = "A large orbital station with recreational facilities, namely a pair of laser tag arenas." mappath = 'maps/redgate/laserdome.dmm' ////////////////////////////////////////////////////////////////////////////////////// diff --git a/maps/redgate/laserdome.dmm b/maps/redgate/laserdome.dmm index 40f9b79056b..82210f36988 100644 --- a/maps/redgate/laserdome.dmm +++ b/maps/redgate/laserdome.dmm @@ -41,15 +41,8 @@ /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/hyperball) "aul" = ( -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/structure/closet/lasertag/red, /obj/effect/floor_decal/corner/red/full, -/obj/item/clothing/gloves/bluespace, -/obj/item/clothing/gloves/bluespace, +/obj/structure/closet/lasertag/red/laserdome, /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/ctf_prep) "awn" = ( @@ -67,17 +60,10 @@ /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/capture_the_flag) "aLY" = ( -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/structure/closet/lasertag/red, /obj/effect/floor_decal/corner/red/full{ dir = 8 }, -/obj/item/clothing/gloves/bluespace, -/obj/item/clothing/gloves/bluespace, +/obj/structure/closet/lasertag/red/laserdome, /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/hbl_prep) "aSF" = ( @@ -349,12 +335,16 @@ /area/redgate/laserdome/arena/hbl_prep) "eUU" = ( /obj/effect/floor_decal/corner/red/full, -/mob/living/carbon/human/dummy/mannequin/autoequip, /obj/item/clothing/shoes/black, /obj/item/clothing/under/color/red, /obj/item/clothing/suit/redtag, /obj/item/clothing/gloves/red, /obj/item/clothing/head/redtag, +/mob/living/carbon/human/dummy/mannequin/autoequip{ + autorotate = 0; + name = "Laserdome Mannequin"; + real_name = "Laserdome Mannequin" + }, /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/ctf_prep) "eXJ" = ( @@ -388,15 +378,8 @@ /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/hbl_prep) "fga" = ( -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, /obj/effect/floor_decal/corner/blue/full, -/obj/structure/closet/lasertag/blue, -/obj/item/clothing/gloves/bluespace, -/obj/item/clothing/gloves/bluespace, +/obj/structure/closet/lasertag/blue/laserdome, /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/hbl_prep) "fhw" = ( @@ -533,17 +516,10 @@ /turf/simulated/floor/tiled/milspec/sterile, /area/redgate/laserdome/lobby/aid_station) "gEn" = ( -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, /obj/effect/floor_decal/corner/blue/full{ dir = 4 }, -/obj/structure/closet/lasertag/blue, -/obj/item/clothing/gloves/bluespace, -/obj/item/clothing/gloves/bluespace, +/obj/structure/closet/lasertag/blue/laserdome, /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/hbl_prep) "gIH" = ( @@ -554,15 +530,8 @@ /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/ctf_prep) "gKy" = ( -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/structure/closet/lasertag/blue, /obj/effect/floor_decal/corner/blue/full, -/obj/item/clothing/gloves/bluespace, -/obj/item/clothing/gloves/bluespace, +/obj/structure/closet/lasertag/blue/laserdome, /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/ctf_prep) "gMp" = ( @@ -733,7 +702,11 @@ /area/redgate/laserdome/arena/capture_the_flag) "inv" = ( /obj/effect/floor_decal/corner/blue/full, -/mob/living/carbon/human/dummy/mannequin/autoequip, +/mob/living/carbon/human/dummy/mannequin/autoequip{ + autorotate = 0; + name = "Laserdome Mannequin"; + real_name = "Laserdome Mannequin" + }, /obj/item/clothing/shoes/black, /obj/item/clothing/under/color/red, /obj/item/clothing/suit/redtag, @@ -780,12 +753,16 @@ /area/redgate/laserdome/arena/hyperball) "iJM" = ( /obj/effect/floor_decal/corner/red/full, -/mob/living/carbon/human/dummy/mannequin/autoequip, /obj/item/clothing/shoes/black, /obj/item/clothing/under/color/blue, /obj/item/clothing/suit/bluetag, /obj/item/clothing/gloves/blue, /obj/item/clothing/head/bluetag, +/mob/living/carbon/human/dummy/mannequin/autoequip{ + autorotate = 0; + name = "Laserdome Mannequin"; + real_name = "Laserdome Mannequin" + }, /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/hbl_prep) "iVw" = ( @@ -860,12 +837,16 @@ /obj/effect/floor_decal/corner/red/full{ dir = 1 }, -/mob/living/carbon/human/dummy/mannequin/autoequip, /obj/item/clothing/shoes/black, /obj/item/clothing/under/color/red, /obj/item/clothing/suit/redtag, /obj/item/clothing/gloves/red, /obj/item/clothing/head/redtag, +/mob/living/carbon/human/dummy/mannequin/autoequip{ + autorotate = 0; + name = "Laserdome Mannequin"; + real_name = "Laserdome Mannequin" + }, /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/hbl_prep) "jZT" = ( @@ -912,15 +893,8 @@ /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/hyperball) "kvk" = ( -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/structure/closet/lasertag/red, /obj/effect/floor_decal/corner/red/full, -/obj/item/clothing/gloves/bluespace, -/obj/item/clothing/gloves/bluespace, +/obj/structure/closet/lasertag/red/laserdome, /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/hbl_prep) "kFg" = ( @@ -975,46 +949,36 @@ /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/capture_the_flag) "kYn" = ( -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/structure/closet/lasertag/red, /obj/effect/floor_decal/corner/red/full{ dir = 4 }, -/obj/item/clothing/gloves/bluespace, -/obj/item/clothing/gloves/bluespace, +/obj/structure/closet/lasertag/red/laserdome, /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/ctf_prep) "lbT" = ( /obj/effect/floor_decal/corner/blue/full{ dir = 8 }, -/mob/living/carbon/human/dummy/mannequin/autoequip, /obj/item/clothing/shoes/black, /obj/item/clothing/under/color/red, /obj/item/clothing/suit/redtag, /obj/item/clothing/gloves/red, /obj/item/clothing/head/redtag, +/mob/living/carbon/human/dummy/mannequin/autoequip{ + autorotate = 0; + name = "Laserdome Mannequin"; + real_name = "Laserdome Mannequin" + }, /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/hbl_prep) "lcP" = ( /turf/simulated/floor/tiled/white, /area/redgate/laserdome/lobby/showers) "ldQ" = ( -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/structure/closet/lasertag/red, /obj/effect/floor_decal/corner/red/full{ dir = 1 }, -/obj/item/clothing/gloves/bluespace, -/obj/item/clothing/gloves/bluespace, +/obj/structure/closet/lasertag/red/laserdome, /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/hbl_prep) "lgv" = ( @@ -1155,17 +1119,10 @@ /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/hyperball) "ngN" = ( -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/structure/closet/lasertag/red, /obj/effect/floor_decal/corner/red/full{ dir = 1 }, -/obj/item/clothing/gloves/bluespace, -/obj/item/clothing/gloves/bluespace, +/obj/structure/closet/lasertag/red/laserdome, /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/ctf_prep) "nlK" = ( @@ -1320,17 +1277,10 @@ /turf/simulated/wall/tgmc/darkwall, /area/redgate/laserdome/arena/hbl_prep) "oIG" = ( -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/structure/closet/lasertag/red, /obj/effect/floor_decal/corner/red{ dir = 5 }, -/obj/item/clothing/gloves/bluespace, -/obj/item/clothing/gloves/bluespace, +/obj/structure/closet/lasertag/red/laserdome, /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/hbl_prep) "oRz" = ( @@ -1341,12 +1291,16 @@ /obj/effect/floor_decal/corner/blue/full{ dir = 1 }, -/mob/living/carbon/human/dummy/mannequin/autoequip, /obj/item/clothing/shoes/black, /obj/item/clothing/under/color/blue, /obj/item/clothing/suit/bluetag, /obj/item/clothing/gloves/blue, /obj/item/clothing/head/bluetag, +/mob/living/carbon/human/dummy/mannequin/autoequip{ + autorotate = 0; + name = "Laserdome Mannequin"; + real_name = "Laserdome Mannequin" + }, /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/ctf_prep) "oWY" = ( @@ -1411,17 +1365,10 @@ /turf/simulated/wall/tgmc/window/darkwall/reinf, /area/redgate/laserdome/arena/hbl_prep) "pBv" = ( -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/structure/closet/lasertag/blue, /obj/effect/floor_decal/corner/blue/full{ dir = 4 }, -/obj/item/clothing/gloves/bluespace, -/obj/item/clothing/gloves/bluespace, +/obj/structure/closet/lasertag/blue/laserdome, /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/ctf_prep) "pCi" = ( @@ -1646,17 +1593,10 @@ /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/ctf_prep) "shp" = ( -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/structure/closet/lasertag/red, /obj/effect/floor_decal/corner/red{ dir = 10 }, -/obj/item/clothing/gloves/bluespace, -/obj/item/clothing/gloves/bluespace, +/obj/structure/closet/lasertag/red/laserdome, /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/ctf_prep) "sox" = ( @@ -1764,17 +1704,10 @@ /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/hbl_prep) "tjc" = ( -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, /obj/effect/floor_decal/corner/blue/full{ dir = 1 }, -/obj/structure/closet/lasertag/blue, -/obj/item/clothing/gloves/bluespace, -/obj/item/clothing/gloves/bluespace, +/obj/structure/closet/lasertag/blue/laserdome, /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/hbl_prep) "tuG" = ( @@ -1807,17 +1740,10 @@ /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/ctf_prep) "tRw" = ( -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/structure/closet/lasertag/blue, /obj/effect/floor_decal/corner/blue{ dir = 10 }, -/obj/item/clothing/gloves/bluespace, -/obj/item/clothing/gloves/bluespace, +/obj/structure/closet/lasertag/blue/laserdome, /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/ctf_prep) "tUV" = ( @@ -1830,12 +1756,16 @@ /obj/effect/floor_decal/corner/blue/full{ dir = 4 }, -/mob/living/carbon/human/dummy/mannequin/autoequip, /obj/item/clothing/shoes/black, /obj/item/clothing/under/color/blue, /obj/item/clothing/suit/bluetag, /obj/item/clothing/gloves/blue, /obj/item/clothing/head/bluetag, +/mob/living/carbon/human/dummy/mannequin/autoequip{ + autorotate = 0; + name = "Laserdome Mannequin"; + real_name = "Laserdome Mannequin" + }, /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/hbl_prep) "tZO" = ( @@ -1845,17 +1775,10 @@ /turf/simulated/wall/tgmc/darkwall, /area/redgate/laserdome/lobby/restaurant) "ubP" = ( -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/structure/closet/lasertag/red, /obj/effect/floor_decal/corner/red/full{ dir = 8 }, -/obj/item/clothing/gloves/bluespace, -/obj/item/clothing/gloves/bluespace, +/obj/structure/closet/lasertag/red/laserdome, /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/ctf_prep) "ucr" = ( @@ -1958,26 +1881,23 @@ /obj/effect/floor_decal/corner/red/full{ dir = 8 }, -/mob/living/carbon/human/dummy/mannequin/autoequip, /obj/item/clothing/shoes/black, /obj/item/clothing/under/color/blue, /obj/item/clothing/suit/bluetag, /obj/item/clothing/gloves/blue, /obj/item/clothing/head/bluetag, +/mob/living/carbon/human/dummy/mannequin/autoequip{ + autorotate = 0; + name = "Laserdome Mannequin"; + real_name = "Laserdome Mannequin" + }, /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/ctf_prep) "uPT" = ( -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/structure/closet/lasertag/blue, /obj/effect/floor_decal/corner/blue/full{ dir = 1 }, -/obj/item/clothing/gloves/bluespace, -/obj/item/clothing/gloves/bluespace, +/obj/structure/closet/lasertag/blue/laserdome, /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/ctf_prep) "val" = ( @@ -2085,17 +2005,10 @@ /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/capture_the_flag) "vNP" = ( -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, /obj/effect/floor_decal/corner/blue/full{ dir = 8 }, -/obj/structure/closet/lasertag/blue, -/obj/item/clothing/gloves/bluespace, -/obj/item/clothing/gloves/bluespace, +/obj/structure/closet/lasertag/blue/laserdome, /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/hbl_prep) "vNV" = ( @@ -2181,17 +2094,10 @@ /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/capture_the_flag) "wED" = ( -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/structure/closet/lasertag/blue, /obj/effect/floor_decal/corner/blue/full{ dir = 8 }, -/obj/item/clothing/gloves/bluespace, -/obj/item/clothing/gloves/bluespace, +/obj/structure/closet/lasertag/blue/laserdome, /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/ctf_prep) "wFp" = ( @@ -2238,17 +2144,10 @@ /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/lobby/spaceview_lounge) "wXJ" = ( -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, /obj/effect/floor_decal/corner/blue{ dir = 5 }, -/obj/structure/closet/lasertag/blue, -/obj/item/clothing/gloves/bluespace, -/obj/item/clothing/gloves/bluespace, +/obj/structure/closet/lasertag/blue/laserdome, /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/hbl_prep) "wYM" = ( @@ -2329,17 +2228,10 @@ /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/hyperball) "yet" = ( -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/item/device/encryptionkey/ent, -/obj/structure/closet/lasertag/red, /obj/effect/floor_decal/corner/red/full{ dir = 4 }, -/obj/item/clothing/gloves/bluespace, -/obj/item/clothing/gloves/bluespace, +/obj/structure/closet/lasertag/red/laserdome, /turf/simulated/floor/tiled/milspec, /area/redgate/laserdome/arena/hbl_prep) "yeu" = (