From 68665d200656ac7173b7bce8e86a62dba29452ba Mon Sep 17 00:00:00 2001 From: Dip Date: Wed, 28 Oct 2020 17:09:46 -0300 Subject: [PATCH] we're crashing the server with no survivors --- _maps/map_files/BoxStation/BoxStation.dmm | 33 +++++++++---------- _maps/map_files/PubbyStation/PubbyStation.dmm | 7 ++-- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 269b9e43..b68feb73 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -28566,7 +28566,6 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/bloodbankgen, /turf/open/floor/plasteel/white, /area/medical/chemistry) "blu" = ( @@ -39058,20 +39057,10 @@ /turf/closed/wall, /area/medical/sleeper) "bHB" = ( -/obj/structure/table, -/obj/item/storage/belt/medical{ - pixel_y = 2 - }, -/obj/item/storage/belt/medical{ - pixel_y = 2 - }, -/obj/item/storage/belt/medical{ - pixel_y = 2 - }, -/obj/item/clothing/neck/stethoscope, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/bloodbankgen, /turf/open/floor/plasteel/white, /area/medical/sleeper) "bHC" = ( @@ -40205,6 +40194,16 @@ /obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/hud/health, +/obj/item/clothing/neck/stethoscope, +/obj/item/storage/belt/medical{ + pixel_y = 2 + }, +/obj/item/storage/belt/medical{ + pixel_y = 2 + }, +/obj/item/storage/belt/medical{ + pixel_y = 2 + }, /turf/open/floor/plasteel/white, /area/medical/sleeper) "bKm" = ( @@ -62815,9 +62814,9 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "xNJ" = ( -/obj/machinery/bloodbankgen, -/turf/open/floor/plasteel/white, -/area/medical/sleeper) +/obj/effect/landmark/barthpot, +/turf/open/floor/carpet, +/area/library) "xSM" = ( /mob/living/simple_animal/hostile/carp/cayenne/lia, /turf/open/floor/carpet/red, @@ -99734,7 +99733,7 @@ bCs bxa bER bFV -xNJ +byu byu bKn bLF @@ -106129,7 +106128,7 @@ aMp btJ aOM aOM -aOM +xNJ aOM aOM aOM diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index c0a456c8..f05e204a 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -2419,7 +2419,7 @@ "aUC" = (/obj/structure/cable{icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plating,/area/maintenance/department/cargo) "aUD" = (/obj/structure/lattice/catwalk,/obj/structure/cable{icon_state = "2-8"},/obj/structure/cable{icon_state = "2-4"},/obj/structure/cable{icon_state = "1-2"},/turf/open/space,/area/solar/starboard) "aUE" = (/turf/open/floor/wood,/area/maintenance/department/chapel/monastery) -"aUF" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/carpet,/area/library/lounge) +"aUF" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/landmark/barthpot,/turf/open/floor/carpet,/area/library/lounge) "aUG" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/obj/structure/cable{icon_state = "4-8"},/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel/white/corner{dir = 1},/area/hallway/secondary/exit/departure_lounge) "aUH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/sign/directions/evac{dir = 1; pixel_y = 32},/obj/structure/cable{icon_state = "4-8"},/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel/white/corner{dir = 1},/area/hallway/secondary/exit/departure_lounge) "aUI" = (/obj/structure/table/wood,/obj/machinery/computer/libraryconsole,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel/dark,/area/library/lounge) @@ -4028,7 +4028,7 @@ "bAW" = (/turf/closed/wall,/area/medical/virology) "bAX" = (/obj/machinery/door/firedoor,/obj/effect/mapping_helpers/airlock/locked,/obj/machinery/door/airlock/virology{autoclose = 0; frequency = 1449; id_tag = "virology_airlock_exterior"; name = "Virology Exterior Airlock"; req_access_txt = "39"},/obj/structure/cable{icon_state = "1-2"},/obj/machinery/doorButtons/access_button{idDoor = "virology_airlock_exterior"; idSelf = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = -24; req_access_txt = "39"},/obj/effect/mapping_helpers/airlock/cyclelink_helper,/turf/open/floor/plasteel/white,/area/medical/virology) "bAY" = (/obj/structure/sign/warning/biohazard,/turf/closed/wall,/area/medical/virology) -"bBb" = (/obj/effect/turf_decal/stripes/line,/turf/open/floor/plasteel/white,/area/medical/sleeper) +"bBb" = (/obj/effect/turf_decal/stripes/line,/obj/machinery/bloodbankgen,/turf/open/floor/plasteel/white,/area/medical/sleeper) "bBc" = (/obj/structure/disposalpipe/segment{dir = 6},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel/white,/area/medical/sleeper) "bBd" = (/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/open/floor/plasteel/white,/area/medical/sleeper) "bBe" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel/white,/area/medical/medbay/central) @@ -6449,7 +6449,6 @@ "mES" = (/obj/machinery/door/airlock/maintenance/abandoned{name = "Surgical Room"},/turf/open/floor/plating,/area/maintenance/department/science) "mHy" = (/obj/item/storage/fancy/cigarettes/cigpack_shadyjims,/turf/open/floor/wood,/area/maintenance/department/engine) "mIa" = (/obj/structure/disposalpipe/segment{dir = 10},/obj/machinery/light/small{dir = 8},/turf/open/floor/plating,/area/maintenance/department/engine) -"mKw" = (/obj/machinery/bloodbankgen,/turf/open/floor/plasteel/white,/area/medical/medbay/central) "mLc" = (/obj/structure/sign/warning/electricshock,/turf/closed/wall/r_wall,/area/engine/supermatter) "mLB" = (/obj/structure/cable{icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/open/floor/plating{icon_state = "platingdmg1"},/area/maintenance/department/security/brig) "mMz" = (/obj/effect/spawner/structure/window/reinforced,/obj/structure/cable,/obj/machinery/door/poddoor/preopen{id = "misclab"; name = "test chamber blast door"},/turf/open/floor/plating,/area/science/xenobiology) @@ -7144,7 +7143,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabVpaZxaLtaLJaZxahtbBVabIbBXbBXbBXbBXbBXbBYbvbbnvbnvbnvbnvbBZbCabCbbCcbCdbCebvcbCfbCgbChbsAbCiiojbBbbClbCmbyobCnbCobCpabhbCrbCsbCtbCubCvabibCxbCybCzbCAbCBafYrGzdggfdQnkkbBpbCEbCFbCGbCHbCIbAoaLPaMdaMebAtcqkcqvbkobCNbCOahtbCPbBCbBDbCQbCRbCRbCSbCTbCUbBJbCVbCWbCWbCXbBNbCZbCWbDabDbbDcbDdbHybwmbwmbwmhgDbwmlWyhxnrFqlWybkFbkFbkFbkFbkFbkFbkFbkFbkFbkFbkFbkFbkFaadjRGeuQvtljEXhSMahiaaaaaaaaaahtaaaaaaaaaaaaahtaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagLnaZxaLtaMfaZxahtbDfabIbBXbDgbDgbDhbvabTlbDjibUbDibDkbnvbvcbvcbvcbDlbDmbDnbvcbDobDpbDqbsAbDrbsAbDrbsAbDrbsAbDsbkhbpPwLobDtbDubDvbDwbDxbDybDybDybDybDybDzbvarPdphJbmDbDAbBpbDBbDCbDDbDEbDFbAoaMIaMJaMKbAtbsUbBzbkobDKbBoahtbAAbDLbDMbDNbDObDPabkbDRbDSbDTablbDVbDWbDXbDYbDXbDXbEabEbbEcbEdbHyglfpNyveMbEfbAFtSLuvqobPlWybwmkgRdMOhTlbwmqIOdmPlWysZuwfcbwmueVdoodtmgmpvuQbwmruibwmahiaaaaaaaaaaedahtahtabyabyaedahtaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahtsTgaZxaKXaMMaZxahtbDfahtbBXbEjbEkbElacbbEnbEobmfbEpbmfbEqbDibErbvcbvcbvcbvcbvcbEsbEtbEubjcbEvbEwbExbEybEzbkbbEAbEBbECbzYbEDbEEbEFbEGbEHbDybEIbEJbEKatebEMbvaxDjphJbmDbEQbBpbERbESbETbEUbEVfRsaMNaMOaMPbAubsUbBzbkobEZbCOaaabCPbFabFbbFcbCRbFdbCSbCTbwbbFfbCVbFhkmnbFibFjbFkbFlbFmbFnbGubFpbHybFrbFsbFtbFubAFlWybFxbFybFzbwmbFBlWybFCbwmjXAbFDlWylWysAKbwmheCefUbwmbwmbwmbwmbwmbwmahtahtabyaaaaaaaaaaaaahtaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabFEaaaaaaaaaaaaaaaaaaahtahtgLnaZxaLtaMMaZxahtbDfabIbBXbFFbvabvabvabvabvabsnbsnbvabFGbEnbFHbFIbFJbFKbFLbAWbErbFMbFNbFObFPmKwbkhbFQbnFacpbFSbkhbFTbFUbFUbFUbFUbFUbFUbDybFVbFWbFXbDybFYbvabltlCYjrbbGabBpbBpbBpbBpbBpbBpbBpbAtbGbbGcbAubGdbBzbkobGebBoahtbAAbGfbGgbGhbCRbGibAAbGjbGkbGlbAFbGmbGnbGobGpbGqbGrbGsbGtbGubGvabmqtAbGxbGynoMabniVJtSLbGBlWybwmbwmrxQbwmbwmbwmbwmfKjbwmbwmbwmuugeMCjFwrNBaaaaaaahtaaaahtaaaahtaaaaaaaaaaaaahtaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabFEaaaaaaaaaaaaaaaaaaahtahtgLnaZxaLtaMMaZxahtbDfabIbBXbFFbvabvabvabvabvabsnbsnbvabFGbEnbFHbFIbFJbFKbFLbAWbErbFMbFNbFObFPbkhbkhbFQbnFacpbFSbkhbFTbFUbFUbFUbFUbFUbFUbDybFVbFWbFXbDybFYbvabltlCYjrbbGabBpbBpbBpbBpbBpbBpbBpbAtbGbbGcbAubGdbBzbkobGebBoahtbAAbGfbGgbGhbCRbGibAAbGjbGkbGlbAFbGmbGnbGobGpbGqbGrbGsbGtbGubGvabmqtAbGxbGynoMabniVJtSLbGBlWybwmbwmrxQbwmbwmbwmbwmfKjbwmbwmbwmuugeMCjFwrNBaaaaaaahtaaaahtaaaahtaaaaaaaaaaaaahtaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabGDbGEbGFbGEaMQbGHbGIaaaahtahtahtgLnaZxaNkaMMaZxahtagSaaabvabvabvabGKbGLbGMbvabvabvabvabGNbDibErbGObGPbGQbGRbAWbGSbGTbGUbFObGVbkhbGXbuhbuhactbGZbuhbHabFUbHbbHcbHdbFUbFUbFUbFUbHebFUbFUbDzbvajCvbAkbAlbHgbvDbHhbHibHjbHkbHlbHmaIAbHnbHobHgbHqbHrbHsbHtbCOahtbCPbCRbHubCRbCRbHvbHwbuzbuzbuzbHybHybHybHybHybHybHyubWbHzbGubHAnsDkhkbHCbHDbHEbAGbwmbwmbwmxlAbwmsvNlWynzDrosrosgxKlWybwmhXtbwmiVJiVJxpDbwmahtabyabyabyabyaedabyabyaedabyahtahtaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabHIbGDbGEbHJbHKbHLbGEbHMbHNaqGaqGaqGeOAaZxaNlaMMaZxahtagSbvabvabHPbHQbHQbHQbHRbHQbHSbvabHTbGNbDibErbHUbHVbHXbHXbHYbHZbIabIbbFObIcbIdbIebIfbIgbkbbCnbIhbIibIjbIkbIlbImbInbIobIpbIqbIrbIsbFUbDzbvabOKbItbIumVjbIvbIvbIvbIxbIvbIvbIycqwbIAbRXcqxbICbIDbBAbIEbBoaaabAAbIFbIGbIHbIIbIJbHwabIabIabIaaaaaaaaaaaaabIaaaaaaubWbIKbILbIMrPWbINcxbfBzbJVfwrrBhbIPbIQbIRlQnbIQrosuojbwmvpzpWFbIQbIQbIQbIQbIQdVJjQhbwmaaaahtahtaaaahtaaaahtaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabybITbIUpbmbIVbIWbIXbHMbGEbGEbGEbGEaZxaZxaNnaMMaZxahtagSbIZbJabJbbJcbJdbJebJfbJgbJhbvabJibGNbJjpQwbJksENbJmbJlbGWbGWcBKbJnbFObFObFObjcbjcbjcbjcbJobkhbJpabobJrbJsbJrabpbJubJvbJwbJxbJyabqbJAbvabENbJBbJCbJDcqzcqzcqzcqzbJEbJFbJGcqDbJHcqEbJJbJKbJLbJMbJNbJNbJNbHwbHwbJObHwbHwbHwbHwbJPbJPbJPbJPbJPahtabyabyabyahtxIxbJQbJRbJSkfhdAFbJTbCVbLhgMmbwmbwmbwmbwmbwmuekizFbwmbwmbwmbwmbwmbwmrNBbwmbwmjDAbwmbwmaaaaedabyabyaedabyabyaedabyahtaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa