From c2e73010d0d5a82a21a2a8e243b2f9f1da5163e0 Mon Sep 17 00:00:00 2001 From: evilew Date: Thu, 13 Jun 2024 15:56:37 +0200 Subject: [PATCH 1/2] added snowflake drones to meta --- _maps/map_files/MetaStation/MetaStation.dmm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 46d1e627..6d8664d2 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -3889,9 +3889,9 @@ "bxN" = (/obj/machinery/light/small{dir = 8},/obj/effect/turf_decal/tile/blue,/obj/effect/turf_decal/tile/blue{dir = 1},/turf/open/floor/plasteel/dark,/area/ai_monitored/turret_protected/aisat/foyer) "bxO" = (/obj/machinery/light/small{dir = 8},/obj/machinery/announcement_system,/turf/open/floor/plasteel/grimy,/area/tcommsat/computer) "bxP" = (/obj/structure/table/wood,/obj/machinery/status_display/evac{pixel_y = 31},/obj/item/radio/off{pixel_y = 4},/obj/item/screwdriver{pixel_y = 10},/turf/open/floor/plasteel/grimy,/area/tcommsat/computer) -"bxQ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/showcase/cyborg/old{pixel_y = 20},/turf/open/floor/plasteel/grimy,/area/tcommsat/computer) +"bxQ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/showcase/cyborg/old{pixel_y = 20},/obj/item/drone_shell/snowflake,/turf/open/floor/plasteel/grimy,/area/tcommsat/computer) "bxR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{icon_state = "1-2"},/turf/open/floor/plasteel/grimy,/area/tcommsat/computer) -"bxS" = (/obj/machinery/light_switch{pixel_y = 28},/obj/structure/showcase/cyborg/old{pixel_y = 20},/turf/open/floor/plasteel/grimy,/area/tcommsat/computer) +"bxS" = (/obj/machinery/light_switch{pixel_y = 28},/obj/structure/showcase/cyborg/old{pixel_y = 20},/obj/item/drone_shell/snowflake,/turf/open/floor/plasteel/grimy,/area/tcommsat/computer) "bxT" = (/obj/structure/table/wood,/obj/machinery/status_display/ai{pixel_y = 31},/obj/item/flashlight/lamp,/turf/open/floor/plasteel/grimy,/area/tcommsat/computer) "bxU" = (/obj/machinery/light/small{dir = 4},/obj/item/radio/intercom{dir = 8; freerange = 1; name = "Station Intercom (Telecomms)"; pixel_y = 30},/obj/structure/table/wood,/obj/item/phone{desc = "Who can it be now?"; pixel_x = -3; pixel_y = 3},/obj/item/cigbutt/cigarbutt{pixel_x = 5; pixel_y = -1},/turf/open/floor/plasteel/grimy,/area/tcommsat/computer) "bxV" = (/turf/closed/wall,/area/aisat) From c41e505b0dd5324caed5d7051617cb38c61f5484 Mon Sep 17 00:00:00 2001 From: evilew Date: Fri, 14 Jun 2024 21:30:29 +0200 Subject: [PATCH 2/2] added treadmills --- _maps/map_files/BoxStation/BoxStation.dmm | 7 ++++--- _maps/map_files/KiloStation/KiloStation.dmm | 7 ++++--- _maps/map_files/MetaStation/MetaStation.dmm | 2 +- _maps/map_files/PubbyStation/PubbyStation.dmm | 6 +++++- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 904956f9..77e72a26 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -7358,6 +7358,7 @@ "nSi" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 5},/turf/open/floor/plasteel/white,/area/medical/medbay/central) "nVj" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/light,/turf/open/floor/plasteel/dark/side,/area/crew_quarters/fitness/sauna) "nVk" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/vending/kink,/turf/open/floor/plasteel/dark/side{dir = 9},/area/crew_quarters/fitness/sauna) +"nWV" = (/obj/item/conveyor_construct/treadmill,/turf/open/floor/wood,/area/crew_quarters/fitness) "ooZ" = (/obj/structure/bookcase/random/nonfiction,/turf/open/floor/wood,/area/library) "orq" = (/obj/machinery/light{dir = 8},/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 4},/turf/open/floor/plasteel/dark,/area/chapel/main) "otM" = (/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals3"},/obj/machinery/door/firedoor,/turf/open/floor/plasteel,/area/hallway/primary/central) @@ -7541,9 +7542,9 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaadaaaaaaaadalvalwalxalyalvalzalzalzalzalzalzalzalzalzaaaaaaaaaaaaakTalAtjjalCakTaaaaaaaaaaaaaaaaaaaiIaiIaiIalDalEalFalGaiUalHaldalIagdalJfTValKagdalLfTValMagdalNfTValOagdalPalQalRaldalkagdalTalUalVaiUalqalXalZalZalZalZalWalnajdjouasCaqGaqGaqGaqGapPapQaszarKbiXbiYarDarDarDbiYarDbiZasBbiOaaaatJaaaatJaaaaadanIambanIaadaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaltamcaltaadaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalvamdameamfalvamgamgalzamhbjaamjalzamkalzaaaaaaaaaaadalzamlamiammalzaaaaaaaaaaaaaaaaaaaaaaaaamnaiHaiIamoampaiUamqamramsaiUamtamuamuamvamuamuamuamvamuamuamuamvamwamxamyamzamAaiUaiUaiUaiUaiUalpamCdUOajcajEakQlQfxovaneamEaiFaiVatvbjdatwreSbjfaszarKarDarDarDarDarDarDarDbiZatxbiNaaaatJaaaatJaaaaadamaamHamaaadaadaadaadaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaltamIaltaadaaaaadaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamJamJamJamJamJamJamJamJamJamJamJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalvamKamLamMalvamNamOaziamQamiamRalzalzalzakTalzakTakTalzbjgamTamSalzaaaaaaaaaaaaaaaaaaaiIaiIaiIamUamVamWamXajLaiUaiUaiUaiUamYamYamYamZamYamYamYanaamYamYamYamZamYamYamYanbanbancandaLjbjhaneamBflsbjbajEajEbjblzbalnapavKcaiFlQqbjebjebjebjebjfatKrWEbjkarDarDbjlarDarDaDMaKtauvbiNaadaaeaaeaaeaadanIanIanianIanIaaaaaaaadaaaaaaaadaaaaaaaaaaaaaaaaadatJaaaaltamIaltaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamJanjanjanjanjanjanjanjanjanjamJaadaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaalvalvankanlalvanmamialzamiamiamiaziamiamiannamialBamiamiamiamianoakTaaaaaaaaaaaaaaaanpanqakVanrakrakXakYakXansmKVwCKozRantanbanbanuanbmKVwCKozRanbanbanbanvanbanbanbanwanbmKVwCKozRanbanbanxalnanyaiXanAanBanCanzamBaneamEanFaiVlfCbjebjebjebjjgYUarKarDarDarDarDarDarDarDbiZavEbiNaaaatJaaaatJaaaanIanJanKanLanIaaaaaaaadaaaaaaaadaaaaadaaaaaaaaaatJaltaltaltamIaltaltaltaltaltaltaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamJanjanjanjanjanjanjanjanjanjamJamJanMamJamJaadaaaaaaaaaaaaalzalzalzalzalzaadaadalzanNanOanPanQamOalzalzakTakTalzalzalzalzakTalzakTakTalzanRamianSalzaaaaaaaaaaaaaaaaaaaiIaiIanTanUanVanWanXaiHanYanYanYanYanYanZaoaanYanYanYanYanYanYanYaobaocaocaocaodaoeaocaofaogaohaoianeaojaokajdajdajdajdajdajdajdjouaolaqGaECbjeauDbjebjfaszarKarDarDarDbjparDarDarDbiZasBbiOaaaatJaaaatJaaaanIaooaopaoqanIaaaaaaaadaaaaaaaadaaaaadaltalualtalualtaoramIamIamIamIamIamIaosaltaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadamJanjanjanjanjanjanjanjanjanjaotaouaovaowamJaadaaeaaealzalzalzaoxaoyaozalzaaaaaaalzamianOanmamiaoAalzaadaadaadaaFaadaadaadaaFaaFaoCaoCalzaoDamiaoEalzaaaaaaaaaaaaaaaaaaaaaaadajLaiHaoFaiHaoGaoHaoHaoHaoIaoHaoHaoHaoJaoKaoKaoKaoLaoKaoKaoMaoNaoOaoPanGaoQanGanGanGanGaoRanGaoSaoSaoSaoSaoTaoUaoVaoWaoXaoXaoYaoZaqGbjqbjebjebjebjoaszarLaGharEarFjySarFarGarFbjrasBbiOaaaaaeaaeaaeaaaanIapdapeapfanIapgapgapgapgapgalualualualtaphsMlaosaltaltamIaltaltaltaltapialtaltaadmTUcsjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamJanjanjanjanjanjanjanjanjanjamJaadaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaalvalvankanlalvanmamialzamiamiamiaziamiamiannamialBamiamiamiamianoakTaaaaaaaaaaaaaaaanpanqakVanrakrakXakYakXansmKVwCKozRantanbanbanuanbmKVwCKozRanbanbanbanvanbanbanbanwanbmKVwCKozRanbanbanxalnanyaiXanAanBanCanzamBaneamEanFaiVlfCbjenWVbjebjjgYUarKarDarDarDarDarDarDarDbiZavEbiNaaaatJaaaatJaaaanIanJanKanLanIaaaaaaaadaaaaaaaadaaaaadaaaaaaaaaatJaltaltaltamIaltaltaltaltaltaltaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamJanjanjanjanjanjanjanjanjanjamJamJanMamJamJaadaaaaaaaaaaaaalzalzalzalzalzaadaadalzanNanOanPanQamOalzalzakTakTalzalzalzalzakTalzakTakTalzanRamianSalzaaaaaaaaaaaaaaaaaaaiIaiIanTanUanVanWanXaiHanYanYanYanYanYanZaoaanYanYanYanYanYanYanYaobaocaocaocaodaoeaocaofaogaohaoianeaojaokajdajdajdajdajdajdajdjouaolaqGaECbjebjebjebjfaszarKarDarDarDbjparDarDarDbiZasBbiOaaaatJaaaatJaaaanIaooaopaoqanIaaaaaaaadaaaaaaaadaaaaadaltalualtalualtaoramIamIamIamIamIamIaosaltaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadamJanjanjanjanjanjanjanjanjanjaotaouaovaowamJaadaaeaaealzalzalzaoxaoyaozalzaaaaaaalzamianOanmamiaoAalzaadaadaadaaFaadaadaadaaFaaFaoCaoCalzaoDamiaoEalzaaaaaaaaaaaaaaaaaaaaaaadajLaiHaoFaiHaoGaoHaoHaoHaoIaoHaoHaoHaoJaoKaoKaoKaoLaoKaoKaoMaoNaoOaoPanGaoQanGanGanGanGaoRanGaoSaoSaoSaoSaoTaoUaoVaoWaoXaoXaoYaoZaqGbjqbjeauDbjebjoaszarLaGharEarFjySarFarGarFbjrasBbiOaaaaaeaaeaaeaaaanIapdapeapfanIapgapgapgapgapgalualualualtaphsMlaosaltaltamIaltaltaltaltapialtaltaadmTUcsjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadamJanjanjanjanjanjanjanjanjanjanMapjapkaplamJaadalzapmalzapnapoamiappamialzakTakTalzapqanOanmapqalzalzalzaUtaUtaUtalzalzalzalzalzalzaaFalzalzamPalzalzaaaaaaaaaaaaaaaaaaaaaaadaiHapsakVaiHaptaoHapuapvapwapxapwaoHapyaoKapzapAapBapCaoKamYanbapDapEapFapGapGapGapGapGapHapIapGapGapGapGapGapJapKapLapMapNapObjsaqGbjtbjebjubjvbjwbjxbjybjzbjybjybjAbjBbjCbjDbjDbjEbiOaadaluapValuapganIanIapWapXanIapYamIamIapZaltaqaamIaqbaltaqcamIamIaqdaltamIaltaqeaqfaltamIaqgaltatJaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadamJanjanjanjanjaqhanjanjanjaqiaqjapjapkaqkamJaadalzamialzaqlaqmanQaqnaqoalzaoEamiaqpbjaanOaqqamiamialzqmggzPwXUaDVawCalzxZrcgXvBbalzaadaaFaqraqsaqraaaaaaaaaaaaaaaaaaaaaaaaaadaiHaqtaquaiHaqvaoHaqwaqxaqyapwapwaoHapyaoKaqzapBaqAaqBaqCamYanbandapEaiEaqDaqDaqDaqDaqDaqEaqFaqDaqDaqDaqDaqDaqDaqDaqDaqDasGaqGaqIaqGatIayGbjFatIavMayHayHaEXayHayHaRiaJgaqGaqGaqGaqGaqGaaaaqLamIaluapgaqMaqNaqOaqPamIamIamIaltamIaltaqQamIamIaltamIaqRaqSaqTapiamIaltaqUaqValtbjGapZaltatJatJatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadamJanjanjanjanjanjanjanjanjanjanMaqWapkaqXamJalzalzaqYalzalzalzamPaqZaraaraarbarcardarcarearfargarhalzcgYaXhaXhaXhaXhlwTarielTarialzaoBaadaqraqsaqraaaaaaaaaaaaaaaarjarjarjarjarjarjarjarjaptaoHarkarlarmapwarnaoHapyaroarparqarrarsaqCamYanbartapEaiEaqDaruarvautarxaryasxaqDatBatCatGaqDatHauuayzaqDasGaqGbjHaLVauFauFauGauHaqJaqKaqKaqKaqKaqKaqJapRaEYbjIaadaadaadaadaluarNaluapgarOamIarPbjJaoramIaltaltarQaltaltarRaltaltaqTarSarTamIaltamIarUarUarUarUarUarUarUarUarUatJatJatJatJatJfRxatJaaaaaaaoBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 56e11972..3c83abb4 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -30460,6 +30460,7 @@ "aYX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, +/obj/structure/punching_bag, /turf/open/floor/wood, /area/crew_quarters/fitness/recreation) "aYY" = ( @@ -84589,7 +84590,7 @@ /turf/open/floor/engine, /area/engine/supermatter) "xlT" = ( -/obj/structure/punching_bag, +/obj/item/conveyor_construct/treadmill, /turf/open/floor/wood, /area/crew_quarters/fitness/recreation) "xmU" = ( @@ -101881,7 +101882,7 @@ cFW awD bKD bLb -xlT +btv btr bvz bvx @@ -102138,7 +102139,7 @@ cuB awD bKH bLb -btv +xlT btu bLW bLC diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 6d8664d2..bbe0a37e 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -2298,7 +2298,7 @@ "aTb" = (/obj/effect/spawner/structure/window,/turf/open/floor/plating,/area/crew_quarters/fitness/recreation) "aTd" = (/turf/open/floor/plasteel/dark/side{dir = 9},/area/crew_quarters/fitness/recreation) "aTe" = (/obj/structure/cable/yellow{icon_state = "1-2"},/turf/open/floor/plasteel/dark/side{dir = 4},/area/crew_quarters/fitness/recreation) -"aTg" = (/obj/structure/punching_bag,/turf/open/floor/wood,/area/crew_quarters/fitness/recreation) +"aTg" = (/obj/item/conveyor_construct/treadmill,/turf/open/floor/wood,/area/crew_quarters/fitness/recreation) "aTh" = (/obj/structure/window/reinforced{dir = 8},/obj/item/statuebust,/turf/open/floor/grass,/area/crew_quarters/fitness/recreation) "aTi" = (/obj/machinery/light/small{dir = 8},/obj/structure/easel,/turf/open/floor/plating,/area/maintenance/starboard/fore) "aTj" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/item/cigbutt,/turf/open/floor/plating,/area/maintenance/starboard/fore) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 2bea8409..e12e06c0 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -62581,6 +62581,10 @@ }, /turf/open/floor/plasteel, /area/construction/mining/aux_base) +"qkK" = ( +/obj/item/conveyor_construct/treadmill, +/turf/open/floor/wood, +/area/crew_quarters/fitness) "qnT" = ( /obj/machinery/iv_drip, /turf/open/floor/plating, @@ -108753,7 +108757,7 @@ bkV bms bng boj -boi +qkK bqz boi aEj