From 691a69b8f8b64e9a48ed37c7756b7b87ef88fd0d Mon Sep 17 00:00:00 2001 From: MrCat15352 <125268716+MrCat15352@users.noreply.github.com> Date: Sat, 28 Dec 2024 22:00:55 +0500 Subject: [PATCH] UPDATE: Outpost access & remap ice outpost (#1305) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Заодно фиксим отсутствующее мясо таяры и риола * Изменил доступы на радио * Изменены доступы. ОБНОВЛЕНИЕ аванпоста --- .../_mod_celadon/outpost/elysium_asteroid.dmm | 4 +- _maps/_mod_celadon/outpost/elysium_ice.dmm | 912 ++++++++++++------ mod_celadon/riol/code/species/food.dm | 2 +- mod_celadon/tajara/code/species/food.dm | 2 +- 4 files changed, 622 insertions(+), 298 deletions(-) diff --git a/_maps/_mod_celadon/outpost/elysium_asteroid.dmm b/_maps/_mod_celadon/outpost/elysium_asteroid.dmm index 0e6893951323..e23243d52644 100644 --- a/_maps/_mod_celadon/outpost/elysium_asteroid.dmm +++ b/_maps/_mod_celadon/outpost/elysium_asteroid.dmm @@ -6101,7 +6101,8 @@ color = "#c1b6a5" }, /obj/machinery/jukebox/boombox{ - pixel_y = 5 + pixel_y = 5; + req_one_access_txt = "109" }, /obj/item/phone{ pixel_x = -11; @@ -15277,7 +15278,6 @@ /area/outpost/fraction/nanotrasen) "MH" = ( /obj/machinery/jukebox/boombox{ - req_one_access_txt = "8125"; pixel_x = -8 }, /obj/structure/table/syndi, diff --git a/_maps/_mod_celadon/outpost/elysium_ice.dmm b/_maps/_mod_celadon/outpost/elysium_ice.dmm index c46c7daff863..395c5a35368e 100644 --- a/_maps/_mod_celadon/outpost/elysium_ice.dmm +++ b/_maps/_mod_celadon/outpost/elysium_ice.dmm @@ -1355,6 +1355,10 @@ /obj/item/spacecash/bundle/c10000, /turf/open/floor/wood/ebony, /area/outpost/crew/bar/bar_zone) +"aXq" = ( +/obj/item/cigbutt/cigarbutt, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "aXr" = ( /obj/structure/chair/office{ dir = 1 @@ -1799,6 +1803,12 @@ light_range = 2 }, /area/outpost/vacant_rooms/trash_factory) +"bna" = ( +/obj/structure/deployable_barricade/wooden{ + dir = 4 + }, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "bob" = ( /obj/effect/turf_decal/trimline/opaque/solgovgold/warning{ dir = 1; @@ -1987,6 +1997,11 @@ }, /turf/open/floor/plasteel/tech, /area/outpost/crew/cryo) +"bzr" = ( +/obj/structure/barricade/wooden, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "bzC" = ( /obj/effect/turf_decal/borderfloor{ dir = 9 @@ -2116,6 +2131,14 @@ }, /turf/open/floor/plasteel/patterned, /area/outpost/cargo/smeltery) +"bDR" = ( +/obj/structure/curtain/cloth/grey, +/obj/effect/mob_spawn/human/elysium_outpost/wagabond, +/obj/item/bedsheet{ + layer = 3.2 + }, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "bEz" = ( /obj/structure/projected_forcefield{ max_integrity = 900000 @@ -2753,6 +2776,9 @@ pixel_x = 7; pixel_y = 5 }, +/obj/item/reagent_containers/hypospray/medipen/survival{ + layer = 2 + }, /turf/open/floor/plating/asteroid/icerock/temperate, /area/outpost/exterior) "cci" = ( @@ -2813,6 +2839,10 @@ light_range = 2 }, /area/outpost/exterior) +"cgx" = ( +/obj/effect/decal/cleanable/shreds, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "cgS" = ( /obj/effect/turf_decal/techfloor{ dir = 8 @@ -3721,6 +3751,10 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/plating/asteroid/icerock/temperate, /area/outpost/exterior) +"cQb" = ( +/obj/structure/barricade/wooden/crude, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/external) "cQc" = ( /obj/machinery/light/small/directional/east, /turf/open/floor/plasteel/showroomfloor, @@ -4123,6 +4157,13 @@ }, /turf/open/floor/plasteel/dark, /area/outpost/cargo) +"dig" = ( +/obj/effect/portal/permanent/one_way{ + id = "outpost_dungeon_trapshaft_deep_exit_wrong"; + alpha = 0 + }, +/turf/open/floor/plating/abductor, +/area/outpost/exterior) "dik" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{ dir = 8 @@ -5191,6 +5232,12 @@ /obj/machinery/suit_storage_unit/cmo, /turf/open/floor/wood, /area/outpost/medical/cmo) +"dRX" = ( +/obj/structure/table/scrap, +/obj/item/flashlight/lamp/bananalamp, +/obj/item/reagent_containers/food/drinks/bottle/menthol, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "dSk" = ( /obj/effect/turf_decal/borderfloor{ dir = 5 @@ -6005,6 +6052,16 @@ }, /turf/open/floor/wood/walnut, /area/outpost/crew/bar/vip_elysium_zone) +"erZ" = ( +/obj/structure/table/abductor, +/obj/item/clothing/suit/armor/heavy/adamantine{ + anchored = 1 + }, +/obj/effect/landmark/portal_exit{ + id = "outpost_dungeon_trapshaft_deep_exit_wrong" + }, +/turf/open/floor/plating/abductor, +/area/outpost/exterior) "esi" = ( /obj/effect/turf_decal/industrial/outline/yellow, /obj/machinery/portable_atmospherics/canister/carbon_dioxide, @@ -6404,6 +6461,12 @@ }, /turf/open/floor/mineral/plastitanium, /area/outpost/security/bay) +"eFn" = ( +/obj/effect/landmark/portal_exit{ + id = "outpost_dungeon_trapshaft_deep_exit_wagabond" + }, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "eFs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ dir = 9 @@ -6782,9 +6845,9 @@ /turf/open/floor/carpet/stellar, /area/outpost/crew/bar) "eRF" = ( -/obj/structure/barricade/wooden/crude/snow, +/obj/effect/decal/cleanable/molten_object/large, /turf/open/floor/plating/asteroid/icerock/temperate, -/area/outpost/exterior) +/area/outpost/external) "eSn" = ( /obj/machinery/light_switch{ pixel_x = -22; @@ -7219,6 +7282,9 @@ "fje" = ( /obj/structure/table/scrap, /obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/hypospray/medipen/survival{ + layer = 2 + }, /turf/open/floor/plating/asteroid/icerock/temperate, /area/outpost/exterior) "fjC" = ( @@ -7380,6 +7446,10 @@ /obj/structure/sign/poster/elysium/random, /turf/closed/wall/r_wall/rust, /area/outpost/maintenance/fore) +"fqE" = ( +/obj/machinery/gibber, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "fqW" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 4 @@ -7649,6 +7719,10 @@ light_range = 2 }, /area/outpost/fraction/separatist) +"fzj" = ( +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/tajara, +/turf/closed/indestructible/reinforced, +/area/outpost/fraction/syndi) "fzu" = ( /obj/effect/spawner/structure/window/reinforced/indestructable, /turf/open/floor/plating{ @@ -9339,6 +9413,12 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/outpost/medical) +"gIu" = ( +/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/mob_spawn/human/elysium_outpost/wagabond, +/obj/structure/curtain/cloth/grey, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "gIA" = ( /obj/machinery/firealarm/directional/north, /turf/open/floor/wood/ebony, @@ -9399,8 +9479,7 @@ /turf/open/floor/carpet/purple, /area/outpost/crew/bar/vip_zone) "gKs" = ( -/obj/structure/curtain/cloth/grey, -/obj/effect/mob_spawn/human/elysium_outpost/wagabond, +/obj/effect/decal/cleanable/molten_object/large, /turf/open/floor/plating/asteroid/icerock/temperate, /area/outpost/exterior) "gKS" = ( @@ -10178,11 +10257,6 @@ /turf/open/floor/wood/ebony, /area/outpost/crew/bar/theatre) "hqc" = ( -/obj/structure/curtain/cloth/grey, -/obj/item/bedsheet{ - layer = 3.2 - }, -/obj/effect/mob_spawn/human/elysium_outpost/wagabond, /turf/open/floor/plating/asteroid/icerock/temperate{ light_color = "#1B1D2E"; light_range = 2 @@ -11258,6 +11332,19 @@ /obj/structure/neon_spline/blue, /turf/open/floor/plating/asteroid/icerock/temperate, /area/outpost/exterior) +"idm" = ( +/obj/structure/table/scrap, +/obj/item/reagent_containers/food/drinks/bottle/blazaam{ + pixel_x = 7; + pixel_y = 5 + }, +/obj/item/reagent_containers/hypospray/medipen, +/obj/item/storage/fancy/candle_box{ + pixel_x = -5; + pixel_y = 4 + }, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "idq" = ( /obj/effect/turf_decal/spline/fancy/transparent/orange{ dir = 5 @@ -12025,6 +12112,10 @@ /obj/structure/sign/poster/elysium/random, /turf/closed/indestructible/reinforced, /area/outpost/operations/outpost_command) +"iFA" = ( +/obj/structure/sign/warning/longtermwaste, +/turf/closed/indestructible/rock/schist, +/area/outpost/external) "iFB" = ( /turf/open/floor/plasteel/tech, /area/hangar) @@ -12638,6 +12729,10 @@ layer = 2.4 }, /area/outpost/exterior) +"jdA" = ( +/obj/effect/mob_spawn/human/elysium_outpost/wagabond, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "jdG" = ( /turf/open/floor/plasteel/patterned/cargo_one, /area/outpost/fraction/solfed) @@ -13530,6 +13625,19 @@ }, /turf/open/floor/wood/ebony, /area/outpost/fraction/solfed) +"jEp" = ( +/obj/effect/decal/cleanable/glass, +/obj/effect/mob_spawn/human/elysium_outpost/wagabond, +/obj/structure/curtain/cloth/grey, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) +"jEz" = ( +/obj/machinery/jukebox/boombox{ + pixel_y = 5; + req_one_access_txt = "109" + }, +/turf/closed/indestructible/rock/schist, +/area/outpost/external) "jED" = ( /obj/structure/cable, /obj/machinery/power/terminal{ @@ -14234,6 +14342,12 @@ }, /turf/open/floor/plasteel/tech/techmaint, /area/outpost/security/checkpoint) +"kgT" = ( +/obj/structure/deployable_barricade/wooden{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "khw" = ( /obj/structure/railing/corner{ dir = 8; @@ -14265,11 +14379,8 @@ /turf/open/floor/carpet/red, /area/outpost/crew/dop_zone_1) "kil" = ( -/obj/structure/holosign/barrier/infinite, -/turf/open/floor/plating/asteroid/snow/temperatre{ - light_color = "#1B1D2E"; - light_range = 2 - }, +/obj/structure/deployable_barricade/wooden, +/turf/open/floor/plating/asteroid/icerock/temperate, /area/outpost/exterior) "kjd" = ( /obj/item/flashlight/seclite, @@ -14532,13 +14643,11 @@ }, /area/outpost/exterior) "ksk" = ( -/obj/structure/chair/stool{ - dir = 8 - }, -/turf/open/floor/plating/asteroid/snow/temperatre{ - light_color = "#1B1D2E"; - light_range = 2 - }, +/obj/structure/table_frame/abductor, +/obj/effect/decal/cleanable/glass/strange, +/obj/effect/decal/cleanable/greenglow, +/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium, +/turf/open/floor/plating/asteroid/icerock/temperate, /area/outpost/exterior) "ksL" = ( /obj/structure/chair/sofa/blue/corpo/left/directional/north, @@ -14578,6 +14687,13 @@ /obj/effect/overlay/holoray, /turf/open/floor/plasteel/tech, /area/outpost/crew/cryo) +"ktO" = ( +/obj/structure/spider/stickyweb{ + color = "#808080" + }, +/obj/structure/closet/crate/secure/loot, +/turf/open/floor/wood/walnut, +/area/outpost/exterior) "ktZ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/kitchen_coldroom/freezerfloor/freezer_blue, @@ -14623,6 +14739,13 @@ }, /turf/open/floor/wood/walnut, /area/outpost/fraction/syndi/donkco_shop) +"kwD" = ( +/obj/structure/table/scrap, +/obj/item/reagent_containers/hypospray/medipen/survival{ + layer = 2 + }, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "kxv" = ( /obj/structure/table/glass, /obj/item/flashlight/lamp/green, @@ -14762,11 +14885,11 @@ }, /area/outpost/exterior) "kDj" = ( -/obj/item/clothing/suit/armor/heavy/adamantine{ - anchored = 1 +/obj/structure/chair/sofa/red/old/left{ + dir = 8 }, -/obj/structure/table/abductor, -/turf/open/floor/plating/abductor, +/obj/effect/decal/cleanable/vomit, +/turf/open/floor/plating/asteroid/icerock/temperate, /area/outpost/exterior) "kDx" = ( /obj/effect/turf_decal/trimline/opaque/white/corner{ @@ -15652,6 +15775,23 @@ }, /turf/open/floor/plating/asteroid/icerock/temperate, /area/outpost/exterior) +"loH" = ( +/obj/structure/closet/secure_closet/freezer/meat, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ethereal, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/fly, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/moth, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/riol, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/shadow, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/spider, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/squid, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/tajara, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/zombie, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "lpo" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/plasteel/dark, @@ -15717,6 +15857,10 @@ }, /turf/open/floor/plating/asteroid/icerock/temperate, /area/outpost/exterior) +"lqQ" = ( +/obj/effect/decal/cleanable/wrapping, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "lrS" = ( /obj/structure/spider/stickyweb{ color = "#808080" @@ -16468,7 +16612,6 @@ light_color = "#BBFFBB" }, /obj/machinery/jukebox/boombox{ - req_one_access_txt = "8125"; pixel_x = -2 }, /obj/machinery/door/firedoor/border_only{ @@ -16695,6 +16838,13 @@ }, /turf/open/floor/marble/black, /area/outpost/fraction/nanotrasen) +"mcH" = ( +/obj/item/storage/fancy/candle_box{ + pixel_x = -5; + pixel_y = 4 + }, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "mcJ" = ( /obj/effect/turf_decal/elysium_logo/two_one, /obj/structure/railing{ @@ -16757,6 +16907,13 @@ /obj/machinery/computer/scan_consolenew, /turf/open/floor/plasteel/white, /area/outpost/medical/genetic) +"mfz" = ( +/obj/item/grown/log/tree{ + pixel_x = 7; + pixel_y = 5 + }, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "mgt" = ( /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -16873,8 +17030,16 @@ }, /area/outpost/fraction/separatist) "mkn" = ( -/obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/hostile/asteroid/roach, +/obj/structure/table/scrap, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer{ + pixel_x = 8; + pixel_y = 11 + }, +/obj/item/reagent_containers/food/drinks/beer{ + pixel_x = -8; + pixel_y = 8 + }, /turf/open/floor/plating/asteroid/icerock/temperate, /area/outpost/exterior) "mkN" = ( @@ -18680,6 +18845,16 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2, /turf/open/floor/plasteel/dark, /area/outpost/cargo) +"nry" = ( +/obj/item/storage/fancy/cigarettes/cigpack_candy, +/obj/item/storage/fancy/cigarettes/cigpack_midori, +/obj/item/storage/fancy/cigarettes/cigpack_mindbreaker, +/obj/item/storage/fancy/cigarettes/cigpack_syndicate, +/obj/item/storage/fancy/cigarettes/cigpack_xeno, +/obj/item/storage/fancy/cigarettes/derringer/gold, +/obj/structure/closet/crate/trashcart, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "nrA" = ( /obj/structure/chair/sofa/brown/old/left, /obj/effect/decal/cleanable/dirt/dust, @@ -19413,7 +19588,11 @@ /turf/open/floor/plasteel/telecomms_floor, /area/outpost/operations/outpost_command) "nUM" = ( -/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/sprayweb, +/obj/item/mecha_parts/mecha_equipment/conversion_kit/flames_red, +/obj/item/reagent_containers/hypospray/medipen/survival{ + layer = 2 + }, /turf/open/floor/plating/asteroid/icerock/temperate, /area/outpost/exterior) "nUP" = ( @@ -19460,7 +19639,7 @@ /turf/open/floor/plasteel/dark, /area/outpost/medical/morgue) "nXd" = ( -/obj/effect/decal/cleanable/blood/footprints, +/obj/structure/kitchenspike, /turf/open/floor/plating/asteroid/icerock/temperate, /area/outpost/exterior) "nXt" = ( @@ -19688,6 +19867,13 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/plasteel/dark, /area/outpost/cargo) +"oeO" = ( +/obj/effect/portal/permanent/one_way{ + id = "outpost_dungeon_trapshaft_deep_exit_wagabond"; + color = "#FFFF00" + }, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "ofE" = ( /obj/structure/bed{ dir = 4; @@ -20329,6 +20515,10 @@ }, /turf/open/floor/wood/ebony, /area/outpost/crew/bar) +"ozw" = ( +/obj/effect/decal/cleanable/vomit, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "ozM" = ( /obj/effect/turf_decal/borderfloor/corner, /obj/effect/turf_decal/siding/white{ @@ -20586,6 +20776,13 @@ "oII" = ( /turf/open/floor/plasteel/tech, /area/outpost/operations/outpost_command) +"oJu" = ( +/obj/structure/spider/stickyweb{ + color = "#808080" + }, +/obj/structure/closet/crate/secure/loot, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "oJD" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4, @@ -20805,12 +21002,19 @@ "oQO" = ( /obj/effect/turf_decal/industrial/warning/corner, /obj/item/storage/bottles/moonshine/sealed, +/obj/item/storage/backpack/duffelbag/med/surgery, /turf/open/floor/mineral/plastitanium/red, /area/outpost/exterior) "oRI" = ( /obj/structure/neon_spline/orange/corner, /turf/open/floor/wood/walnut, /area/outpost/crew/bar) +"oSo" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "oSz" = ( /turf/open/floor/plasteel/tech, /area/outpost/cargo) @@ -22345,6 +22549,11 @@ }, /turf/open/floor/wood/ebony, /area/outpost/crew/bar/theatre) +"pSm" = ( +/obj/effect/radiation/waste/intense, +/obj/structure/closet/crate/secure/loot, +/turf/open/floor/plating/asteroid/wasteplanet/lit, +/area/outpost/exterior) "pSs" = ( /obj/structure/railing/wood{ dir = 4; @@ -23940,6 +24149,12 @@ /obj/structure/grille/broken, /turf/open/floor/plating, /area/outpost/maintenance/fore) +"rcR" = ( +/obj/item/storage/bottles/sandblast, +/obj/machinery/hydroponics/soil, +/obj/item/stack/medical/splint/ghetto, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "rdz" = ( /obj/machinery/hydroponics/soil, /obj/item/toy/plush/carpplushie/candy, @@ -24706,15 +24921,6 @@ light_range = 2 }, /area/outpost/exterior) -"rHh" = ( -/obj/structure/urinal{ - pixel_y = 28 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/plasteel/showroomfloor, -/area/outpost/medical) "rGW" = ( /obj/item/reagent_containers/food/snacks/grown/ambrosia{ pixel_y = -3; @@ -24725,6 +24931,15 @@ }, /turf/open/floor/plating/rust, /area/outpost/fraction/separatist) +"rHh" = ( +/obj/structure/urinal{ + pixel_y = 28 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/plasteel/showroomfloor, +/area/outpost/medical) "rHt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -25013,6 +25228,12 @@ /obj/machinery/light/directional/south, /turf/open/floor/plasteel/tech, /area/hangar) +"rRR" = ( +/obj/item/paper{ + default_raw_text = "Всяк сюда идущий, знай, что обратной дороги больше не будет. Если ты считаешь что готов стать снова частью общества, то шагай смело в это зеленое нечто и молись, чтобы тебя на атомы не расплющило!" + }, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "rRV" = ( /obj/effect/turf_decal/borderfloor{ dir = 8 @@ -25219,6 +25440,12 @@ }, /turf/open/floor/plasteel/dark, /area/outpost/cargo) +"rYk" = ( +/obj/effect/mob_spawn/human/elysium_outpost/wagabond, +/obj/effect/decal/cleanable/vomit, +/obj/item/reagent_containers/food/drinks/bottle/lemonjuice, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "rYq" = ( /obj/machinery/light/directional/west, /obj/structure/chair/sofa/brown/left/directional/east, @@ -25288,6 +25515,11 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/patterned, /area/outpost/cargo/smeltery) +"sdG" = ( +/obj/effect/spawner/lootdrop/ration, +/obj/item/storage/backpack/duffelbag/med, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "sdL" = ( /obj/structure/cable{ icon_state = "2-8" @@ -25325,10 +25557,11 @@ /turf/open/floor/plasteel/white, /area/outpost/medical/hall_1) "seN" = ( -/obj/effect/decal/cleanable/blood/drip{ - pixel_x = 13 +/obj/effect/mob_spawn/human/skeleton/alive{ + density = 0 }, -/turf/open/floor/plating/asteroid/icerock/temperate, +/obj/structure/closet/crate/secure/loot, +/turf/open/floor/plating/asteroid/icerock/smooth, /area/outpost/exterior) "sfv" = ( /obj/structure/toilet{ @@ -25957,6 +26190,10 @@ }, /turf/open/floor/wood, /area/outpost/security/detective) +"syi" = ( +/obj/effect/decal/cleanable/squid_ink, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "sym" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/portables_connector/layer4, @@ -26963,12 +27200,8 @@ /turf/open/floor/mineral/plastitanium/red, /area/outpost/cargo/faction/syndicate) "tma" = ( -/obj/structure/sign/warning/longtermwaste, -/obj/structure/barricade/wooden/snowed, -/turf/open/floor/plating/asteroid/snow/temperatre{ - light_color = "#1B1D2E"; - light_range = 2 - }, +/obj/effect/decal/cleanable/leaper_sludge, +/turf/open/floor/plating/asteroid/icerock/temperate, /area/outpost/exterior) "tmq" = ( /obj/effect/turf_decal/corner/opaque/neutral/full, @@ -27650,6 +27883,10 @@ /obj/machinery/hydroponics, /turf/open/floor/plating/asteroid/icerock/temperate, /area/outpost/exterior) +"tNC" = ( +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/tajara, +/turf/closed/indestructible/rock/schist, +/area/outpost/external) "tNX" = ( /obj/structure/bed/double, /obj/item/bedsheet/double/yellow, @@ -27818,6 +28055,14 @@ }, /turf/open/floor/carpet/green, /area/outpost/crew/bar/vip_elysium_zone) +"tWn" = ( +/mob/living/simple_animal/bot/medbot/catmedbot{ + emagged = 2; + desc = "Очень яростная медкитти кошка хочет вас смертельно вырезать, ваш недуг... Кажется она сломана?"; + name = "\improper EvilKitty" + }, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "tWq" = ( /obj/structure/closet/crate/trashcart, /obj/effect/spawner/lootdrop/glowstick, @@ -28711,6 +28956,12 @@ /obj/effect/turf_decal/trimline/opaque/neutral/filled/warning, /turf/open/floor/plasteel/dark, /area/outpost/fraction/nanotrasen) +"uHk" = ( +/obj/effect/mob_spawn/human/elysium_outpost/wagabond, +/obj/structure/curtain/cloth/grey, +/obj/effect/decal/cleanable/vomit, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "uHB" = ( /mob/living/simple_animal/hostile/asteroid/roach, /obj/effect/decal/cleanable/blood, @@ -28721,6 +28972,7 @@ short_desc = "Вы видите тело одетое в робу академии наук. Оно все в ранениях и укусах. А рядом с телом на стене находятся кровоподтеки, которые тянутся к зеленой лампочке. Кажется что оно активировано?" }, /obj/structure/trap/stun, +/obj/item/clothing/suit/armor/roumain/flamebearer, /turf/open/floor/plating/abductor, /area/outpost/exterior) "uJr" = ( @@ -28906,7 +29158,13 @@ /turf/open/floor/plasteel/patterned/brushed, /area/outpost/crew/bathroom) "uQb" = ( -/obj/effect/decal/cleanable/blood/squirt, +/obj/structure/chair/sofa/red/old/right, +/obj/effect/decal/cleanable/vomit, +/obj/item/reagent_containers/food/drinks/bottle/pruno, +/obj/item/reagent_containers/food/drinks/bottle/pruno{ + pixel_x = 9; + pixel_y = -2 + }, /turf/open/floor/plating/asteroid/icerock/temperate, /area/outpost/exterior) "uQn" = ( @@ -30697,6 +30955,12 @@ }, /turf/open/floor/plasteel/white, /area/outpost/crew/garden) +"wkt" = ( +/obj/structure/chair/sofa/red/old/corner, +/obj/effect/decal/cleanable/xenoblood, +/obj/item/toy/plush/celadon/tribal_salamander, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "wkE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -31165,6 +31429,21 @@ /obj/item/clothing/neck/necklace/dope, /turf/open/floor/plating/asteroid/wasteplanet/lit, /area/outpost/exterior) +"wxI" = ( +/obj/structure/table/scrap, +/obj/item/reagent_containers/food/drinks/bottle/fernet{ + pixel_x = -5; + pixel_y = 9 + }, +/obj/item/paper{ + default_raw_text = "...сегодня снова, к нам с верху с пещер свалился еще один. Того кого бросили на произвол судьбы. И теперь он вынужден волочить свою судьбу в этих бого забытых пещерах. Но, зато сегодня у нас будет мясо на ужин.. я так давно не ел мяса.." + }, +/obj/item/storage/fancy/candle_box{ + pixel_x = -5; + pixel_y = 4 + }, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "wxM" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -31295,6 +31574,15 @@ }, /turf/open/floor/plasteel/tech, /area/outpost/cargo) +"wBV" = ( +/obj/structure/chair/sofa/red/old/directional, +/obj/item/reagent_containers/food/drinks/bottle/pruno{ + pixel_x = -11; + pixel_y = -1 + }, +/obj/item/stack/medical/gauze, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "wCD" = ( /obj/structure/cable{ icon_state = "4-8" @@ -31387,6 +31675,24 @@ "wHi" = ( /turf/open/floor/plating/asteroid/icerock/lit, /area/outpost/external) +"wIa" = ( +/obj/structure/toilet/greyscale{ + dir = 4 + }, +/obj/effect/decal/cleanable/xenoblood, +/obj/effect/decal/cleanable/blood/splatter, +/obj/item/reagent_containers/hypospray/medipen/anti_rad{ + layer = 2; + pixel_x = -3; + pixel_y = 0 + }, +/obj/structure/curtain/cloth/grey, +/obj/item/storage/firstaid/advanced{ + pixel_y = -1; + pixel_x = -1 + }, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "wIr" = ( /obj/item/radio/intercom/directional/west, /turf/open/floor/plasteel/dark, @@ -31493,9 +31799,14 @@ }, /area/outpost/exterior) "wLx" = ( -/obj/effect/decal/cleanable/blood/squirt, -/obj/structure/barricade/wooden/crude/snow, -/turf/open/floor/plating/asteroid/icerock/temperate, +/obj/item/grown/log/tree{ + pixel_x = 7; + pixel_y = 5 + }, +/turf/open/floor/plating/asteroid/snow/temperatre{ + light_color = "#1B1D2E"; + light_range = 2 + }, /area/outpost/exterior) "wMb" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -31860,6 +32171,12 @@ /obj/effect/decal/cleanable/plastic, /turf/open/floor/plating/asteroid/icerock/temperate, /area/outpost/exterior) +"xbU" = ( +/obj/structure/deployable_barricade/wooden{ + dir = 1 + }, +/turf/open/floor/plating/asteroid/icerock/temperate, +/area/outpost/exterior) "xcn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, /turf/open/floor/plasteel/stairs{ @@ -32009,6 +32326,14 @@ }, /turf/open/floor/plasteel/dark, /area/outpost/cargo) +"xjg" = ( +/obj/structure/spider/stickyweb{ + color = "#808080" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/closet/crate/secure/loot, +/turf/open/floor/wood/walnut, +/area/outpost/exterior) "xjB" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -33373,7 +33698,6 @@ /area/outpost/medical/hall_1) "ylc" = ( /obj/machinery/jukebox/boombox{ - req_one_access_txt = "8125"; pixel_x = -8 }, /obj/structure/table/syndi, @@ -36068,7 +36392,7 @@ rgY rgY rgY qfP -qNy +xjg qNy qNy lrS @@ -36738,10 +37062,10 @@ rgY rgY rgY uqt +rgY uqt -uqt -uqt -uqt +rgY +rgY uqt uqt rgY @@ -36925,10 +37249,10 @@ rgY rgY rgY rgY -uqt -uqt -uqt -uqt +rgY +rgY +rgY +rgY rgY rgY rgY @@ -37112,8 +37436,8 @@ rgY rgY rgY rgY -uqt -uqt +rgY +rgY rgY rgY rgY @@ -37298,8 +37622,8 @@ rgY rgY rgY rgY -rgY -rgY +cKu +cKu rgY rgY rgY @@ -37484,10 +37808,10 @@ rgY rgY rgY rgY -rgY -rgY -rgY -rgY +cKu +dAp +dAp +cKu rgY rgY rgY @@ -37661,21 +37985,21 @@ rgY rgY rgY rgY +jEz rgY rgY rgY rgY -rgY -rgY -rgY -rgY -rgY -rgY -rgY -rgY -rgY -rgY -rgY +etm +etm +etm +cKu +cKu +hQU +hQU +hQU +dAp +cKu rgY rgY rgY @@ -37853,21 +38177,21 @@ rgY rgY rgY rgY -rgY -rgY -rgY -rgY -rgY -rgY -rgY -rgY -rgY -rgY -rgY -rgY -rgY -rgY -rgY +etm +ksU +pai +cCh +gdu +hQU +cWT +bEK +hQU +ohz +lNl +cWT +cWT +cWT +hQU udk iwD rgY @@ -38040,21 +38364,21 @@ rgY rgY rgY rgY -rgY -rgY -rgY -rgY -rgY -rgY +etm +etm +etm cKu cKu +cWT +cWT +cWT +dAp +cKu rgY rgY -rgY -rgY -rgY -rgY -rgY +cWT +hBB +udk udk rgY rgY @@ -38233,8 +38557,8 @@ rgY rgY rgY cKu -dAp -dAp +cWT +cWT cKu rgY rgY @@ -38414,22 +38738,22 @@ rgY rgY rgY rgY -etm -etm -etm -cKu +rgY +rgY +rgY +rgY +rgY +rgY cKu -hQU -hQU -hQU -dAp cKu rgY rgY rgY rgY +mcH +nry rgY -hQU +iDK rgY rgY rgY @@ -38601,25 +38925,25 @@ rgY rgY rgY rgY -etm -ksU -pai -cCh -gdu +rgY +rgY +rgY +rgY +rgY +rgY +rgY +rgY +rgY +rgY hQU -cWT -bEK hQU -ohz -lNl -cWT -cWT -cWT hQU -kqB -rgY -rgY +fqE rgY +kqB +aKm +aKm +aKm rgY rgY rgY @@ -38788,27 +39112,27 @@ rgY rgY rgY rgY -etm -etm -etm -cKu -cKu -cWT -cWT -cWT -dAp -cKu rgY rgY -cWT -hBB -udk rgY rgY rgY rgY rgY rgY +loH +hQU +hQU +rgY +rgY +rgY +rgY +rgY +rgY +rgY +bzr +rgY +rgY rgY rgY rgY @@ -38880,7 +39204,7 @@ qNy qfP oOx cuI -cuI +ktO qfP rgY osx @@ -38980,20 +39304,20 @@ rgY rgY rgY rgY -cKu -cWT -cWT -cKu rgY rgY rgY +nXd +hQU +hQU +aXq rgY rgY -iDK -rgY +wIa rgY rgY rgY +hQU rgY rgY rgY @@ -39168,16 +39492,16 @@ rgY rgY rgY rgY -cKu -cKu rgY rgY rgY rgY rgY +hQU +rYk rgY -cWT -cWT +ozw +nUM rgY rgY hQU @@ -39284,7 +39608,7 @@ rgY vRw vRw vRw -vRw +oJu rgY rgY hQU @@ -39334,23 +39658,19 @@ rgY udk osq txs -mkn +osq aWO fbZ gmS ohz -xpt +kwD kqA hQU -hQU +xbU xbG xvA udk -lTt -rgY -rgY -rgY -rgY +jEp rgY rgY rgY @@ -39362,12 +39682,16 @@ rgY rgY rgY rgY +hQU +cgx +xbG +idm rgY +hQU +tWn rgY -cWT ohz -hQU -hQU +ohz rgY rgY hdT @@ -39471,7 +39795,7 @@ rgY rgY vQP vRw -vRw +oJu rgY rgY hQU @@ -39542,15 +39866,15 @@ rgY cbH rgY rgY +wUa +wUa +txY +hQU +mkn +wxI +dRX rgY -rgY -rgY -rgY -rgY -rgY -rgY -rgY -rgY +kgT rgY rgY hQU @@ -39718,7 +40042,7 @@ jtU jtU jtU rgY -udk +gIu xbG hQU hQU @@ -39728,16 +40052,16 @@ rgY ceY epL efi -rgY -rgY -rgY -rgY -rgY -rgY -rgY -rgY -rgY -rgY +wUa +txY +wUa +hQU +hQU +tum +hQU +hQU +hQU +ozw rgY rgY hQU @@ -39915,16 +40239,16 @@ hQU iml lTt wdz +wUa rgY -rgY -rgY -rgY -rgY -rgY -rgY -rgY -rgY -rgY +hQU +tum +hQU +hQU +hQU +oSo +iko +hQU rgY rgY hQU @@ -40035,7 +40359,7 @@ rgY rgY dAp dAp -vRw +oJu rgY rgY rgY @@ -40104,15 +40428,15 @@ hQU rgY rgY rgY +txY rgY -rgY -rgY -rgY -rgY -rgY -rgY -rgY -rgY +uQb +iko +tma +epL +efi +hQU +gKs rgY hdT cWT @@ -40290,16 +40614,16 @@ hQU gmW nsB rgY +eRF +hQU rgY +wBV +ksk +hQU rgY rgY -rgY -rgY -rgY -rgY -rgY -rgY -rgY +iko +hQU rgY rgY cWT @@ -40450,7 +40774,7 @@ rgY rgY rgY cVC -xIt +xbU hQU rgY rgY @@ -40477,16 +40801,16 @@ wUa hQU wRn rgY -mcc -ciC -rgY -rgY -rgY -rgY -rgY -rgY +hqc +wUa +iFA +wkt +kDj +mfz +lqQ rgY rgY +hQU rgY rgY rgY @@ -40664,16 +40988,16 @@ txY hQU hQU hqc -ksk +wUa dmO rgY rgY rgY rgY -rgY -rgY -rgY -rgY +hQU +hQU +hQU +syi rgY rgY rgY @@ -40822,10 +41146,10 @@ hQU hQU rgY rgY -ohz +nER rgY rgY -hQU +tum rgY rgY jtU @@ -40852,15 +41176,15 @@ wUa hQU lTt txY +kil hQU -lTt -hQU +kil udk rgY rgY rgY -rgY -rgY +bDR +uHk rgY rgY rgY @@ -41007,11 +41331,11 @@ rgY rgY rgY hQU -hQU -rgY -hQU -hQU -hQU +eFn +cQb +nER +oeO +rRR hQU rgY rgY @@ -41040,11 +41364,11 @@ ciD nnQ udk hQU +kil hQU hQU hQU -hQU -gKs +rKQ rgY rgY rgY @@ -41141,7 +41465,7 @@ rgY ssr rgY rgY -vRw +oJu rgY rgY rgY @@ -41197,7 +41521,7 @@ rgY hQU rgY rgY -hQU +nER rgY rgY rgY @@ -41219,7 +41543,7 @@ aWA akz jtU rgY -wUa +wLx txY jzA jzA @@ -41383,8 +41707,8 @@ dTJ dTJ hQU hQU -xIt -hQU +nER +nER rgY rgY rgY @@ -41405,8 +41729,8 @@ nei ksL jtU jtU -wUa -hQU +rgY +rgY jzA jzA wFE @@ -41418,7 +41742,7 @@ cnh xUm jzA rgY -hQU +jdA rKQ rgY hQU @@ -41592,7 +41916,7 @@ sfH hyU jtU rgY -txY +rgY jzA jzA jay @@ -41778,8 +42102,8 @@ wXN aCx jtU jtU -wUa -hQU +rgY +rgY jzA aPc kAQ @@ -41796,7 +42120,7 @@ jzA rgY rgY rgY -hQU +rKQ hQU rgY rgY @@ -41964,8 +42288,8 @@ eJs mvx jtU jtU -wUa -wUa +rgY +rgY jzA jzA jQX @@ -41984,7 +42308,7 @@ rgY rgY rgY rgY -hQU +bna rgY rgY rgY @@ -42152,7 +42476,7 @@ aro jtU txY wUa -txY +wUa jzA xhT vbK @@ -42238,7 +42562,7 @@ rgY rgY rgY rgY -osx +rgY osx osx osx @@ -42423,6 +42747,7 @@ uqt rgY rgY rgY +rgY suZ omX osx @@ -42431,7 +42756,6 @@ osx osx osx osx -osx xbv osx osx @@ -42612,7 +42936,7 @@ rgY rgY rgY rgY -osx +rgY osx osx osx @@ -43231,8 +43555,8 @@ mVG mVG rgY rgY -rgY -jtk +tNC +fzj jtk iII jtk @@ -43302,7 +43626,7 @@ cWT rgY rgY rgY -rOx +rcR hQU xkb hQU @@ -43840,19 +44164,19 @@ txY wUa hQU rgY -seN -nUM -eRF -hBB rgY rgY rgY rgY -hQU -udk rgY rgY -hQU +rgY +rgY +rgY +rgY +rgY +rgY +eTT hQU rgY rgY @@ -44024,21 +44348,21 @@ hcB wUa wUa wUa -kil +wUa wUa dHy -hQU rgY rgY -hQU -uQb -nXd -wLx -hQU -hQU -pyd -nXd -eRF +rgY +rgY +rgY +rgY +rgY +rgY +rgY +rgY +rgY +rgY mzv gGe rgY @@ -44212,7 +44536,7 @@ wUa qWa xnU wUa -tma +wUa hQU rgY tPU @@ -44304,7 +44628,7 @@ rgY edB rgY rgY -hzF +seN dAp rgY rgY @@ -44399,7 +44723,7 @@ wUa wUa wUa wUa -nnQ +wUa hQU tPU tPU @@ -44609,7 +44933,7 @@ udk rgY rgY rgY -kqB +sdG qRS kqB rgY @@ -45060,7 +45384,7 @@ rgY rgY dAp dAp -hzF +seN rgY rgY rgY @@ -46180,7 +46504,7 @@ mrZ etm etm etm -hzF +seN rgY rgY rgY @@ -46565,7 +46889,7 @@ rgY rgY cQh kVU -iUp +kVU cQh rgY rgY @@ -46751,8 +47075,8 @@ bEz ime cQh cQh -nlC iUp +nlC cQh rgY rgY @@ -46936,11 +47260,11 @@ dAp itc duh lAd -iUp +dig uJm -kDj iUp -pFT +erZ +cQh rgY rgY rgY @@ -47127,7 +47451,7 @@ cQh iUp iUp iUp -cQh +pFT rgY rgY rgY @@ -49168,7 +49492,7 @@ rgY rgY rgY rgY -mOL +pSm mOL mOL mOL @@ -49734,7 +50058,7 @@ mNM foo tDD rgY -mOL +pSm rgY rgY rgY diff --git a/mod_celadon/riol/code/species/food.dm b/mod_celadon/riol/code/species/food.dm index f01af2c72eb3..012fad0f39bb 100644 --- a/mod_celadon/riol/code/species/food.dm +++ b/mod_celadon/riol/code/species/food.dm @@ -1,5 +1,5 @@ /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/riol - icon_state = "riol meat" + icon_state = "meat" desc = "Delicious riol damage." cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/plain/human/riol filling_color = "#8e2323" diff --git a/mod_celadon/tajara/code/species/food.dm b/mod_celadon/tajara/code/species/food.dm index 0fec8cee9842..d582e33b5689 100644 --- a/mod_celadon/tajara/code/species/food.dm +++ b/mod_celadon/tajara/code/species/food.dm @@ -1,5 +1,5 @@ /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/tajara - icon_state = "tajarameat" + icon_state = "birdmeat" desc = "Delicious cat damage." cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/plain/human/tajara filling_color = "#8e2323"