Skip to content

Commit da4e830

Browse files
Bruh-24Bruh-24
committed
Merge remote-tracking branch 'origin/master' into metacoins
2 parents 5d9833e + e15b202 commit da4e830

35 files changed

Lines changed: 14030 additions & 279 deletions

File tree

‎README.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
![Goodge](https://forthebadge.com/images/badges/ctrl-c-ctrl-v.svg)
1717
![endingbadge](https://forthebadge.com/images/badges/works-on-my-machine-1.svg)
1818

19-
| Website | Link |
20-
| ----------------------- | -------------------------------------------------------------------------------------------------------- |
21-
| MassMeta Code | [https://github.com/Alliance-codeBase/SittleStation](https://github.com/Alliance-codeBase/SittleStation) |
22-
| Guide to Modularization | [./modular_meta/modularization_guide_ru.md](./massmeta/modularization_guide.md) |
23-
| Our Discord | [https://discord.gg/lambda](https://discord.gg/XHRzsmG4Eq) |
24-
| /TG/ Website | [https://www.tgstation13.org](https://www.tgstation13.org) |
25-
| /TG/ Codedocs | [https://codedocs.tgstation13.org/](https://codedocs.tgstation13.org/) |
26-
| /TG/ Coderbus Discord | [https://discord.gg/Vh8TJp9](https://discord.gg/Vh8TJp9) |
19+
| Website | Link |
20+
| ----------------------- | ------------------------------------------------------------------------------------------------ |
21+
| MassMeta Code | [https://github.com/Alliance-codeBase/PostMeta/](https://github.com/Alliance-codeBase/PostMeta/) |
22+
| Guide to Modularization | [./modular_meta/modularization_guide_ru.md](./massmeta/modularization_guide.md) |
23+
| Our Discord | [https://discord.gg/qxWZWft7BC](https://discord.gg/qxWZWft7BC) |
24+
| /TG/ Website | [https://www.tgstation13.org](https://www.tgstation13.org) |
25+
| /TG/ Codedocs | [https://codedocs.tgstation13.org/](https://codedocs.tgstation13.org/) |
26+
| /TG/ Coderbus Discord | [https://discord.gg/Vh8TJp9](https://discord.gg/Vh8TJp9) |
2727

2828
This is MassMeta downstream fork of /tg/station SpaceStation 13.
2929

@@ -57,7 +57,7 @@ This is MassMeta downstream fork of /tg/station SpaceStation 13.
5757

5858
[Гайд по тому как принять участие в разработке (на английском)](.github/CONTRIBUTING.md)
5959

60-
**Если вы хотите, чтобы ваша фича попала в репозиторий на показ игрокам, то велком в `#Code-chat` в [нашем Дискорде](https://discord.gg/lambda13).**
60+
**Если вы хотите, чтобы ваша фича попала в репозиторий на показ игрокам, то велком в `#Code-chat` в [нашем Дискорде](https://discord.gg/qxWZWft7BC).**
6161

6262
[/tg/station HACKMD account (BLOCKED in RU)](https://hackmd.io/@tgstation) - Design documentation here
6363

‎_maps/map_files/Deltastation/DeltaStation2.dmm‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3240,9 +3240,6 @@
32403240
"aNN" = (
32413241
/obj/structure/rack,
32423242
/obj/item/gun/energy/ionrifle,
3243-
/obj/item/gun/ballistic/automatic/battle_rifle{
3244-
pixel_y = 3
3245-
},
32463243
/obj/item/clothing/suit/hooded/ablative,
32473244
/obj/item/gun/energy/temperature/security,
32483245
/obj/structure/window/reinforced/spawner/directional/south,

‎_maps/map_files/KiloStation/KiloStation.dmm‎

Lines changed: 13 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -783,37 +783,13 @@
783783
/area/station/maintenance/department/medical/central)
784784
"alv" = (
785785
/obj/structure/rack,
786-
/obj/item/clothing/suit/armor/riot{
787-
pixel_x = -3;
788-
pixel_y = 3
789-
},
790-
/obj/item/clothing/suit/armor/riot,
791-
/obj/item/clothing/suit/armor/riot{
792-
pixel_x = 3;
793-
pixel_y = -3
794-
},
795-
/obj/item/clothing/head/helmet/toggleable/riot{
796-
pixel_x = -3;
797-
pixel_y = 3
798-
},
799-
/obj/item/clothing/head/helmet/toggleable/riot,
800-
/obj/item/clothing/head/helmet/toggleable/riot{
801-
pixel_x = 3;
802-
pixel_y = -3
803-
},
804-
/obj/item/shield/riot{
805-
pixel_x = -3;
806-
pixel_y = 3
807-
},
808-
/obj/item/shield/riot,
809-
/obj/item/shield/riot{
810-
pixel_x = 3;
811-
pixel_y = -3
812-
},
813786
/obj/effect/turf_decal/bot,
814787
/obj/effect/turf_decal/tile/neutral/half/contrasted{
815788
dir = 4
816789
},
790+
/obj/effect/spawner/random/armory/riot_armor,
791+
/obj/effect/spawner/random/armory/riot_helmet,
792+
/obj/effect/spawner/random/armory/riot_shield,
817793
/turf/open/floor/iron/dark,
818794
/area/station/security/armory)
819795
"alz" = (
@@ -1608,29 +1584,13 @@
16081584
/area/station/hallway/primary/port)
16091585
"azo" = (
16101586
/obj/structure/rack,
1611-
/obj/item/clothing/suit/armor/bulletproof{
1612-
pixel_x = -3;
1613-
pixel_y = 3
1614-
},
1615-
/obj/item/clothing/suit/armor/bulletproof,
1616-
/obj/item/clothing/suit/armor/bulletproof{
1617-
pixel_x = 3;
1618-
pixel_y = -3
1619-
},
1620-
/obj/item/clothing/head/helmet/alt{
1621-
pixel_x = -3;
1622-
pixel_y = 3
1623-
},
1624-
/obj/item/clothing/head/helmet/alt,
1625-
/obj/item/clothing/head/helmet/alt{
1626-
pixel_x = 3;
1627-
pixel_y = -3
1628-
},
16291587
/obj/effect/turf_decal/bot,
16301588
/obj/effect/decal/cleanable/dirt,
16311589
/obj/effect/turf_decal/tile/neutral/half/contrasted{
16321590
dir = 4
16331591
},
1592+
/obj/effect/spawner/random/armory/bulletproof_armor,
1593+
/obj/effect/spawner/random/armory/bulletproof_helmet,
16341594
/turf/open/floor/iron/dark,
16351595
/area/station/security/armory)
16361596
"azv" = (
@@ -9401,21 +9361,13 @@
94019361
/area/station/maintenance/port/greater)
94029362
"dil" = (
94039363
/obj/structure/rack,
9404-
/obj/item/gun/energy/e_gun{
9405-
pixel_x = -3;
9406-
pixel_y = 3
9407-
},
9408-
/obj/item/gun/energy/e_gun,
9409-
/obj/item/gun/energy/e_gun{
9410-
pixel_x = 3;
9411-
pixel_y = -3
9412-
},
94139364
/obj/effect/turf_decal/bot,
94149365
/obj/structure/window/reinforced/spawner/directional/north,
94159366
/obj/structure/window/reinforced/spawner/directional/east,
94169367
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
94179368
dir = 1
94189369
},
9370+
/obj/effect/spawner/random/armory/e_gun,
94199371
/turf/open/floor/iron/showroomfloor,
94209372
/area/station/security/armory)
94219373
"dix" = (
@@ -51608,24 +51560,14 @@
5160851560
/turf/open/floor/engine/plasma,
5160951561
/area/station/engineering/atmos)
5161051562
"qWZ" = (
51611-
/obj/item/grenade/barrier{
51612-
pixel_x = 4
51613-
},
51614-
/obj/item/grenade/barrier,
51615-
/obj/item/grenade/barrier{
51616-
pixel_x = -4
51617-
},
5161851563
/obj/structure/table,
5161951564
/obj/item/key/security,
5162051565
/obj/item/key/security,
51621-
/obj/item/gun/energy/e_gun/dragnet,
51622-
/obj/item/gun/energy/e_gun/dragnet{
51623-
pixel_x = -4;
51624-
pixel_y = 4
51625-
},
5162651566
/obj/effect/turf_decal/tile/neutral{
5162751567
dir = 4
5162851568
},
51569+
/obj/effect/spawner/random/armory/dragnet,
51570+
/obj/effect/spawner/random/armory/barrier_grenades,
5162951571
/turf/open/floor/iron/dark,
5163051572
/area/station/security/armory)
5163151573
"qXa" = (
@@ -54643,19 +54585,11 @@
5464354585
/area/station/hallway/primary/central)
5464454586
"rTB" = (
5464554587
/obj/structure/rack,
54646-
/obj/item/gun/energy/disabler{
54647-
pixel_x = -3;
54648-
pixel_y = 3
54649-
},
54650-
/obj/item/gun/energy/disabler,
54651-
/obj/item/gun/energy/disabler{
54652-
pixel_x = 3;
54653-
pixel_y = -3
54654-
},
5465554588
/obj/effect/turf_decal/bot,
5465654589
/obj/structure/window/reinforced/spawner/directional/south,
5465754590
/obj/structure/window/reinforced/spawner/directional/west,
5465854591
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
54592+
/obj/effect/spawner/random/armory/disablers,
5465954593
/turf/open/floor/iron/showroomfloor,
5466054594
/area/station/security/armory)
5466154595
"rTD" = (
@@ -58014,24 +57948,6 @@
5801457948
/turf/open/floor/iron/dark,
5801557949
/area/station/science/robotics/lab)
5801657950
"sVP" = (
58017-
/obj/item/storage/box/rubbershot{
58018-
pixel_x = -3;
58019-
pixel_y = 3
58020-
},
58021-
/obj/item/storage/box/rubbershot{
58022-
pixel_x = -3;
58023-
pixel_y = 3
58024-
},
58025-
/obj/item/storage/box/rubbershot,
58026-
/obj/item/storage/box/rubbershot,
58027-
/obj/item/storage/box/rubbershot{
58028-
pixel_x = 3;
58029-
pixel_y = -3
58030-
},
58031-
/obj/item/storage/box/rubbershot{
58032-
pixel_x = 3;
58033-
pixel_y = -3
58034-
},
5803557951
/obj/structure/closet/secure_closet{
5803657952
name = "shotgun rubber rounds locker";
5803757953
req_access = list("armory")
@@ -58041,6 +57957,8 @@
5804157957
/obj/effect/turf_decal/tile/neutral{
5804257958
dir = 4
5804357959
},
57960+
/obj/effect/spawner/random/armory/rubbershot,
57961+
/obj/effect/spawner/random/armory/rubbershot,
5804457962
/turf/open/floor/iron/dark,
5804557963
/area/station/security/armory)
5804657964
"sVQ" = (
@@ -60276,21 +60194,13 @@
6027660194
/area/station/maintenance/port/fore)
6027760195
"tFS" = (
6027860196
/obj/structure/rack,
60279-
/obj/item/gun/energy/laser{
60280-
pixel_x = -3;
60281-
pixel_y = 3
60282-
},
60283-
/obj/item/gun/energy/laser,
60284-
/obj/item/gun/energy/laser{
60285-
pixel_x = 3;
60286-
pixel_y = -3
60287-
},
6028860197
/obj/effect/turf_decal/bot,
6028960198
/obj/structure/window/reinforced/spawner/directional/north,
6029060199
/obj/structure/window/reinforced/spawner/directional/west,
6029160200
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
6029260201
dir = 4
6029360202
},
60203+
/obj/effect/spawner/random/armory/laser_gun,
6029460204
/turf/open/floor/iron/showroomfloor,
6029560205
/area/station/security/armory)
6029660206
"tGb" = (
@@ -70984,22 +70894,14 @@
7098470894
/area/station/service/hydroponics)
7098570895
"wYl" = (
7098670896
/obj/structure/rack,
70987-
/obj/item/gun/ballistic/shotgun/riot{
70988-
pixel_x = -3;
70989-
pixel_y = 3
70990-
},
70991-
/obj/item/gun/ballistic/shotgun/riot,
70992-
/obj/item/gun/ballistic/shotgun/riot{
70993-
pixel_x = 3;
70994-
pixel_y = -3
70995-
},
7099670897
/obj/effect/turf_decal/bot,
7099770898
/obj/structure/window/reinforced/spawner/directional/south,
7099870899
/obj/structure/window/reinforced/spawner/directional/east,
7099970900
/obj/effect/decal/cleanable/dirt,
7100070901
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
7100170902
dir = 8
7100270903
},
70904+
/obj/effect/spawner/random/armory/shotgun,
7100370905
/turf/open/floor/iron/showroomfloor,
7100470906
/area/station/security/armory)
7100570907
"wYx" = (

‎_maps/map_files/MetaStation/MetaStation.dmm‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15712,9 +15712,6 @@
1571215712
"frt" = (
1571315713
/obj/structure/rack,
1571415714
/obj/item/gun/energy/ionrifle,
15715-
/obj/item/gun/ballistic/automatic/battle_rifle{
15716-
pixel_y = 3
15717-
},
1571815715
/obj/item/gun/energy/temperature/security,
1571915716
/obj/item/clothing/suit/hooded/ablative,
1572015717
/obj/effect/turf_decal/tile/red/half/contrasted{
@@ -59746,18 +59743,6 @@
5974659743
},
5974759744
/turf/open/floor/iron,
5974859745
/area/station/commons/locker)
59749-
"usQ" = (
59750-
/obj/item/folder/white{
59751-
pixel_x = 4;
59752-
pixel_y = -3
59753-
},
59754-
/obj/structure/table/glass,
59755-
/obj/effect/turf_decal/tile/green/half/contrasted{
59756-
dir = 8
59757-
},
59758-
/obj/effect/spawner/random/decoration/lavalamp,
59759-
/turf/open/floor/iron/dark,
59760-
/area/station/command/bridge)
5976159746
"uta" = (
5976259747
/obj/structure/rack,
5976359748
/obj/item/book/manual/wiki/security_space_law{

0 commit comments

Comments
 (0)