From d87f4d76608de9006b5932f534b5fdc13ffafdcb Mon Sep 17 00:00:00 2001 From: evilew Date: Mon, 5 Aug 2024 13:29:45 +0200 Subject: [PATCH] added cats - added cats to important parts of maints, to hunt mice --- _maps/map_files/BoxStation/BoxStation.dmm | 6 +++--- _maps/map_files/KiloStation/KiloStation.dmm | 3 +++ _maps/map_files/MetaStation/MetaStation.dmm | 9 ++++++--- _maps/map_files/PubbyStation/PubbyStation.dmm | 13 ++++++++++++- code/game/objects/structures/lattice.dm | 14 ++++++++++---- 5 files changed, 34 insertions(+), 11 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 77e72a26..c4bf53fd 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -934,7 +934,7 @@ "arX" = (/obj/structure/table,/obj/item/stack/sheet/metal/fifty,/obj/item/stack/sheet/metal/fifty,/obj/item/stack/sheet/glass/fifty,/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 4},/turf/open/floor/plasteel,/area/construction/mining/aux_base) "arY" = (/obj/machinery/space_heater,/turf/open/floor/plating,/area/maintenance/port/fore) "arZ" = (/obj/structure/reagent_dispensers/watertank,/obj/effect/spawner/lootdrop/maintenance,/turf/open/floor/plating,/area/maintenance/port/fore) -"asa" = (/obj/structure/cable{icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/open/floor/plating,/area/maintenance/port/fore) +"asa" = (/obj/structure/cable{icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/mob/living/simple_animal/pet/cat,/turf/open/floor/plating,/area/maintenance/port/fore) "asb" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plating,/area/maintenance/port/fore) "asc" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/door/airlock/maintenance{dir = 4; req_access_txt = "12"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plating,/area/maintenance/port/fore) "asd" = (/obj/structure/cable{icon_state = "1-2"},/obj/structure/cable{icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plating,/area/maintenance/port/fore) @@ -2907,7 +2907,7 @@ "beH" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plating,/area/maintenance/port) "beI" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plating,/area/maintenance/port) "beJ" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plating,/area/maintenance/port) -"beK" = (/obj/structure/cable{icon_state = "1-2"},/obj/structure/disposalpipe/sorting/mail/flip{dir = 1; sortType = 1},/obj/structure/cable{icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/open/floor/plating,/area/maintenance/port) +"beK" = (/obj/structure/cable{icon_state = "1-2"},/obj/structure/disposalpipe/sorting/mail/flip{dir = 1; sortType = 1},/obj/structure/cable{icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/mob/living/simple_animal/pet/cat,/turf/open/floor/plating,/area/maintenance/port) "beL" = (/obj/machinery/door/airlock{dir = 4; name = "Kitchen"; req_access_txt = "28"},/obj/machinery/door/firedoor,/turf/open/floor/plasteel/cafeteria,/area/crew_quarters/kitchen) "beM" = (/obj/structure/cable{icon_state = "4-8"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/primary/central) "beN" = (/obj/machinery/door/airlock/public/glass{name = "Diner"},/obj/machinery/door/firedoor,/turf/open/floor/plasteel,/area/crew_quarters/bar) @@ -6540,7 +6540,7 @@ "cwP" = (/obj/structure/cable{icon_state = "1-8"},/turf/open/floor/plating,/area/maintenance/port/aft) "cwQ" = (/obj/structure/cable{icon_state = "1-4"},/obj/structure/disposalpipe/segment{dir = 5},/turf/open/floor/plating,/area/maintenance/port/aft) "cwR" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plating,/area/maintenance/port/aft) -"cwS" = (/obj/structure/disposalpipe/sorting/mail/flip{dir = 8; sortType = 4},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plating,/area/maintenance/port/aft) +"cwS" = (/obj/structure/disposalpipe/sorting/mail/flip{dir = 8; sortType = 4},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/mob/living/simple_animal/pet/cat,/turf/open/floor/plating,/area/maintenance/port/aft) "cwT" = (/obj/structure/cable{icon_state = "1-8"},/obj/structure/disposalpipe/segment{dir = 9},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plating,/area/maintenance/port/aft) "cwU" = (/obj/machinery/shieldgen,/turf/open/floor/plating,/area/engine/engineering) "cwV" = (/obj/machinery/vending/engineering,/turf/open/floor/plating,/area/engine/engineering) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 9e33677a..72d866af 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -50558,6 +50558,7 @@ dir = 6 }, /obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/pet/cat, /turf/open/floor/plating, /area/maintenance/aft) "bGb" = ( @@ -65415,6 +65416,7 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, +/mob/living/simple_animal/pet/cat, /turf/open/floor/plating, /area/maintenance/port/aft) "cek" = ( @@ -75063,6 +75065,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/mob/living/simple_animal/pet/cat, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cvF" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index bbe0a37e..372a0e98 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -8107,6 +8107,7 @@ "dqC" = (/obj/structure/weightmachine/stacklifter,/turf/open/floor/wood,/area/crew_quarters/fitness/recreation) "dvQ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/turf_decal/tile/brown{dir = 1},/turf/open/floor/plasteel/dark/corner{dir = 1},/area/hallway/primary/central) "dxG" = (/obj/structure/lattice,/turf/closed/wall,/area/maintenance/port/aft) +"dFy" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/mob/living/simple_animal/pet/cat,/turf/open/floor/plating,/area/maintenance/starboard/fore) "dLG" = (/obj/machinery/vending/cola/random,/turf/open/floor/plating,/area/maintenance/port/fore) "dQj" = (/obj/structure/cable/yellow{icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/open/floor/carpet/green,/area/library) "dRA" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/effect/turf_decal/stripes/line{dir = 4},/turf/open/floor/plasteel,/area/quartermaster/storage) @@ -8137,6 +8138,7 @@ "gMZ" = (/obj/structure/reagent_dispensers/water_cooler,/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/psych) "gNd" = (/turf/open/floor/wood,/area/crew_quarters/fitness/pool) "gVZ" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/light/small{dir = 1; pixel_x = -8; pixel_y = 12},/turf/open/floor/plating,/area/maintenance/starboard) +"gXT" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/mob/living/simple_animal/pet/cat,/turf/open/floor/plating,/area/maintenance/starboard/fore) "hbu" = (/obj/structure/chair/office/dark{dir = 1},/turf/open/floor/wood,/area/security/vacantoffice) "hfO" = (/obj/machinery/airalarm{dir = 1; pixel_y = -22},/obj/machinery/light,/turf/open/floor/plasteel/dark/side,/area/crew_quarters/fitness/recreation) "hqT" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/flora/junglebush/b,/obj/machinery/light{color = "#ffa500"},/turf/open/floor/grass,/area/crew_quarters/fitness/pool) @@ -8257,6 +8259,7 @@ "xKx" = (/obj/structure/chair/sofa,/obj/item/trash/boritos,/turf/open/floor/carpet/red,/area/crew_quarters/locker) "xPC" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber/on,/turf/open/floor/plasteel,/area/hallway/primary/port) "ycl" = (/obj/structure/sauna_oven,/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/wood,/area/crew_quarters/fitness/pool) +"ycO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{icon_state = "1-2"},/mob/living/simple_animal/pet/cat,/turf/open/floor/plating,/area/maintenance/port) "yhM" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 8},/turf/open/floor/plasteel,/area/crew_quarters/locker) (1,1,1) = {" @@ -8348,9 +8351,9 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEarsaafaoDaafarsaafbogbogaafbogbogbogbogaoDaaaaaaaaaakZartaruakZarvarwarwarwarwarwarxakZaoQaryakZarzarAamkarBarCakZaoNausarFakZaoOaqnarGarHarIakZanGcCKarKakZarLaqqarMarNarOakZarPajQarQarRarSaqvaqwadYarTarUarVarWarXarYarZasaasbakdascasdaseasfasgashasiasjaskasjaslasjasmasnasoaspasqasrassakhaqSagqcobasuasvaswaswaswaswaswasxasyaszaswaswaswaswaswasAalZasBasCauAalZalZapQalZavvasFasGapQasHasIasJasKasLasMasNajFalYaqaasOasPasQaqaaaaaafaaaaaaackaafaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoDaafaoDaafaoDaoDaoDaqeaafaafaafaoDaoDaafaaaaafaafaiVasRasSasTasUasVasVasVasVasVasWasXasYasZataatbatciizateateateateatfakZakZakZakZakZakZakZakZakZakZatgakZathakZakZakZakZakZakZajQatiatjanNaqvaqwaphatkatlatmatnatoatpatqatranXakdatsattatuatvatwatxatyatzatAatBatCatDatEatFaqRatGatGatGatHakhatIatJatKatLvVFaswatMatNatOatPatQkhfatSaswatTatUatVaswalZalZatWatXatYapPalZapQalZasDapQatZiZTauaaubaucajFajFaudaueajFaufaqaaqaaugauhaqaalZalYalZalZauialZaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoDaoDaoDaoDaoDaafaoDaoDaafarsaoDaoDaafaafaafaafakZakZaujakZakZaukaulaulaulaulaulaumakZakZakZakZakZakZaupakZakZakZakZausakZayHauuauvauwauxakSauyauzauzauBauCauDakZaaaaaaaaaaaaaaaajSauEauFanNauGauHauIanXauJanXadYadYauKauLanXadYauMauNaigaigakhauOauPauQauOakhauRauSakhauTaqRaqRauUauUauUakhakhauVagqqORauWbTdaswauYauZavaavbavcavdaveavfavgavhaviaswavjalZavkavlavmavnalZavoalZalZalZavpalZauaavqavravsajFajFajFajFavtapPapQavuaAFalZavwavxavyalZavzalZaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaafaoDaoDaoDaoDaoDaoDaoDaoDaoDaoDaoDavAaoDaafarsakZakZakZaAVavCakZaafaafaafaafaafaafaafaafaafaafaafakZanFmSravJxkEdLGarDakZavGavHavIavJavKakZakZakZavLavMavMavMavNakZakZaaaaaaaaaaaaaaaajSajSaicavOavPavQavRavRavSavTavRavRavUavVavRavWavRavXavYavZawaavTawbawcavRavRavRavTavRawdajQaweawfawfawfawfaicaqSagqauXkjxbVMaswaswaswaswaswawgawhawiawjawkaswaswaswawlalZapPawmatZapQalZapQalZawnalZawoawpawqawrawsawtawuawvawwawxawyawzawwawAapQapQawmapQawBawCawBawDackackaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaafaoDaoDaoDaoDaoDaoDaoDaoDaoDaoDaoDavAaoDaafarsakZakZakZaAVavCakZaafaafaafaafaafaafaafaafaafaafaafakZanFmSravJxkEdLGarDakZavGavHavIavJavKakZakZakZavLavMavMavMavNakZakZaaaaaaaaaaaaaaaajSajSaicavOavPavQavRavRavSavTavRavRavUavVavRavWavRavXavYavZawaavTawbawcavRavRavRavTavRawdajQaweawfawfawfawfaicaqSagqauXkjxbVMaswaswaswaswaswawgawhawiawjawkaswaswaswawlalZapPawmatZapQalZapQalZawnalZawoawpawqawrawsawtawuawvawwawxawyawzdFyawAapQapQawmapQawBawCawBawDackackaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarsaafaoDaqeaoDaoDaoDaoDawEaafaoDaoDaoDaoDaoDaoDawFawGawHawIawJakZakZaafaaaaaaaaaaaaaaaaaaaaaaaaaafakZbSUavFaurujnawKujnawLawMawNawOawPawQakZaaaaafaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaawRawfawSawTawUawVawWawWawXawVawWawWawYawZaxaaxbaxcaxdaxeaxfawWaxgaxhaxiaxjaxjaxkaxlaxmaxnaxoaxpaxqaxraxsaxtaicaqSagqadlahHanbaswaxvatUaxwatPatQatRaxxaswaxyatNaxzaswaxAalZalZalZavpalZalZapQalZarialZaxBaxCaxCaubaxDajFaxCaxCaxCaxCaxCaxCaxCaxEaxEaowaxEaxEaxEaxEaxEaxEaxEaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoDaoDaoDaoDaoDaoDaoDaoDaoDaoDaoDaafaoDaoDaoDaafakZakZakZaxFawQasEakZaaaaaaaaaaaaaaaaaaaafaafaafaafakZaxGkyeaxHpWEarEmjIakZaxJakZaxKaxLaxMakZaaaaxNaxNaxNaxNaxNaxNaxNaaaaaaaaaaaaaaaaaaajSajSaicaxOaxPaxQaxRaxSaxTaxQaxUaxSaxPaxVaxWaxXaxYaxZayaaybaycaydayeayfaygayhayfayiayjaykaylaymaynayoaypayqaicaqSayrayrayrayrayraviaysaytayuayvavdaveaywayxayyauYaswayzayAayBayCayDayEayFayGayGayGayGayIayJayKayLayMayNaxCayOayPayQayPayRaxCaxEaxEaxEaxEaaaaaaaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoDaoDaoDaoDaoDaoDaoDaoDaoDaoDaoDaafaoDaoDaoDaafakZakZakZaxFawQasEakZaaaaaaaaaaaaaaaaaaaafaafaafaafakZaxGkyeaxHpWEarEmjIakZaxJakZaxKaxLaxMakZaaaaxNaxNaxNaxNaxNaxNaxNaaaaaaaaaaaaaaaaaaajSajSaicaxOaxPaxQaxRaxSaxTaxQaxUaxSaxPaxVaxWaxXaxYaxZayaaybaycaydayeayfaygayhayfayiayjaykaylaymaynayoaypayqaicaqSayrayrayrayrayraviaysaytayuayvavdaveaywayxayyauYaswayzayAayBayCayDayEayFayGayGgXTayGayIayJayKayLayMayNaxCayOayPayQayPayRaxCaxEaxEaxEaxEaaaaaaaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaoDaoDaoDaoDaoDaoDaoDaySaoDaafaafaafaafakZayTawQaoOaiVaaaaaaaaaaaaaaaaaaayVayUayUayVayWayVayVayXayVayVayYayYayYayYayZayYazaakZaafaxNazbazcazdazeazfaxNaaaaaaaaaaaaaaaaaaaaaaaaaicazgazhaziaicazgazjaziaicazgazkaziaicazlaiWazmaicaiWaznazoazpazqazrazrazsaztazuazrazrazvaicaicaicaicaicaqSayrazwazxazyayraswaswaswaswazzazAazBawjawkaswaswaswalZazCapPaowapQapQazDapQaxCaxCaxCaxCaxCazEazFazGazHazIazJazKazKazKazLazMaafaafaafaaaaaaaaaaaaaaaaaaaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaafaafaafaoDaoDaoDaoDaqeaoDaoDaoDazNaoDaoDaoDaoDaafaaaaafaiVavDawQazOakZaaaaaaaaaaaaaaaaaaayUazPazQayVazRazSazTazUazVayVazWazXazYazZaAaayYazaakZaaaaxNaAbaAcaAdaAeaAfaxNaaaaaaaaaaaaaaaaaaaAgaAhajQaAiaAjaAkaicaAlaAmaAkaicaAnaAjaAkaicaAoaApaAqaicaAraAsaAtaAuaAvazraAwaAxaAyaAzaAAaABazvaACaADaAEaCHaAGaAHayraAIaAJaAKayraALaAMaANaswaAOaAPaAQaARaASaATaAUaAUayGaAWaxCaxCaxCaxCaxCaxCaxCaAXaAYaAZaBaaBbaBcaBdaBeazMaBfaBgaBhaBiaBjaBkackackaafaaaaaaaaaaaaaaaaaaaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaoDaoDaoDaoDaoDaoDaoDaafaoDaafaafaoDaoDaafaafakZakZarMawQakZakZaaaaaaaaaaaaaaaaBlaBmaBnaBnaBoaBpaBqaBraBsaBtayVaBvaBwaBxaByaBzayYaBAakZaaaaxNaBBaBCaBDaBEaBFaxNaaaaaaaaaaaaaaaaBGaBHaBIajQaBJaAjaBKaicaBJaAjaBLaicaBJaAjaBMaicaBNaBOaBPaicaBQaBRaBSaBTaBUazraBVaBWaBXaBYaBZaCaazvaCbaCcapFapFaCdaCeayraCfaCgaChayraCiaCjaCjaCkaClaCmaCnaswaswaswaswaswalZaCoaxCaCpaCqaCraCsaCtaCuaCvaCwaCxaCyaCzaCAaCBaCCaCDazKaCEaCFaCFazKaCDaCGackaafaaaaaaaaaaaaaaaaaaaoEaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -8394,7 +8397,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaXQbKJbezbKKbwwbKLbvSbKMbCgbKNbKOvFkbKPbDWbDWbCgbKQbKRbyqbKSbKTbKUbyqbKVbKWbwybOwbCobyxbyybCobEnbEjbKZbLabLbbwybwybLcbLdbJwbJybLebLfbLgbLhbLibLjbLkbLlbLmbLnbJCaafbEqbLobJHbJHbLpbJHbJHbLqbLraafbJMbLsbLtbLubLvbJMbJMbJMbJMbJMbLwbeYbJVbLxbLybprbLzbLAbEKbLBbLCbEKbEKbETbENbLDbIBbDgbIEbtMfqebIDbKdbKgbKhbKisKKbLJbpsbLKbLLbLMbzGbLNbLObLPbLQbFdbLRbLSbLTbLUbLVbLWbLXbLYbLZbMabMbbMcbMdbFqbMebMfbMgbMhbMhbDGaafaafbMiaafbMjaafbBPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaMdbKDaMiaaaaTAbMkbMlbMmbJgbMnbMobMpbMqbMraTAaaaaMdaQNaMiaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaXQaXQaSdaXQbbnaXQaSdaXQaXQaXQaSdaXQaSdaSdaSdbMsbMtbMubMvbMwbMwbCgbMxbMybMzbMAbMBbMCbCgbyqbyqbyqbyqbyqbyqbyqbClbAwbwybMDbCobyxbyybCobCobMFbCobMGbMHbwybMIbwCbdtbMJbJybMKbMLbMMbMNbMObLjbMPbMQbMRbMSbMTaafbEqbMUbMVbMWbMXbMVbMWbMYbLraafbMZbNabNbbNcbNdbNebNfbNgbNhbJMbNibeYbNjbzfbNkbNlbNmbNmbNnbNobNpbNqbNrbNmbNsbNmbKjbNukRUbKkbLFbLEbzvbNybzwbzvbzvkiebNzbNzbNBbNzbzBaaObNCbNDbNEbzDbNFbNGbNHbNIbNJbNKbNLbNKbNKbNMbNNbNObNPbGYbetbGZbNQbNRbNSbDGaafaaabBPaaabBOaaabNTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaMdbNUbNVaWoaTAaTAbNWbNXbJgbNYbMobNZbOaaTAaTAaWoaWsbObaPsaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaXQaXRbOcbxWbOdbxWaXSaXSbOeaXSbOcaXSbOfbOcaXSbOgbOhbwwbKLbCmbMwbCgbOibKPbOjbOkbOlbOmbCgbOnbOobOpbOqbOrbOsbwwbClbOtbwybKXbCobyxbyybCobCobOxbOubCobOybwybOzbwCbdtbJwbJybOAbOBbOCbODbOEbLjbOFbOGbOHbOIbJCbOJbOKbOJbOKbOKbOLbOKbOKbOJbOKbOJbJMbOMbONbOObOPbOQbORbOSoDKbJMbOTbeYbOUaYFbLybNmbOVbOWbOXbOYbOZbPabPabPbbPcbNmbNmbNmbNmbNmbNmbNmbzvbPdbPebPfbPgbAtbPibPjbPkbPlbNzaZgaZgaZgaZgbzBbPmbPnbPobIUbPpbPqbPqbPqbPrbPsbMabPtbPubJabJbbJcbPvbMhbPwbDGaafaaabBPaaabBOaaabBPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaMdbKDaMiaaabxVaTAbPxbJgbJgbPybPzbPAbPBaTAbxVaaaaMdbKDaMiaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaXQaZuaZvaZvaZvaZvaZvbPCbPDbzZbzWbzWbPEbPFbPGbPHbPIbwwbKLbPJbMwbCgbDYbPLbDWbPMbPLbPNbCgbPObPPbPQbPRbPSbOrbwwbClbPTbwybPUvpxbyxbPXbPWbPYbPZbQabQbbQcbwyaYwbwCbdtbQdbJybQebQfbQgbQhbLjbLjbQibQjbQkbQlbJCbQmbQnbQobQpbQqbQrbQsbQpbQtbQubQvbQwbQxbONbQybQzbJMkhdbQAwdcbJMbQBbeYbQCaYFbQDbQEbQFbQGbQHbQIbQJbQKbOXbQLbQMbNmbQNbQObQPbQObSrbNmbQRbQSbQTbQUbzwuXKbzxbQVbQWbQXbNzbQYbQZbRabRbbzBbPmbRcbRdbRebRfbIUbIUbIUbRgbRhbRhbRibRjbRkbRlbDGbDGbDGbDGbDGaafaaaaaiaaabBOaaabBPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaMdbKDaMiaaabxVaTAbRmbRnbRobRpbRqbRrbRsaTAbxVaaaaMdbKDaMiaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaXQaZuaZvaZvaZvaZvaZvbPCbPDbzZbzWbzWbPEbPFbPGbPHbPIbwwycObPJbMwbCgbDYbPLbDWbPMbPLbPNbCgbPObPPbPQbPRbPSbOrbwwbClbPTbwybPUvpxbyxbPXbPWbPYbPZbQabQbbQcbwyaYwbwCbdtbQdbJybQebQfbQgbQhbLjbLjbQibQjbQkbQlbJCbQmbQnbQobQpbQqbQrbQsbQpbQtbQubQvbQwbQxbONbQybQzbJMkhdbQAwdcbJMbQBbeYbQCaYFbQDbQEbQFbQGbQHbQIbQJbQKbOXbQLbQMbNmbQNbQObQPbQObSrbNmbQRbQSbQTbQUbzwuXKbzxbQVbQWbQXbNzbQYbQZbRabRbbzBbPmbRcbRdbRebRfbIUbIUbIUbRgbRhbRhbRibRjbRkbRlbDGbDGbDGbDGbDGaafaaaaaiaaabBOaaabBPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaMdbKDaMiaaabxVaTAbRmbRnbRobRpbRqbRrbRsaTAbxVaaaaMdbKDaMiaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaXQaXQbRtbRtaXQaXQaXQaSdaXQaSdaXQaSdaSdbwwbRubwwbwwbwwbKLbOtbMwbCgbPNbRvbRwbPMbRwbRxbCgbRybRzbMwbFLbRAbRBbwwbClbwybwybwybwybRCbRDbwybwybwybwybwybREbwybwybACbgIbRFbJybRGbRHbRIbRJbRKbLjbRLbRMbQkbRNbRObRPbRQbRRbRSbRTbRRbRUbRVbRWbRXbRYbQwbRZbONbSabSbbScbSdbSebSfbJMbSgbeYbShaYFbLybSibSjbSkbSlbSmbSnbSobSpbQLbSqbNmbSrbSsbStbSubQQbNmbSvbSwbSxbSybSzbSAbNzbSBbSCbSDbNzbSEbSFbSGbSHbzBbSIbSJbSKbIUbIUbIUbIUbIUbIUbIUbIUbSLbSMbFqbSNbMfbSObSPbSQbDGaafaaabBPaaabBOaaabBPaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEbKCbKDaMiaaaaaaaTAaTAaTAaTAaTBaTAaTAaTAaTAaaaaaaaMdbKDaMiaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaXQbSRbcNaXQaaaaafaaaaaaaaaaafaaaaaabwwbSSbSTbvSbSVbSWbCmbSXbCgbCgbCgbCgbSYbCgbCgbCgbSZbPJbCmbMwbTabTbbwwbTcbwyaxubTebTfbTgbThbTibCobTjbwybTkbTlbTmbwybwCbdtbTnbJybMKbQfbTobTpbMKbLjbTqbTrbTsbTtbRObTubTvbTwbTxbTybTzbTAbTvbTBbTCbTDbQwbTEbTFbTGbTHbTIbTJbTKbTLbTMbTNbeYbTOaYFbLybSibTPbTQbTQbTRbTSbTTbTUbTVbTWbNmbTXbSsbTYbTZbUabNmbUbbUcbUdbUebzvbKlbNzbNzbNzbNzbNzbUfaZdaZdbUgbzBbSIbSJbSKbIUbIUbIUbIUbPsbIUbIUbIUbUhbUibGYaafbGZbUjbUkbUlbDGaafaaabBPaaabBOaaabBPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaMdbKDaMiaaaaaaaaaaaabxVbxVbUmbxVbxVaaaaaaaaaaaaaMdbKDaMiaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaXQbUnbUnaXQaafaafaafaafaafaafaafaafbwwbUobUpbUpbUpbUqfSSbMwbCmbKMbDTbBrbUrbUsbOtbwwbwwbwwbwwbwwbUtbwwbwwbClbwynPGbJvbUvbUwbUwdQjbTibUybwybUzbUAbUBbwybyEbdtbUCbJybMKbUDbUEbUFbMKbLjbUGbUHbUIbUGbRObUJbUKbULbUMbUNbUObUPbUQbURbUSbUTbQwbUUbUVbUWbUXbOQbUYbUYbUZbJMbVabeYbVbbCTbLybNmbVcbVdbVebOXbVfbVgbQIbVhbVibVjbVkbVlbVmbVnbVobNmbzvbzvbzvbzvbzvbVpbpsbVqbVrbfIaZdbVsberbVtaZdbzBbzBbVubSKbIUbIUbIUbIUbIUbIUbIUbIUbVvbVwbJabVxbJcbVybSPbVzbDGaafaaabBPaaabBOaaabeuaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaMdaQNaMiaaaaaaaaaaaaaaaaaaaQQaaaaaaaaaaaaaaaaaaaMdbKDaMiaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index e12e06c0..e0057fbb 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -35777,6 +35777,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/mob/living/simple_animal/pet/cat, /turf/open/floor/plating, /area/maintenance/department/engine) "btR" = ( @@ -58355,6 +58356,7 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/mob/living/simple_animal/pet/cat, /turf/open/floor/plating, /area/maintenance/department/security/brig) "gvf" = ( @@ -60757,6 +60759,15 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/wood, /area/maintenance/department/crew_quarters/dorms) +"mou" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/mob/living/simple_animal/pet/cat, +/turf/open/floor/plating, +/area/maintenance/department/engine) "mpd" = ( /obj/structure/cable/yellow{ icon_state = "0-8" @@ -91868,7 +91879,7 @@ bDi bDi wIv qOH -fpT +mou fpT fpT wNq diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index d7c398d1..9b944c40 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -155,10 +155,16 @@ //GS13 - a variant of lattice, used for maint wire protection -/obj/structure/lattice/catwalk/maintenance +/obj/structure/catwalk_maint name = "maint catwalk" desc = "This catwalk seems to be placed in maintenance, in order to protect the wires." - anchored = TRUE - density = FALSE - layer = BELOW_OBJ_LAYER max_integrity = 50 + icon = 'icons/obj/smooth_structures/catwalk.dmi' + icon_state = "catwalk" + density = FALSE + anchored = TRUE + armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 50) + max_integrity = 50 + layer = HIGH_OBJ_LAYER + plane = FLOOR_PLANE + obj_flags = BLOCK_Z_FALL