diff --git a/maps/yw/cryogaia-04-maintenance.dmm b/maps/yw/cryogaia-04-maintenance.dmm index 7a498c2a1dd..895b23acccc 100644 --- a/maps/yw/cryogaia-04-maintenance.dmm +++ b/maps/yw/cryogaia-04-maintenance.dmm @@ -437,10 +437,6 @@ "asH" = ( /turf/simulated/mineral/ignore_mapgen/cave, /area/mine/unexplored/lower_rock) -"asJ" = ( -/obj/structure/sign/christmas/wreath, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) "asN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment{ @@ -843,13 +839,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/central) -"aHs" = ( -/obj/structure/sign/christmas/lights{ - icon_state = "xmaslights"; - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/central) "aHO" = ( /obj/effect/landmark{ name = "vinestart" @@ -909,7 +898,6 @@ /area/maintenance/maintroom1) "aKE" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "aKM" = ( @@ -1988,21 +1976,6 @@ /obj/item/weapon/packageWrap, /turf/simulated/floor/wood, /area/library_conference_room) -"brU" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/structure/sign/christmas/lights{ - icon_state = "xmaslights"; - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/central) "bsg" = ( /obj/structure/grille, /obj/structure/window/reinforced{ @@ -2759,13 +2732,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/aft) -"bVd" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/water/hotspring, -/area/hallway/lower/fore) "bVp" = ( /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/water/pool, @@ -4892,7 +4858,6 @@ dir = 8; pixel_x = 24 }, -/obj/structure/flora/pottedplant/xmas, /turf/simulated/floor/tiled, /area/hallway/lower/fore) "dmH" = ( @@ -5269,10 +5234,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/aft) -"dwP" = ( -/obj/structure/sign/christmas/wreath, -/turf/simulated/floor/tiled, -/area/crew_quarters/fitness) "dwU" = ( /obj/structure/grille, /obj/structure/window/reinforced, @@ -5907,7 +5868,7 @@ frequency = 1443; level = 3; name = "Distribution and Waste Monitor"; - sensors = list("mair_in_meter" = "Mixed Air In", "air_sensor" = "Mixed Air Supply Tank", "mair_out_meter" = "Mixed Air Out", "dloop_atm_meter" = "Distribution Loop", "wloop_atm_meter" = "Waste Loop", "wloop_engine_meter" = "Engine Waste") + sensors = list("mair_in_meter"="Mixed Air In","air_sensor"="Mixed Air Supply Tank","mair_out_meter"="Mixed Air Out","dloop_atm_meter"="Distribution Loop","wloop_atm_meter"="Waste Loop","wloop_engine_meter"="Engine Waste") }, /turf/simulated/floor/tiled, /area/engineering/atmos/monitoring) @@ -6344,7 +6305,7 @@ /obj/machinery/computer/general_air_control{ frequency = 1441; name = "Tank Monitor"; - sensors = list("n2_sensor" = "Nitrogen", "o2_sensor" = "Oxygen", "co2_sensor" = "Carbon Dioxide", "tox_sensor" = "Toxins", "n2o_sensor" = "Nitrous Oxide", "waste_sensor" = "Gas Mix Tank") + sensors = list("n2_sensor"="Nitrogen","o2_sensor"="Oxygen","co2_sensor"="Carbon Dioxide","tox_sensor"="Toxins","n2o_sensor"="Nitrous Oxide","waste_sensor"="Gas Mix Tank") }, /obj/machinery/light{ dir = 8 @@ -6432,7 +6393,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/structure/sign/christmas/lights, /turf/simulated/floor/tiled, /area/hallway/lower/central) "ejy" = ( @@ -7268,10 +7228,6 @@ }, /turf/simulated/floor, /area/maintenance/substation/atmospheric) -"eIY" = ( -/obj/structure/table/steel, -/turf/simulated/floor, -/area/maintenance/starboard) "eJn" = ( /turf/simulated/wall/r_wall, /area/maintenance/dorm) @@ -7441,7 +7397,7 @@ /area/maintenance/blueserg) "ePN" = ( /obj/structure/closet/secure_closet/freezer/fridge{ - starts_with = list(/obj/item/weapon/reagent_containers/food/drinks/milk = 6, /obj/item/weapon/storage/fancy/egg_box = 4, /obj/item/weapon/reagent_containers/food/condiment/carton/flour = 7, /obj/item/weapon/reagent_containers/food/condiment/sugar = 2) + starts_with = list(/obj/item/weapon/reagent_containers/food/drinks/milk=6,/obj/item/weapon/storage/fancy/egg_box=4,/obj/item/weapon/reagent_containers/food/condiment/carton/flour=7,/obj/item/weapon/reagent_containers/food/condiment/sugar=2) }, /turf/simulated/floor/tiled/white, /area/crew_quarters/coffee_shop) @@ -8225,10 +8181,6 @@ pixel_y = 5 }, /obj/structure/disposalpipe/segment, -/obj/structure/sign/christmas/lights{ - icon_state = "xmaslights"; - dir = 4 - }, /turf/simulated/floor/wood, /area/library) "frF" = ( @@ -8939,7 +8891,6 @@ dir = 8 }, /obj/effect/mist, -/obj/structure/sign/christmas/lights, /turf/simulated/floor/water/hotspring, /area/hallway/lower/fore) "fUd" = ( @@ -11459,7 +11410,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/structure/sign/christmas/lights, /turf/simulated/floor/tiled, /area/hallway/lower/central) "huZ" = ( @@ -11632,8 +11582,6 @@ dir = 2; icon_state = "pipe-c" }, -/obj/item/toy/griffin, -/obj/item/clothing/accessory/scarf/christmas, /turf/simulated/floor/tiled, /area/civilian/atrium/lower) "hzd" = ( @@ -12065,21 +12013,6 @@ }, /turf/simulated/floor/reinforced, /area/rnd/lab) -"hOv" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) "hOH" = ( /obj/effect/floor_decal/corner/lime{ dir = 1 @@ -12209,11 +12142,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/sign/christmas/lights{ - dir = 1; - icon_state = "xmaslights"; - name = "Christmas lights_N" - }, /turf/simulated/floor/tiled, /area/civilian/atrium/lower) "hSb" = ( @@ -13527,9 +13455,6 @@ layer = 3.3; pixel_y = -27 }, -/obj/item/clothing/shoes/boots/winter/christmasgreen, -/obj/item/clothing/suit/storage/hooded/wintercoat/christmasgreen, -/obj/item/clothing/under/christmas/green, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "iAZ" = ( @@ -13987,10 +13912,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor, /area/maintenance/security_lower) -"iQl" = ( -/obj/structure/sign/christmas/wreath, -/turf/simulated/floor/tiled, -/area/civilian/atrium/lower) "iQo" = ( /obj/effect/floor_decal/corner/lime{ dir = 5 @@ -14578,7 +14499,6 @@ dir = 1; pixel_y = -30 }, -/obj/structure/sign/christmas/lights, /turf/simulated/floor/tiled, /area/hallway/lower/aft) "jhk" = ( @@ -15478,7 +15398,6 @@ dir = 1; pixel_y = -30 }, -/obj/structure/flora/pottedplant/xmas, /turf/simulated/floor/tiled, /area/hallway/lower/fore) "jIu" = ( @@ -15957,8 +15876,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/toy/stickhorse, -/obj/item/weapon/toy/xmas_cracker, /turf/simulated/floor/tiled, /area/civilian/atrium/lower) "jUn" = ( @@ -17711,10 +17628,6 @@ /obj/random/maintenance/clean, /turf/simulated/floor/plating, /area/maintenance/lowfloor1) -"kMl" = ( -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/tiled, -/area/hallway/lower/aft) "kMD" = ( /obj/machinery/disposal, /obj/effect/floor_decal/corner/lime{ @@ -17908,11 +17821,6 @@ name = "north bump"; pixel_y = 24 }, -/obj/structure/sign/christmas/lights{ - dir = 1; - icon_state = "xmaslights"; - name = "Christmas lights_N" - }, /turf/simulated/floor/tiled, /area/civilian/atrium/lower) "kTj" = ( @@ -18519,10 +18427,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/pyschwarde) -"llN" = ( -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/tiled, -/area/hallway/lower/central) "lmj" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, @@ -18717,7 +18621,7 @@ input_tag = "o2_in"; name = "Oxygen Supply Control"; output_tag = "o2_out"; - sensors = list("o2_sensor" = "Tank") + sensors = list("o2_sensor"="Tank") }, /obj/effect/floor_decal/corner/blue{ dir = 9 @@ -18845,10 +18749,6 @@ /obj/item/weapon/gun/energy/laser/practice, /turf/simulated/floor/tiled/dark, /area/security/range) -"lwe" = ( -/obj/structure/flora/pottedplant/xmas, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) "lwk" = ( /turf/simulated/wall/r_wall, /area/security/perma/bathroom) @@ -19255,10 +19155,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/sign/christmas/lights{ - icon_state = "xmaslights"; - dir = 8 - }, /turf/simulated/floor/tiled, /area/hallway/lower/central) "lJI" = ( @@ -19711,11 +19607,6 @@ /obj/structure/railing{ dir = 4 }, -/obj/structure/sign/christmas/lights{ - dir = 1; - icon_state = "xmaslights"; - name = "Christmas lights_N" - }, /turf/simulated/floor/water/hotspring, /area/hallway/lower/fore) "lVE" = ( @@ -20029,7 +19920,7 @@ "mih" = ( /obj/structure/closet/athletic_mixed, /obj/item/clothing/shoes/boots/jackboots{ - armor = list("melee" = 69, "bullet" = 69, "laser" = 69, "energy" = 69, "bomb" = 69, "bio" = 69, "rad" = 69); + armor = list("melee"=69,"bullet"=69,"laser"=69,"energy"=69,"bomb"=69,"bio"=69,"rad"=69); desc = "This pair of Jackboots look worn and freshly used. They have several claw markings inside and you can read the initials D and M at the bottom"; name = "Dhaeleena's Jackboots" }, @@ -20284,17 +20175,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) -"mtK" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/sign/christmas/lights{ - dir = 1; - icon_state = "xmaslights"; - name = "Christmas lights_N" - }, -/turf/simulated/floor/water/hotspring, -/area/hallway/lower/fore) "mtT" = ( /obj/machinery/light{ dir = 1 @@ -20337,7 +20217,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/sign/christmas/lights, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "mvH" = ( @@ -20946,11 +20825,6 @@ dir = 4; pixel_x = -22 }, -/obj/structure/sign/christmas/lights{ - dir = 1; - icon_state = "xmaslights"; - name = "Christmas lights_N" - }, /turf/simulated/floor/tiled, /area/civilian/atrium/lower) "mJZ" = ( @@ -21380,11 +21254,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/lower/aft) -"mZo" = ( -/obj/structure/closet/secure_closet/personal, -/obj/structure/sign/christmas/wreath, -/turf/simulated/floor/tiled/freezer, -/area/crew_quarters/pool) "mZs" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/rust, @@ -25184,13 +25053,6 @@ }, /turf/simulated/floor/wood, /area/maintenance/maintroom6) -"pql" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/flora/pottedplant/xmas, -/turf/simulated/floor/wood, -/area/library_conference_room) "pqo" = ( /obj/structure/closet, /turf/simulated/floor/tiled/dark, @@ -25235,7 +25097,6 @@ /obj/machinery/camera/autoname{ dir = 1 }, -/obj/structure/sign/christmas/lights, /turf/simulated/floor/water/hotspring, /area/hallway/lower/fore) "pqI" = ( @@ -26318,10 +26179,6 @@ "pXc" = ( /obj/structure/disposalpipe/segment, /obj/machinery/libraryscanner, -/obj/structure/sign/christmas/lights{ - icon_state = "xmaslights"; - dir = 4 - }, /turf/simulated/floor/wood, /area/library) "pXu" = ( @@ -26573,10 +26430,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/obj/structure/sign/christmas/lights{ - icon_state = "xmaslights"; - dir = 4 - }, /turf/simulated/floor/tiled, /area/hallway/lower/central) "qeD" = ( @@ -26611,7 +26464,7 @@ input_tag = "n2o_in"; name = "Nitrous Oxide Supply Control"; output_tag = "n2o_out"; - sensors = list("n2o_sensor" = "Tank") + sensors = list("n2o_sensor"="Tank") }, /obj/effect/floor_decal/corner/white{ dir = 8 @@ -26885,7 +26738,7 @@ name = "Mixed Air Supply Control"; output_tag = "air_out"; pressure_setting = 2000; - sensors = list("air_sensor" = "Tank") + sensors = list("air_sensor"="Tank") }, /obj/effect/floor_decal/corner/white{ dir = 1 @@ -26981,7 +26834,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/sign/christmas/lights, /turf/simulated/floor/tiled/steel_ridged, /area/hallway/primary/starboard) "qqI" = ( @@ -27096,7 +26948,6 @@ "qwk" = ( /obj/structure/table/glass, /obj/machinery/light, -/obj/item/clothing/accessory/scarf/christmas, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "qwl" = ( @@ -27393,10 +27244,6 @@ /obj/structure/table/gamblingtable, /turf/simulated/floor/wood, /area/maintenance/dorm) -"qHG" = ( -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/water/hotspring, -/area/hallway/lower/fore) "qIc" = ( /obj/structure/table/standard{ name = "plastic table frame" @@ -27849,10 +27696,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos) -"ras" = ( -/obj/structure/flora/pottedplant/xmas, -/turf/simulated/floor/wood, -/area/library) "raN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/valve/digital/open{ @@ -29029,7 +28872,7 @@ input_tag = "waste_in"; name = "Gas Mix Tank Control"; output_tag = "waste_out"; - sensors = list("waste_sensor" = "Tank") + sensors = list("waste_sensor"="Tank") }, /obj/effect/floor_decal/corner/lime{ dir = 5 @@ -29714,7 +29557,7 @@ input_tag = "n2_in"; name = "Nitrogen Supply Control"; output_tag = "n2_out"; - sensors = list("n2_sensor" = "Tank") + sensors = list("n2_sensor"="Tank") }, /obj/effect/floor_decal/corner/red{ dir = 9 @@ -32507,12 +32350,6 @@ /area/engineering/atmos) "tPL" = ( /obj/machinery/camera/autoname, -/obj/structure/flora/pottedplant/xmas, -/obj/structure/sign/christmas/lights{ - dir = 1; - icon_state = "xmaslights"; - name = "Christmas lights_N" - }, /turf/simulated/floor/tiled, /area/civilian/atrium/lower) "tPW" = ( @@ -33003,13 +32840,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lowfloor1) -"ueq" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/structure/flora/pottedplant/xmas, -/turf/simulated/floor/tiled, -/area/civilian/atrium/lower) "ueB" = ( /obj/structure/table/glass, /obj/item/weapon/storage/fancy/vials, @@ -35436,7 +35266,7 @@ input_tag = "co2_in"; name = "Carbon Dioxide Supply Control"; output_tag = "co2_out"; - sensors = list("co2_sensor" = "Tank") + sensors = list("co2_sensor"="Tank") }, /obj/effect/floor_decal/corner/black{ dir = 10 @@ -35531,7 +35361,7 @@ input_tag = "tox_in"; name = "Phoron Supply Control"; output_tag = "tox_out"; - sensors = list("tox_sensor" = "Tank") + sensors = list("tox_sensor"="Tank") }, /obj/effect/floor_decal/corner/orange{ dir = 10 @@ -37661,7 +37491,7 @@ /obj/machinery/vending/cigarette{ name = "Cigarette machine"; prices = list(); - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + products = list(/obj/item/weapon/storage/fancy/cigarettes=10,/obj/item/weapon/storage/box/matches=10,/obj/item/weapon/flame/lighter/zippo=4,/obj/item/clothing/mask/smokable/cigarette/cigar/havana=2) }, /obj/structure/cable{ d1 = 4; @@ -39056,11 +38886,6 @@ "xLr" = ( /turf/simulated/floor/wood/broken, /area/maintenance/maintroom6) -"xLz" = ( -/obj/effect/floor_decal/rust, -/obj/structure/sign/christmas/wreath, -/turf/simulated/floor/tiled, -/area/civilian/atrium/lower) "xLU" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -39174,9 +38999,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/clothing/shoes/boots/winter/christmasred, -/obj/item/clothing/suit/storage/hooded/wintercoat/christmasred, -/obj/item/clothing/under/christmas/red, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "xQp" = ( @@ -39928,6 +39750,10 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/lower/aft) +"ymn" = ( +/obj/structure/table/steel, +/turf/simulated/floor, +/area/maintenance/starboard) (1,1,1) = {" qDW @@ -51358,7 +51184,7 @@ jTx pqI iZJ uvM -ras +nux qkE nux bEO @@ -51969,7 +51795,7 @@ hxY vwz smm rFV -iQl +eDV eDV xeF xWz @@ -52016,7 +51842,7 @@ nDX oPX dSN kas -pql +csd cMj uHu jZy @@ -52160,7 +51986,7 @@ hMe tvx wuo qMv -llN +wuo kas kCx cPP @@ -52448,7 +52274,7 @@ fyh kGl kfQ jPJ -bVd +lVi oba tPL pfm @@ -52468,7 +52294,7 @@ aNB onF eDV eMV -ueq +tiQ hMe hMe hMe @@ -53091,7 +52917,7 @@ nSQ ouo dmB oba -mtK +eeY eeY eeY eeY @@ -53258,7 +53084,7 @@ xYA tRh arx xYA -qHG +tRh oba kSU lem @@ -53453,7 +53279,7 @@ wqB fZD sDm mJt -aHs +wuo lJC wuo wuo @@ -53589,7 +53415,7 @@ hqI eMx uzq xyQ -xLz +uuf iFY alt eDV @@ -53615,7 +53441,7 @@ xpN tVI bpi eLo -brU +eLo qeB pPN kCU @@ -54097,7 +53923,7 @@ qzR lEm vFd vso -asJ +jeS txp dNi tQZ @@ -54252,7 +54078,7 @@ lPF mcc cpt gxb -dwP +lEm lEm lEm qzR @@ -54276,7 +54102,7 @@ mrX tYw ckQ sqv -kMl +mrX kAC eHd kAC @@ -54438,7 +54264,7 @@ oVd xqH ixD mrX -kMl +mrX kAC kAC kAC @@ -54585,7 +54411,7 @@ ifH vso jeS txp -hOv +dNi tQZ tKx tKx @@ -54723,7 +54549,7 @@ cvd kTp jSO xyQ -mZo +ayH mcc kdW uyA @@ -56857,7 +56683,7 @@ aZa jeS jeS wcN -lwe +jeS veC hKf hKf @@ -59894,7 +59720,7 @@ eNq whU whU hIa -eIY +ymn kpQ eNq mwy diff --git a/maps/yw/cryogaia-05-main.dmm b/maps/yw/cryogaia-05-main.dmm index a7fae388f15..167ee8d6df1 100644 --- a/maps/yw/cryogaia-05-main.dmm +++ b/maps/yw/cryogaia-05-main.dmm @@ -627,10 +627,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge) -"amq" = ( -/obj/structure/flora/tree/pine/xmas/presents, -/turf/simulated/floor/tiled, -/area/civilian/atrium/central) "amA" = ( /obj/structure/cable/green{ d1 = 2; @@ -3094,7 +3090,7 @@ input_tag = "cooling_in"; name = "Engine Cooling Control"; output_tag = "cooling_out"; - sensors = list("engine_sensor" = "Engine Core") + sensors = list("engine_sensor"="Engine Core") }, /obj/effect/floor_decal/corner/yellow/diagonal, /turf/simulated/floor/tiled, @@ -3166,7 +3162,7 @@ "blu" = ( /obj/structure/closet, /obj/item/clothing/suit/storage/vest/hoscoat/jensen{ - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0); + armor = list("melee"=0,"bullet"=0,"laser"=0,"energy"=0,"bomb"=0,"bio"=0,"rad"=0); desc = "A trenchcoat augmented with a special alloy for some protection and style. Well, it was. It looks like most of the plating's been stripped out." }, /obj/item/clothing/glasses/fakesunglasses, @@ -3245,7 +3241,6 @@ "bmk" = ( /obj/structure/table/gamblingtable, /obj/item/weapon/deck/cah, -/obj/structure/sign/christmas/lights, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bmN" = ( @@ -3602,10 +3597,6 @@ dir = 4; pixel_x = -30 }, -/obj/structure/sign/christmas/lights{ - icon_state = "xmaslights"; - dir = 8 - }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bwh" = ( @@ -3835,7 +3826,6 @@ /obj/machinery/holoposter{ pixel_y = 32 }, -/obj/item/clothing/head/helmet/space/santahat, /turf/simulated/floor/tiled, /area/hallway/secondary/exit) "bCU" = ( @@ -4897,9 +4887,9 @@ input_level_max = 0; max_coils = 1; name = "bluespace power storage unit"; - output_level = 1e+006; - output_level_max = 1e+006; - recharge_rate = 1e+006 + output_level = 1000000; + output_level_max = 1000000; + recharge_rate = 1000000 }, /obj/structure/cable{ d2 = 8; @@ -6245,16 +6235,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/security) -"cuC" = ( -/obj/effect/floor_decal/corner/red{ - dir = 8 - }, -/obj/structure/sign/christmas/lights{ - icon_state = "xmaslights"; - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/civilian/atrium/central) "cuF" = ( /obj/structure/cable/green{ d1 = 1; @@ -6575,7 +6555,6 @@ /obj/structure/table/standard, /obj/item/stack/cable_coil/random, /obj/item/stack/cable_coil/random, -/obj/item/clothing/accessory/scarf/christmas, /turf/simulated/floor/tiled, /area/storage/art) "czO" = ( @@ -7362,10 +7341,6 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, -/obj/structure/sign/christmas/lights{ - icon_state = "xmaslights"; - dir = 8 - }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "cQb" = ( @@ -7578,16 +7553,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/bridge) -"cUF" = ( -/obj/structure/bed/chair/wood/wings{ - dir = 8 - }, -/obj/structure/sign/christmas/lights{ - icon_state = "xmaslights"; - dir = 4 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "cUR" = ( /obj/effect/floor_decal/techfloor, /obj/structure/table/steel, @@ -11572,7 +11537,6 @@ "ewA" = ( /obj/machinery/recharge_station, /obj/effect/floor_decal/industrial/outline/blue, -/obj/structure/sign/christmas/lights, /turf/simulated/floor/tiled, /area/crew_quarters/locker) "ewF" = ( @@ -12843,7 +12807,6 @@ dir = 2; icon_state = "pipe-c" }, -/obj/structure/flora/pottedplant/xmas, /turf/simulated/floor/tiled, /area/hallway/primary/central_one) "eYw" = ( @@ -12880,10 +12843,6 @@ /obj/effect/floor_decal/corner/red{ dir = 9 }, -/obj/structure/sign/christmas/lights{ - icon_state = "xmaslights"; - dir = 8 - }, /turf/simulated/floor/tiled, /area/civilian/atrium/central) "eYY" = ( @@ -13168,10 +13127,6 @@ }, /turf/simulated/floor/carpet, /area/bridge/meeting_room) -"feT" = ( -/obj/structure/flora/pottedplant/xmas, -/turf/simulated/floor/tiled, -/area/civilian/atrium/central) "feW" = ( /obj/machinery/light, /obj/structure/table/standard, @@ -13652,8 +13607,6 @@ "fnW" = ( /obj/structure/table/gamblingtable, /obj/item/weapon/deck/cah/black, -/obj/structure/sign/christmas/lights, -/obj/item/weapon/toy/snowglobe/stellardelight, /turf/simulated/floor/wood, /area/crew_quarters/bar) "foh" = ( @@ -14501,7 +14454,6 @@ dir = 8; pixel_x = 28 }, -/obj/item/weapon/storage/backpack/santabag, /turf/simulated/floor/tiled, /area/storage/art) "fEK" = ( @@ -16839,16 +16791,6 @@ /obj/item/clothing/glasses/omnihud/all, /turf/simulated/floor/wood, /area/crew_quarters/captain) -"gvp" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 4 - }, -/obj/structure/sign/christmas/lights{ - icon_state = "xmaslights"; - dir = 8 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "gvD" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 5; @@ -19210,11 +19152,6 @@ }, /turf/simulated/floor/tiled, /area/security/security_processing) -"htm" = ( -/obj/item/weapon/gift, -/obj/item/toy/xmastree, -/turf/simulated/floor/tiled, -/area/civilian/atrium/central) "htv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -20714,10 +20651,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/brown, -/obj/structure/sign/christmas/lights{ - icon_state = "xmaslights"; - dir = 4 - }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "hXZ" = ( @@ -20791,13 +20724,6 @@ /obj/item/clothing/glasses/sunglasses, /turf/simulated/floor/carpet, /area/security/detectives_office) -"hZG" = ( -/obj/structure/sign/christmas/lights{ - icon_state = "xmaslights"; - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/civilian/atrium/central) "hZM" = ( /obj/structure/table/glass, /obj/item/device/universal_translator, @@ -21476,7 +21402,6 @@ }, /obj/structure/table/woodentable, /obj/machinery/light/small, -/obj/item/weapon/toy/partypopper, /turf/simulated/floor/wood, /area/crew_quarters/bar) "ioS" = ( @@ -22266,20 +22191,6 @@ }, /turf/simulated/floor/tiled/steel, /area/security/pilotroom) -"iFG" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/sign/christmas/lights{ - icon_state = "xmaslights"; - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/locker) "iFL" = ( /obj/machinery/power/apc{ dir = 4; @@ -23777,10 +23688,6 @@ "jnQ" = ( /obj/structure/table/standard, /obj/item/weapon/coin/silver, -/obj/item/clothing/shoes/boots/winter/christmasred, -/obj/item/clothing/suit/storage/hooded/wintercoat/christmasred, -/obj/item/clothing/under/christmas/red, -/obj/item/clothing/head/santa, /turf/simulated/floor/tiled, /area/crew_quarters/locker) "jnX" = ( @@ -25507,14 +25414,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/quartermaster/storage) -"jXs" = ( -/obj/structure/closet/secure_closet/personal, -/obj/structure/sign/christmas/lights{ - icon_state = "xmaslights"; - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/locker) "jXB" = ( /obj/structure/cable/green{ d1 = 4; @@ -29056,13 +28955,6 @@ }, /turf/simulated/floor/outdoors/snow/gravsnow/cryogaia, /area/borealis2/outdoors/grounds) -"ltm" = ( -/obj/structure/bed/chair/wood/wings{ - dir = 4 - }, -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "ltq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -29430,10 +29322,6 @@ /obj/machinery/vending/fitness{ dir = 4 }, -/obj/structure/sign/christmas/lights{ - icon_state = "xmaslights"; - dir = 8 - }, /turf/simulated/floor/tiled, /area/crew_quarters/locker) "lzB" = ( @@ -29675,14 +29563,6 @@ /obj/effect/floor_decal/corner_oldtile/purple, /turf/simulated/floor/tiled/white, /area/rnd/research) -"lGa" = ( -/obj/effect/floor_decal/corner_oldtile/purple, -/obj/effect/floor_decal/corner_oldtile/purple{ - dir = 8 - }, -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) "lGk" = ( /turf/simulated/wall, /area/storage/auxillary) @@ -30053,10 +29933,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/structure/sign/christmas/lights{ - icon_state = "xmaslights"; - dir = 4 - }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "lMt" = ( @@ -31100,10 +30976,6 @@ /obj/structure/sign/double/barsign{ dir = 4 }, -/obj/structure/sign/christmas/lights{ - icon_state = "xmaslights"; - dir = 4 - }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "mhP" = ( @@ -32775,7 +32647,6 @@ dir = 4; pixel_x = -30 }, -/obj/structure/flora/pottedplant/xmas, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "mJb" = ( @@ -33582,10 +33453,6 @@ }, /turf/simulated/floor/plating, /area/lawoffice) -"mXE" = ( -/obj/item/weapon/gift, -/turf/simulated/floor/tiled, -/area/civilian/atrium/central) "mXW" = ( /obj/machinery/door/blast/shutters{ dir = 2; @@ -35266,7 +35133,6 @@ /obj/structure/table/standard, /obj/item/weapon/storage/fancy/crayons, /obj/item/weapon/storage/fancy/crayons, -/obj/item/weapon/toy/snowglobe/snowvillage, /turf/simulated/floor/tiled, /area/storage/art) "nDn" = ( @@ -37656,7 +37522,6 @@ /obj/effect/floor_decal/corner/red{ dir = 9 }, -/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/steel, /area/security/lobby) "oBc" = ( @@ -39038,7 +38903,6 @@ /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 8 }, -/obj/structure/sign/christmas/lights, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "pdk" = ( @@ -40420,10 +40284,6 @@ /area/maintenance/bridge) "pBb" = ( /obj/structure/table/standard, -/obj/item/clothing/shoes/boots/winter/christmasgreen, -/obj/item/clothing/suit/storage/hooded/wintercoat/christmasgreen, -/obj/item/clothing/under/christmas/green, -/obj/item/clothing/head/santa/green, /turf/simulated/floor/tiled, /area/crew_quarters/locker) "pBh" = ( @@ -43036,7 +42896,6 @@ dir = 8 }, /obj/effect/floor_decal/corner_oldtile/purple, -/obj/structure/sign/christmas/lights, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "qGe" = ( @@ -43086,10 +42945,10 @@ /turf/simulated/floor/tiled/white, /area/medical/resleeving) "qGy" = ( +/mob/living/simple_mob/animal/passive/dog/corgi/Lisa, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/mob/living/simple_mob/animal/passive/dog/corgi/Lisa, /turf/simulated/floor/wood, /area/quartermaster) "qGP" = ( @@ -43494,7 +43353,6 @@ /obj/effect/floor_decal/corner/brown{ dir = 10 }, -/obj/structure/sign/christmas/lights, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "qPi" = ( @@ -49594,10 +49452,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/structure/sign/christmas/lights{ - icon_state = "xmaslights"; - dir = 4 - }, /turf/simulated/floor/tiled, /area/crew_quarters/locker) "tmP" = ( @@ -52284,22 +52138,6 @@ }, /turf/simulated/floor/tiled/dark, /area/lawoffice) -"uzt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/corner/brown{ - dir = 5 - }, -/obj/structure/sign/christmas/wreath, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) "uzv" = ( /obj/structure/table/steel, /obj/item/weapon/paper_bin{ @@ -53010,10 +52848,6 @@ /area/hallway/secondary/exit) "uNO" = ( /obj/structure/disposalpipe/segment, -/obj/structure/sign/christmas/lights{ - icon_state = "xmaslights"; - dir = 4 - }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "uOx" = ( @@ -53215,10 +53049,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/central_one) -"uSh" = ( -/obj/structure/flora/pottedplant/xmas, -/turf/simulated/floor/tiled, -/area/hallway/primary/central_one) "uSu" = ( /obj/machinery/door/airlock/external{ frequency = 1380; @@ -54196,7 +54026,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/structure/sign/christmas/lights, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "voQ" = ( @@ -54626,13 +54455,6 @@ }, /turf/simulated/floor/tiled, /area/security/hallway) -"vxB" = ( -/obj/effect/floor_decal/corner/red{ - dir = 8 - }, -/obj/structure/flora/pottedplant/xmas, -/turf/simulated/floor/tiled, -/area/civilian/atrium/central) "vxN" = ( /obj/structure/cable{ icon_state = "4-8" @@ -55478,13 +55300,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_a) -"vPb" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/obj/structure/flora/pottedplant/xmas, -/turf/simulated/floor/grass, -/area/civilian/atrium/central) "vPk" = ( /obj/effect/floor_decal/corner/brown{ dir = 4 @@ -55806,7 +55621,7 @@ frequency = 1443; level = 3; name = "Distribution and Waste Monitor"; - sensors = list("mair_in_meter" = "Mixed Air In", "air_sensor" = "Mixed Air Supply Tank", "mair_out_meter" = "Mixed Air Out", "dloop_atm_meter" = "Distribution Loop", "wloop_atm_meter" = "Waste Loop", "wloop_engine_meter" = "Engine Waste") + sensors = list("mair_in_meter"="Mixed Air In","air_sensor"="Mixed Air Supply Tank","mair_out_meter"="Mixed Air Out","dloop_atm_meter"="Distribution Loop","wloop_atm_meter"="Waste Loop","wloop_engine_meter"="Engine Waste") }, /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) @@ -59907,7 +59722,6 @@ /area/crew_quarters/heads/hop) "xzh" = ( /obj/machinery/door/firedoor/glass/hidden/steel, -/obj/structure/sign/christmas/lights, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "xzk" = ( @@ -60258,7 +60072,6 @@ "xHN" = ( /obj/structure/table/woodentable, /obj/machinery/light/small, -/obj/item/weapon/toy/snowglobe/tether, /turf/simulated/floor/wood, /area/crew_quarters/bar) "xHR" = ( @@ -71453,7 +71266,7 @@ mWl sVL cPW bXi -gvp +cLj bvR hqj rNf @@ -72587,7 +72400,7 @@ pOt pUo skG jie -ltm +jie vGB uSd woK @@ -73558,7 +73371,7 @@ uNO uNO pYM kUD -cUF +oyx mhC xsx xsk @@ -73870,7 +73683,7 @@ rtZ ace xPw rZJ -feT +ddl rAS szi gmb @@ -73878,11 +73691,11 @@ ddl aZB ddl ddl -hZG -hZG +ddl +ddl iTi aLH -cuC +tRd eYX mCS snI @@ -74331,7 +74144,7 @@ kUr uqY nlU qAt -uSh +nDG nDG sGz nDG @@ -74370,7 +74183,7 @@ qqm ddl lbQ fVu -vxB +tRd mGD oAX sCa @@ -74515,7 +74328,7 @@ uEi uEi uEi bfW -htm +ddl isM hfp ibu @@ -74677,7 +74490,7 @@ ibu nRe ibu eNc -amq +ddl vTC hfp akO @@ -74839,7 +74652,7 @@ iyW iyW iyW jEM -mXE +ddl isM hfp ibu @@ -75655,7 +75468,7 @@ wBK rmU wCr eaq -vPb +oQG wCr xtB oQG @@ -76806,7 +76619,7 @@ gQc pZp fMH tbd -lGa +qLG fBX tQK rGD @@ -79265,9 +79078,9 @@ pGl vhU cei oTa -jXs +lQA lzA -jXs +lQA qGf xxx uRY @@ -80224,7 +80037,7 @@ whS xKQ cnD nti -uzt +bMi tQQ pcV dsi @@ -80721,7 +80534,7 @@ fVG hmQ oZr tmm -iFG +xeA uqV hOo kgc