From 806e6ebff0335883f91ea7201c8be0dd7d13d66b Mon Sep 17 00:00:00 2001 From: evilew Date: Sat, 21 Oct 2023 13:54:49 +0200 Subject: [PATCH 1/2] small map tweaks By Hellknight: - fixed disposals in Kilo near Pool - fixed something atmos-related in Box lol By Lew: - moved the autolathe in cargo to be accessible by everyone - fixed some floor decals in Pubby - removed a butterfly in Pubby --- _maps/map_files/BoxStation/BoxStation.dmm | 10 +- _maps/map_files/KiloStation/KiloStation.dmm | 27 +- _maps/map_files/MetaStation/MetaStation.dmm | 6 +- _maps/map_files/PubbyStation/PubbyStation.dmm | 297 +++++++++++++++--- 4 files changed, 270 insertions(+), 70 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 90354403..a5f259c7 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -5860,7 +5860,7 @@ "cjL" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible,/obj/machinery/atmospherics/components/binary/pump{dir = 4; name = "Mix to Engine"},/turf/open/floor/plasteel,/area/engine/atmos) "cjM" = (/obj/machinery/atmospherics/pipe/simple/green/visible,/obj/machinery/atmospherics/pipe/simple/orange/visible{dir = 4},/turf/open/floor/plasteel,/area/engine/atmos) "cjN" = (/obj/machinery/light{dir = 4},/obj/machinery/atmospherics/pipe/simple/orange/visible{dir = 4},/turf/open/floor/plasteel,/area/engine/atmos) -"cjO" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible,/obj/effect/spawner/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/orange/visible{dir = 4},/turf/open/floor/plating,/area/engine/atmos) +"cjO" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible,/obj/effect/spawner/structure/window/reinforced,/obj/machinery/atmospherics/pipe/layer_manifold{dir = 4},/turf/open/floor/plating,/area/engine/atmos) "cjP" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/orange/visible{dir = 10},/turf/open/space,/area/space/nearstation) "cjQ" = (/obj/structure/door_assembly/door_assembly_mai,/turf/open/floor/plating,/area/maintenance/aft) "cjR" = (/obj/structure/trash_pile,/turf/open/floor/plating,/area/maintenance/aft) @@ -6562,7 +6562,7 @@ "cxl" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 8},/turf/open/floor/plasteel,/area/engine/engineering) "cxm" = (/obj/machinery/light{dir = 4},/obj/structure/closet/radiation,/turf/open/floor/plasteel,/area/engine/engineering) "cxn" = (/obj/machinery/atmospherics/pipe/simple/green/visible,/turf/closed/wall/r_wall,/area/engine/atmos) -"cxo" = (/obj/machinery/atmospherics/pipe/simple/yellow/visible,/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/engine/atmos) +"cxo" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/atmospherics/pipe/layer_manifold,/turf/open/floor/plating,/area/engine/atmos) "cxp" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/turf/open/floor/plating,/area/engine/atmos) "cxq" = (/obj/machinery/atmospherics/pipe/simple/green/visible,/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/engine/atmos) "cxr" = (/obj/machinery/atmospherics/pipe/simple/cyan/visible,/turf/closed/wall/r_wall,/area/engine/atmos) @@ -7546,15 +7546,15 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabObccGbTLbTLccHkJjccIccJccKbTLccLccMccNccObTLbTLcbpbTLbTLbXSbXSbXSbXTbShaaaccPccQcbtbgLcbtccRbgKccSccTccUccVccWccXccYccZbQQcdacdbcdccddcdecdfcdgcdhcdecdicdecdjcdkcdlbZncdmcdncdocdpcdqcdrcdscdtaadcducdvccbcdwcaBaadcccbLBbZvaTVcdxcaKcdybZwcdzcdAcdBbZwcaKcaKcdCcaKcaKbZvbLBbODbVYbVYbVYbVYbVYcdDcdEcdFbXxbVYbVYbVYbVYbVYcdGcdHcdHcdIcdJcdKcdLcdMcdNcdOcdPcdQcdRcdScdRcdTbQocdUbXEccDbXEbXEbXEaadaadaadaaeaaeaaeaaeaaeaaeaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabObbObccGbTLccKbTLbObbTLbObbTLcdVcdWbTLbTLbTLcdXbObbXSbXSbObaaabXSbSgbShaaacdYcdZcbuceacbscebcdYceccedceecefcegcehceicejbQQbZgcekcelcembZucenceocepceqcercescetceuceucevcewcbRcexceycezceAceBceCceDcbYceEccbccbcaBaadcccbLBbZvceFceGaYmbZwbZwbZwceHbZwbZwceIceIceJceIceIbZvbLBbODceKceLceKceMceNbYzceOcePceQceRbPWbPWbPWbVYceScdHceTjaWcdJcgavQHwioceXceYcdPceZcfacfbcfccfdbQocfebXEccDbXEaaaaaabnwatJbXEaPaaPaaPaaPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhraaaaaaaaaaaabhraadaaeaaeaaeaaeaaeatJaadaadaadaadaadbXScffbTLbTLgwdcfgbObcfhbObcfibObcdWbTLbTLcfjbXRbObaaaaadaaaaaabXSbSgbWFbObbZacfkcflcfmcflcfnbZacfocfpbZabZabZabZacfqcfrbQQcfscftcfucfvbZubZucfwbYdcfxcfycfzcfAbZubZubZncfBcfCcfDcfCcfDcfEcfDcfFaadcaBcaBcaBcaBcaBaadbOhbLBbZvcaKcfGcfHcfIcfJcfKcfLcfMcfNcaKcaKcaKcaKcfObZvbLBbODcfPcfQcfRcfScfTbYzcfUbYzcfVcfWbPWbPWcfXbVYcfYcdHcdHsIocdJuRXceWjMfjMfaprcdPcgbcgccgdcgecgfbQocggbXEccDbXEbZYbZYbZYbZYbXEbcgnsmoFOaPaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacryaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhratJcghbhratJbhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabObbObccGbTLbTLbTLcgibTLcdVcgjbObbObbObcgkbObbObbObbXSbXSbXScglcgmcgncgoccMbZabZabZabZabZabZabZabZabZabZacfjcgpbObcgqcgrcgscgtcgubYicgvcepcgwcepbYdcgxbZubZucfAcgycazcazcgzcgAcgBcbScgCcgDcgEcbWcbXcbYcgFcgGcgGcaBaadbOhbLBcgHcgIcgIcgIcgJcgKcaKcgLcfHcgMcfHcfHcfHcfHcgNbZvbLBbODceKcgOceKcgPcgQbYzcfUbYzcgRcgScgTcgTcgUbVYcgVcgWcdHgdLccyccyuNYccyccyccycdPcdQcgZchacgbchbbQocggbXExRvsVucEzcEzcEzcEzycpmpbtzPmQMaPaatJeNWatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhratJcghbhratJbhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabObbObccGbTLbTLbTLcgibTLcdVcgjbObbObbObcgkbObbObbObbXSbXSbXScglcgmcgncgoccMbZabZabZabZabZabZabZabZabZabZacfjcgpbObcgqcgrcgscgtcgubYicgvcepcgwcepbYdcgxbZubZucfAcgycazcazcgzcgAcgBcbScgCcgDcgEcjOcbXcbYcgFcgGcgGcaBaadbOhbLBcgHcgIcgIcgIcgJcgKcaKcgLcfHcgMcfHcfHcfHcfHcgNbZvbLBbODceKcgOceKcgPcgQbYzcfUbYzcgRcgScgTcgTcgUbVYcgVcgWcdHgdLccyccyuNYccyccyccycdPcdQcgZchacgbchbbQocggbXExRvsVucEzcEzcEzcEzycpmpbtzPmQMaPaatJeNWatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaoBaoBaaeaadaadchcaoBbObbObbObbObbObbObbObbObbObbObbTLbTLbTLbTLbTLchdchechfchfchgchhchichjchjchjchjchjchjchjchjchjchjchkchlchlchmbObchnchocgscgtchpchqchrcazcazchschtcazcazchuchvchwbZuchxchychzchAbZuchBchCchDcdtaadcduchEchFchGcaBaadcccchHbXcbXcbXcbXebZvchIcaKchJchKchLchMchNchNchNchObZvbLBbODbVYbVYbVYbVYbXxbYzcfUchPchQbVYbVYbVYbVYbVYchRchScdHcdHcdHcdHceUchUboIchVchWbCfbCfbCfbCfbCfbCfcggbXEccDbXEbZYbZYbZYbZYbXEbblmpbmSVaPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaachXchYchYchYchYchZciaciacibciccidciecifcigcihciibObcijbObbObbObbObbObcikbObbObbWFbXTcilcilcilcilcilcilcilcilcimcimcimcimcimbXRcinbObchnchocgsciocipciqcircisceucitciucivceuciwcixciycizciAciBciCciDbZuchBciEciFceCceDcbYciGcgGcgGcaBaadcccciHbOhbOhbOhbLBbZvciIcaKcaKciJciKciLcaGchNcaGciMbZvbLBbODciNcgTcgTciOciPbYzciQcePciRciSbPWbPWbPWbVYciTciUciVcdHciWcdHcdHcdHciXciYciZcjacjbcjccjdcjecjfcggbXEccDbXEaadaadaaaaaabXEaPaaPaaPaaPaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaoBaadaaeaoBaadaoBaoBbXSbXSbXSbTLcjgcjhcjicjjcjkbObbTLbObcjlcjmcjlcjncjocjlcjpbWFbXTcilcjqcjrcjscjtcjucjvcjqcjwcjxcjycjzcimcimcinbObcjAchocgscjBcjCcjDcjDcjEcjFcjFcjFcjFcjFcjGcjHcjIcjIcjIcjJbZuchzcjKcjLcjMcjNcjOcjPcaBcaBcaBcaBcaBaadcccciHcjQcjRbLAbLBcaCcjScjTcjUcjVcjWcjXcjYchNcjYcjZbZvbLBbODckabPWbPWckbckcbYzcfUbYzcfVckdbPWckecfXbVYckfckgckhckickjckkcklcklckmcknckockpckqckrckscktcjfcggbXEccDbXEbXEbXEaaeaaeaadaadaadaadatJatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaoBaadaaeaaeaaeaaeaaeckubTLckvbTLckwckxcjhckybTLckzbTLbObcjlckAcjlckBckCcjlckDbWFbXTcilcjqckEckFckGckHckIcjqckJckKckLckMckNcimcinbObchnchocgsbYdckObYdckPckQcjFckRckSckTcjFckUcfAckVcjIckWciDckXckYckZclacgDclbcbWclccbYcldcleclfcaBaadbOhciHbOhclgclhbLBbZvclicljclkcllclmcljclnchNclnclocckbLBbODbPWbPWbPWclpclqcePclrbYzcgRclscgTcgTcgUbODcltcluclvclwcltcltclxclyclzclAclBclCclDclEcjfclFcjfcggbXEclGbXEclHbXEaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaoBaadaaeaaeaaeaaeaaeckubTLckvbTLckwckxcjhckybTLckzbTLbObcjlckAcjlckBckCcjlckDbWFbXTcilcjqckEckFckGckHckIcjqckJckKckLckMckNcimcinbObchnchocgsbYdckObYdckPckQcjFckRckSckTcjFckUcfAckVcjIckWciDckXckYckZclacgDclbcjOclccbYcldcleclfcaBaadbOhciHbOhclgclhbLBbZvclicljclkcllclmcljclnchNclnclocckbLBbODbPWbPWbPWclpclqcePclrbYzcgRclscgTcgTcgUbODcltcluclvclwcltcltclxclyclzclAclBclCclDclEcjfclFcjfcggbXEclGbXEclHbXEaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaoBaaaaoBaoBaoBaadaadbXSbXSbXSclIclJclKclLclMccHbObbObclNcjlclOclPcjlclQclRcjlbWFbXTcilclSclTclUckGclVclSclSckJclWclXclYclZcimcinbObchnchoaYncmacmbcmccmccmdcmecmfcmgcmhcjFbZucfAcmicmjckWcmkckXckYcmlcmmcgDcmncmocmpcmqcmrcmscmtcaBaadbOhciHbOhbUcbUcbLBbZvbZwcmucmvbZwcmwbZwbZwbZwbZwbZwbZvbLBbODbVYbVYbVYbVYchQcmxcfUcmychQbVYbVYbVYbVYbODcmzcmAcmzcmBcmzcltclxclycmCcmDcjfcmEcmFcmEcjfcmGcjfcggbXEcmHcmIcblbZYaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaadaadaadaadaaaaaaaaaaaaaaaaaaaadaadaadbXScmJcmKcmKcmLcjkbXRbObcmMcmNcjlcmOcmPcmQcmOcmOcmRbShbXTcilclSclScmScmTcmUcmVcmWcmXcmYcmZcnacnbcimcinbObcnccndcnecmacnfcngcnhcnicnjcnkcnlcnmcjFcnncnockVcjIckWcnpckXcmkcnqchBcnrcnsceCcntcnucnvcleclecaBaadcccciHcnwbOhcnxbLBcnycgIcgIcnzbZwcnAcnBcnCbOhcnDcnEbOCbLBbODciNcgTcgTcnFciPbYzciQcePcnGcnHbPWbPWbPWbODcnIcmzcmzcmzcmzcltcnJcnJcnKcmDcjfcnLcnLcnLcnLcnLcjfcggbXEcnMcbmcnNbZYaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQaaQaaQaaQaaQaaQaaQaaQaaQaaYaaQaaQaaQaaQaaQaaaaaabObbObbObbObbObbObcnObObbObbObbObcnPcnQcjlcmOclPcnRcmOcmOcmRbShbXTcilcnScnTcnUcnVcjqcmSapccnWaWYcnXcnYcnZcimcoacobcoccodcgscmacoecofcogcohcoicojcokcolcomcbQconcjIcjIcjIcoobZucopcoqchBchCbZucdtcorcoscaBcaBcaBcaBaadccccotcoubOhcovcowcoxbXccoycozbOhcoAcoBcoCbOhcoDbYubYwcoEbODckackebPWcoFckcbYzcfUbYzcfVcoGbPWbPWcfXbODcoHcmzcoIcoJcoKcoLcoMcoNcoOcmDcjfcnLcoPcoQcnLcnLcjfcoRbXEcoScoTccDbZYaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQaaaaadaaaaadaaaaadaaaacfaaaaadaaaaadaaaaaQaadaadbObcoUcoVbTLcoWbTLbTLbTLbTLbXRbObcoXcoYcoZcmOclPcjlcpacpbcjlbShbXTcilcpccpdcmUcmUcmUcpecpfcpgcphcpicpjcpkcimbObbObcplcpmcpncmacmacpocppcpqcprcprcprcprcjFbZucpscptcpucpvcpwcpxcpycpzclacgDcpAcbWclccnucpBcpCcpCcaBaadcccbLAciHbOhbOhcpDbKtbOhcpEcpFbOhbOhcpGbOhbOhcpFcpHbSXcpIbODbPWbPWbPWcpJcpKcePclrbYzcgRcpLcgTcgTcgUbODcmzcmzcpMcmzcmzcltcnJcnJcpNcpOcjfcnLcnLcpPcnLcnLcjfcggbXEbXEbXEccDbXEaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQaaaaadaaaaadaaaaadaaaacfaaaaadaaaaadaaaaaQaadaadbObcoUcoVbTLcoWbTLbTLbTLbTLbXRbObcoXcoYcoZcmOclPcjlcpacpbcjlbShbXTcilcpccpdcmUcmUcmUcpecpfcpgcphcpicpjcpkcimbObbObcplcpmcpncmacmacpocppcpqcprcprcprcprcjFbZucpscptcpucpvcpwcpxcpycpzclacgDcpAcjOclccnucpBcpCcpCcaBaadcccbLAciHbOhbOhcpDbKtbOhcpEcpFbOhbOhcpGbOhbOhcpFcpHbSXcpIbODbPWbPWbPWcpJcpKcePclrbYzcgRcpLcgTcgTcgUbODcmzcmzcpMcmzcmzcltcnJcnJcpNcpOcjfcnLcnLcpPcnLcnLcjfcggbXEbXEbXEccDbXEaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQaaacpQcpRcpSaaacpQcpRcpSaaacpQcpRcpSaaaaaQaaaaaabObcpTbTLcpUbObbObcpVbObbObbObbObckAcpWckAckAcjlclQclQcjlcjlbShbXTcilclScpXcpYcjqcpZclSclSckJcqackMcqbcqccqdcqecqfcqgcqhcqicqjcqkcqlcqmcqntDkcqpcqqcqrcqscqtcqucqvceucqwcqxcgycqycgCcexchCcqzcdtcorcqAcqBcqCcqDcaBaadbOhbOhciHcqEcqFcpDcqGbOhcpEcqHbYucqIcqJcqKbYucqLcqMbXGcqNbODbVYbVYbVYbVYchQcqOcfUcqPchQbVYbVYbVYbVYbODcltcltcltcltcltcltcqQcqQcqRcqScjfcjfcjfcjfcjfcjfcjfcggbXEcqTgWmccDbXEaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQaadcpQcqVcpSaaacpQcqVcpSaaacpQcqVcpSaadaadaaaaaabObcqWbTLbTLbObcfibTLcqYccNcgjbObcqZcracrbckAcrccmOcmOcmRcjlbWFbXTcilcjqcrdcrecjqcrfcrgcjqckJcrhcricrjcrkcrlcrmcrncrocrpcrqcrrcrscrtcrucrvcrwcrxcppcofcqscrzbZucpscgycrAcrBcrCcrDcrEbZtcrFcrGceCcntcnucrHcpCcpCcaBaadbOhbLAcrIcrJcrKcrLbYmbOhcrMcrNcrOcqMbOCcqMcpHcrPcrQbXGcrRbODciNcgTcgTcrSciPbYzcrTcePcrUcrVbPWbPWbPWbODcrWbZWcrXcrYcrYcltcrZcrZcqRcmDcltcnMcsacoScsbcscbXEcggbXEcsbcsbccDbXEbXEbXEaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQaaacpQcqVcpSaadcpQcqVcpSaadcpQcqVcpSaaaaadaadaadbObaVjcqXcsdbObcsechfcsfcsgcfjbObcshcracsickAcrccmOcsjcmRcskbWFbXTcilcjqcslcsmcsncsocspcjqcsqcsrcsscstcsucimcsvcswcsxcsycszcsAcsBcsCcsDcpqcsEcsFcsGcqocsIcsJbZucpscsKcsLbZubZucsKcsKcsKchCcsMcsNcorcoscaBcaBcaBcaBaadbOhcovcsOcsPcsQcsRcsSbOhbOhcsTcsUcsVbOCcsWcsXbOhbOhbXGcrRbODckabPWbPWcsYckcbYzcfUbYzcfVcsZbPWbPWcfXbODcsbctactbctcctdcltctectecqRcmDcltctfctgcthctictjctkctlcmIcmIcmIctmctnctoctpaaeaaeaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 8fd3a43e..bd496594 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -46921,11 +46921,13 @@ /turf/closed/wall, /area/ai_monitored/turret_protected/ai_upload) "byU" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/yellowsiding{ dir = 8 }, @@ -46945,12 +46947,12 @@ dir = 8 }, /obj/effect/turf_decal/tile/red, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/toilet/restrooms) "byX" = ( @@ -50584,6 +50586,9 @@ /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/toilet/restrooms) "bEP" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ icon_state = "4-8" }, @@ -52858,12 +52863,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ dir = 8 }, -/obj/machinery/door/airlock/grunge{ - name = "Recreation Area" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/airlock/grunge{ + name = "Recreation Area" + }, /turf/open/floor/wood, /area/crew_quarters/fitness/pool) "bII" = ( @@ -55567,6 +55572,9 @@ pixel_y = 32 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 1 + }, /turf/open/floor/plating{ icon_state = "platingdmg3" }, @@ -57304,9 +57312,6 @@ }, /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/junction/yjunction{ - dir = 1 - }, /turf/open/floor/plating{ icon_state = "panelscorched" }, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 9612a000..1d1617aa 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -3247,7 +3247,7 @@ "blq" = (/obj/structure/table,/obj/item/clipboard,/obj/item/folder/yellow,/obj/item/folder/yellow,/obj/item/multitool,/obj/item/pen/red,/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 8},/turf/open/floor/plasteel,/area/quartermaster/office) "blr" = (/obj/structure/chair/office/dark{dir = 8},/turf/open/floor/plasteel,/area/quartermaster/office) "bls" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 1},/turf/open/floor/plasteel,/area/quartermaster/office) -"blt" = (/obj/machinery/disposal/bin,/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/light_switch{pixel_x = 27},/obj/machinery/light/small{dir = 4},/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 4},/turf/open/floor/plasteel,/area/quartermaster/office) +"blt" = (/obj/machinery/light_switch{pixel_x = 27},/obj/machinery/light/small{dir = 4},/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 4},/obj/structure/disposalpipe/segment,/turf/open/floor/plasteel,/area/quartermaster/office) "blu" = (/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 8},/obj/structure/closet/crate{icon_state = "crateopen"},/obj/effect/spawner/lootdrop/maintenance,/turf/open/floor/plasteel,/area/hallway/primary/port) "blv" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/open/floor/plasteel,/area/hallway/primary/port) "blw" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/hallway/primary/port) @@ -3330,7 +3330,7 @@ "bmV" = (/obj/machinery/photocopier,/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/turf/open/floor/plasteel,/area/quartermaster/office) "bmW" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/turf/open/floor/plasteel,/area/quartermaster/office) "bmX" = (/obj/structure/disposalpipe/segment,/obj/machinery/holopad,/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/turf/open/floor/plasteel,/area/quartermaster/office) -"bmY" = (/obj/machinery/autolathe,/obj/machinery/newscaster{pixel_x = 28},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -28},/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 8},/turf/open/floor/plasteel,/area/quartermaster/office) +"bmY" = (/obj/machinery/newscaster{pixel_x = 28},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -28},/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 8},/obj/machinery/disposal/bin,/obj/structure/disposalpipe/trunk{dir = 1},/turf/open/floor/plasteel,/area/quartermaster/office) "bmZ" = (/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/turf/open/floor/plasteel,/area/hallway/primary/port) "bna" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/holopad,/obj/effect/turf_decal/tile/brown{dir = 8},/turf/open/floor/plasteel,/area/hallway/primary/port) "bnb" = (/obj/structure/disposalpipe/segment{dir = 6},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/structure/cable/yellow{icon_state = "2-4"},/obj/effect/turf_decal/tile/brown,/turf/open/floor/plasteel,/area/hallway/primary/port) @@ -3420,7 +3420,7 @@ "boH" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/firedoor,/obj/structure/table/reinforced,/obj/machinery/door/window/westleft{dir = 1; name = "Delivery Desk"; req_access_txt = "50"},/obj/effect/spawner/lootdrop/maintenance,/obj/effect/turf_decal/bot,/turf/open/floor/plasteel,/area/quartermaster/sorting) "boI" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plating,/area/quartermaster/sorting) "boJ" = (/obj/machinery/door/firedoor,/obj/machinery/mineral/ore_redemption,/turf/open/floor/plasteel/dark,/area/quartermaster/office) -"boK" = (/obj/effect/spawner/structure/window/reinforced,/obj/structure/disposalpipe/segment,/turf/open/floor/plating,/area/quartermaster/office) +"boK" = (/obj/structure/disposalpipe/segment,/obj/machinery/autolathe,/obj/machinery/door/window/westleft{name = "Cargo Desk"; req_access_txt = "50"; dir = 1},/turf/open/floor/plasteel/dark,/area/quartermaster/office) "boL" = (/obj/structure/sign/directions/supply{dir = 1; pixel_y = 8},/turf/closed/wall,/area/quartermaster/office) "boM" = (/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 8},/turf/open/floor/plasteel,/area/hallway/primary/port) "boN" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/door/firedoor,/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 4},/turf/open/floor/plasteel,/area/hallway/primary/port) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 1d734e54..d0015b84 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -7404,6 +7404,9 @@ /obj/structure/medkit_cabinet{ pixel_y = 27 }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "aoG" = ( @@ -12051,6 +12054,9 @@ /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-10" }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "axG" = ( @@ -12060,6 +12066,9 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "axI" = ( @@ -12069,20 +12078,32 @@ /obj/machinery/airalarm{ pixel_y = 22 }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "axJ" = ( /obj/structure/sign/departments/security{ pixel_y = 32 }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "axK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "axL" = ( /obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "axM" = ( @@ -13463,12 +13484,27 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -24 }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "aAJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "aAK" = ( @@ -13486,6 +13522,13 @@ /area/hallway/primary/central) "aAM" = ( /obj/structure/chair, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/hallway/primary/central) "aAN" = ( @@ -13913,6 +13956,12 @@ icon_state = "0-2" }, /obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "aBI" = ( @@ -13931,6 +13980,10 @@ dir = 4 }, /obj/item/crowbar, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/hallway/primary/central) "aBL" = ( @@ -14565,6 +14618,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "aCX" = ( @@ -14607,6 +14666,10 @@ /obj/structure/chair{ dir = 1 }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/hallway/primary/central) "aDb" = ( @@ -15097,6 +15160,10 @@ pixel_x = 32; pixel_y = 1 }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/hallway/primary/central) "aEc" = ( @@ -15557,6 +15624,9 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "aEX" = ( @@ -15821,6 +15891,12 @@ /area/crew_quarters/heads/hop) "aFC" = ( /obj/machinery/vending/snack, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "aFD" = ( @@ -15829,6 +15905,10 @@ dir = 4 }, /obj/item/taperecorder, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/hallway/primary/central) "aFE" = ( @@ -16275,6 +16355,12 @@ /area/hallway/primary/central) "aGz" = ( /obj/machinery/vending/cigarette, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "aGA" = ( @@ -16296,6 +16382,9 @@ /obj/structure/sign/warning/vacuum/external{ pixel_x = -32 }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "aGD" = ( @@ -17086,6 +17175,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "aIg" = ( @@ -17097,6 +17189,9 @@ dir = 4; name = "Dormitory" }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "aIh" = ( @@ -17113,6 +17208,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "aIj" = ( @@ -18158,6 +18256,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "aKb" = ( @@ -18169,6 +18270,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "aKc" = ( @@ -18210,12 +18314,18 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "aKf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "aKg" = ( @@ -22211,7 +22321,6 @@ /obj/structure/window/reinforced{ dir = 8 }, -/mob/living/simple_animal/butterfly, /turf/open/floor/grass, /area/hallway/secondary/exit/departure_lounge) "aSw" = ( @@ -53328,6 +53437,9 @@ "cos" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "cot" = ( @@ -53335,6 +53447,9 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "cou" = ( @@ -53353,6 +53468,9 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "coz" = ( @@ -57164,6 +57282,16 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) +"dRZ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "dSr" = ( /obj/item/chair, /turf/open/floor/wood, @@ -57335,9 +57463,6 @@ /area/space/nearstation) "erV" = ( /obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "eue" = ( @@ -58525,6 +58650,15 @@ icon_state = "panelscorched" }, /area/maintenance/department/science) +"hfv" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "hfZ" = ( /obj/structure/reagent_dispensers/watertank, /obj/machinery/requests_console{ @@ -58546,6 +58680,14 @@ }, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"hiX" = ( +/obj/structure/chair, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "hiY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -58716,6 +58858,9 @@ /obj/structure/sign/warning/vacuum/external{ pixel_y = 32 }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "hHr" = ( @@ -59959,6 +60104,12 @@ /area/science/xenobiology) "kHQ" = ( /obj/machinery/vending/mealdor, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "kIo" = ( @@ -59973,6 +60124,9 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "kJo" = ( @@ -61215,9 +61369,6 @@ pixel_x = 32 }, /obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "nMG" = ( @@ -62332,6 +62483,12 @@ /obj/item/stack/sheet/mineral/wood, /turf/open/floor/plating, /area/maintenance/department/engine) +"qhU" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "qjx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/stripes/line, @@ -62527,6 +62684,13 @@ }, /turf/open/floor/plasteel/dark, /area/maintenance/department/crew_quarters/dorms) +"qSO" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "qUe" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 @@ -62652,6 +62816,16 @@ /obj/item/storage/toolbox/mechanical, /turf/open/floor/plating, /area/maintenance/department/engine) +"rfl" = ( +/obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "rgn" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -62938,9 +63112,6 @@ pixel_x = 27 }, /obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "rMV" = ( @@ -62950,6 +63121,14 @@ }, /turf/open/floor/plating/airless, /area/maintenance/department/engine) +"rNy" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "rNB" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -63011,6 +63190,15 @@ }, /turf/open/floor/plating, /area/storage/emergency/starboard) +"rZS" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "sbk" = ( /obj/structure/girder, /turf/open/floor/plating, @@ -63271,6 +63459,13 @@ }, /turf/open/space/basic, /area/space) +"sPO" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "sQt" = ( /obj/machinery/door/airlock/external{ name = "Supply Dock Airlock"; @@ -75912,6 +76107,7 @@ aaa aaa aaa aaa +cFB aaa aaa aaa @@ -75929,8 +76125,7 @@ aaa aaa aaa aaa -aaa -aaa +cFB aaa aaa aaa @@ -78410,7 +78605,7 @@ aaa aaa aaa aaa -abN +bBW aaa aaa aaa @@ -82773,7 +82968,7 @@ wnl oTC ait aaa -abN +bBW aaa aHA axh @@ -86360,7 +86555,7 @@ atw aon avt awJ -axG +qhU ayG pFy aiu @@ -86617,7 +86812,7 @@ atx auz avu awJ -axG +qhU ayH aAe aBc @@ -87131,7 +87326,7 @@ atz aux avv awK -axG +qhU ayL aAi aBd @@ -87388,7 +87583,7 @@ atA auA avw awJ -axG +qhU ayL aAi aBd @@ -87645,7 +87840,7 @@ atx auz avx awJ -axG +qhU ayJ aAg aBe @@ -88159,7 +88354,7 @@ atz aux avy awK -axG +qhU ayL aAi aBe @@ -88416,7 +88611,7 @@ atC auA avz awJ -axG +qhU ayL aAi aBd @@ -88673,7 +88868,7 @@ atD auz avA awJ -axG +qhU ayL aAi aBd @@ -89444,7 +89639,7 @@ atF alv alv awM -axG +qhU ayN aAk axG @@ -90215,7 +90410,7 @@ ajM agR atu awO -axG +qhU axG aAm aBi @@ -90472,7 +90667,7 @@ atH alI atZ awP -axG +qhU ayP aAn aBi @@ -90729,7 +90924,7 @@ ajM amu auv awQ -axG +qhU ayQ gOf aBi @@ -98224,13 +98419,13 @@ aGV blu aDZ aDZ -bjm +bgC nKF -cqi -cqi -cqi -cqi -cqi +erV +erV +erV +erV +erV erV rMt ksC @@ -101268,7 +101463,7 @@ awk axn axn axn -aAL +dRZ aAL aCZ aAL @@ -101529,7 +101724,7 @@ aAM aBK aDa aEb -aAM +hiX aFD aDa aAN @@ -102047,9 +102242,9 @@ aaa aaa aaa awd -aHN +hfv aIU -aJI +rZS aLe axT ayp @@ -102304,9 +102499,9 @@ cdm cdm cdm awd -aHN +hfv aIU -aJH +rfl aLe ayd ayt @@ -102561,9 +102756,9 @@ aET rYC aET aET -aHN +hfv aIU -aJI +rZS lAs lAs iKb @@ -102820,7 +103015,7 @@ qbZ aET aoF aIU -aJI +rZS lAs aMg aNH @@ -103077,7 +103272,7 @@ aET aET hFy aJh -bhe +sPO lAs aMh aNI @@ -103589,9 +103784,9 @@ aFF vuP aGB aET -aHN +hfv aIU -aJI +rZS lAs aMj aNK @@ -103846,9 +104041,9 @@ aET aaH aET aET -aHN +hfv aIU -aJI +rZS lAs aMk aNL @@ -104105,7 +104300,7 @@ aGC cos coy aJj -aJI +rZS lAs aMl aNM @@ -104362,7 +104557,7 @@ aGD aDZ aDZ aJk -aJH +rfl lAs aMm lAs @@ -104613,10 +104808,10 @@ aAP avk aDg aEc -aEY +rNy cot -aBI -aBI +qSO +qSO aBI aJl aKf From 3b7783c8945b8116ba2ec470a153542804015e7f Mon Sep 17 00:00:00 2001 From: evilew Date: Sat, 21 Oct 2023 14:16:47 +0200 Subject: [PATCH 2/2] nerfed heat produced from candles and cigs --- code/game/objects/items/candle.dm | 2 +- code/game/objects/items/cigs_lighters.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index 5a2b457f..8a489e54 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -8,7 +8,7 @@ item_state = "candle1" w_class = WEIGHT_CLASS_TINY light_color = LIGHT_COLOR_FIRE - heat = 1000 + heat = 1 var/wax = 1000 var/lit = FALSE var/infinite = FALSE diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 1942eb24..18f448dc 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -115,7 +115,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/smoketime = 300 var/chem_volume = 30 var/list/list_reagents = list(/datum/reagent/drug/nicotine = 15) - heat = 1000 + heat = 1 /obj/item/clothing/mask/cigarette/suicide_act(mob/user) user.visible_message("[user] is huffing [src] as quickly as [user.p_they()] can! It looks like [user.p_theyre()] trying to give [user.p_them()]self cancer.")