test

.github/CODEOWNERS

@@ -13,38 +13,28 @@
 /strings/ @MrCat15352
 /tgui/ @MrCat15352
 /sound/ @MrCat15352
-/code/controllers/subsystem/shuttle.dm @MrCat15352
-/code/modules/shuttle/ @MrCat15352
-/code/modules/overmap/ @MrCat15352
-/code/game/objects/items/storage/ration.dm @MrCat15352
-/code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm @MrCat15352
-/code/modules/food_and_drinks/food/ration.dm @MrCat15352
-/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @MrCat15352
-/code/modules/projectiles/ @MrCat15352
-/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm @MrCat15352
+/code/ @MrCat15352
+/mod_celadon/ @MrCat15352
+/mod_celadon/_storge_sounds/ @MrCat15352
 /**/*.dm @MrCat15352
-
+/**/*.ogg @MrCat15352
+/**/*.mp3 @MrCat15352
 
 # Map Maintainers
 
 # molnizz
 
-/_maps/ @molnizz
-/code/controllers/subsystem/shuttle.dm @molnizz
-/code/modules/shuttle/ @molnizz
-/code/modules/overmap/ @molnizz
-/_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm @molnizz
+/_maps/_mod_celadon/ @molnizz
 /**/*.dmm @molnizz
+/**/*.json @molnizz
 
 
 # Sprite Maintainers
 
-# RalseiDreemuurr
-
-/icons/ @RalseiDreemuurr
-/whitesands/icons/ @RalseiDreemuurr
-/**/*.dmi @RalseiDreemuurr
+# MysticalFaceLesS
 
+/mod_celadon/_storge_icons/ @MysticalFaceLesS
+/**/*.dmi @MysticalFaceLesS
 
 # MAINTAINERS
 

.github/labeler.yml

@@ -18,7 +18,7 @@
     - '**/*.dmi'
 
 # Any changes if not in modulare folder
-'🪓 НЕ МОДУЛЬНО 🪓':
+'🪓 ТРОГАЛИ CORE-CODE 🪓':
 - changed-files:
   - any-glob-to-any-file:
     - '_maps/map_files/**'

.github/workflows/codeowner_reviews.yml

@@ -0,0 +1,25 @@
+name: Codeowner Reviews
+
+# Controls when the workflow will run
+on: pull_request_target
+
+jobs:
+  assign-users:
+    runs-on: ubuntu-latest
+
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so the job can access it
+      - uses: actions/checkout@v3
+
+      #Parse the Codeowner file
+      - name: CodeOwnersParser
+        id: CodeOwnersParser
+        uses: tgstation/CodeOwnersParser@v1
+
+      #Request reviews
+      - name: Request reviews
+        if: steps.CodeOwnersParser.outputs.owners != ''
+        uses: tgstation/RequestReviewFromUser@v1
+        with:
+          separator: " "
+          users: ${{ steps.CodeOwnersParser.outputs.owners }}

.github/workflows/labeler.yml

@@ -26,6 +26,6 @@ jobs:
         if: github.event_name != 'push'
         uses: actions/labeler@v5
         with:
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          repo-token: "${{ secrets.TOKEN || secrets.GITHUB_TOKEN }}"
           sync-labels: true
           configuration-path: .github/labeler.yml

DarkErp.bat

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

_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm

@@ -1458,7 +1458,7 @@
 /turf/open/floor/plasteel/mono,
 /area/ruin/beach/complex)
 "wV" = (
-/obj/item/kitchen/knife/hunting{
+/obj/item/melee/knife/hunting{
 	name = "machete";
 	pixel_y = 8;
 	desc = "Space vines HATE this one simple trick!"

_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm

@@ -1232,7 +1232,7 @@
 /obj/machinery/atmospherics/components/unary/passive_vent{
 	dir = 1
 	},
-/obj/item/fireaxe{
+/obj/item/melee/axe/fire{
 	name = "rusty fire axe"
 	},
 /turf/open/floor/engine/airless,

_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm

@@ -203,8 +203,7 @@
 "kj" = (
 /obj/structure/closet/cabinet,
 /obj/item/pneumatic_cannon/speargun,
-/obj/item/storage/backpack/magspear_quiver,
-/obj/item/kitchen/knife/hunting,
+/obj/item/melee/knife/hunting,
 /turf/open/floor/wood,
 /area/ruin/beach)
 "kr" = (
@@ -529,7 +528,7 @@
 	dir = 6
 	},
 /obj/structure/table/reinforced,
-/obj/item/kitchen/knife/butcher,
+/obj/item/melee/knife/butcher,
 /turf/open/floor/plastic,
 /area/ruin/beach)
 "wg" = (
@@ -1032,7 +1031,7 @@
 "Os" = (
 /obj/structure/table/wood/reinforced,
 /obj/effect/turf_decal/corner/opaque/pink/diagonal,
-/obj/item/kitchen/knife{
+/obj/item/melee/knife/kitchen{
 	pixel_y = 12;
 	pixel_x = 9
 	},
@@ -1051,8 +1050,7 @@
 "PB" = (
 /obj/structure/closet/cabinet,
 /obj/item/pneumatic_cannon/speargun,
-/obj/item/storage/backpack/magspear_quiver,
-/obj/item/kitchen/knife/hunting,
+/obj/item/melee/knife/hunting,
 /obj/machinery/light/small/directional/east{
 	light_color = "#d8b1b1"
 	},
@@ -1244,7 +1242,6 @@
 /turf/open/water/beach/deep,
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "Vt" = (
-/obj/item/nullrod/carp,
 /obj/structure/bed/dogbed,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood/walnut,

_maps/RandomRuins/BeachRuins/beach_float_resort.dmm

@@ -193,7 +193,7 @@
 /turf/open/water/beach,
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "eZ" = (
-/obj/item/melee/roastingstick,
+/obj/item/roastingstick,
 /turf/open/floor/wood{
 	light_range = 2
 	},
@@ -1314,10 +1314,10 @@
 /area/ruin/beach/float_resort)
 "Ja" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/ketchup{
+/obj/item/reagent_containers/condiment/ketchup{
 	pixel_y = 18
 	},
-/obj/item/reagent_containers/food/condiment/mayonnaise{
+/obj/item/reagent_containers/condiment/mayonnaise{
 	pixel_x = -8;
 	pixel_y = 16
 	},

_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm

@@ -1628,7 +1628,7 @@
 /obj/effect/turf_decal/weather/sand{
 	dir = 5
 	},
-/obj/item/melee/roastingstick,
+/obj/item/roastingstick,
 /obj/item/reagent_containers/food/snacks/sausage,
 /turf/open/floor/plating/dirt{
 	light_range = 2
@@ -2304,7 +2304,7 @@
 /obj/effect/turf_decal/weather/sand{
 	dir = 8
 	},
-/obj/item/melee/roastingstick,
+/obj/item/roastingstick,
 /turf/open/floor/plating/dirt{
 	light_range = 2
 	},

_maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm

@@ -16,7 +16,7 @@
 /area/ruin/beach/piratecrash/storage)
 "af" = (
 /obj/structure/table/wood,
-/obj/item/kitchen/knife,
+/obj/item/melee/knife/kitchen,
 /obj/effect/turf_decal/corner/opaque/black/diagonal,
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
@@ -37,7 +37,7 @@
 	},
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/snacks/fishfry,
-/obj/item/kitchen/knife/shiv{
+/obj/item/melee/knife/shiv{
 	pixel_x = -6;
 	pixel_y = 5
 	},

_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm

@@ -887,7 +887,7 @@
 /area/ruin/unpowered/crashed_holemaker)
 "oC" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/item/kitchen/knife,
+/obj/item/melee/knife/kitchen,
 /turf/open/floor/wood{
 	icon_state = "wood-broken7"
 	},

_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm

@@ -242,9 +242,9 @@
 /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/condiment/pack/ketchup,
-/obj/item/reagent_containers/food/condiment/pack/ketchup,
-/obj/item/reagent_containers/food/condiment/pack/ketchup,
+/obj/item/reagent_containers/condiment/pack/ketchup,
+/obj/item/reagent_containers/condiment/pack/ketchup,
+/obj/item/reagent_containers/condiment/pack/ketchup,
 /obj/effect/turf_decal/corner/opaque/black{
 	dir = 1
 	},
@@ -332,7 +332,7 @@
 /obj/item/restraints/legcuffs/beartrap,
 /obj/item/reagent_containers/glass/bottle/venom,
 /obj/item/reagent_containers/glass/bottle/curare,
-/obj/item/kitchen/knife/combat/survival,
+/obj/item/melee/knife/survival,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/reagent_containers/food/snacks/meat/slab/human,
 /obj/item/reagent_containers/food/snacks/meat/slab/human,
@@ -384,7 +384,7 @@
 /obj/effect/decal/cleanable/blood/gibs/torso,
 /obj/structure/safe,
 /obj/item/ammo_box/a12g/slug,
-/obj/item/kitchen/knife/combat,
+/obj/item/melee/knife/combat,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood,

_maps/RandomRuins/IceRuins/icemoon_underground_brazillianlab.dmm

@@ -367,23 +367,6 @@
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
-"sf" = (
-/obj/structure/table/wood,
-/obj/item/nullrod{
-	block_chance = 50;
-	desc = "This massive chart appears to be the layout of a SolGov outpost. It's covered in marks, scribbles in a language you don't recognize, and several stains. It's unusually sturdy.";
-	icon_state = "blueprints";
-	item_state = "blueprints";
-	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi';
-	name = "facility blueprints";
-	pixel_y = 10;
-	righthand_file = 'icons/mob/inhands/items_righthand.dmi';
-	w_class = 5
-	},
-/turf/open/floor/wood{
-	initial_gas_mix = "ICEMOON_ATMOS"
-	},
-/area/ruin/unpowered)
 "si" = (
 /obj/structure/flora/rock/jungle,
 /obj/structure/flora/grass/jungle/b,
@@ -1248,13 +1231,6 @@
 	},
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/ruin/unpowered)
-"Zs" = (
-/obj/structure/table/wood,
-/obj/item/banhammer,
-/turf/open/floor/wood{
-	initial_gas_mix = "ICEMOON_ATMOS"
-	},
-/area/ruin/unpowered)
 
 (1,1,1) = {"
 aW
@@ -2252,7 +2228,7 @@ Hb
 aW
 WH
 jy
-Zs
+ib
 WH
 WH
 WH
@@ -2284,7 +2260,7 @@ Hb
 aW
 Br
 ib
-sf
+ib
 WH
 WH
 fB

_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_cavecrew.dmm

@@ -1034,7 +1034,7 @@
 /obj/item/reagent_containers/food/snacks/rationpack,
 /obj/item/reagent_containers/food/snacks/rationpack,
 /obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/condiment/enzyme{
+/obj/item/reagent_containers/condiment/enzyme{
 	pixel_x = -8;
 	pixel_y = 5
 	},
@@ -1509,10 +1509,6 @@
 	},
 /area/ruin/jungle/cavecrew/dormitories)
 "sJ" = (
-/obj/item/clothing/head/crown/fancy{
-	pixel_y = 9;
-	pixel_x = 6
-	},
 /obj/structure/table/reinforced{
 	color = "#c1b6a5"
 	},