From 4212968854e15d6cd3cd15254a542adfc356b4c4 Mon Sep 17 00:00:00 2001 From: evilew Date: Sat, 23 Nov 2024 20:05:08 +0100 Subject: [PATCH] map quick fixes - added BEPIS machines, civilian bounty pads to all maps - fixed incorrect ID var on lavaland outpost shuttle land --- GainStation13/code/game/donator.dm | 70 +++++++++---------- _maps/map_files/BoxStation/BoxStation.dmm | 9 +-- _maps/map_files/KiloStation/KiloStation.dmm | 15 ++-- _maps/map_files/MetaStation/MetaStation.dmm | 15 ++-- _maps/map_files/Mining/Lavaland_Lower.dmm | 9 +-- _maps/map_files/PubbyStation/PubbyStation.dmm | 32 +++++---- 6 files changed, 74 insertions(+), 76 deletions(-) diff --git a/GainStation13/code/game/donator.dm b/GainStation13/code/game/donator.dm index 0300ac2dcf..cf78ef7774 100644 --- a/GainStation13/code/game/donator.dm +++ b/GainStation13/code/game/donator.dm @@ -1,99 +1,99 @@ //GS13: donator items and other ckey-locked junk -/datum/gear/gatobadge_employee //these are available only to admins with CC-related characters +/datum/gear/donator/gatobadge_employee //these are available only to admins with CC-related characters name = "GATO Badge - Employee" category = LOADOUT_CATEGORY_DONATOR path = /obj/item/clothing/accessory/medal/gato_badge/employee ckeywhitelist = list("sonoida", "yeeny") -/datum/gear/gatobadge_middleman //these are available to players who were granted permission to have their characters to CC +/datum/gear/donator/gatobadge_middleman //these are available to players who were granted permission to have their characters to CC name = "GATO Badge - Correspondent" category = LOADOUT_CATEGORY_DONATOR path = /obj/item/clothing/accessory/medal/gato_badge/middleman ckeywhitelist = list("johnjimjim", "sonoida", "yeeny", "Not Number", "Not_Number", "NotNumber",) -/datum/gear/halsey_overcoat +/datum/gear/donator/halsey_overcoat name = "Halsey's Commander Overcoat" category = LOADOUT_CATEGORY_DONATOR path = /obj/item/clothing/suit/chloe/halsey ckeywhitelist = list("yeeny") -/datum/gear/haydee_suit +/datum/gear/donator/haydee_suit name = "Haydee Suit" category = LOADOUT_CATEGORY_DONATOR path = /obj/item/clothing/suit/space/hardsuit/engine/haydee ckeywhitelist = list("lumu", "sonoida") -/datum/gear/haydee_pistol +/datum/gear/donator/haydee_pistol name = "Haydee Pistol" category = LOADOUT_CATEGORY_DONATOR path = /obj/item/gun/ballistic/automatic/toy/pistol/haydee ckeywhitelist = list("lumu", "sonoida") -/datum/gear/rose_plush +/datum/gear/donator/rose_plush name = "Dezir Rose Plush" - category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + category = LOADOUT_CATEGORY_DONATOR path = /obj/item/toy/plush/gs13/rose ckeywhitelist = list("eremitanovem", "sonoida") -/datum/gear/chloe_plush +/datum/gear/donator/chloe_plush name = "Chloe Plush" - category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + category = LOADOUT_CATEGORY_DONATOR path = /obj/item/toy/plush/gs13/chloe ckeywhitelist = list("alphas0") -/datum/gear/grimmy_coat +/datum/gear/donator/grimmy_coat name = "Overcoat of the Destitute" - category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + category = LOADOUT_CATEGORY_DONATOR path = /obj/item/clothing/suit/storage/blueshield/grimmy ckeywhitelist = list("bbgrimmy") -/datum/gear/tarek_gps +/datum/gear/donator/tarek_gps name = "Tarek's GPS" - category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + category = LOADOUT_CATEGORY_DONATOR path = /obj/item/gps/mining ckeywhitelist = list("e926user25") -/datum/gear/milwaukee_crowbar +/datum/gear/donator/milwaukee_crowbar name = "Milwaukee Pocket Crowbar" - category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + category = LOADOUT_CATEGORY_DONATOR path = /obj/item/crowbar/bronze/glaug ckeywhitelist = list("happytpr") -/datum/gear/fatfang +/datum/gear/donator/fatfang name = "Fattening Fangs Injector" - category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + category = LOADOUT_CATEGORY_DONATOR path = /obj/item/dnainjector/fatfang ckeywhitelist = list("sonoida") -/datum/gear/toolbelt +/datum/gear/donator/toolbelt name = "Empty Toolbelt" - category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + category = LOADOUT_CATEGORY_DONATOR path = /obj/item/storage/belt/utility ckeywhitelist = list("killmewitha22", "Killmewitha22", "KILLMEWITHA22", "sonoida") //metha rossi you fat hog -/datum/gear/wgspell_add +/datum/gear/donator/wgspell_add name = "Weight Gain Spellbook" - category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + category = LOADOUT_CATEGORY_DONATOR path = /obj/item/book/granter/spell/fattening ckeywhitelist = list("sonoida", "themrsky", "Not Number") -/datum/gear/wgspell_transfer +/datum/gear/donator/wgspell_transfer name = "Weight Transfer Spellbook" - category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + category = LOADOUT_CATEGORY_DONATOR path = /obj/item/book/granter/spell/fattening/transfer ckeywhitelist = list("sonoida", "themrsky", "Not Number") -/datum/gear/wgspell_take +/datum/gear/donator/wgspell_take name = "Weight Steal Spellbook" - category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + category = LOADOUT_CATEGORY_DONATOR path = /obj/item/book/granter/spell/fattening/steal ckeywhitelist = list("sonoida", "themrsky", "Not Number") -/datum/gear/white_eyepatch_cabal +/datum/gear/donator/white_eyepatch_cabal name = "Cabal's Eyepatch" - category = LOADOUT_CATEGORY_GLASSES + category = LOADOUT_CATEGORY_DONATOR path = /obj/item/clothing/glasses/eyepatch/cabal ckeywhitelist = list("spess_lizurd", "SPESS LIZURD", "spess lizurd", "SPESS_LIZURD", "spesslizurd", "sonoida") @@ -102,27 +102,27 @@ category = LOADOUT_CATEGORY_GLASSES path = /obj/item/clothing/glasses/eyepatch/white -/datum/gear/metis_plush +/datum/gear/donator/metis_plush name = "Metis Plush" - category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + category = LOADOUT_CATEGORY_DONATOR path = /obj/item/toy/plush/gs13/metis ckeywhitelist = list("paraillegal", "Paraillegal") -/datum/gear/wheelys +/datum/gear/donator/wheelys name = "Wheely-Heels" - category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + category = LOADOUT_CATEGORY_DONATOR path = /obj/item/clothing/shoes/wheelys ckeywhitelist = list("colorlessspy", "Colorlessspy") -/datum/gear/crowbars_plush +/datum/gear/donator/crowbars_plush name = "Crowbars Plush" - category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + category = LOADOUT_CATEGORY_DONATOR path = /obj/item/toy/plush/gs13/crowbars ckeywhitelist = list("M16nPregnant", "m16npregnant" ) -/datum/gear/sams_welder +/datum/gear/donator/sams_welder name = "Sam's Unlucky Welder" - category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + category = LOADOUT_CATEGORY_DONATOR path = /obj/item/weldingtool/bronze ckeywhitelist = list("almaniak", "Almaniak", "AlManiak") diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 443c017087..1824af56c6 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -4336,9 +4336,9 @@ "bGP" = (/obj/machinery/light,/obj/machinery/power/apc{areastring = "/area/quartermaster/office"; name = "Cargo Office APC"; pixel_x = 1; pixel_y = -24},/obj/structure/cable{icon_state = "0-4"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel,/area/cargo/office) "bGQ" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{icon_state = "1-2"},/obj/structure/cable{icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown,/turf/open/floor/plasteel,/area/cargo/office) "bGR" = (/obj/effect/turf_decal/loading_area{dir = 1},/turf/open/floor/plasteel,/area/cargo/office) -"bGS" = (/obj/structure/chair{dir = 1},/turf/open/floor/plasteel,/area/cargo/office) +"bGS" = (/obj/structure/table,/turf/open/floor/plasteel,/area/cargo/office) "bGT" = (/obj/structure/reagent_dispensers/water_cooler,/turf/open/floor/plasteel,/area/cargo/office) -"bGU" = (/obj/structure/table,/obj/machinery/light,/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/cargo/office) +"bGU" = (/obj/machinery/light,/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/obj/machinery/piratepad/civilian,/turf/open/floor/plasteel,/area/cargo/office) "bGV" = (/obj/machinery/door/poddoor/shutters/preopen{id = "hopqueue"; name = "HoP Queue Shutters"},/obj/effect/turf_decal/loading_area{dir = 4},/turf/open/floor/plasteel,/area/hallway/primary/central) "bGW" = (/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/obj/effect/turf_decal/tile/blue{dir = 8},/obj/machinery/vending/mealdor,/turf/open/floor/plasteel,/area/command/heads_quarters/hop) "bGX" = (/obj/machinery/requests_console{announcementConsole = 1; department = "Head of Personnel's Desk"; departmentType = 5; name = "Head of Personnel RC"; pixel_y = -30},/obj/machinery/camera{c_tag = "Head of Personnel's Office"; dir = 1},/turf/open/floor/plasteel,/area/command/heads_quarters/hop) @@ -5793,7 +5793,7 @@ "ciX" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/obj/structure/disposalpipe/junction/flip{dir = 2},/turf/open/floor/plasteel,/area/science/misc_lab) "ciY" = (/obj/machinery/disposal/bin,/obj/structure/disposalpipe/trunk{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel,/area/science/misc_lab) "ciZ" = (/obj/structure/sign/nanotrasen,/turf/closed/wall/r_wall,/area/science/explab) -"cja" = (/obj/structure/table,/obj/item/paper_bin{pixel_y = 6},/obj/machinery/light{dir = 1; pixel_y = 16},/turf/open/floor/plasteel/white,/area/science/explab) +"cja" = (/obj/machinery/rnd/bepis,/turf/open/floor/plasteel/white,/area/science/explab) "cjb" = (/obj/structure/table,/obj/item/pen,/obj/item/hand_labeler,/obj/item/stack/packageWrap,/obj/machinery/firealarm{pixel_y = 24},/turf/open/floor/plasteel/white,/area/science/explab) "cjc" = (/obj/structure/table,/obj/item/folder/white,/obj/item/folder/white,/obj/machinery/airalarm{pixel_y = 23},/obj/item/radio/off,/obj/machinery/camera{c_tag = "Experimentor Lab"; network = list("ss13","rd")},/turf/open/floor/plasteel/white,/area/science/explab) "cjd" = (/obj/structure/closet/l3closet/scientist,/obj/structure/cable{icon_state = "0-2"},/obj/machinery/power/apc{areastring = "/area/science/explab"; dir = 1; name = "Experimentation Lab APC"; pixel_y = 28},/turf/open/floor/plasteel/white,/area/science/explab) @@ -7371,6 +7371,7 @@ "pUc" = (/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals3"},/turf/open/floor/plasteel,/area/hallway/primary/starboard) "pVv" = (/obj/structure/chair/sofa{dir = 8},/turf/open/floor/carpet,/area/hallway/secondary/exit) "pYb" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/fitness/sauna) +"pYc" = (/obj/machinery/computer/piratepad_control/civilian{dir = 1},/turf/open/floor/plasteel,/area/cargo/office) "qmg" = (/obj/item/reagent_containers/glass/beaker/large{pixel_x = -3; pixel_y = 2},/obj/item/reagent_containers/glass/beaker/large,/obj/structure/table,/obj/item/reagent_containers/food/condiment/enzyme,/obj/machinery/light{dir = 8},/turf/open/floor/plasteel/cafeteria,/area/maintenance/port/fore) "qnB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/dark/corner{dir = 4},/area/crew_quarters/fitness/sauna) "qqn" = (/obj/machinery/door/airlock{id_tag = "DormDepart"; name = "1st Class Lounge"},/turf/open/floor/plasteel/dark,/area/hallway/secondary/exit) @@ -7614,7 +7615,7 @@ byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJatJatJbhratJbhrbhratJbhraaaaaaaaaaaaaaaaaaaaabChbCibCjbCkbvdbzibvdbzjdjRbClbzjbvdbvdbCmbsqbsqbeVbCobCpbCqbCrbCrbswbCtbCubCvbCwbBebylbjXasJbCxbCybCzbCAbCAbCBbCCbCDbCEbCFaTBbCGbCHbCIbCJbCKaTBaadaadbBrbCLbCMbCNbCObCPbCQbCRbBrbnYaIPbCSbCTbCUbCVbCWbCXbCYbCZbDabDbbDcbDdbDdbDdbDdbDdbDebDfbDdbDdbDdbDgbusbDhbDibAabDjbDkbDlbDlbDmbDnbAhiLkbAibDobDpbDqbDrbDsbDtbDubtcbDvbtcbtcbtcbDwbyNbDxbDybDzbDAbDBbDCbDDbDEbDFbDGbDHbDIbDJbDKbDLbDKbDMbDNbDObDPbAJatJatJatJatJatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaabzgbwybwybDQbvdbzibvddgbdgbdgbdgbbvdbvdbDRbDSbDTbeVbDUbDVbDWbDXbDXbDXbDYbDZbCvbCwbBebylbjXbEabBfbwRbEbbEcbEdbEebEfbEgbEhbEiaTBbEjbCHbEkbElbEmaTBaaaaaabBrbEnbEobEpbEqbErbErbEsbEtbEubEvbEwbExbEybEzbEAbEBbEBbECbEDbEEbEFbEGbEHbEIbEJbEKbELbEMbHqbrtbENbEObEObEPbAabAabAabEQbERbESbBKbDnbAhbETbAibfLbyNbyNbyNbyNbyNbyNbyNbyNbyNbEUbEVbEUbyNbEWbEXbEYbEZbEZbEZbFabFbbFcbFdbFebFfbFgbFhbFibFhbFjbFkbFlbFmbFnbwtbFobFobwtaadiWgiWgiWgaadiWgiWgiWgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaabFpbChbCibCjbxYbFqbvebFrbwDbvdbFqbvdbvdbvdbDRbFsbFtbeVbFubFvbFwbswbswbswbFxbswbCvbCwbBebylbjXbFybFzbwRbFAbFBbFCbFDbypbwRbFEbFFaTBbFGbFHaMZbjWbFIaTBaaaaaabBrbFJbFKbFLbFMbFNbFObFPbBrbFQaIPbFRbqGbqGbFTbFUbFVbqGbqGbFWbfzbfzbFWbqGbFWbqGbFWbqGbFWbqGbfzbfzbEObFZbDlbGabGbbAabEQbGcbGdbGebGfbAhbGgbGhbGibGjbGkbEZbEZbGlbEZbEZbGmbGnbGobGpbGqbEZbGrbGsbGtbGubGubGubGvbGvbGvbGvbGwbGxbGybGzbGAbGzbGBbGCbCfriRbGEbGFbGGbGHbwtaadaaaaaaaaaatJaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG -byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaabGIbGJbGIbGKbGLbGKbGKbGKbGKbGKbGKbGMbvdbDRbFsbGNbeVbGObGPbGQbGRbGSbGSbGSbGTbGUbBdbBebylaKebGVbBfbwRbGWbGXbGYbGZbHabwRaTBaTBaTBaTBbHbbHcbHdaTBaTBaTBaTBbBrbHebHfbHgbHhbFNbFObFPbBrbHiaIPaxxbqGbHjbHkbHlbHmbHnbqGvnpbrtbHpbLvbHrbHsbHtbHuhoZbHvbqGbrtbHwbEObHxbDlbHybHzbHAbHBbHCbHDbHDbHEbHFbHGbHHbHIbHJbHKbHLbHMbHLbHLbHNbHLbHLbHObHPbHLbHLbHQbHRbHSbHTbHUbHVbHWbHXbHYbHZbGwbIabGybGzbIbbGzbGBbIcbCfbGDbAJbIdbIebIfbwtaaaaaaaaaaaaatJaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG +byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaabGIbGJbGIbGKbGLbGKbGKbGKbGKbGKbGKbGMbvdbDRbFsbGNbeVbGObGPbGQbGRbswbGTbGSpYcbGUbBdbBebylaKebGVbBfbwRbGWbGXbGYbGZbHabwRaTBaTBaTBaTBbHbbHcbHdaTBaTBaTBaTBbBrbHebHfbHgbHhbFNbFObFPbBrbHiaIPaxxbqGbHjbHkbHlbHmbHnbqGvnpbrtbHpbLvbHrbHsbHtbHuhoZbHvbqGbrtbHwbEObHxbDlbHybHzbHAbHBbHCbHDbHDbHEbHFbHGbHHbHIbHJbHKbHLbHMbHLbHLbHNbHLbHLbHObHPbHLbHLbHQbHRbHSbHTbHUbHVbHWbHXbHYbHZbGwbIabGybGzbIbbGzbGBbIcbCfbGDbAJbIdbIebIfbwtaaaaaaaaaaaaatJaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJatJatJbhratJbhrbhratJbhraaaaaaaaaaaaaaaaaaaaabzgbwybwybwybsqbIhbIhbIhbIhbIhbIibvdbvdbDRbFsbIjbIkbIkbIlbImbInbIobIpbIpbIpbIobIobIqbIraRmaTBaTBbwRbwRbwRbwRbwRbIsbwRbItbIubIvaTBbIwbIxbIyaTBbIBbIAbIBbBrbBrbBrbBrbBrbBrbBrbBrbBrbICaTSaRmbIDbIEbrsbIGbIHbIIbqGbIJbrtbsLbrtbILgNrbINbIObIPgNrbILbrtbHwbEObIQbIRbISbITbIUbIVbIWbITbITbIXbIYbIZbJabJbbJbbJbbJbbJcbJbbJbbJbbJdbJdbJebJfbJgbJgbCabJhbCbbHTbJibJjbJkbJlbJmbJnbCfbJobJpbJqbJrbJqbJsbJtbCfriRbAJbJubIebJvbwtaadaaaaaaaaaatJaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaFcbJwbJxbJyaFcbJzbJAbvdbJBbJCbJCbJDbJEbJFbJGbJHbIpbJIbJJbJKbJLbIobJMbylaIPaLPblobJNbJOaLPbljbJPbJQbJRbJSbJSbJSbJTbJUbJVbJWbJXaLPaLPaLPaLPbJOaLPbljaNKaLPaLPbJNaLPbJYaIPbjXbIDbJZbKabKbbKcbKdbqGbKebrtbPGbrtbILbIMbKgbKhbKibIMbILbrtbKjbEObDlbKkbKlbKmbKnbKobKpbKqbKrbAhbAhbKsbKtbJbbKubKvbKwbKxbKybKzbJbbKAbKBbKCbKDbKEbJgbCabJhbKFbKGbKHbKIbKJbKKbKLbKMbCfbKNbKObKPbKQbKPbKObKRbCfriRbAJbKSbKTbKUbwtaadaadaadaadaadatJatJatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyKbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaFcbKVbKWbKXaFcaFcaFcbKYbKZbKZaFcaFcbLabLbbLcbLdbLebLfbLgbLhbLibIobxbbLjaIPmMXthejqfaIPaIPbLkaIPbylaIPmMXthejqfaIPbLlbLmbLnaIPmMXthejqfaIPaIPaIPaLzaIPaIPmMXthejqfbJYbLobjXbqGbLpbLqbLrbLsbLtbqGbLubrtmIMbLvbqGbLwbLxbLybLxbLzbqGbrtbHwbEObEObEObEObEObAhbAhbAhbAhbAhbAhbLAwHdbLCbJbbLDbLEbLFbLGbLHbLIbJbbLJbLKbLLbLMbLNbJgbCabLObLPbLQbLRbLSbLSbLTbLUbLVbCfbLWbLXbLYbLZbLYbMabLWbCfriRbAJbMbbIebMcbwtaadaaaaaaaaaatJaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 9ea4a683e7..f8b38d4265 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -30798,6 +30798,9 @@ dir = 8 }, /obj/effect/turf_decal/bot, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/science/research) "aZY" = ( @@ -31891,14 +31894,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/item/clipboard, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/table/reinforced, +/obj/machinery/rnd/bepis, /turf/open/floor/plasteel/dark, /area/science/research) "bbN" = ( @@ -43448,6 +43447,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/piratepad/civilian, /turf/open/floor/plasteel, /area/hallway/primary/starboard) "buS" = ( @@ -55782,6 +55782,9 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/machinery/computer/piratepad_control/civilian{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) "bPy" = ( @@ -124140,7 +124143,7 @@ aZY aJF aWX aVJ -sae +tNd bbM aNT aPo diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index e3eed90154..a2454aacdf 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -15276,6 +15276,7 @@ /obj/effect/turf_decal/tile/brown{ dir = 4 }, +/obj/machinery/piratepad/civilian, /turf/open/floor/plasteel/dark/corner{ dir = 4 }, @@ -15713,16 +15714,15 @@ /turf/open/floor/plasteel/dark/side, /area/hallway/primary/port) "bkw" = ( -/obj/structure/closet/crate{ - icon_state = "crateopen" - }, -/obj/effect/spawner/lootdrop/maintenance, /obj/effect/turf_decal/tile/brown{ dir = 8 }, /obj/structure/medkit_cabinet{ pixel_x = 24 }, +/obj/machinery/computer/piratepad_control/civilian{ + dir = 8 + }, /turf/open/floor/plasteel/dark/corner{ dir = 8 }, @@ -29333,13 +29333,8 @@ /turf/open/floor/plasteel, /area/science/explab) "cmR" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 6 - }, -/obj/item/pen, /obj/effect/turf_decal/stripes/line, +/obj/machinery/rnd/bepis, /turf/open/floor/plasteel, /area/science/explab) "cmS" = ( diff --git a/_maps/map_files/Mining/Lavaland_Lower.dmm b/_maps/map_files/Mining/Lavaland_Lower.dmm index 711cedbe45..7cf3e86c64 100644 --- a/_maps/map_files/Mining/Lavaland_Lower.dmm +++ b/_maps/map_files/Mining/Lavaland_Lower.dmm @@ -9623,13 +9623,6 @@ }, /turf/open/floor/plasteel, /area/xenoarch/caloriteresearch_powered) -"Cd" = ( -/obj/structure/ladder/unbreakable{ - height = 1; - id = "xenoarch" - }, -/turf/closed/wall, -/area/xenoarch/gen) "Cg" = ( /obj/structure/flora/grass/jungle, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, @@ -19499,7 +19492,7 @@ ab ab ab ab -Cd +Sy dv dv aR diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index e488c1740e..aa5b66b0e2 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -22054,10 +22054,14 @@ /turf/open/floor/plasteel, /area/cargo/office) "aTe" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/mineral/ore_redemption{ + input_dir = 4; + output_dir = 8 + }, +/obj/machinery/door/firedoor, /turf/open/floor/plating, /area/cargo/office) "aTg" = ( @@ -23515,12 +23519,9 @@ /turf/open/floor/plasteel, /area/cargo/office) "aWv" = ( -/obj/machinery/door/firedoor, -/obj/machinery/mineral/ore_redemption{ - input_dir = 4; - output_dir = 8 - }, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/tile/brown, +/obj/machinery/piratepad/civilian, +/turf/open/floor/plasteel, /area/cargo/office) "aWw" = ( /obj/effect/turf_decal/tile/brown, @@ -32321,12 +32322,9 @@ /turf/open/floor/plasteel/white, /area/science/explab) "bpg" = ( -/obj/structure/table/reinforced, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/item/paper_bin, -/obj/item/pen, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -32337,6 +32335,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/rnd/bepis, /turf/open/floor/plasteel/dark, /area/science/explab) "bph" = ( @@ -63513,6 +63512,13 @@ }, /turf/closed/wall/r_wall, /area/engineering/storage/tech) +"tEB" = ( +/obj/effect/turf_decal/tile/brown, +/obj/machinery/computer/piratepad_control/civilian{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/cargo/office) "tGK" = ( /turf/open/floor/plasteel/dark, /area/service/library) @@ -103091,7 +103097,7 @@ aSe aTc iHJ aVp -bfH +aWv bLW aYr sMp @@ -103348,7 +103354,7 @@ aSf aTd aUn aVr -bfH +tEB xWc aYs aZk @@ -103605,7 +103611,7 @@ jLr aTe aaR aVs -aWv +bLW xWc bLW aaS