From 910819b09c141602d9abc3f79f01e0087a05c575 Mon Sep 17 00:00:00 2001 From: enkidienne <56667232+enkidienne@users.noreply.github.com> Date: Sun, 30 Jul 2023 17:19:34 -0400 Subject: [PATCH] urf now has armory --- maps/operation_trebuchet/innie_base4.dmm | 49 ++++++++++++------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/maps/operation_trebuchet/innie_base4.dmm b/maps/operation_trebuchet/innie_base4.dmm index 28147b1a5def2..f9e6106542d33 100644 --- a/maps/operation_trebuchet/innie_base4.dmm +++ b/maps/operation_trebuchet/innie_base4.dmm @@ -67,10 +67,8 @@ "bo" = (/obj/structure/sign/warning/secure_area/armory,/turf/unsimulated/wall,/area/asteroid_base/kitchen) "bp" = (/obj/machinery/door/airlock/halo/lifepod{name = "Airlock"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/asteroid_base/kitchen) "bq" = (/obj/machinery/door/airlock/halo/lifepod,/turf/simulated/floor/plating,/area/asteroid_base/kitchen) -"br" = (/obj/structure/table/rack,/obj/item/weapon/gun/projectile/m6d_magnum,/obj/item/weapon/gun/projectile/m6d_magnum,/obj/item/weapon/gun/projectile/m6d_magnum,/turf/simulated/floor/tiled,/area/asteroid_base/kitchen) "bs" = (/turf/simulated/floor/tiled,/area/asteroid_base/kitchen) "bt" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/asteroid_base/kitchen) -"bu" = (/obj/structure/table/rack,/obj/item/weapon/gun/projectile/m6d_magnum,/obj/item/weapon/gun/projectile/m6d_magnum,/obj/item/weapon/gun/projectile/m6d_magnum,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/tiled,/area/asteroid_base/kitchen) "bv" = (/obj/structure/table/rack,/obj/item/clothing/head/bomb_hood/security/colossus,/turf/simulated/floor/tiled,/area/asteroid_base/kitchen) "bw" = (/obj/structure/bed,/obj/item/weapon/bedsheet/brown,/turf/simulated/floor/tiled,/area/asteroid_base/main_hangar) "bx" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/asteroid_base/main_hangar) @@ -80,20 +78,14 @@ "bB" = (/turf/simulated/floor/tiled,/area/asteroid_base/main_hangar) "bC" = (/obj/structure/bed,/obj/item/weapon/bedsheet/hos,/turf/simulated/floor/tiled,/area/asteroid_base/main_hangar) "bD" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/tiled/dark,/area/asteroid_base/kitchen) -"bE" = (/obj/structure/table/rack,/obj/item/ammo_magazine/m6d/m224,/obj/item/ammo_magazine/m6d/m224,/obj/item/ammo_magazine/m6d/m224,/turf/simulated/floor/tiled,/area/asteroid_base/kitchen) -"bF" = (/obj/structure/table/rack,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/asteroid_base/kitchen) -"bG" = (/obj/structure/table/rack,/obj/item/weapon/gun/projectile/br85,/obj/item/weapon/gun/projectile/br85,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/tiled,/area/asteroid_base/east_dorms) "bH" = (/obj/structure/table/rack,/obj/item/clothing/suit/bomb_suit/security/colossus,/turf/simulated/floor/tiled,/area/asteroid_base/kitchen) "bI" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/tiled,/area/asteroid_base/main_hangar) "bJ" = (/turf/unsimulated/wall{tag = "icon-rock-dark"; icon_state = "rock-dark"},/area/asteroid_base/east_dorms) "bK" = (/obj/structure/extinguisher_cabinet,/turf/unsimulated/wall,/area/asteroid_base/east_dorms) "bL" = (/turf/simulated/floor/tiled/dark,/area/asteroid_base/east_dorms) "bM" = (/turf/unsimulated/wall,/area/asteroid_base/east_dorms) -"bN" = (/obj/structure/table/rack,/obj/item/ammo_magazine/br85/m634,/obj/item/ammo_magazine/br85/m634,/turf/simulated/floor/tiled,/area/asteroid_base/east_dorms) "bO" = (/turf/simulated/floor/tiled,/area/asteroid_base/east_dorms) -"bP" = (/obj/structure/table/rack,/obj/effect/decal/cleanable/dirt,/obj/item/ammo_magazine/m7/m443,/obj/item/ammo_magazine/m7/m443,/obj/item/ammo_magazine/m7/m443,/turf/simulated/floor/tiled,/area/asteroid_base/east_dorms) "bQ" = (/mob/living/simple_animal/npc/colonist/weapon_smuggler,/turf/simulated/floor/tiled,/area/asteroid_base/east_dorms) -"bR" = (/obj/structure/table/rack,/obj/item/weapon/gun/projectile/m7_smg,/obj/item/weapon/gun/projectile/m7_smg,/obj/item/weapon/gun/projectile/m7_smg,/obj/item/weapon/gun/projectile/m7_smg,/obj/effect/decal/cleanable/dirt,/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/tiled,/area/asteroid_base/east_dorms) "bS" = (/obj/structure/table/rack,/obj/item/weapon/storage/briefcase/colossuscase,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/tiled,/area/asteroid_base/east_dorms) "bT" = (/obj/structure/table/rack,/obj/item/weapon/storage/briefcase/colossuscase,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled,/area/asteroid_base/east_dorms) "bU" = (/obj/machinery/vending/wallmed1,/turf/unsimulated/wall,/area/asteroid_base/east_dorms) @@ -105,18 +97,13 @@ "ca" = (/turf/unsimulated/wall{tag = "icon-rock-dark"; icon_state = "rock-dark"},/area/asteroid_base/medbay) "cb" = (/turf/simulated/wall,/area/asteroid_base/medbay) "cc" = (/turf/simulated/floor/plating,/area/asteroid_base/medbay) -"cd" = (/obj/item/turret_deploy_kit/chaingun,/turf/simulated/floor/tiled,/area/asteroid_base/east_dorms) -"ce" = (/obj/structure/table/rack,/obj/item/ammo_magazine/chaingun_boxmag,/turf/simulated/floor/tiled,/area/asteroid_base/east_dorms) "cf" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/asteroid_base/east_dorms) "cg" = (/obj/structure/closet/crate,/obj/item/ammo_magazine/m545/m118,/obj/item/ammo_magazine/m545/m118,/obj/item/ammo_magazine/m545/m118,/obj/item/weapon/gun/projectile/m545_lmg,/obj/item/weapon/gun/projectile/m545_lmg,/obj/item/weapon/gun/projectile/m545_lmg,/turf/simulated/floor/tiled,/area/asteroid_base/east_dorms) -"ch" = (/obj/structure/table/rack,/obj/item/clothing/suit/justice/zeal,/obj/item/clothing/glasses/tacgoggles,/turf/simulated/floor/tiled,/area/asteroid_base/east_dorms) "ci" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/tiled/dark,/area/asteroid_base/east_dorms) "cj" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/asteroid_base/medbay) "ck" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/tiled,/area/asteroid_base/medbay) "cl" = (/turf/unsimulated/wall,/area/asteroid_base/medbay) "cm" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/asteroid_base/medbay) -"cn" = (/obj/item/turret_deploy_kit/HMG,/turf/simulated/floor/tiled,/area/asteroid_base/east_dorms) -"co" = (/obj/structure/table/rack,/obj/item/ammo_magazine/HMG_boxmag,/turf/simulated/floor/tiled,/area/asteroid_base/east_dorms) "cp" = (/obj/structure/bed,/obj/item/weapon/bedsheet/ce,/turf/simulated/floor/tiled,/area/asteroid_base/medbay) "cq" = (/obj/structure/bed,/obj/item/weapon/bedsheet/yellow,/turf/simulated/floor/tiled,/area/asteroid_base/medbay) "cr" = (/obj/structure/bed,/obj/item/weapon/bedsheet/purple,/turf/simulated/floor/tiled,/area/asteroid_base/medbay) @@ -155,9 +142,7 @@ "cY" = (/obj/machinery/door/airlock/halo,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/asteroid_base/east_dorms) "cZ" = (/obj/structure/skele_stand,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/white,/area/asteroid_base/medbay) "da" = (/obj/structure/closet/secure_closet/medical3,/obj/machinery/light,/turf/simulated/floor/tiled/white,/area/asteroid_base/medbay) -"db" = (/obj/structure/table/standard,/turf/simulated/floor/tiled/white,/area/asteroid_base/medbay) "dc" = (/obj/machinery/vending/medical,/turf/simulated/floor/tiled/white,/area/asteroid_base/medbay) -"dd" = (/obj/structure/table/standard,/obj/effect/decal/cleanable/dirt,/obj/machinery/light,/turf/simulated/floor/tiled/white,/area/asteroid_base/medbay) "de" = (/obj/structure/closet/secure_closet/medical1,/turf/simulated/floor/tiled/white,/area/asteroid_base/medbay) "df" = (/obj/structure/closet/crate,/obj/item/weapon/grenade/frag/high_yield,/obj/item/weapon/grenade/frag/high_yield,/obj/item/weapon/grenade/frag/high_yield,/obj/item/weapon/grenade/frag/high_yield,/obj/item/weapon/grenade/frag/high_yield,/obj/item/weapon/grenade/frag/high_yield,/obj/item/weapon/grenade/frag/high_yield,/obj/item/weapon/grenade/frag/high_yield,/obj/item/weapon/grenade/frag/high_yield,/obj/item/device/binoculars,/obj/item/device/binoculars,/obj/item/device/binoculars,/obj/item/device/binoculars,/obj/item/device/binoculars,/obj/item/device/binoculars,/turf/simulated/floor/tiled,/area/asteroid_base/east_dorms) "dg" = (/obj/effect/landmark/start/Insurrectionist,/turf/simulated/floor/tiled,/area/asteroid_base/east_dorms) @@ -234,6 +219,21 @@ "eA" = (/obj/effect/landmark/map_data{name = "New New Antarctica"},/turf/unsimulated/wall{tag = "icon-rock-dark"; icon_state = "rock-dark"},/area/asteroid_base/east_dorms) "eB" = (/obj/item/device/mobilecomms/commsbackpack/innie/permanant,/turf/unsimulated/wall{tag = "icon-rock-dark"; icon_state = "rock-dark"},/area/asteroid_base/kitchen) "eC" = (/obj/item/device/mobilecomms/commsbackpack/unsc/permanant,/turf/unsimulated/wall{tag = "icon-rock-dark"; icon_state = "rock-dark"},/area/asteroid_base/kitchen) +"eK" = (/obj/machinery/pointbased_vending/armory/hybrid/innie,/turf/simulated/floor/tiled,/area/asteroid_base/east_dorms) +"hk" = (/obj/machinery/pointbased_vending/armory/hybrid/innie,/turf/simulated/floor/tiled,/area/asteroid_base/kitchen) +"iv" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/light,/obj/machinery/vending/armory/medical/innie,/turf/simulated/floor/tiled/white,/area/asteroid_base/medbay) +"jg" = (/obj/machinery/pointbased_vending/armory/heavy/innie,/turf/simulated/floor/tiled,/area/asteroid_base/kitchen) +"zw" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/pointbased_vending/armory/innie_armor,/turf/simulated/floor/tiled,/area/asteroid_base/east_dorms) +"De" = (/obj/machinery/pointbased_vending/armory/heavy/innie,/turf/simulated/floor/tiled,/area/asteroid_base/east_dorms) +"Ds" = (/obj/machinery/pointbased_vending/armory/innie_armor,/turf/simulated/floor/tiled,/area/asteroid_base/kitchen) +"JU" = (/obj/machinery/door/airlock/halo/maint,/turf/simulated/floor/plating,/area/asteroid_base/main_hangar) +"MR" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/pointbased_vending/armory/hybrid/innie,/turf/simulated/floor/tiled,/area/asteroid_base/east_dorms) +"Nl" = (/obj/machinery/pointbased_vending/armory/innie_armor,/turf/simulated/floor/tiled,/area/asteroid_base/east_dorms) +"PC" = (/obj/machinery/vending/armory/medical/innie,/turf/simulated/floor/tiled/white,/area/asteroid_base/medbay) +"Sj" = (/obj/effect/decal/cleanable/cobweb2,/obj/machinery/pointbased_vending/armory/innie_armor,/turf/simulated/floor/tiled,/area/asteroid_base/kitchen) +"Tk" = (/obj/item/turret_deploy_kit/chaingun,/obj/item/ammo_magazine/chaingun_boxmag,/obj/item/ammo_magazine/chaingun_boxmag,/obj/structure/table/rack,/turf/simulated/floor/tiled,/area/asteroid_base/east_dorms) +"WH" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/pointbased_vending/armory/innie_armor,/turf/simulated/floor/tiled,/area/asteroid_base/east_dorms) +"Xe" = (/obj/structure/table/rack,/obj/item/clothing/suit/justice/zeal,/obj/item/clothing/glasses/tacgoggles,/obj/item/clothing/head/helmet/zeal,/turf/simulated/floor/tiled,/area/asteroid_base/east_dorms) (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababab @@ -244,9 +244,9 @@ aaaaaaaaaaaaaaaaaaaaaaaaadadaeadadajanajajajajajagahafacacacacacababacahacababab aaaaeBaaaaaaaaaaaaaaaaaaadaiaoaladajajajajajajajagagafacapagahacacacacahacabababababacagacacacacacab aaaaeCaaaaaaaaaaaaaaaaaaadajaqajadanajajajarajajasagafacatauavahahagagahacabababababacahahahagagacab aaaaaaaaaaaaaaaaaaaaaaaaadalawajadaxalajajajajajasayafacahahahacacacacacacabababababacacacacacagacab -aaaaaaaaaaaaaaaaaaaaaaadadadajadadalazajajajajajaAagafacacacacacababababababababababababababacahacab -aaaaaaaaaaaaadaBadadadadadadaCadadadaDadaEaEaFadafafafafafafaGafafafafafafaHafafafafafafababacahacab -aaaaaaaaaaaaadaIaEaFaJadadaFaEaFaFaFaFaFaFaEaFaFaKaLaLaLaKaMaKaLaKaKaKaKaKaKaKaKaKaKaNafababacahacab +aaaaaaaaaaaaaaaaaaaaaaadadadajadadalazajajajajajaAagafacacahacacababababababababababababababacahacab +aaaaaaaaaaaaadaBadadadadadadaCadadadaDadaEaEaFadafafafafafJUaGafafafafafafaHafafafafafafababacahacab +aaaaaaaaaaaaadaIaEaFaJadadaFaEaFaFaFaFbmaFaEaFaFaKaLaLaLaMaKaKaLaKaKaKaKaKaKaKaKaKaKaNafababacahacab aaaaaaaaaaaaaOaEaEaFaJadadaFaFaFaFaFaFaFaFaFaFaFaLaLaKaKaKaKaKaKaKaKaKaLaLaLaLaPaKaKaLafababacagacab aaaaaaaaaaaaadaFaQadadadadaRaSadadadadadaFaFaFadafafafaTafafafafafafafafafafafafafaKaKafababacagacab aaaaaaaaaaaaadaUaUadadadadaRaVadaaaaaaadaFaFaFadababacaWacabababababababababababafaKaKafabacacagacab @@ -259,11 +259,11 @@ aaaaaaadadadadaFaQadadadadadadadadadadadaFaEaEadafafafaTafafafafafafafaHafafafaf aaaaaaadblaFaFaEaEaFaFaFaFaFaFaFbmaFaFaFaFaEaFaFaKaLaLaKaKaMaLaLaKaKaKaKaKaKaKaKaLaKaKafababacagacab aaaaaaadaFaEaFaEaFaFaFaFaFaFaFaFaFaFaFaFaEaFaFaFaPaLaKaKaKaKaLaKaKaKaKaKaLbnaKaKbcaKaKafababacahacab aaaaaaadaEaEadadbobpadadadadadbqbqadadadaFaFaFadafafafafafafafafaGafafafafafafafbdafafafababacagacab -aaaaaaadaEaFadbrbsbtbsbuadbvbsbsbsbsbvaBaFaFaFadbwbxbybzbAbBbCafabababababababacahacacacacacacagacab -aaaaaaadbDaFadbEbsbFbsbEadbHbsbsbsbsbHadaFaEaEadbIbxbxbBbBbBbBafabababababababacahahahagagagahahacab -bJbJbJbKbLbLbMbGbObNbQbRbMbSbObObObObTbUbLbVbLbWbXbXbXbXbXbYbXbZcacacacacacacacbcccbcbcbcbcbcbcbcbca -bJbJbJbMbLbLbMcdbOcecfbPbMchbObObObOchbMcibLbLbMbXbXbXbXbXcjckclcacacacacacacacbcmcbcacacacacacacaca -bJbJbJbMbVbVbMcnbObObOcobMchbObObObOchbMbLbLbLbMcpbYcqbXcrcjcsclcacbcbcbcbcbcbcbcmcbcacacacacacacaca +aaaaaaadaEaFadhkbsbtbsSjadbvbsbsbsbsbvaBaFaFaFadbwbxbybzbAbBbCafabababababababacahacacacacacacagacab +aaaaaaadbDaFadjgbsbtbsDsadbHbsbsbsbsbHadaFaEaEadbIbxbxbBbBbBbBafabababababababacahahahagagagahahacab +bJbJbJbKbLbLbMMRbObObQWHbMbSbOTkTkbObTbUbLbVbLbWbXbXbXbXbXbYbXbZcacacacacacacacbcccbcbcbcbcbcbcbcbca +bJbJbJbMbLbLbMDebObOcfzwbMXebObObObOXebMcibLbLbMbXbXbXbXbXcjckclcacacacacacacacbcmcbcacacacacacacaca +bJbJbJbMbVbVbMeKbObObONlbMXebObObObOXebMbLbLbLbMcpbYcqbXcrcjcsclcacbcbcbcbcbcbcbcmcbcacacacacacacaca bJbJbJbMbLbLbMbMbMctcubMbMbMbMcvcvbMbMbMbLbLbLbMclclclclclclclclcacbcwcccmcmcccccmcbcacacacacacacaca bJbJbJbMbLbLbLbLbLbVbLcxbLbVbLbLbLbVbLbLbLbVbVbMcbcbcbcbcbcbcbcbcbcbcccbcbcbcbcbcbcbcacacacacacacaca bJbJbJbMcycybLbLbVbVbLbLczbVbVbVbLcAbLbLbVbVcBcCcmcmcccccmcmcmcccccmcmcbcacacacacacacacacacacacacaca @@ -273,7 +273,7 @@ bJbJbJbUbVbLbLcEbMbKbLbVbMbJbJbJbJbJbJcGbLbLcHbMcIcJcKcLcMcNcOclcacbcccbcbcbcbcb bJbJbJbMbVbVbMbMbMbMbLbLbMbMbMbUbMbMbMbMbLbLbLcPcQcJcRcJcJcJcJclcacbcccmcmcmcScbcacacacacacacacacaca bJbJbJbMcTcTbLbLbLbLbLczbLbVbLbLbLbLbLbVbLbLbLcUcJcJcRcJcJcJcVclcacbcbcbcbcbcccbcacacacacacacacacaca bJbJbJbMbLbLbLcAcWbVbLbLbLcWbLbLcXbVbVbLbLcBbLbMcJcJcRcRcJcJcRclcacacacacacbcmcbcacacacacacacacacaca -bJbJbJbMbMbMbMbMbMbMcYbMbMbMbMbMbMbMbMbMbMcCbMbMcZdadbcJdcdddeclcacacacacacbcmcbcacacacacacacacacaca +bJbJbJbMbMbMbMbMbMbMcYbMbMbMbMbMbMbMbMbMbMcCbMbMcZdaPCcJdcivdeclcacacacacacbcmcbcacacacacacacacacaca bJbJbJbJbJbJbJbMdfdgbOdgcgbMbJbJbJbJbJbJdidjdibMclclclclclclclclcacacacacacbcccbcacacacacacacacacaca bJbJbJbJbJbJbJbMdkdlbOcfbObMbJbJbJbJbJbJdidjdibJcacacacacbcbcbcbcbcbcbcbcbcbdmcbcacacacacacacacacaca bJbJbJbJbJbJbJbMdndgbOdgdhbMbJbJbJbJbJbJdidjdibJcacacacacbdpcccccccmccccccdqdrcbcacacacacacacacacaca @@ -287,3 +287,4 @@ bJbJbJbJbJbJbJbJbMbMbMbMbMbJbJesbJbJbJbJbJbJbJbJcacacacacacacacacacacacbcmcceteu bJbJbJbJbJbJbJbJbJbJbJbJbJbJbJbJbJbJbJbJbJbJbJbJcacacacacacacacacacacacbcbcbcbcbcbcbcbcbcbcbcbcbcaca eAbJbJbJbJbJbJbJbJbJbJbJbJbJbJbJbJbJbJbJbJbJbJbJcacacacacacacacacacacacacacacacacacacacacacacacacaca "} +