This repository was archived by the owner on May 22, 2025. It is now read-only.
Commit f3a76b6
committed
Merge branch 'master' of https://github.com/wonderinghost/Yogstation
File tree
36 files changed
+329
-177
lines changed- .vscode
- _maps
- RandomRuins
- IceRuins
- JungleRuins
- SpaceRuins
- map_files
- DonutStation
- YogStation
- code
- game
- machinery
- objects
- items
- circuitboards
- structures
- crates_lockers/closets
- secure
- turfs
- closed
- modules
- atmospherics/environmental
- clothing/under/jobs/Plasmaman
- mob/living/simple_animal
- friendly
- hostile/mining_mobs/elites
- shuttle
- tgchat
- html
- changelogs
- icons
- mob
- clothing/uniform
- inhands/weapons
- obj
- clothing
36 files changed
+329
-177
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | | - | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | | - | |
13 | | - | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1870 | 1870 | | |
1871 | 1871 | | |
1872 | 1872 | | |
1873 | | - | |
1874 | | - | |
1875 | | - | |
1876 | 1873 | | |
1877 | 1874 | | |
1878 | 1875 | | |
| |||
3311 | 3308 | | |
3312 | 3309 | | |
3313 | 3310 | | |
| 3311 | + | |
| 3312 | + | |
| 3313 | + | |
3314 | 3314 | | |
3315 | 3315 | | |
3316 | 3316 | | |
| |||
5808 | 5808 | | |
5809 | 5809 | | |
5810 | 5810 | | |
| 5811 | + | |
| 5812 | + | |
| 5813 | + | |
| 5814 | + | |
5811 | 5815 | | |
5812 | 5816 | | |
5813 | 5817 | | |
| |||
6007 | 6011 | | |
6008 | 6012 | | |
6009 | 6013 | | |
6010 | | - | |
6011 | 6014 | | |
6012 | 6015 | | |
6013 | 6016 | | |
| |||
7446 | 7449 | | |
7447 | 7450 | | |
7448 | 7451 | | |
| 7452 | + | |
| 7453 | + | |
| 7454 | + | |
| 7455 | + | |
7449 | 7456 | | |
7450 | 7457 | | |
7451 | 7458 | | |
| |||
7558 | 7565 | | |
7559 | 7566 | | |
7560 | 7567 | | |
7561 | | - | |
7562 | | - | |
7563 | | - | |
| 7568 | + | |
7564 | 7569 | | |
7565 | 7570 | | |
7566 | 7571 | | |
| |||
Lines changed: 2 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
499 | 499 | | |
500 | 500 | | |
501 | 501 | | |
502 | | - | |
| 502 | + | |
503 | 503 | | |
504 | 504 | | |
505 | 505 | | |
| |||
521 | 521 | | |
522 | 522 | | |
523 | 523 | | |
524 | | - | |
| 524 | + | |
525 | 525 | | |
526 | 526 | | |
527 | 527 | | |
| |||
656 | 656 | | |
657 | 657 | | |
658 | 658 | | |
659 | | - | |
660 | 659 | | |
661 | 660 | | |
662 | 661 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
128 | 128 | | |
129 | 129 | | |
130 | 130 | | |
131 | | - | |
132 | | - | |
133 | | - | |
134 | | - | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
135 | 136 | | |
136 | 137 | | |
137 | 138 | | |
| |||
196 | 197 | | |
197 | 198 | | |
198 | 199 | | |
199 | | - | |
| 200 | + | |
200 | 201 | | |
201 | 202 | | |
202 | 203 | | |
203 | 204 | | |
204 | 205 | | |
205 | | - | |
206 | | - | |
207 | | - | |
208 | | - | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
209 | 212 | | |
210 | 213 | | |
211 | 214 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2781 | 2781 | | |
2782 | 2782 | | |
2783 | 2783 | | |
| 2784 | + | |
| 2785 | + | |
| 2786 | + | |
| 2787 | + | |
| 2788 | + | |
| 2789 | + | |
| 2790 | + | |
| 2791 | + | |
| 2792 | + | |
2784 | 2793 | | |
2785 | 2794 | | |
2786 | 2795 | | |
| |||
10298 | 10307 | | |
10299 | 10308 | | |
10300 | 10309 | | |
| 10310 | + | |
| 10311 | + | |
| 10312 | + | |
| 10313 | + | |
| 10314 | + | |
| 10315 | + | |
| 10316 | + | |
| 10317 | + | |
| 10318 | + | |
10301 | 10319 | | |
10302 | 10320 | | |
10303 | 10321 | | |
| |||
13985 | 14003 | | |
13986 | 14004 | | |
13987 | 14005 | | |
| 14006 | + | |
| 14007 | + | |
| 14008 | + | |
| 14009 | + | |
| 14010 | + | |
| 14011 | + | |
| 14012 | + | |
| 14013 | + | |
13988 | 14014 | | |
13989 | 14015 | | |
13990 | 14016 | | |
| |||
29836 | 29862 | | |
29837 | 29863 | | |
29838 | 29864 | | |
29839 | | - | |
29840 | | - | |
29841 | | - | |
29842 | 29865 | | |
29843 | 29866 | | |
29844 | 29867 | | |
| |||
34277 | 34300 | | |
34278 | 34301 | | |
34279 | 34302 | | |
| 34303 | + | |
| 34304 | + | |
| 34305 | + | |
| 34306 | + | |
| 34307 | + | |
| 34308 | + | |
| 34309 | + | |
| 34310 | + | |
| 34311 | + | |
| 34312 | + | |
| 34313 | + | |
| 34314 | + | |
| 34315 | + | |
| 34316 | + | |
| 34317 | + | |
| 34318 | + | |
| 34319 | + | |
| 34320 | + | |
| 34321 | + | |
| 34322 | + | |
| 34323 | + | |
| 34324 | + | |
| 34325 | + | |
| 34326 | + | |
| 34327 | + | |
| 34328 | + | |
| 34329 | + | |
| 34330 | + | |
| 34331 | + | |
| 34332 | + | |
| 34333 | + | |
| 34334 | + | |
| 34335 | + | |
| 34336 | + | |
34280 | 34337 | | |
34281 | 34338 | | |
34282 | 34339 | | |
| |||
35184 | 35241 | | |
35185 | 35242 | | |
35186 | 35243 | | |
| 35244 | + | |
| 35245 | + | |
| 35246 | + | |
| 35247 | + | |
35187 | 35248 | | |
35188 | 35249 | | |
35189 | 35250 | | |
| |||
39277 | 39338 | | |
39278 | 39339 | | |
39279 | 39340 | | |
| 39341 | + | |
| 39342 | + | |
| 39343 | + | |
| 39344 | + | |
| 39345 | + | |
| 39346 | + | |
| 39347 | + | |
| 39348 | + | |
39280 | 39349 | | |
39281 | 39350 | | |
39282 | 39351 | | |
| |||
55123 | 55192 | | |
55124 | 55193 | | |
55125 | 55194 | | |
55126 | | - | |
55127 | | - | |
55128 | | - | |
55129 | | - | |
55130 | | - | |
55131 | | - | |
55132 | | - | |
55133 | | - | |
55134 | | - | |
55135 | | - | |
55136 | | - | |
55137 | | - | |
55138 | 55195 | | |
55139 | 55196 | | |
55140 | 55197 | | |
| |||
82329 | 82386 | | |
82330 | 82387 | | |
82331 | 82388 | | |
82332 | | - | |
| 82389 | + | |
82333 | 82390 | | |
82334 | 82391 | | |
82335 | 82392 | | |
| |||
91383 | 91440 | | |
91384 | 91441 | | |
91385 | 91442 | | |
91386 | | - | |
| 91443 | + | |
91387 | 91444 | | |
91388 | 91445 | | |
91389 | 91446 | | |
| |||
92588 | 92645 | | |
92589 | 92646 | | |
92590 | 92647 | | |
92591 | | - | |
| 92648 | + | |
92592 | 92649 | | |
92593 | 92650 | | |
92594 | 92651 | | |
| |||
101411 | 101468 | | |
101412 | 101469 | | |
101413 | 101470 | | |
101414 | | - | |
| 101471 | + | |
101415 | 101472 | | |
101416 | 101473 | | |
101417 | 101474 | | |
| |||
104972 | 105029 | | |
104973 | 105030 | | |
104974 | 105031 | | |
104975 | | - | |
| 105032 | + | |
104976 | 105033 | | |
104977 | 105034 | | |
104978 | 105035 | | |
| |||
105254 | 105311 | | |
105255 | 105312 | | |
105256 | 105313 | | |
105257 | | - | |
| 105314 | + | |
105258 | 105315 | | |
105259 | 105316 | | |
105260 | 105317 | | |
| |||
0 commit comments