From 290a1de761d27395668a91c0c82f1ab4883d5da9 Mon Sep 17 00:00:00 2001 From: Sonoida Date: Thu, 15 Dec 2022 00:30:52 +0100 Subject: [PATCH] added spritework for the feeding tube still got a couple thing to tweak, but at least it's fully functional! Current known bug is that the "injecting" sprite still pops up when you yank it out of your mouth --- _maps/map_files/OmegaStation/OmegaStation.dmm | 16 ++++----- code/game/machinery/feeding_tube.dm | 34 +++++++++--------- icons/obj/feeding_tube.dmi | Bin 1524 -> 3205 bytes tgstation.dme | 1 + 4 files changed, 26 insertions(+), 25 deletions(-) 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 dc1af013315989c9cf88a87d53d0b0ad0324c421..b207e880f968abb8fcd981637bd84308c2df18f5 100644 GIT binary patch delta 2983 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 AUjP6A 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"