Skip to content

Commit

Permalink
Merge pull request #695 from CeladonSS13/beta-dev
Browse files Browse the repository at this point in the history
#8 Перенос обновлений с Beta на Alpha сервер
  • Loading branch information
MysticalFaceLesS authored Jun 8, 2024
2 parents 1bf783d + a6965fd commit 1d9dbdd
Show file tree
Hide file tree
Showing 593 changed files with 23,250 additions and 6,807 deletions.
23 changes: 23 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
# to the same file or dir, add them to the end under Multiple Owners

# MrCat15352

/code/controllers/subsystem/shuttle.dm @MrCat15352
/code/modules/shuttle/ @MrCat15352
/code/modules/overmap/ @MrCat15352
Expand All @@ -19,7 +20,29 @@
/whitesands/icons/ @MrCat15352

# CI and tool chains

/tools/ @MysticalFaceLesS

# MAINTAINERS

# MysticalFaceLesS

/code/game/objects/items/storage/ration.dm @MysticalFaceLesS
/code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm @MysticalFaceLesS
/code/modules/food_and_drinks/food/ration.dm @MysticalFaceLesS
/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @MysticalFaceLesS
/code/modules/projectiles/ @MysticalFaceLesS
/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm @MysticalFaceLesS
/code/modules/unit_tests/icons/ @MysticalFaceLesS

# molnizz

/code/controllers/subsystem/shuttle.dm @molnizz
/code/modules/shuttle/ @molnizz
/code/modules/overmap/ @molnizz
/_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm @molnizz

# CONTRIBUTORS

#SIC SEMPER TYRANNIS
#/_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm @MrCat15352
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@
"cN" = (
/obj/structure/safe/floor,
/obj/item/hand_tele,
/obj/item/stack/sheet/mineral/adamantine,
/obj/item/stack/sheet/mineral/adamantine,
/obj/item/stack/sheet/mineral/hidden/hellstone,
/obj/item/stack/sheet/mineral/hidden/hellstone,
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/ruin/unpowered/corprejectrooms)
"cP" = (
Expand Down Expand Up @@ -1726,11 +1726,11 @@
/obj/item/spacecash/bundle/c1000,
/obj/item/spacecash/bundle/c1000,
/obj/item/stack/sheet/bluespace_crystal/five,
/obj/item/stack/sheet/mineral/bananium{
/obj/item/stack/sheet/mineral/hidden/hellstone{
amount = 15
},
/obj/item/stack/sheet/mineral/gold/twenty,
/obj/item/stack/sheet/mineral/runite/ten,
/obj/item/stack/sheet/mineral/hidden/hellstone/ten,
/obj/item/toy/figure/captain,
/obj/item/organ/cyberimp/brain/anti_stun,
/obj/item/disk/design_disk/adv/knight_gear,
Expand Down
Loading

0 comments on commit 1d9dbdd

Please sign in to comment.