Commit Graph

300 Commits

Author SHA1 Message Date
BongaTheProto
2aaf3f1cf2 people are dumb sometimes 2022-01-17 23:43:49 -05:00
Letter N
023177cb45 Revert "Bump pillow from 8.3.2 to 9.0.0 in /tools" 2022-01-18 11:43:49 +08:00
BongaTheProto
362559148e Merge remote-tracking branch 'upstream/master' 2022-01-17 21:24:40 -05:00
SandPoot
530fc3c31c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-01-16 23:38:59 -03:00
dependabot[bot]
4db84cc664 Bump pillow from 8.3.2 to 9.0.0 in /tools
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.3.2 to 9.0.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/8.3.2...9.0.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-13 03:39:22 +00:00
BongaTheProto
48f16a00f9 Update byond version
1557 is the current one in deployments, also supposedly the most stable one
2021-12-07 12:08:19 -05:00
keronshb
bd7a2b6a2a Lets families compile 2021-10-12 16:12:38 -04:00
SandPoot
51fdbc73d0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-10 23:14:02 -03:00
silicons
4836f222d0 Merge pull request #15097 from LetterN/generic-housekeeping-pr
Generic syncs
2021-09-10 00:16:25 -07:00
SandPoot
e3c17dc05e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-09 01:57:47 -03:00
dependabot[bot]
8606d044ed Bump pillow from 8.2.0 to 8.3.2 in /tools
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.2.0 to 8.3.2.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/8.2.0...8.3.2)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-08 03:03:18 +00:00
LetterN
44b9e14391 cbt => juke 2021-09-08 09:13:14 +08:00
SandPoot
dfe4a91219 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-11 13:06:19 -03:00
silicons
f1744f3a05 Merge pull request #14995 from cadyn/linuxdecompression
Update linux scripts and dependencies for new auxmos version
2021-08-11 02:44:52 -07:00
silicons
68c3618ebe Update check_grep.sh 2021-08-09 19:14:01 -07:00
Cadyn Bombaci
c0f4786258 Update linux scripts and dependencies for new auxmos version 2021-08-09 12:54:22 -07:00
SandPoot
dbf3b3f057 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-07-28 14:22:48 -03:00
Putnam3145
f357f5b12e okay maybe don't copy that closely 2021-07-25 17:58:20 -07:00
Putnam3145
94871ab34e just copy from bee (4head) 2021-07-25 17:55:43 -07:00
Putnam3145
c78a7af848 byond version, also more like this 2021-07-25 17:01:36 -07:00
Putnam3145
b7af177012 Maybe I Can Just Remove Them 2021-07-25 16:54:15 -07:00
Putnam3145
1266d59f68 more possible dependency reqs (?) 2021-07-25 16:49:12 -07:00
Putnam3145
ce71d99fc8 why are there so many files 2021-07-25 15:36:37 -07:00
SandPoot
3af9bacebe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-07-17 13:03:33 -03:00
cadyn
90b2292764 Fix tiny oopsies 2021-07-14 18:59:07 -07:00
SandPoot
591090641e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-07-04 15:53:12 -03:00
SandPoot
502ba229d6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-07-03 12:02:34 -03:00
Putnam3145
862de42e60 tweaks to auxmos compile on linux 2021-07-03 03:15:55 -07:00
Cadyn
555982fc37 Appease CI 2021-06-30 06:22:08 -07:00
Cadyn Bombaci
ee99bbee3e Make Cit work on linux with and without TGS4 2021-06-30 05:03:54 -07:00
Cadyn Bombaci
a6fa046f2a Get TGS4 working first 2021-06-30 01:43:50 -07:00
SandPoot
c48360be5c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-06-19 10:20:49 -03:00
silicons
816b09bf32 Merge remote-tracking branch 'citadel/master' into backend_sync 2021-06-10 22:36:26 -07:00
SandPoot
91fd04c552 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-06-10 23:41:21 -03:00
dependabot[bot]
413bb15961 Bump pillow from 8.1.1 to 8.2.0 in /tools
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.1.1 to 8.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/8.1.1...8.2.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-08 23:13:41 +00:00
SandPoot
fa69a3fb64 no lentext allowed 2021-05-29 17:45:12 -03:00
silicons
c3d91f01db scripts 2021-04-28 07:20:54 -07:00
silicons
990e74179a other thing 2021-04-25 16:09:41 -07:00
silicons
12894384ff okay 2021-04-25 14:17:37 -07:00
SandPoot
0165c4a7c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-10 12:34:59 -03:00
LetterN
f976a89157 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-31 08:19:31 +08:00
SandPoot
1a7d33b801 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-27 11:41:32 -03:00
dependabot[bot]
bf9a093b06 Bump pyyaml from 5.3.1 to 5.4 in /tools
Bumps [pyyaml](https://github.com/yaml/pyyaml) from 5.3.1 to 5.4.
- [Release notes](https://github.com/yaml/pyyaml/releases)
- [Changelog](https://github.com/yaml/pyyaml/blob/master/CHANGES)
- [Commits](https://github.com/yaml/pyyaml/compare/5.3.1...5.4)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-26 00:47:40 +00:00
SandPoot
73c0ff2f8d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-24 23:57:03 -03:00
DeltaFire
a1e9b61eb1 stop 2021-03-23 03:50:57 +01:00
LetterN
292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +08:00
SandPoot
83c2c913b3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-19 20:55:35 -03:00
dependabot[bot]
8432f095f8 Bump pillow from 7.2.0 to 8.1.1 in /tools
Bumps [pillow](https://github.com/python-pillow/Pillow) from 7.2.0 to 8.1.1.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/7.2.0...8.1.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-19 16:09:09 +00:00
Letter N
935e46b492 The Mapping Update
Cleans up the map (again)
Makes mining code more better
2021-03-12 12:11:35 +08:00
SandPoot
20509121b8 Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-08 14:07:57 -03:00