diff --git a/_maps/RandomZLevels/away_mission/research.dmm b/_maps/RandomZLevels/away_mission/research.dmm index 4365847a92..4f85d084b5 100644 --- a/_maps/RandomZLevels/away_mission/research.dmm +++ b/_maps/RandomZLevels/away_mission/research.dmm @@ -3505,7 +3505,6 @@ /turf/open/floor/plasteel/white, /area/awaymission/research/interior/cryo) "gR" = ( -/obj/item/melee/classic_baton/telescopic, /obj/effect/turf_decal/tile/purple{ dir = 1 }, @@ -3516,6 +3515,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/item/melee/baton/cattleprod, /turf/open/floor/plasteel/white, /area/awaymission/research/interior/cryo) "gS" = ( @@ -6439,7 +6439,7 @@ }, /turf/open/floor/plating, /area/awaymission/research/interior/maint) -"II" = ( +"Hs" = ( /obj/structure/table/wood, /obj/item/book/granter/crafting_recipe/bone_bow, /turf/open/floor/mineral/plasma, @@ -6516,11 +6516,6 @@ }, /turf/open/floor/plating, /area/awaymission/research/interior/escapepods) -"TO" = ( -/obj/structure/table/wood, -/obj/item/book/granter/action/origami, -/turf/open/floor/mineral/plasma, -/area/space/nearstation) "Uu" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; @@ -6571,6 +6566,11 @@ }, /turf/open/floor/plating, /area/awaymission/research/interior/escapepods) +"ZZ" = ( +/obj/structure/table/wood, +/obj/item/book/granter/action/origami, +/turf/open/floor/mineral/plasma, +/area/space/nearstation) (1,1,1) = {" aa @@ -11110,8 +11110,8 @@ ab ab na nb -II -TO +Hs +ZZ na ab ab diff --git a/_maps/RandomZLevels/away_mission/snowdin.dmm b/_maps/RandomZLevels/away_mission/snowdin.dmm index a40066df4f..c6b675acf6 100644 --- a/_maps/RandomZLevels/away_mission/snowdin.dmm +++ b/_maps/RandomZLevels/away_mission/snowdin.dmm @@ -417,7 +417,6 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 2; pixel_y = 24 }, /obj/effect/turf_decal/tile/neutral{ @@ -1035,7 +1034,6 @@ /area/awaymission/snowdin/post/research) "cE" = ( /obj/machinery/firealarm{ - dir = 2; pixel_y = 24 }, /obj/effect/decal/cleanable/dirt, @@ -1281,7 +1279,6 @@ "cY" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 2; piping_layer = 3; pixel_x = 5; pixel_y = 5 @@ -1329,7 +1326,6 @@ "db" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 2; piping_layer = 3; pixel_x = 5; pixel_y = 5 @@ -1389,7 +1385,6 @@ "df" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 2; piping_layer = 3; pixel_x = 5; pixel_y = 5 @@ -1861,7 +1856,6 @@ /area/awaymission/snowdin/post) "em" = ( /obj/machinery/power/apc{ - dir = 2; name = "Gateway APC"; pixel_y = -24; req_access = 150 @@ -1936,9 +1930,7 @@ /turf/open/floor/plasteel, /area/awaymission/snowdin/post/messhall) "et" = ( -/obj/machinery/vending/boozeomat{ - req_access_txt = "0" - }, +/obj/machinery/vending/boozeomat, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -1968,7 +1960,6 @@ /area/awaymission/snowdin/post/messhall) "ew" = ( /obj/machinery/firealarm{ - dir = 2; pixel_y = 24 }, /obj/effect/turf_decal/tile/bar, @@ -2210,7 +2201,6 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 2; pixel_y = 24 }, /obj/effect/turf_decal/tile/blue{ @@ -2411,7 +2401,6 @@ /area/awaymission/snowdin/post/dorm) "fw" = ( /obj/machinery/sleeper{ - icon_state = "sleeper"; dir = 4 }, /obj/effect/turf_decal/tile/blue{ @@ -2631,7 +2620,6 @@ /area/awaymission/snowdin/post/hydro) "fT" = ( /obj/machinery/firealarm{ - dir = 2; pixel_y = 24 }, /obj/effect/turf_decal/tile/green{ @@ -3808,7 +3796,6 @@ /area/awaymission/snowdin/post) "iu" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 2; piping_layer = 3; pixel_x = 5; pixel_y = 5 @@ -4483,7 +4470,8 @@ /turf/open/floor/plating, /area/awaymission/snowdin/post/garage) "jL" = ( -/obj/vehicle/ridden/atv, +/obj/vehicle/ridden/atv/snowmobile, +/obj/item/key, /turf/open/floor/plating, /area/awaymission/snowdin/post/garage) "jM" = ( @@ -5060,8 +5048,9 @@ /turf/open/floor/plating, /area/awaymission/snowdin/post/garage) "lc" = ( -/obj/vehicle/ridden/atv, /obj/effect/decal/cleanable/oil, +/obj/vehicle/ridden/atv/snowmobile, +/obj/item/key, /turf/open/floor/plating, /area/awaymission/snowdin/post/garage) "ld" = ( @@ -5285,7 +5274,6 @@ /area/awaymission/snowdin/post) "lv" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 2; piping_layer = 3; pixel_x = 5; pixel_y = 5 @@ -5421,7 +5409,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 2; piping_layer = 3; pixel_x = 5; pixel_y = 5 @@ -5468,7 +5455,6 @@ /area/awaymission/snowdin/post/hydro) "lG" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 2; piping_layer = 3; pixel_x = 5; pixel_y = 5 @@ -6601,7 +6587,6 @@ /obj/item/ammo_box/a762, /obj/structure/closet/secure_closet{ icon_state = "sec"; - locked = 1; name = "security officer's locker"; req_access_txt = "201" }, @@ -6800,7 +6785,6 @@ /area/awaymission/snowdin/post/hydro) "ot" = ( /obj/machinery/firealarm{ - dir = 2; pixel_y = 24 }, /turf/open/floor/plasteel, @@ -8715,7 +8699,6 @@ /area/awaymission/snowdin/outside) "sW" = ( /obj/machinery/power/turbine{ - dir = 2; luminosity = 2 }, /obj/structure/cable, @@ -9863,7 +9846,6 @@ "wm" = ( /obj/machinery/porta_turret/centcom_shuttle/weak{ desc = "A turret built with substandard parts and run down further with age."; - icon_state = "syndie_off"; dir = 9; faction = list("pirate") }, @@ -9958,7 +9940,6 @@ }, /obj/effect/light_emitter{ light_color = "#FAA019"; - light_power = 1; light_range = 4; name = "fire light" }, @@ -9990,7 +9971,6 @@ /area/awaymission/snowdin/outside) "wC" = ( /obj/vehicle/ridden/atv{ - icon_state = "atv"; dir = 4 }, /obj/effect/light_emitter{ @@ -11092,10 +11072,8 @@ /turf/open/floor/plating, /area/awaymission/snowdin/post/minipost) "zq" = ( -/obj/vehicle/ridden/atv{ - icon_state = "atv"; - dir = 8 - }, +/obj/vehicle/ridden/atv/snowmobile, +/obj/item/key, /turf/open/floor/plating, /area/awaymission/snowdin/post/minipost) "zr" = ( @@ -11412,12 +11390,6 @@ /obj/item/clothing/suit/hooded/wintercoat, /turf/open/floor/plating/snowed, /area/awaymission/snowdin/outside) -"Ah" = ( -/obj/structure/window/reinforced/fulltile/ice, -/obj/structure/grille, -/obj/item/clothing/suit/hooded/wintercoat, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/minipost) "Ai" = ( /turf/open/floor/plating{ icon_state = "platingdmg1" @@ -11588,7 +11560,6 @@ }, /obj/effect/light_emitter{ light_color = "#FAA019"; - light_power = 1; light_range = 4; name = "fire light" }, @@ -12299,7 +12270,6 @@ desc = "It's a storage unit for a Syndicate boarding party." }, /obj/effect/turf_decal/bot_white, -/obj/item/gun/ballistic/automatic/pistol, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -12345,7 +12315,6 @@ /area/awaymission/snowdin/cave) "CP" = ( /obj/structure/shuttle/engine/heater{ - icon_state = "heater"; dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -12635,14 +12604,6 @@ /obj/item/stack/rods, /turf/open/floor/mineral/plastitanium/red, /area/awaymission/snowdin/cave) -"Ds" = ( -/obj/item/grenade/plastic/c4, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/awaymission/snowdin/cave) "Dt" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced{ @@ -12880,7 +12841,6 @@ /area/awaymission/snowdin/cave) "DU" = ( /obj/structure/shuttle/engine/heater{ - icon_state = "heater"; dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -13215,26 +13175,14 @@ /obj/item/toy/plush/nukeplushie, /turf/open/floor/plasteel/dark, /area/awaymission/snowdin/cave) -"EE" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/weather/snow, -/obj/machinery/suit_storage_unit{ - state_open = 1 - }, -/turf/open/floor/mineral/plastitanium{ - initial_gas_mix = "o2=22;n2=82;TEMP=180"; - planetary_atmos = 1; - temperature = 180 - }, -/area/awaymission/snowdin/cave) "EF" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, /obj/effect/turf_decal/weather/snow, -/obj/machinery/suit_storage_unit/syndicate, +/obj/item/clothing/suit/hooded/wintercoat/security, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/structure/rack, /turf/open/floor/mineral/plastitanium{ initial_gas_mix = "o2=22;n2=82;TEMP=180"; planetary_atmos = 1; @@ -13246,9 +13194,9 @@ dir = 5 }, /obj/effect/turf_decal/weather/snow, -/obj/machinery/suit_storage_unit{ - state_open = 1 - }, +/obj/item/clothing/suit/hooded/wintercoat/security, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/structure/rack, /turf/open/floor/mineral/plastitanium{ initial_gas_mix = "o2=22;n2=82;TEMP=180"; planetary_atmos = 1; @@ -13320,7 +13268,6 @@ /area/awaymission/snowdin/cave) "EN" = ( /obj/machinery/sleeper/syndie{ - icon_state = "sleeper_s"; dir = 1 }, /obj/effect/turf_decal/bot_white, @@ -13333,7 +13280,6 @@ "EP" = ( /obj/effect/turf_decal/bot_white, /obj/machinery/sleeper/syndie{ - icon_state = "sleeper_s"; dir = 1 }, /turf/open/floor/plasteel/dark, @@ -13757,7 +13703,6 @@ /area/awaymission/snowdin/cave/cavern) "FY" = ( /obj/machinery/conveyor{ - dir = 2; id = "snowdin_belt_mine" }, /obj/machinery/light/small{ @@ -13780,8 +13725,7 @@ /area/awaymission/snowdin/post/mining_main) "Gc" = ( /obj/structure/statue/snow/snowman{ - anchored = 1; - name = "snowman" + anchored = 1 }, /obj/item/pickaxe/mini{ pixel_x = 5; @@ -13868,7 +13812,6 @@ "Gn" = ( /obj/structure/plasticflaps, /obj/machinery/conveyor{ - dir = 2; id = "snowdin_belt_mine" }, /turf/open/floor/plating, @@ -14054,7 +13997,6 @@ output_dir = 2 }, /obj/machinery/conveyor{ - dir = 2; id = "snowdin_belt_mine" }, /turf/open/floor/plating, @@ -14170,7 +14112,6 @@ /area/awaymission/snowdin/post/mining_main/mechbay) "Hk" = ( /obj/machinery/conveyor{ - dir = 2; id = "snowdin_belt_mine" }, /turf/open/floor/plating, @@ -14286,11 +14227,9 @@ /area/awaymission/snowdin/post/mining_main/mechbay) "HC" = ( /obj/machinery/mineral/processing_unit{ - dir = 1; - output_dir = 2 + dir = 1 }, /obj/machinery/conveyor{ - dir = 2; id = "snowdin_belt_mine" }, /turf/open/floor/plating, @@ -14555,7 +14494,6 @@ /area/awaymission/snowdin/post/mining_main/mechbay) "In" = ( /obj/mecha/working/ripley/mining{ - icon_state = "ripley"; dir = 1 }, /obj/effect/turf_decal/bot, @@ -14615,11 +14553,9 @@ /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main) "Ix" = ( -/obj/vehicle/ridden/atv{ - icon_state = "atv"; - dir = 1 - }, /obj/effect/decal/cleanable/oil, +/obj/vehicle/ridden/atv/snowmobile, +/obj/item/key, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main) "Iy" = ( @@ -27300,7 +27236,7 @@ oa dX yW yW -Ah +AX Av Lw yX @@ -36093,7 +36029,7 @@ CC El an an -EE +EF CC ae ae @@ -36607,7 +36543,7 @@ OF En Es Dp -EE +EF CC zh af @@ -38396,7 +38332,7 @@ CC CL CW Di -Ds +Di Di CC CX @@ -55604,7 +55540,7 @@ eL eJ tp qi -tt +tz qi tp eJ @@ -56372,13 +56308,13 @@ eJ eJ tp qi -tt +tz tv qi tt qi tv -tt +tz qi tp eJ @@ -57146,7 +57082,7 @@ eJ eJ tp qi -tt +tz qi tp eJ @@ -69622,7 +69558,7 @@ tp qi tz qi -tt +tz qi qi qi @@ -70385,7 +70321,7 @@ eJ gW tp qi -tt +tz tp qi qi @@ -71159,7 +71095,7 @@ qi qi tp qi -tt +tz qi tp tp diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm index fc797d227c..5bdc0d4532 100644 --- a/code/modules/awaymissions/mission_code/snowdin.dm +++ b/code/modules/awaymissions/mission_code/snowdin.dm @@ -475,43 +475,26 @@ /obj/effect/spawner/lootdrop/snowdin/dungeonlite name = "dungeon lite" - loot = list(/obj/item/melee/classic_baton = 11, - /obj/item/melee/classic_baton/telescopic = 12, - /obj/item/book/granter/spell/smoke = 10, + loot = list(/obj/item/book/granter/spell/smoke = 10, /obj/item/book/granter/spell/blind = 10, /obj/item/storage/firstaid/regular = 45, /obj/item/storage/firstaid/toxin = 35, /obj/item/storage/firstaid/brute = 27, /obj/item/storage/firstaid/fire = 27, /obj/item/storage/toolbox/syndicate = 12, - /obj/item/grenade/plastic/c4 = 7, /obj/item/grenade/clusterbuster/smoke = 15, /obj/item/clothing/under/chameleon = 13, - /obj/item/clothing/shoes/chameleon/noslip = 10, /obj/item/borg/upgrade/ddrill = 3) /obj/effect/spawner/lootdrop/snowdin/dungeonmid name = "dungeon mid" - loot = list(/obj/item/defibrillator/compact = 6, - /obj/item/storage/firstaid/tactical = 35, - /obj/item/shield/energy = 6, - /obj/item/shield/riot/tele = 12, - /obj/item/dnainjector/lasereyesmut = 7, - /obj/item/gun/magic/wand/fireball/inert = 3, + loot = list(/obj/item/shield/riot = 12, /obj/item/pneumatic_cannon = 15, - /obj/item/melee/transforming/energy/sword = 7, - /obj/item/book/granter/spell/knock = 15, - /obj/item/book/granter/spell/summonitem = 20, - /obj/item/book/granter/spell/forcewall = 17, /obj/item/storage/backpack/holding = 12, - /obj/item/grenade/spawnergrenade/manhacks = 6, - /obj/item/grenade/spawnergrenade/spesscarp = 7, - /obj/item/grenade/clusterbuster/inferno = 3, /obj/item/stack/sheet/mineral/diamond{amount = 15} = 10, /obj/item/stack/sheet/mineral/uranium{amount = 15} = 10, /obj/item/stack/sheet/mineral/plasma{amount = 15} = 10, /obj/item/stack/sheet/mineral/gold{amount = 15} = 10, - /obj/item/book/granter/spell/barnyard = 4, /obj/item/pickaxe/drill/diamonddrill = 6, /obj/item/borg/upgrade/vtec = 7, /obj/item/borg/upgrade/disablercooler = 7) @@ -519,21 +502,12 @@ /obj/effect/spawner/lootdrop/snowdin/dungeonheavy name = "dungeon heavy" - loot = list(/obj/item/twohanded/singularityhammer = 25, - /obj/item/twohanded/mjollnir = 10, - /obj/item/twohanded/fireaxe = 25, + loot = list(/obj/item/twohanded/fireaxe = 25, /obj/item/organ/brain/alien = 17, - /obj/item/twohanded/dualsaber = 15, - /obj/item/organ/heart/demon = 7, - /obj/item/gun/ballistic/automatic/c20r/unrestricted = 16, - /obj/item/gun/magic/wand/resurrection/inert = 15, - /obj/item/gun/magic/wand/resurrection = 10, - /obj/item/uplink/old = 2, - /obj/item/book/granter/spell/charge = 12, - /obj/item/grenade/clusterbuster/spawner_manhacks = 15, - /obj/item/book/granter/spell/fireball = 10, + /obj/item/organ/heart/cursed = 7, + /obj/item/book/granter/spell/forcewall = 17, + /obj/item/gun/magic/wand/fireball/inert = 3, /obj/item/pickaxe/drill/jackhammer = 30, - /obj/item/borg/upgrade/syndicate = 13, /obj/item/borg/upgrade/selfrepair = 17) /obj/effect/spawner/lootdrop/snowdin/dungeonmisc