diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 1bb88f47..71fe6f7f 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -3115,7 +3115,7 @@ "esZ" = (/obj/structure/cable/white{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/junction/flip,/turf/open/floor/plating,/area/maintenance/port) "eva" = (/obj/machinery/atmospherics/pipe/simple/green/visible{dir = 4},/obj/machinery/computer/atmos_control/tank/air_tank{dir = 1},/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/engine/atmos) "ewc" = (/turf/open/floor/plasteel/dark/side{dir = 1},/area/crew_quarters/dorms) -"ewH" = (/obj/item/twohanded/required/kirbyplants,/obj/machinery/airalarm{pixel_y = 23},/turf/open/floor/plasteel/dark,/area/crew_quarters/dorms) +"ewH" = (/obj/item/twohanded/required/kirbyplants,/obj/machinery/airalarm{pixel_y = 23},/obj/machinery/light{dir = 1},/turf/open/floor/plasteel/dark,/area/crew_quarters/dorms) "ewT" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 8},/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/green{dir = 4},/turf/open/floor/plasteel,/area/hydroponics) "exb" = (/obj/machinery/door/window/brigdoor{dir = 8; name = "Creature Pen"; req_access_txt = "47"},/obj/machinery/door/poddoor/preopen{id = "xeno3"; name = "Creature Cell #3"},/obj/structure/cable/white{icon_state = "1-4"},/obj/structure/cable/white{icon_state = "2-4"},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/science/xenobiology) "eyu" = (/obj/machinery/atmospherics/components/binary/pump{dir = 8},/obj/machinery/light/small,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/engine,/area/maintenance/disposal/incinerator) @@ -3256,7 +3256,7 @@ "iey" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/white{icon_state = "4-8"},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/turf/open/floor/plasteel{heat_capacity = 1e+006},/area/hallway/primary/aft) "iio" = (/turf/closed/wall,/area/science/mixing) "ikn" = (/obj/structure/sink{dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/doorButtons/access_button{idDoor = "virology_airlock_interior"; idSelf = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = 8; pixel_y = -28; req_access_txt = "39"},/obj/effect/turf_decal/stripes/line{dir = 10},/turf/open/floor/plasteel/white,/area/medical/virology) -"inR" = (/obj/structure/cable/white{icon_state = "1-2"},/obj/machinery/light{dir = 4},/obj/item/assembly/mousetrap/armed,/turf/open/floor/plating,/area/crew_quarters/dorms) +"inR" = (/obj/structure/cable/white{icon_state = "1-2"},/obj/machinery/light{dir = 4},/turf/open/floor/plating,/area/crew_quarters/dorms) "iqC" = (/obj/machinery/air_sensor/atmos/carbon_tank,/turf/open/floor/engine/co2,/area/engine/atmos) "iqI" = (/obj/structure/table/wood,/obj/item/paicard,/turf/open/floor/wood,/area/crew_quarters/dorms) "iui" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/obj/structure/disposalpipe/segment,/turf/open/floor/plasteel/grimy,/area/chapel/main) @@ -3527,12 +3527,12 @@ "quq" = (/obj/machinery/light/small,/turf/open/floor/plating,/area/maintenance/disposal) "qva" = (/obj/machinery/computer/security/telescreen/entertainment{pixel_x = -31},/turf/open/floor/carpet/red,/area/crew_quarters/dorms) "qvG" = (/obj/machinery/button/door{id = "Dorm3"; name = "Dorm Bolt Control"; normaldoorcontrol = 1; pixel_x = -25; specialfunctions = 4},/obj/structure/closet/cabinet,/obj/item/toy/plush/random,/turf/open/floor/wood,/area/crew_quarters/dorms) -"qxZ" = (/obj/item/radio/intercom{name = "Station Intercom"; pixel_x = 28},/turf/open/floor/plasteel/dark/side{dir = 4},/area/crew_quarters/dorms) +"qxZ" = (/obj/item/radio/intercom{name = "Station Intercom"; pixel_x = 28},/obj/machinery/light{dir = 4; light_color = "#e8eaff"},/turf/open/floor/plasteel/dark/side{dir = 4},/area/crew_quarters/dorms) "qAa" = (/obj/structure/lattice,/turf/closed/wall,/area/space/nearstation) "qAj" = (/obj/structure/cable/white{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/light/small{dir = 1},/turf/open/floor/plasteel,/area/maintenance/port) "qAV" = (/obj/structure/disposalpipe/segment,/turf/closed/wall,/area/storage/primary) "qBB" = (/obj/structure/cable/white{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/turf/open/floor/plating{icon_state = "platingdmg2"},/area/maintenance/port) -"qCg" = (/obj/item/twohanded/required/kirbyplants,/obj/structure/extinguisher_cabinet{pixel_y = 30},/turf/open/floor/plasteel/dark,/area/crew_quarters/dorms) +"qCg" = (/obj/item/twohanded/required/kirbyplants,/obj/structure/extinguisher_cabinet{pixel_y = 30},/obj/machinery/light{dir = 1},/turf/open/floor/plasteel/dark,/area/crew_quarters/dorms) "qCk" = (/obj/structure/chair/office/light{dir = 4},/obj/effect/landmark/start/virologist,/turf/open/floor/plasteel/white,/area/medical/virology) "qDc" = (/obj/structure/closet/l3closet/virology,/obj/effect/turf_decal/tile/purple,/obj/effect/turf_decal/tile/purple{dir = 4},/turf/open/floor/plasteel/white,/area/medical/virology) "qEl" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{dir = 4},/obj/machinery/pipedispenser/disposal/transit_tube,/obj/effect/turf_decal/bot,/turf/open/floor/plasteel,/area/engine/atmos) @@ -3564,7 +3564,7 @@ "rCw" = (/obj/machinery/door/window/brigdoor{dir = 4; name = "Creature Pen"; req_access_txt = "47"},/obj/machinery/door/poddoor/preopen{id = "xeno4"; name = "Creature Cell #4"},/obj/structure/cable/white{icon_state = "1-8"},/obj/structure/cable/white{icon_state = "2-8"},/obj/effect/turf_decal/delivery,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/science/xenobiology) "rEx" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/effect/turf_decal/stripes/line,/turf/open/floor/plasteel,/area/engine/atmos) "rKl" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/turf/open/floor/plating,/area/crew_quarters/dorms) -"rON" = (/turf/open/floor/plasteel/dark/side{dir = 8},/area/crew_quarters/dorms) +"rON" = (/obj/machinery/light{dir = 8},/turf/open/floor/plasteel/dark/side{dir = 8},/area/crew_quarters/dorms) "rPz" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 1},/turf/open/floor/plasteel/white,/area/medical/virology) "rPE" = (/obj/structure/cable/white{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/landmark/event_spawn,/obj/structure/disposalpipe/segment,/turf/open/floor/plating,/area/maintenance/port) "rRQ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 5},/turf/open/floor/plating,/area/crew_quarters/dorms) @@ -4086,13 +4086,13 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaadaadaadaadabubxlaOvaOwaNVaOxaOyaMNaOzaMPaOBaMXaOCaMTaMUaMVaODaMXaOEaOFaOGaOHaOIbbgbbgbbgbbgaGRaONaOOatuatvatwaOSatzatAatBaOWaOXaOYaOZaPavsLaPcatCatDatEaPfiOoaPhaPbaPiaPjaPkaPlaPmaPnaPoaPpaPqaPraPsatFatGatHaPubloatJatNatOaPylFiaaeaPzaPAaPBaPCaPzaaeaafaaaaafaaeaaeaaeaaeaaeaaeaaeaaeaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaacaacaacaacaadaadaadaadafMbxlbuCbuCaNVbuCbuCaMNaPIaPJaLUbuWbuWaPKbvdaKDbuWbuWaLOaPMaPNaPOaPPaGSaPRaGYaGZaHaaPVaPWaPXaPYaPZaQaatPauhauraPZaQeaQfbxQaQbhxoaQdausauhautaQjaQgaQkaQlaQmaQnaQoaQpaQqaQraQsaQtaQuaQvaQvauuauxauyaQxaQyoQLaQztLtaQAlFiaaeaPzaQBaQCaQDaPzaaeaaeaaaaafaafaafaafaaaaaaaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaanCPaaaaaaaaaaaaaaaaadaadaadaadaacaacaadaadaadaadabiaSObxpbxpaQHbxpbxpbxtbwVaQJaQKaQKaQMaQNaQOaQPaQKaQRblKaQSaQTaQUrPEaQWaQWaQWaQWaQWaQWaQWaQXaQYaQZaQXaRaaRbaRcaRdaRenxAsJJaKgsJKaRfaRgaRfaRhaRimrzaRfauzauSauTamgamiamkavmavvavwaRraRsaRtaRslNsaRsaRraRuaRvsJLaRxsOMsOMaRysOMsOMsOMavzsOMsOMaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaasdXaaafgSfgSaaalMBaaafgSfgSaaaaaaaadaadaadaadaadaacaacaadaadaadaadaMJaRBsJOaRDsJPaREbwWaRFaRGaRHaRIaRJaRKaRLaRMaRNaROaRPaRQaRRaQUqBBaQWaRTaScaRVaRWaRXaRYaRZaSaaSbaScaSdaRbaSeaSfaSgaShaShaShaSiaRfaSjaSkaSlaSmaSnaRgavAavBfgGsEGsEGsEGuuUavAavCaRsaSuaSvaSwaSxaSyaSzavDavFsJLsOZsOUavHavTavUsOYaSIaSJaSKaRyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaiaaafgSfgSaaalMBaaafgSfgSaaaaaaaadaadaadaadaadaacaacaadaadaadaadaMJaRBsJOaRDsJPaREbwWaRFaRGaRHaRIaRJaRKaRLaRMaRNaROaRPaRQaRRaQUqBBaQWaRTaScaRVaRWaRXaRYaRZaSaaSbaScaSdaRbaSeaSfaSgaShaShaShaSiaRfaSjaSkaSlaSmaSnaRgavAavBfgGsEGsEGsEGuuUavAavCaRsaSuaSvaSwaSxaSyaSzavDavFsJLsOZsOUavHavTavUsOYaSIaSJaSKaRyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaapZUsdXkYJnOrfVcbDhfVcgrUiNVaaaaaaaaaaadaadaadaadaadaacaacaacaadaadaMJaPGaPGaSMaPGaSNaMJaSPbxuaSRaSSaSTaSUaSVaSWaSXaSYaSZbxuaTaaQUbcbaQWaRUaTcaTdaTeaTfaTgaThaSasJSaTiaHJaRbaTjaTkaTlaShaTmaTnaToaTpaTqaTraTsaTtaTuaRfavVawsaTyaTzaTAaTBaTCawzawBaTFaTGaTHaTIaTJawDaTLaTMaTNaTOaTPsPKsOVaTSaTTsOMaTUaTVaTWaRyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaasdXaaaeGAeGAsdXlMBsdXeGAeGAaaaaaaaaaaaaaaaaadaadaadgeraacaacaadaadaMJaTXaQGaTYbuGaTZaMJaEtaUaaEtaPLaPLaPLaEtaPLaPLaPLaEtaUaaEtaQUaUbaQWaUcaUdaUeaUfsJXsJXsJXaUgaUhaUiaUjaRbaUkaSfaUmaShaUoaUpaUqaUraUsaUtaUuaUvaUwaRgaTwaTxaUxaUyaUyaUyaUzaTDaTEaRsawEawGawHaUDawLaSzaUFaUGaUHaUIaUIaUIaUJaUKsOYaULaUMaUNaRyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaapZUaaasdXaaaaaalMBaaaaaasdXaaaaaaaaaaaaaaaaaaaaasdXsdXaaaaacaadaadaMJbuHaUOaUPbuIblqaMJbvoaUQaURaUSaURaUSaUTaUSaURaUSaURaUUbvoaQUyiPaQWaUVsKdaUWaUXaUXbxSaUYsKeaUZaVaaVbaRbaVcaVdaVeaVfaVgaVhaViaTpaVjaVlaVlaVmaVnaRfaTwaVoaVpaUyaVqaUyaVraVsaTEaRrawOaxfaxgaVwaxhaTLaVyaVzaVAaVBaVCaVDaVEaVFaxjaVHaVIaVJaRyaaaaacaacaacaacaacaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaiaaasdXaaaaaalMBaaaaaasdXaaaaaaaaaaaaaaaaaaaaasdXsdXaaaaacaadaadaMJbuHaUOaUPbuIblqaMJbvoaUQaURaUSaURaUSaUTaUSaURaUSaURaUUbvoaQUyiPaQWaUVsKdaUWaUXaUXbxSaUYsKeaUZaVaaVbaRbaVcaVdaVeaVfaVgaVhaViaTpaVjaVlaVlaVmaVnaRfaTwaVoaVpaUyaVqaUyaVraVsaTEaRrawOaxfaxgaVwaxhaTLaVyaVzaVAaVBaVCaVDaVEaVFaxjaVHaVIaVJaRyaaaaacaacaacaacaacaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaapZUaaafgSfgSsdXlMBsdXfgSfgSaaaaaaaaaaaaaaaaaapZUsdXaaaaaaaaaaacaadaMJbuJbuKbuLbuKbuNaMJaadaVKaVLaUUaUUaUUaUUaUUaUUaUUaUUaUUbvgaQUyiPaQWaVNaVOaHXaVQaVRaVSaVTaVUaVVaVWaVXaRbaVYaVZaWasCbaWcaWdaWeaRfaWfaWgaWhaWiaWjaRgaTwaTxaUxaUysNzaUyaUzaTDaTEaRsaWkaWlaWmaWnaxkaWpaWqaWraVAaWsaWtaWuaVEsOZsOYaWwaWxaWyaRyaadaadaacaadaadaadaadaacaacaadaadaadaacaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaacaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaqTtsdXkYJnOrfVcbDhfVcgrUiNVaaaaaaaaaaaaaaacaisdXaaaaaaaaaaaaaadaadaMJbuOsKjbuPsKjbuQaMJbvoaUQaURaWzaWzaWzaUUaWzaWzaWzaWzaUUbvgaQUesZqZNaWAaWBaWCaWDkpzpDSoMGaWEaVQaWFaWGaRbaWHaWIaWJaShaWKaWLaWMaRfaTpaRfaRhaWNaWOaRfaTwaTxaWPaWQaWRaWSaJdaTDaxlaRraTLaWUaWVstoaSzaWWaWqaWXaVAaWYaWZaXaaVEsPasOMsOMsOMsOMsOMaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaasdXaaaeGAeGAsdXlMBsdXeGAeGAaaaaaaaaaaaasdXsdXaaaaaaaaaaaaaaaaadaadaMJsKnbuRbuSbuRbuUaMJaadaXcaUQaVLaUQaVLaUQaVLaUQaVLaUQaVLbvoaQUlyxaQWaQWtXdaXfiUqaXgaXhaXiaXjaXkaVWaXlaShaShaShvYVjbOaXmaXnaXoaXpaXqaXraXsaXtaXuaShdaiaTxuuUtWhtWhtWhfgGaTDaxnaxBaxLaXzaXAaXBaXCblraXDaXEagmaXGaXHaXIaVEsOTsOYaxUsOMaadaadaadaadaadaadaadaadaadaadaadeGmeGmeGmeGmeGmaadaadaadaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaiaaaeGAeGAsdXlMBsdXeGAeGAaaaaaaaaaaaasdXsdXaaaaaaaaaaaaaaaaadaadaMJsKnbuRbuSbuRbuUaMJaadaXcaUQaVLaUQaVLaUQaVLaUQaVLaUQaVLbvoaQUlyxaQWaQWtXdaXfiUqaXgaXhaXiaXjaXkaVWaXlaShaShaShvYVjbOaXmaXnaXoaXpaXqaXraXsaXtaXuaShdaiaTxuuUtWhtWhtWhfgGaTDaxnaxBaxLaXzaXAaXBaXCblraXDaXEagmaXGaXHaXIaVEsOTsOYaxUsOMaadaadaadaadaadaadaadaadaadaadaadeGmeGmeGmeGmeGmaadaadaadaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabGdbGdbGdlMBbGdbGdbGdaaaaaaaaapZUsdXaaaaaaaaaaaaaaasdXaahaadaMJaMJaMJaMJaMJaMJaMJabiaadbvobvobvgbvgbvgbvgbvobvoaadaadbvoaQUbcbaQWjnKaXLaXMaQWaQWaQWaQWaQWaQWaXNaQWaShaXOaXPaXQaXRaXSbxTaXTaXUaXVaXWaXXaXYaXZaXRaYaaYbaYcaYcaYdaYeaYcaYfaxXaxBaxYaYjaYkaYlaYmaxZayaaYpaUHaYqaYraYsaVEsPkdpGaYvtmsorVorVorVorVorVrpysVtsVtsVtsVtsVteGmdfKdfKlmqeGmaadaadaadaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabGdbGdbGdliRliRpxdmQRliRliRliRbGdbGdjofjofaaaaaaaaaaaaaaapZUsdXaacaadabuacGafMafMaadagEabiaadahuahuahubvobvgbvonbtxAZxXVxXVxXVxXVwhJlaWaQWaYwaYxaYyaQWaYzwILwILnxPnxPaHbqeCjbOaYGaYHaYIagyaYKaYLaYMaYNaYOaYPaYQaYRaYSagDaYUaYVieyieyblshOcaYWaYYaybaZaaZbaZcaZdehVaZaaycaydaZhaZiaZjaZiaZjaZkaZlaZmdieiioiioayeayfaygayyayAayCayDazcayDsVteGmdfKqnAlmqeGmaadaadaadaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaasdXaaaaaaliRliRliRliRmdreNxhuUhuUmdrliRliRliRliRliRaaaaaaaaaaaapZUsdXaaaaacaacaadahuafLaadaadafLahuaadaadaadbvgaadaadaadqltuxRnmaaZpaZqaZraZslyxaQWaZuaZvaZwaQWbcbaZyaZzaZAaPVaZBrPEaShaZCaZDaZEagUaZGaZHaZIaZJaZKaZLaZMaZNaZOahsaZQaZRbyobyobyqbyobyoaTDaRqaZaaZUaZVaZWaZXaZeazdazebaababazfbadazfbafbagbahazgazhtPnhVEhVEhVEhVElmrhVEwwTwvykCGsVtsVtsVtucdsVtsVtiioiiotPnaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMhhMaaa diff --git a/code/game/machinery/feeding_tube.dm b/code/game/machinery/feeding_tube.dm index 7703f241..a492780f 100644 --- a/code/game/machinery/feeding_tube.dm +++ b/code/game/machinery/feeding_tube.dm @@ -18,7 +18,7 @@ /obj/machinery/feeding_tube/Initialize(mapload) . = ..() update_icon() - + /obj/machinery/feeding_tube/Destroy() attached = null QDEL_NULL(beaker) @@ -86,7 +86,7 @@ START_PROCESSING(SSmachines, src) update_icon() else - to_chat(usr, "There's no one attached to the feeding hose!") + to_chat(usr, "There's nothing attached to the feeding hose!") /obj/machinery/feeding_tube/attackby(obj/item/W, mob/user, params) @@ -163,8 +163,8 @@ return else if(beaker) eject_beaker(user) - else - toggle_mode() + // else + // toggle_mode() /obj/machinery/feeding_tube/verb/eject_beaker() set category = "Object" @@ -184,27 +184,27 @@ beaker = null update_icon() -/obj/machinery/feeding_tube/verb/toggle_mode() - set category = "Object" - set name = "Toggle Mode" - set src in view(1) +// /obj/machinery/feeding_tube/verb/toggle_mode() +// set category = "Object" +// set name = "Toggle Mode" +// set src in view(1) - if(!isliving(usr)) - to_chat(usr, "You can't do that!") - return +// if(!isliving(usr)) +// to_chat(usr, "You can't do that!") +// return - if(usr.incapacitated()) - return - mode = !mode - to_chat(usr, "The feeding hose is now [mode ? "injecting" : "taking blood"].") - update_icon() +// if(usr.incapacitated()) +// return +// mode = !mode +// to_chat(usr, "The feeding hose is now [mode ? "injecting" : "taking blood"].") +// update_icon() /obj/machinery/feeding_tube/examine(mob/user) . = ..() if(get_dist(user, src) > 2) return - . += "[src] is [mode ? "injecting" : "taking blood"].\n" + . += "[src] is pumping liquid.\n" if(beaker) if(beaker.reagents && beaker.reagents.reagent_list.len) diff --git a/icons/obj/feeding_tube.dmi b/icons/obj/feeding_tube.dmi index dc1af013..b207e880 100644 Binary files a/icons/obj/feeding_tube.dmi and b/icons/obj/feeding_tube.dmi differ diff --git a/tgstation.dme b/tgstation.dme index ad752722..f33af5d5 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -876,6 +876,7 @@ #include "code\game\machinery\doppler_array.dm" #include "code\game\machinery\droneDispenser.dm" #include "code\game\machinery\exp_cloner.dm" +#include "code\game\machinery\feeding_tube.dm" #include "code\game\machinery\firealarm.dm" #include "code\game\machinery\flasher.dm" #include "code\game\machinery\gulag_item_reclaimer.dm"