#26 Перенос обновлений с Beta на Alpha сервер

_maps/_mod_celadon/RandomRuins/BeachRuins/beach_crashed_engineer.dmm

@@ -116,7 +116,7 @@
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "dO" = (
 /obj/structure/cable,
-/obj/machinery/rnd/production/circuit_imprinter/department/engi,
+/obj/structure/salvageable/circuit_imprinter,
 /turf/open/floor/plasteel/tech,
 /area/ruin/unpowered)
 "dX" = (
@@ -283,7 +283,7 @@
 /area/ruin/unpowered)
 "mz" = (
 /obj/structure/cable,
-/obj/machinery/computer/rdconsole/core{
+/obj/structure/salvageable/computer{
 	dir = 1
 	},
 /turf/open/floor/plasteel/tech,

_maps/_mod_celadon/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm

@@ -646,9 +646,7 @@
 /obj/structure/closet/body_bag,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/obj/item/circuitboard/computer/rdconsole,
 /obj/item/stack/medical/suture/medicated,
-/obj/item/circuitboard/machine/rdserver,
 /obj/item/circuitboard/machine/protolathe/department/security,
 /obj/effect/mob_spawn/human/sec,
 /turf/open/floor/plasteel,

_maps/_mod_celadon/RandomRuins/BeachRuins/beach_fishing_hut.dmm

@@ -79,12 +79,6 @@
 	},
 /area/ruin/beach)
 "eV" = (
-/obj/structure/closet/crate/freezer,
-/obj/item/reagent_containers/food/snacks/fishmeat/carp,
-/obj/item/reagent_containers/food/snacks/fishmeat/carp,
-/obj/item/reagent_containers/food/snacks/fishmeat/carp,
-/obj/item/reagent_containers/food/snacks/fishmeat/carp,
-/obj/item/reagent_containers/food/snacks/fishmeat/carp,
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple{
 	dir = 9
 	},
@@ -462,6 +456,11 @@
 /obj/item/reagent_containers/food/snacks/fishmeat/carp,
 /obj/item/reagent_containers/food/snacks/fishmeat/carp,
 /obj/structure/closet/secure_closet/freezer,
+/obj/item/reagent_containers/food/snacks/fishmeat/carp,
+/obj/item/reagent_containers/food/snacks/fishmeat/carp,
+/obj/item/reagent_containers/food/snacks/fishmeat/carp,
+/obj/item/reagent_containers/food/snacks/fishmeat/carp,
+/obj/item/reagent_containers/food/snacks/fishmeat/carp,
 /turf/open/floor/plastic,
 /area/ruin/beach)
 "sG" = (
@@ -491,9 +490,7 @@
 /obj/machinery/atmospherics/components/unary/portables_connector{
 	dir = 1
 	},
-/obj/machinery/portable_atmospherics/canister/oxygen{
-	anchored = 1
-	},
+/obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/open/floor/plastic,
 /area/ruin/beach)
 "tr" = (
@@ -570,16 +567,27 @@
 /area/overmap_encounter/planetoid/cave/explored)
 "yo" = (
 /obj/structure/table/wood/poker,
-/obj/item/kirbyplants{
-	icon_state = "plant-17";
-	pixel_y = 13;
-	layer = 3
-	},
 /obj/item/reagent_containers/food/snacks/burger/fish{
 	pixel_y = -3;
 	pixel_x = 11;
 	layer = 3.1
 	},
+/obj/item/gun/ballistic/revolver/ashhand{
+	pixel_x = -1;
+	pixel_y = 7
+	},
+/obj/item/ammo_casing/a4570{
+	pixel_x = -7;
+	pixel_y = -2
+	},
+/obj/item/spacecash/bundle/c1000{
+	pixel_x = -4;
+	pixel_y = -5
+	},
+/obj/item/spacecash/bundle/c1000{
+	pixel_x = 9;
+	pixel_y = 4
+	},
 /turf/open/floor/carpet,
 /area/ruin/beach)
 "yK" = (
@@ -1182,6 +1190,11 @@
 "Ty" = (
 /obj/structure/table/wood,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/item/fishing_rod,
+/obj/item/fishing_rod{
+	pixel_x = 5;
+	pixel_y = -2
+	},
 /turf/open/floor/wood,
 /area/ruin/beach)
 "TM" = (

_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm

@@ -1292,14 +1292,14 @@
 	},
 /area/ruin)
 "df" = (
-/obj/machinery/rnd/production/protolathe/department/engineering,
 /obj/machinery/light/small/broken/directional/south,
 /obj/effect/turf_decal/corner/transparent/neutral/half{
 	dir = 1
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
 	},
+/obj/structure/salvageable/protolathe,
 /turf/open/floor/plasteel/dark{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},

_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm

@@ -2134,16 +2134,16 @@
 	pixel_y = -33;
 	specialfunctions = 4
 	},
-/obj/machinery/computer/rdconsole{
-	dir = 1
-	},
 /obj/machinery/button/door{
 	desc = "A door remote bast door switch.";
 	id = "lablock1";
 	name = "Lab #1 lockdown";
 	pixel_x = -7;
 	pixel_y = -23
 	},
+/obj/structure/salvageable/computer{
+	dir = 1
+	},
 /turf/open/floor/wood,
 /area/ship/bridge)
 "Ii" = (
@@ -2274,9 +2274,6 @@
 /turf/open/floor/grass,
 /area/overmap_encounter/planetoid/jungle/explored)
 "Kl" = (
-/obj/effect/turf_decal/siding/wideplating/dark{
-	dir = 4
-	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -2285,6 +2282,9 @@
 	pixel_x = -7;
 	pixel_y = 4
 	},
+/obj/effect/turf_decal/siding/wideplating/dark{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/office)
 "Km" = (

_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_surface_ikea_ai.dmm

@@ -22,11 +22,6 @@
 	desc = "Allows you to to turn a cyborg into a... something.";
 	name = "borg module picker (Unknown)"
 	},
-/obj/item/borg/upgrade/transform{
-	desc = "Allows you to to turn a cyborg into a... something.";
-	name = "borg module picker (Unknown)";
-	new_module = /obj/item/robot_module/syndicate_medical
-	},
 /turf/open/floor/wood,
 /area/ruin/powered)
 "h" = (
@@ -144,7 +139,7 @@
 /area/ruin/powered)
 "Q" = (
 /obj/item/paper{
-	default_raw_text = "Welcome to your Space Ikea Brand Full AI Kit! There are all the amenities needed to create a functional AI for your installation in this easy to use kit! Note: Warranty void if exposed to: High Humidity, High Temperatures, Grass, Mud, The Jungle. Thank you for shopping Space Ikea!"
+	default_raw_text = "Welcome to your Space IDEA Brand Deluxe AI Kit! There are all the amenities needed to create a functional AI for your installation in this easy to use kit! Note: Warranty void if exposed to: High Humidity, High Temperatures, Grass, Mud, The Jungle, lonely Robotists. Thank you for shopping Space IDEA!"
 	},
 /turf/open/floor/wood,
 /area/ruin/powered)

_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_codelab.dmm

@@ -3315,7 +3315,7 @@
 	name = "Nanotrasen Genetic Research Maintenance"
 	})
 "Fy" = (
-/obj/machinery/modular_computer/console/preset/research,
+/obj/structure/salvageable/computer,
 /turf/open/floor/plasteel/white,
 /area/ruin/unpowered/buried_shrine{
 	name = "Nanotrasen Genetic Research Laboratory"

_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_boxsci.dmm

@@ -77,6 +77,7 @@
 	pixel_x = 6;
 	pixel_y = 25
 	},
+/obj/item/research_notes/loot/big,
 /turf/open/floor/plasteel/white,
 /area/ruin/unpowered)
 "fB" = (
@@ -139,9 +140,8 @@
 /turf/open/floor/plasteel/white,
 /area/ruin/unpowered)
 "ks" = (
-/obj/machinery/computer/rdconsole/core,
 /obj/effect/decal/cleanable/dirt,
-/obj/item/research_notes/loot/big,
+/obj/structure/salvageable/computer,
 /turf/open/floor/plasteel/white,
 /area/ruin/unpowered)
 "kz" = (
@@ -279,6 +279,11 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/ruin/unpowered)
+"sz" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/mmi/posibrain,
+/turf/open/floor/plasteel,
+/area/ruin/unpowered)
 "sO" = (
 /obj/machinery/light/broken/directional/south,
 /obj/effect/decal/cleanable/dirt,
@@ -478,7 +483,7 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
-/obj/machinery/rnd/production/protolathe/department/science,
+/obj/structure/salvageable/protolathe,
 /turf/open/floor/plasteel/white,
 /area/ruin/unpowered)
 "Hs" = (
@@ -708,7 +713,7 @@
 /turf/open/floor/plasteel,
 /area/ruin/unpowered)
 "VO" = (
-/obj/machinery/rnd/production/circuit_imprinter/department/science,
+/obj/structure/salvageable/circuit_imprinter,
 /turf/open/floor/plasteel/white,
 /area/ruin/unpowered)
 "VR" = (
@@ -748,11 +753,9 @@
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
 "YD" = (
-/mob/living/simple_animal/bot/firebot/rockplanet{
-	icon_state = "firebot1"
-	},
+/obj/item/mmi/posibrain,
 /turf/open/floor/plating{
-	icon_state = "panelscorched"
+	icon_state = "platingdmg1"
 	},
 /area/ruin/unpowered)
 "YE" = (
@@ -1002,7 +1005,7 @@ lv
 uQ
 lv
 tW
-hS
+YD
 ON
 RV
 sO
@@ -1050,7 +1053,7 @@ ra
 sp
 oo
 lv
-YD
+tW
 iE
 gW
 bN
@@ -1075,7 +1078,7 @@ ra
 JY
 Vp
 nS
-gW
+sz
 Qr
 gW
 tW

_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm

@@ -364,11 +364,11 @@
 /turf/open/floor/plasteel/dark,
 /area/overmap_encounter/planetoid/rockplanet/explored)
 "fH" = (
-/obj/machinery/rnd/destructive_analyzer,
 /obj/structure/railing{
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/salvageable/destructive_analyzer,
 /turf/open/floor/pod/light,
 /area/ruin/rockplanet/nanotrasen)
 "fN" = (
@@ -435,7 +435,7 @@
 /obj/structure/sign/poster/official/random{
 	pixel_x = 32
 	},
-/obj/machinery/rnd/production/circuit_imprinter/department/science,
+/obj/structure/salvageable/circuit_imprinter,
 /turf/open/floor/pod/light,
 /area/ruin/rockplanet/nanotrasen)
 "gE" = (
@@ -1397,12 +1397,12 @@
 /turf/open/floor/plating/asteroid/rockplanet/lit,
 /area/overmap_encounter/planetoid/rockplanet/explored)
 "wj" = (
-/obj/machinery/computer/rdconsole/core{
-	dir = 1
-	},
 /obj/structure/railing{
 	dir = 8
 	},
+/obj/structure/salvageable/computer{
+	dir = 1
+	},
 /turf/open/floor/pod/light,
 /area/ruin/rockplanet/nanotrasen)
 "wn" = (
@@ -2602,10 +2602,10 @@
 /turf/open/water/jungle,
 /area/overmap_encounter/planetoid/rockplanet/explored)
 "TI" = (
-/obj/machinery/rnd/production/protolathe/department/science,
 /obj/structure/railing{
 	dir = 8
 	},
+/obj/structure/salvageable/protolathe,
 /turf/open/floor/pod/light,
 /area/ruin/rockplanet/nanotrasen)
 "TL" = (

_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_harmfactory.dmm

@@ -87,7 +87,6 @@
 "cg" = (
 /obj/structure/rack,
 /obj/item/stack/sheet/mineral/gold/twenty,
-/obj/item/circuitboard/computer/rdconsole,
 /turf/open/floor/plasteel/patterned,
 /area/ruin/powered)
 "ck" = (
@@ -138,8 +137,8 @@
 /area/ruin/powered)
 "dJ" = (
 /obj/structure/rack,
-/obj/item/circuitboard/machine/techfab/department/cargo,
 /obj/item/stack/sheet/mineral/diamond/five,
+/obj/item/circuitboard/machine/protolathe/department/engineering,
 /turf/open/floor/plating/rust,
 /area/ruin/powered)
 "dN" = (

_maps/_mod_celadon/RandomRuins/RockRuins/rockplanet_miningexpedition.dmm

@@ -146,14 +146,6 @@
 "tN" = (
 /turf/open/floor/plating/asteroid/rockplanet/lit,
 /area/overmap_encounter/planetoid/rockplanet/explored)
-"ub" = (
-/obj/machinery/computer{
-	dir = 8
-	},
-/turf/open/floor/plasteel/rockvault,
-/area/ruin/rockplanet/nanotrasen{
-	name = "Abandoned Syndicate Mining Facility"
-	})
 "ug" = (
 /obj/machinery/suit_storage_unit/mining,
 /turf/open/floor/plasteel/mono,
@@ -1131,7 +1123,7 @@ Vw
 VL
 Qr
 sj
-ub
+pl
 Vw
 ll
 tN