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

DarkErp.bat

@@ -0,0 +1,4 @@
+# Активируем тёмную сторону ЕРП на сервере Shiptest.
+
+..start system = Dark_ERP
+..initial new ERP = Dark

_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm

@@ -193,7 +193,7 @@
 	pixel_x = 6;
 	pixel_y = -6
 	},
-/obj/item/gun/ballistic/automatic/pistol/syndicate/no_mag{
+/obj/item/gun/ballistic/automatic/pistol/ringneck/no_mag{
 	name = "bible gun";
 	pixel_x = -7;
 	pixel_y = -8;
@@ -3198,8 +3198,8 @@
 /obj/structure/closet/wardrobe/chaplain_black{
 	populate = 0
 	},
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/ammo_box/magazine/m10mm,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
 /obj/structure/spacevine{
 	name = "vines"
 	},

_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm

@@ -5613,9 +5613,9 @@
 /obj/structure/closet,
 /obj/item/clothing/suit/armor/ngr/captain,
 /obj/item/clothing/under/syndicate/ngr/officer,
-/obj/item/gun/ballistic/automatic/pistol/syndicate,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/ammo_box/magazine/m10mm,
+/obj/item/gun/ballistic/automatic/pistol/ringneck,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
 /turf/open/floor/wood{
 	icon_state = "wood-broken2"
 	},
@@ -5787,9 +5787,9 @@
 /area/overmap_encounter/planetoid/jungle/explored)
 "Nh" = (
 /obj/structure/filingcabinet,
-/obj/item/gun/ballistic/automatic/pistol/syndicate,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/ammo_box/magazine/m10mm,
+/obj/item/gun/ballistic/automatic/pistol/ringneck,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/jungle/starport/tower)
 "Nj" = (

_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm

@@ -3173,7 +3173,7 @@
 /obj/structure/closet/cabinet,
 /obj/item/hatchet/wooden,
 /obj/item/ammo_box/a357,
-/obj/item/gun/ballistic/revolver/syndicate,
+/obj/item/gun/ballistic/revolver/viper,
 /turf/open/floor/wood,
 /area/ship/bridge)
 "VM" = (

_maps/RandomRuins/JungleRuins/jungle_syndicate.dmm

@@ -1108,7 +1108,7 @@
 "Il" = (
 /obj/effect/decal/cleanable/cobweb,
 /obj/structure/rack,
-/obj/item/gun/ballistic/automatic/pistol/syndicate,
+/obj/item/gun/ballistic/automatic/pistol/ringneck,
 /turf/open/floor/plating,
 /area/ruin/jungle/syndifort)
 "Iv" = (
@@ -1220,8 +1220,8 @@
 /obj/structure/rack,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light/small/directional/south,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/ammo_box/magazine/m10mm,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
 /turf/open/floor/plating,
 /area/ruin/jungle/syndifort)
 "My" = (
@@ -1593,9 +1593,9 @@
 /area/ruin/jungle/syndifort)
 "WG" = (
 /obj/structure/closet/crate/secure/weapon,
-/obj/item/gun/ballistic/automatic/smg/c20r,
-/obj/item/ammo_box/magazine/smgm45,
-/obj/item/ammo_box/magazine/smgm45,
+/obj/item/gun/ballistic/automatic/smg/cobra,
+/obj/item/ammo_box/magazine/m45_cobra,
+/obj/item/ammo_box/magazine/m45_cobra,
 /turf/open/floor/plating,
 /area/ruin/jungle/syndifort/jerry)
 "WT" = (

_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm

@@ -1115,10 +1115,10 @@
 /turf/open/floor/plating,
 /area/ruin/unpowered/listening_post)
 "te" = (
-/obj/item/gun/ballistic/automatic/smg/c20r{
+/obj/item/gun/ballistic/automatic/smg/cobra{
 	spawnwithmagazine = 0
 	},
-/obj/item/ammo_box/magazine/smgm45{
+/obj/item/ammo_box/magazine/m45_cobra{
 	start_empty = 1
 	},
 /obj/structure/guncloset,
@@ -2345,8 +2345,8 @@
 /area/ruin/unpowered/listening_post)
 "TM" = (
 /obj/structure/closet/cabinet,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/gun/ballistic/automatic/pistol/syndicate,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
+/obj/item/gun/ballistic/automatic/pistol/ringneck,
 /obj/effect/turf_decal/siding/wood{
 	dir = 6
 	},

_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm

@@ -4360,7 +4360,7 @@
 /area/ruin/lavaland/factory/adminstrative)
 "RC" = (
 /obj/effect/turf_decal/siding/white,
-/obj/item/ammo_box/magazine/m10mm{
+/obj/item/ammo_box/magazine/m10mm_ringneck{
 	start_empty = 1
 	},
 /obj/item/ammo_casing/c10mm{
@@ -5013,7 +5013,7 @@
 /obj/effect/mob_spawn/human/corpse/syndicatesoldier,
 /obj/effect/decal/cleanable/blood/old,
 /obj/effect/turf_decal/siding/white,
-/obj/item/ammo_box/magazine/m10mm{
+/obj/item/ammo_box/magazine/m10mm_ringneck{
 	start_empty = 1
 	},
 /turf/open/floor/concrete/pavement/lava,

_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm

@@ -587,12 +587,12 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/item/ammo_box/magazine/pistolm9mm{
+/obj/item/ammo_box/magazine/m9mm_rattlesnake{
 	pixel_y = 6;
 	pixel_x = 12;
 	layer = 3.1
 	},
-/obj/item/ammo_box/magazine/pistolm9mm{
+/obj/item/ammo_box/magazine/m9mm_rattlesnake{
 	pixel_y = 6;
 	pixel_x = 6;
 	start_empty = 1;

_maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm

@@ -250,21 +250,6 @@
 	},
 /turf/open/floor/plating,
 /area/ruin/powered)
-"ga" = (
-/obj/structure/table/wood/reinforced,
-/obj/item/gun/ballistic/automatic/smg/c20r/toy/riot{
-	pixel_x = 5;
-	pixel_y = 7
-	},
-/obj/item/ammo_box/foambox/riot{
-	pixel_x = -3;
-	pixel_y = -3
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/grimy,
-/area/ruin/powered)
 "gp" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable{
@@ -1871,6 +1856,21 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating/rust,
 /area/ruin/powered)
+"RC" = (
+/obj/structure/table/wood/reinforced,
+/obj/item/gun/ballistic/automatic/toy{
+	pixel_x = 5;
+	pixel_y = 7
+	},
+/obj/item/ammo_box/foambox/riot{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/grimy,
+/area/ruin/powered)
 "RM" = (
 /obj/effect/spawner/structure/window/hollow/reinforced,
 /turf/open/floor/plating,
@@ -2968,7 +2968,7 @@ RU
 bO
 cv
 oc
-ga
+RC
 Tl
 ko
 kU

_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm

@@ -2000,9 +2000,9 @@
 /obj/structure/closet/crate/secure/gear{
 	req_one_access_txt = "53"
 	},
-/obj/item/ammo_box/magazine/tec9,
-/obj/item/ammo_box/magazine/tec9,
-/obj/item/gun/ballistic/automatic/pistol/tec9,
+/obj/item/ammo_box/magazine/m9mm_rattlesnake,
+/obj/item/ammo_box/magazine/m9mm_rattlesnake,
+/obj/item/storage/pistolcase/ringneck,
 /turf/open/floor/plasteel/mono/dark,
 /area/ruin/rockplanet/shippingdocksecure)
 "rK" = (

_maps/RandomRuins/SpaceRuins/corporate_mining.dmm

@@ -601,8 +601,8 @@
 /area/ruin/space/has_grav/corporatemine/crewquarters)
 "nN" = (
 /obj/structure/closet/cabinet,
-/obj/item/gun/ballistic/automatic/pistol/syndicate,
-/obj/item/ammo_box/magazine/m10mm,
+/obj/item/gun/ballistic/automatic/pistol/ringneck,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
 /obj/item/clothing/under/syndicate/donk,
 /obj/item/clothing/suit/hazardvest/donk/qm,
 /obj/item/reagent_containers/food/snacks/donkpocket,
@@ -2035,10 +2035,6 @@
 /obj/effect/decal/cleanable/blood/drip,
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/space)
-"TO" = (
-/obj/structure/spawner/burrow/asteroid,
-/turf/open/floor/plating/asteroid/airless,
-/area/ruin/space)
 "TR" = (
 /obj/effect/decal/cleanable/blood/tracks{
 	dir = 8
@@ -2803,7 +2799,7 @@ Al
 Al
 Al
 VM
-TO
+Iv
 Al
 Al
 Al

_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm

@@ -754,7 +754,7 @@
 	dir = 8
 	},
 /obj/item/paper,
-/obj/item/ammo_box/magazine/m10mm,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/dark,
 /area/ruin/powered)

_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_underground_abandoned_newcops.dmm

@@ -812,7 +812,7 @@
 /obj/structure/closet/syndicate,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/spawner/lootdrop/maintenance/two,
-/obj/item/ammo_box/magazine/m10mm,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/powered)
 "Ko" = (

_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_abandoned_library.dmm

@@ -207,7 +207,7 @@
 	pixel_x = 7;
 	pixel_y = -7
 	},
-/obj/item/gun/ballistic/automatic/pistol/syndicate{
+/obj/item/gun/ballistic/automatic/pistol/ringneck{
 	desc = "A small, easily concealable 10mm handgun. Has a threaded barrel for suppressors. Does not fire holy ammo.";
 	name = "bible gun";
 	pixel_x = -7;
@@ -3198,8 +3198,8 @@
 /obj/structure/closet/wardrobe/chaplain_black{
 	populate = 0
 	},
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/ammo_box/magazine/m10mm,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
 /obj/structure/spacevine{
 	name = "vines"
 	},

_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_bombed_starport.dmm

@@ -5613,9 +5613,9 @@
 /obj/structure/closet,
 /obj/item/clothing/suit/armor/ngr/captain,
 /obj/item/clothing/under/syndicate/ngr/officer,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/gun/ballistic/automatic/pistol/syndicate,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
+/obj/item/gun/ballistic/automatic/pistol/ringneck,
 /turf/open/floor/wood{
 	icon_state = "wood-broken2"
 	},
@@ -5787,9 +5787,9 @@
 /area/overmap_encounter/planetoid/jungle/explored)
 "Nh" = (
 /obj/structure/filingcabinet,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/gun/ballistic/automatic/pistol/syndicate,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
+/obj/item/gun/ballistic/automatic/pistol/ringneck,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/jungle/starport/tower)
 "Nj" = (

_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm

@@ -3173,7 +3173,7 @@
 /obj/structure/closet/cabinet,
 /obj/item/hatchet/wooden,
 /obj/item/ammo_box/a357,
-/obj/item/gun/ballistic/revolver/syndicate,
+/obj/item/gun/ballistic/revolver/viper,
 /turf/open/floor/wood,
 /area/ship/bridge)
 "VM" = (

_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_syndicate.dmm

@@ -1108,7 +1108,7 @@
 "Il" = (
 /obj/effect/decal/cleanable/cobweb,
 /obj/structure/rack,
-/obj/item/gun/ballistic/automatic/pistol/syndicate,
+/obj/item/gun/ballistic/automatic/pistol/ringneck,
 /turf/open/floor/plating,
 /area/ruin/jungle/syndifort)
 "Iv" = (
@@ -1220,8 +1220,8 @@
 /obj/structure/rack,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light/small/directional/south,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/ammo_box/magazine/m10mm,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
 /turf/open/floor/plating,
 /area/ruin/jungle/syndifort)
 "My" = (
@@ -1593,9 +1593,9 @@
 /area/ruin/jungle/syndifort)
 "WG" = (
 /obj/structure/closet/crate/secure/weapon,
-/obj/item/gun/ballistic/automatic/smg/c20r,
-/obj/item/ammo_box/magazine/smgm45,
-/obj/item/ammo_box/magazine/smgm45,
+/obj/item/gun/ballistic/automatic/smg/cobra,
+/obj/item/ammo_box/magazine/m45_cobra,
+/obj/item/ammo_box/magazine/m45_cobra,
 /turf/open/floor/plating,
 /area/ruin/jungle/syndifort/jerry)
 "WT" = (

_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_comm_outpost.dmm

@@ -256,10 +256,10 @@
 "SD" = (
 /obj/structure/closet/crate,
 /obj/item/clothing/gloves/combat,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/gun/ballistic/automatic/pistol/syndicate,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
+/obj/item/gun/ballistic/automatic/pistol/ringneck,
 /turf/open/floor/carpet/black,
 /area/ruin/unpowered/corprejectrooms{
 	name = "Syndicate Comm Outpost"

_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm

@@ -4360,7 +4360,7 @@
 /area/ruin/lavaland/factory/adminstrative)
 "RC" = (
 /obj/effect/turf_decal/siding/white,
-/obj/item/ammo_box/magazine/m10mm{
+/obj/item/ammo_box/magazine/m10mm_ringneck{
 	start_empty = 1
 	},
 /obj/item/ammo_casing/c10mm{
@@ -5013,7 +5013,7 @@
 /obj/effect/mob_spawn/human/corpse/syndicatesoldier,
 /obj/effect/decal/cleanable/blood/old,
 /obj/effect/turf_decal/siding/white,
-/obj/item/ammo_box/magazine/m10mm{
+/obj/item/ammo_box/magazine/m10mm_ringneck{
 	start_empty = 1
 	},
 /turf/open/floor/concrete/pavement/lava,

_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm

@@ -60,7 +60,7 @@
 /obj/structure/alien/weeds,
 /obj/structure/bed/nest,
 /obj/effect/decal/cleanable/blood/gibs,
-/obj/item/gun/ballistic/automatic/pistol/syndicate,
+/obj/item/gun/ballistic/automatic/pistol/ringneck,
 /turf/open/floor/plating/asteroid/basalt,
 /area/ruin/unpowered/crashed_holemaker{
 	name = "Xeno Nest"