From 4b202faa1e41b845e77adced1eb9cc61046cab57 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 30 Aug 2017 17:06:42 -0500 Subject: [PATCH] Tiny PubbyStation update --- _maps/map_files/PubbyStation/PubbyStation.dmm | 558 ++++++++++++------ 1 file changed, 372 insertions(+), 186 deletions(-) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 7f55c286c7..502f7ba293 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -3595,8 +3595,8 @@ /area/security/armory) "aij" = ( /obj/structure/closet/secure_closet/contraband/armory, -/obj/item/book/codex_gigas, /obj/item/poster/random_contraband, +/obj/item/clothing/suit/security/officer/russian, /obj/item/grenade/smokebomb, /turf/open/floor/plasteel/black, /area/security/armory) @@ -4110,7 +4110,11 @@ /area/crew_quarters/heads/hos) "ajt" = ( /obj/structure/table, -/obj/machinery/chem_dispenser/drinks/beer, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ + pixel_x = 4; + pixel_y = 7 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) "aju" = ( @@ -4445,10 +4449,7 @@ /turf/open/floor/plasteel/black, /area/crew_quarters/heads/hos) "akf" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -24 - }, -/turf/open/floor/plating, +/turf/open/floor/carpet, /area/maintenance/department/crew_quarters/dorms) "akg" = ( /obj/structure/mineral_door/wood, @@ -4512,12 +4513,6 @@ /obj/machinery/door/airlock/glass{ name = "space-bridge access" }, -/obj/machinery/button/door{ - id = "supplybridge"; - name = "Space Bridge Control"; - pixel_y = 27; - req_access_txt = "0" - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -4564,12 +4559,6 @@ /obj/machinery/door/airlock/glass{ name = "space-bridge access" }, -/obj/machinery/button/door{ - id = "supplybridge"; - name = "Space Bridge Control"; - pixel_y = 27; - req_access_txt = "0" - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -4923,12 +4912,7 @@ /turf/open/space/basic, /area/space) "alb" = ( -/obj/structure/table, -/obj/item/lighter, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plating, +/turf/open/floor/wood, /area/maintenance/department/crew_quarters/dorms) "alc" = ( /obj/structure/table, @@ -7456,9 +7440,7 @@ /area/security/brig) "aqB" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/plasteel/darkred/side{ - dir = 1 - }, +/turf/open/floor/plasteel/black, /area/security/brig) "aqC" = ( /turf/open/floor/plasteel/black, @@ -7467,9 +7449,7 @@ /obj/machinery/ai_status_display{ pixel_y = 32 }, -/turf/open/floor/plasteel/darkred/side{ - dir = 1 - }, +/turf/open/floor/plasteel/black, /area/security/brig) "aqE" = ( /obj/structure/cable{ @@ -8976,13 +8956,13 @@ /area/security/brig) "atI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/darkred/side, +/turf/open/floor/plasteel/black, /area/security/brig) "atJ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/turf/open/floor/plasteel/darkred/side, +/turf/open/floor/plasteel/black, /area/security/brig) "atK" = ( /obj/structure/cable{ @@ -20047,6 +20027,7 @@ /obj/structure/chair/wood/normal{ dir = 8 }, +/obj/item/clothing/under/janimaid, /turf/open/floor/wood{ icon_state = "wood-broken" }, @@ -20402,9 +20383,9 @@ /obj/structure/table, /obj/item/book/manual/hydroponics_pod_people, /obj/item/paper/guides/jobs/hydroponics, -/obj/item/reagent_containers/dropper, /obj/item/reagent_containers/glass/bottle/mutagen, /obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /turf/open/floor/plasteel/hydrofloor, /area/hydroponics) "aSH" = ( @@ -22960,6 +22941,10 @@ /obj/structure/sign/botany{ pixel_y = 32 }, +/obj/machinery/light{ + dir = 1; + light_color = "#e8eaff" + }, /turf/open/floor/plasteel/green/side{ dir = 1 }, @@ -23326,8 +23311,9 @@ }, /area/hydroponics) "aYQ" = ( -/obj/machinery/light{ - dir = 4 +/obj/structure/sink{ + dir = 4; + pixel_x = 11 }, /turf/open/floor/plasteel, /area/hydroponics) @@ -29196,14 +29182,16 @@ /turf/open/floor/plating, /area/maintenance/department/engine) "bmg" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/door/airlock/maintenance{ + name = "Genetics Maintenance"; + req_access_txt = "0"; + req_one_access_txt = "12;45;5;9" + }, /turf/open/floor/plating, /area/maintenance/department/engine) "bmh" = ( @@ -39848,8 +39836,8 @@ }, /area/medical/virology) "bHZ" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, /turf/open/floor/plasteel/whitegreen/corner{ dir = 1 @@ -40425,10 +40413,12 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "bJn" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/machinery/light{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/virology) "bJo" = ( @@ -40927,15 +40917,10 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "bKs" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/plasteel/white, /area/medical/virology) "bKt" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, /obj/machinery/computer/pandemic, /turf/open/floor/plasteel/white, /area/medical/virology) @@ -41475,7 +41460,7 @@ layer = 3.1 }, /obj/item/stack/sheet/mineral/plasma{ - amount = 1; + amount = 2; layer = 3 }, /turf/open/floor/plasteel/whitegreen/side{ @@ -41950,7 +41935,10 @@ }, /area/medical/virology) "bMK" = ( -/obj/machinery/vending/cigarette, +/obj/item/soap/nanotrasen, +/obj/item/clothing/neck/stethoscope, +/obj/item/gun/syringe, +/obj/structure/table/glass, /turf/open/floor/plasteel/whiteblue/side{ dir = 10 }, @@ -50077,7 +50065,9 @@ /area/chapel/office) "ceF" = ( /obj/structure/filingcabinet, -/turf/open/floor/plasteel/black, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, /area/chapel/office) "ceG" = ( /obj/machinery/suit_storage_unit/standard_unit, @@ -53368,7 +53358,7 @@ /obj/machinery/light{ dir = 8 }, -/turf/open/floor/plasteel/darkred/side/telecomms, +/turf/open/floor/plasteel/black/telecomms, /area/tcommsat/server) "cmS" = ( /turf/open/floor/plasteel/whitepurple/side/telecomms, @@ -53380,7 +53370,7 @@ /obj/machinery/light{ dir = 4 }, -/turf/open/floor/plasteel/whitepurple/side/telecomms, +/turf/open/floor/plasteel/black/telecomms, /area/tcommsat/server) "cmV" = ( /obj/machinery/telecomms/server/presets/security, @@ -54317,6 +54307,7 @@ /area/crew_quarters/kitchen) "cpA" = ( /obj/structure/rack, +/obj/item/reagent_containers/food/snacks/mint, /obj/item/storage/box/drinkingglasses, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) @@ -55197,17 +55188,6 @@ /turf/open/floor/plating/airless, /area/maintenance/department/engine) "csn" = ( -/obj/structure/closet{ - name = "chaplain closet" - }, -/obj/item/clothing/under/rank/chaplain, -/obj/item/clothing/shoes/sneakers/black, -/obj/item/storage/backpack/cultpack, -/obj/item/storage/fancy/candle_box, -/obj/item/storage/fancy/candle_box, -/obj/item/clothing/suit/nun, -/obj/item/clothing/head/nun_hood, -/obj/item/clothing/suit/holidaypriest, /obj/item/device/radio/intercom{ dir = 0; name = "Station Intercom (General)"; @@ -55218,7 +55198,10 @@ departmentType = 2; pixel_x = -32 }, -/turf/open/floor/plasteel/black, +/obj/structure/closet/wardrobe/chaplain_black, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, /area/chapel/office) "cso" = ( /obj/structure/table/wood, @@ -55513,7 +55496,9 @@ /obj/machinery/newscaster{ pixel_x = -32 }, -/turf/open/floor/plasteel/black, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, /area/chapel/office) "csZ" = ( /obj/structure/chair/wood/normal{ @@ -56007,7 +55992,8 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 24 }, -/obj/item/storage/bag/plants, +/obj/item/storage/bag/plants/portaseeder, +/obj/item/storage/bag/plants/portaseeder, /turf/open/floor/plasteel/hydrofloor, /area/chapel/main/monastery) "cuv" = ( @@ -58192,6 +58178,206 @@ /obj/structure/ore_box, /turf/open/floor/plating, /area/maintenance/department/engine) +"cBk" = ( +/obj/machinery/vending/boozeomat{ + products = list(/obj/item/reagent_containers/food/drinks/bottle/whiskey = 1, /obj/item/reagent_containers/food/drinks/bottle/absinthe = 1, /obj/item/reagent_containers/food/drinks/bottle/limejuice = 1, /obj/item/reagent_containers/food/drinks/bottle/cream = 1, /obj/item/reagent_containers/food/drinks/soda_cans/tonic = 1, /obj/item/reagent_containers/food/drinks/drinkingglass = 10, /obj/item/reagent_containers/food/drinks/ice = 3, /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 6, /obj/item/reagent_containers/food/drinks/flask = 1); + req_access_txt = "0" + }, +/turf/closed/wall, +/area/maintenance/department/crew_quarters/dorms) +"cBl" = ( +/obj/structure/table, +/obj/machinery/chem_dispenser/drinks/beer, +/obj/structure/sign/poster/contraband/random{ + pixel_x = 32 + }, +/turf/open/floor/plating, +/area/maintenance/department/crew_quarters/dorms) +"cBm" = ( +/obj/item/cigbutt/cigarbutt, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, +/area/maintenance/department/crew_quarters/dorms) +"cBn" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 24 + }, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/maintenance/department/crew_quarters/dorms) +"cBo" = ( +/obj/structure/table, +/obj/item/lighter, +/obj/structure/light_construct/small{ + tag = "icon-bulb-construct-stage1 (WEST)"; + icon_state = "bulb-construct-stage1"; + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/department/crew_quarters/dorms) +"cBp" = ( +/obj/structure/table, +/obj/item/reagent_containers/food/drinks/bottle/gin{ + pixel_y = 8 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/department/crew_quarters/dorms) +"cBq" = ( +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/plating, +/area/maintenance/department/crew_quarters/dorms) +"cBr" = ( +/obj/structure/chair/comfy, +/turf/open/floor/carpet, +/area/maintenance/department/crew_quarters/dorms) +"cBs" = ( +/obj/structure/table/wood/poker, +/obj/item/toy/cards/deck, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/maintenance/department/crew_quarters/dorms) +"cBt" = ( +/turf/open/floor/wood, +/area/maintenance/department/crew_quarters/dorms) +"cBu" = ( +/obj/structure/chair/comfy{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/maintenance/department/crew_quarters/dorms) +"cBv" = ( +/obj/item/cigbutt/roach, +/turf/open/floor/carpet, +/area/maintenance/department/crew_quarters/dorms) +"cBw" = ( +/turf/open/floor/wood{ + icon_state = "wood-broken7" + }, +/area/maintenance/department/crew_quarters/dorms) +"cBx" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/button/door{ + id = "supplybridge"; + name = "Space Bridge Control"; + pixel_y = 27; + req_access_txt = "0" + }, +/turf/open/floor/plating, +/area/maintenance/department/crew_quarters/dorms) +"cBy" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/button/door{ + id = "supplybridge"; + name = "Space Bridge Control"; + pixel_y = 27; + req_access_txt = "0" + }, +/turf/open/floor/plating, +/area/maintenance/department/crew_quarters/dorms) +"cBz" = ( +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg1" + }, +/area/maintenance/department/crew_quarters/dorms) +"cBA" = ( +/obj/structure/grille/broken, +/turf/open/floor/plating{ + burnt = 1; + icon_state = "panelscorched" + }, +/area/maintenance/department/crew_quarters/dorms) +"cBB" = ( +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, +/turf/open/floor/plating{ + broken = 1; + icon_state = "platingdmg3" + }, +/area/maintenance/department/crew_quarters/dorms) +"cBC" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/shuttle/escape) +"cBD" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/shuttle/escape) +"cBE" = ( +/turf/closed/wall, +/area/shuttle/escape) +"cBF" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"cBG" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) +"cBH" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/shuttle/escape) +"cBI" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/shuttle/escape) +"cBJ" = ( +/turf/closed/wall, +/area/shuttle/escape) +"cBK" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/virology) +"cBL" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Medbay Maintenance"; + req_access_txt = "0"; + req_one_access_txt = "12;45;5;9" + }, +/turf/open/floor/plating, +/area/maintenance/department/engine) +"cBM" = ( +/obj/structure/sign/securearea{ + desc = "Under the painting a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste... You were delicious.'"; + icon_state = "monkey_painting"; + name = "Mr. Deempisi portrait"; + pixel_y = 28 + }, +/turf/open/floor/plasteel/black, +/area/chapel/office) (1,1,1) = {" aaa @@ -69669,7 +69855,7 @@ bZY bZY bZY bZY -crv +cBM csd cdo csB @@ -71922,11 +72108,11 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa +bVq +cBF +bVq +cBG +bVq aaa aaa aaa @@ -72179,11 +72365,11 @@ aFT aFT aFS aKs -aFS -aKs -aFS -aFS -aFS +cBC +aOc +aPj +aOc +cBH aaa aaa aaa @@ -72436,11 +72622,11 @@ aNZ aNZ aNZ aMI -aNZ -aMI -aNZ -aVJ -aWD +cBD +aOd +aPk +aQq +cBI aaa aaa aaa @@ -72693,11 +72879,11 @@ aIx aIx aIx aIx -aIx -aIx -aIx -aVJ -aWD +cBE +aOc +aPl +aOc +cBJ aaa aaa aaa @@ -83010,8 +83196,8 @@ bDm bvc bFK bGQ -bHW -bGW +bHX +bJm bKn bKn bKn @@ -83782,7 +83968,7 @@ bEs bEr bGS bHZ -bJm +bGW bKq bKn bKn @@ -84039,7 +84225,7 @@ bEt bFM bGT bIa -bGW +cBK bKr bLC bMH @@ -84231,10 +84417,10 @@ anQ aiR aph ajM -coa +aqC arw asI -cof +aqC auH avI auH @@ -84491,7 +84677,7 @@ ajM aqD arx asJ -cof +aqC auH avJ awS @@ -84745,10 +84931,10 @@ anS aiR api ajM -coa +aqC ary asK -cof +aqC auH avK auH @@ -85002,7 +85188,7 @@ anT aiR aph ajM -coa +aqC arz asL atJ @@ -85383,22 +85569,22 @@ aaa aaa adR adR -clO adR adR adR adR -clO adR adR adR adR -clO adR adR adR adR -clO +adR +adR +adR +adR adR adR aaa @@ -85916,7 +86102,7 @@ cmB cmB cmB cny -clO +adR abI aaa aaa @@ -86167,7 +86353,7 @@ cmL cmR cmV cna -cnf +cmR cnj cmK cnr @@ -86421,10 +86607,10 @@ clG cmD cmJ cmM -cmS +cmK cmW cnb -cng +cmK cnk cmK cns @@ -86612,8 +86798,8 @@ bIh bkh bKz bnH -bML -bjc +boN +cBL bOG bPB bQq @@ -86944,7 +87130,7 @@ cmK cnu cmB abI -clO +adR abI aaa aaa @@ -87449,10 +87635,10 @@ clG cmG cmK cmP -cmS +cmK cmY cnd -cnh +cmK cnn cmK cnw @@ -87709,7 +87895,7 @@ cmQ cmU cmZ cne -cni +cmU cno cmK cnx @@ -87972,7 +88158,7 @@ cmB cmB cmB cnz -clO +adR abI aaa aaa @@ -88467,22 +88653,22 @@ aaa aaa adR adR -clO adR adR adR adR -clO adR adR adR adR -clO adR adR adR adR -clO +adR +adR +adR +adR adR adR aaa @@ -94498,11 +94684,11 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa +aiS +aiT +aiS +aiT +aiS aaa aaa aaa @@ -94755,12 +94941,12 @@ aaa aaa aaa aaa -aiS -aiS aiT +cBr +cBs +cBu aiT -aiS -aiS +aaa aaa aaa aaa @@ -94774,13 +94960,13 @@ anX anX anX awd -awd +axi +aaa +aaa aaa aaa -aht aaa aaa -aht aaa aaa aaa @@ -95009,23 +95195,23 @@ aaa aaa aaa aaa -aaa -aaa -abI +aiS +aiS +aiS aiS akf -aju -alP -alP -aiS -aiS -aiT -aiS +akf +cBv aiS aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa aht aaa aht @@ -95034,10 +95220,10 @@ aaa aht aaa aaa -aht aaa aaa -aht +aaa +aaa aaa aaa aaa @@ -95266,18 +95452,18 @@ aaa aaa aaa aaa -aaa -aaa +aiT +cBk +aju +cBo +alQ +cBt +cBw aiS aiS -akg +aiT aiS aiS -akg -aiS -anY -apt -aiS aiS aiS aiS @@ -95523,20 +95709,20 @@ aaa aaa aaa aaa -aaa -aaa -aiT -ajt +aiU +ajv aju -alb +ajt alQ -amE +alb +alb aiS -anZ -ajv +anY +apt aiS -ajv -ajv +cBz +alP +cBB apu ale ale @@ -95780,19 +95966,19 @@ aaa aaa aaa aaa -aaa -aaa -aiU +aiT aju akh alc alR amF +alb anm -aoa -ajv ajv ajv +aju +cBA +aiS aiS akn apX @@ -96037,14 +96223,14 @@ aaa aaa aaa aaa -aaa -aaa aiT -ajv -aki -ald +cBl +cBm +cBp alS amG +alb +aiS aiS aiS aiS @@ -96294,16 +96480,16 @@ aaa aaa aaa aaa -aaa -aaa -aiS -ajw aiS aiS +akg aiS aiS +akg +aiS aiS aob +ajv aoD ajv cnX @@ -96551,13 +96737,13 @@ aaa aaa aaa aaa -aaa -aaa -aiS -aiS +aht aiS +cBn +cBq ajv ajv +aiS akj ale ale @@ -96809,13 +96995,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa +aiS aiS aiT +aiT aiS -akk +aiS +cBx aiS aiS aiS @@ -97071,9 +97257,9 @@ aaa aaa aaa aaa -aiS +aiT akl -aiS +aiT aaa aaa aaa @@ -98613,9 +98799,9 @@ aaa aaa aaa aaa -aiS +aiT akp -aiS +aiT aaa aaa aaa @@ -98870,8 +99056,8 @@ aaa aaa aaa aaa -aiT -akm +aiS +cBy aiS aiS aiS