cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-25 16:54:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
64,110 Commits 9 Branches 0 Tags
fea05d66d496900a91c2d4ffab6d6202fd87f3cc
Commit Graph

64110 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nadyr
fea05d66d4 Merge pull request #2159 from CHOMPStationBot/upstream-merge-10600 
[MIRROR] Fixes belly sensor jamming
 2021-06-09 17:05:07 -04:00
Chompstation Bot
a5f426bf87 Fixes belly sensor jamming 2021-06-09 14:22:37 +00:00
Novacat
367bbcb329 Merge pull request #10600 from Verkister/patch-56 
Fixes belly sensor jamming
 2021-06-09 14:22:37 +00:00
Nadyr
bd225bc902 Merge pull request #2155 from CHOMPStationBot/upstream-merge-10594 
[MIRROR] Ports Paradise pod doors
 2021-06-09 04:52:13 -04:00
Nadyr
68466677e8 Merge pull request #2154 from CHOMPStationBot/upstream-merge-10560 
[MIRROR] Update jukebox.json - Add 1ea secret song.
 2021-06-09 04:50:45 -04:00
Chompstation Bot
25ed3abea7 Ports Paradise pod doors 2021-06-09 00:45:09 +00:00
Aronai Sieyes
666786d4b7 Merge pull request #10594 from VOREStation/Arokha/paradoors 
Ports Paradise pod doors
 2021-06-09 00:45:09 +00:00
Chompstation Bot
c7cb37c067 Update jukebox.json - Add 1ea secret song. 2021-06-09 00:40:58 +00:00
ResidentCody
3e0af97986 Update jukebox.json - Add 1ea secret song. (#10560) 
* Update jukebox.json - Add 1ea secret song.

Adds the song "I Wupped Batman's Ass" to the secret songlist on the jukebox on behalf of another user.

* Adds a comma

Adds a comma that was missed.
 2021-06-09 00:40:58 +00:00
Nadyr
5162e7bcbb Merge pull request #2151 from CHOMPStation2/dependabot/pip/tools/mapmerge2/pillow-8.2.0 
Bump pillow from 8.1.1 to 8.2.0 in /tools/mapmerge2
 2021-06-08 19:25:47 -04:00
Nadyr
e1d906184f Merge pull request #2153 from CHOMPStationBot/upstream-merge-10593 
[MIRROR] Makes headsets colorable in the paint machine
 2021-06-08 19:25:19 -04:00
Chompstation Bot
b63cc39732 Makes headsets colorable in the paint machine 2021-06-08 22:30:48 +00:00
Aronai Sieyes
571cd17853 Merge pull request #10593 from Verkister/patch-55 
Makes headsets colorable in the paint machine
 2021-06-08 22:30:48 +00:00
Nadyr
c78e9c16a5 Merge pull request #2131 from Verkister/patch-17 
Enables vore for raccoons
 2021-06-08 18:03:28 -04:00
dependabot[bot]
383abf51fe Bump pillow from 8.1.1 to 8.2.0 in /tools/mapmerge2 
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 20:42:51 +00:00
Nadyr
4db0aee294 Merge pull request #2150 from CHOMPStationBot/upstream-merge-10584 
[MIRROR] Explorer storage items
 2021-06-08 01:39:37 -04:00
Nadyr
96403c6621 Merge pull request #2147 from CHOMPStationBot/upstream-merge-10570 
[MIRROR] [MIRROR] Adds new UI for secure stuff
 2021-06-07 19:39:27 -04:00
Nadyr
2aa17ad7c6 powder that makes you say yes 2021-06-07 19:38:23 -04:00
Chompstation Bot
c753eb778a Explorer storage items 2021-06-07 19:37:53 -04:00
Nadyr
d0c882b1a2 Merge pull request #2141 from CHOMPStationBot/upstream-merge-10578 
[MIRROR] Put the music speakers in crates!
 2021-06-07 19:31:04 -04:00
Darlantan
ff68c0ebac bundle fix 2021-06-07 19:30:24 -04:00
Nadyr
0148ab6b17 Merge pull request #2148 from CHOMPStationBot/upstream-merge-10568 
[MIRROR] [MIRROR] Add Secret ZLevels
 2021-06-07 19:28:20 -04:00
Nadyr
bf5a11da8d Merge branch 'master' into upstream-merge-10578 2021-06-07 19:20:23 -04:00
Nadyr
53949ecbf7 Merge pull request #2145 from CHOMPStationBot/upstream-merge-10569 
[MIRROR] [MIRROR] Random mob spawners can accept faction input now
 2021-06-07 19:18:13 -04:00
Nadyr
7853a70647 Merge pull request #2143 from CHOMPStationBot/upstream-merge-10567 
[MIRROR] [MIRROR] Adds new rocks + resprites mining outcrops
 2021-06-07 19:17:33 -04:00
Nadyr
ed90d483a9 Merge pull request #2144 from CHOMPStationBot/upstream-merge-10571 
[MIRROR] [MIRROR] Adds unit test for invalid recipes
 2021-06-07 19:16:24 -04:00
Nadyr
1f41db0411 Merge pull request #2140 from CHOMPStationBot/upstream-merge-10573 
[MIRROR] [MIRROR] Add CI annotations to compile errors/warnings.
 2021-06-07 19:15:30 -04:00
Nadyr
663220d893 Merge pull request #2135 from CHOMPStationBot/upstream-merge-10555 
[MIRROR] Portable music player, remote jukebox speaker
 2021-06-07 19:14:49 -04:00
Nadyr
0db1a8034c Merge pull request #2142 from CHOMPStationBot/upstream-merge-10572 
[MIRROR] [MIRROR] Fixes infinite loop following cooking error
 2021-06-07 19:14:15 -04:00
Nadyr
4aed08da58 powder that makes you say yes 2021-06-07 19:03:54 -04:00
Nadyr
52bb59d560 Merge pull request #2136 from CHOMPStationBot/upstream-merge-10576 
[MIRROR] spider emotes weren't added to the list yet
 2021-06-07 18:26:31 -04:00
Nadyr
7293903266 Merge pull request #2134 from CHOMPStationBot/upstream-merge-10562 
[MIRROR] Fix mistake made in 04625a5
 2021-06-07 18:26:05 -04:00
Nadyr
88b340f810 Merge pull request #2133 from CHOMPStationBot/upstream-merge-10559 
[MIRROR] Fix fake space edge turfs
 2021-06-07 18:24:46 -04:00
Nadyr
2f7f34a621 Merge pull request #2081 from Somememeguy/VoxColoring2 
Vox Recoloring Edition: COLORFUL VOX, BAWK!
 2021-06-07 18:16:07 -04:00
Chompstation Bot
4172a616d7 [MIRROR] Add Secret ZLevels 2021-06-07 05:33:52 +00:00
Aronai Sieyes
0028ef1ef0 Merge pull request #10568 from VOREStation/upstream-merge-8111 
[MIRROR] Add Secret ZLevels
 2021-06-07 05:33:52 +00:00
Chompstation Bot
e846fa7b82 [MIRROR] Adds new UI for secure stuff 2021-06-07 05:32:43 +00:00
Chompstation Bot
08eda784f3 [MIRROR] Random mob spawners can accept faction input now 2021-06-07 05:13:13 +00:00
Aronai Sieyes
d72951047e Merge pull request #10569 from VOREStation/upstream-merge-8115 
[MIRROR] Random mob spawners can accept faction input now
 2021-06-07 05:13:13 +00:00
Chompstation Bot
8f0839b53a [MIRROR] Adds unit test for invalid recipes 2021-06-07 05:10:03 +00:00
Aronai Sieyes
82f1d179b0 Merge pull request #10571 from VOREStation/upstream-merge-8119 
[MIRROR] Adds unit test for invalid recipes
 2021-06-07 05:10:03 +00:00
Chompstation Bot
ffd37eda33 [MIRROR] Adds new rocks + resprites mining outcrops 2021-06-07 05:08:55 +00:00
Aronai Sieyes
6d2fe93052 Merge pull request #10567 from VOREStation/upstream-merge-8104 
[MIRROR] Adds new rocks + resprites mining outcrops
 2021-06-07 05:08:55 +00:00
Chompstation Bot
b77bf895ed [MIRROR] Fixes infinite loop following cooking error 2021-06-07 04:50:33 +00:00
Aronai Sieyes
36b9a379ac Merge pull request #10572 from VOREStation/upstream-merge-8118 
[MIRROR] Fixes infinite loop following cooking error
 2021-06-07 04:50:33 +00:00
Chompstation Bot
a6ce064280 Put the music speakers in crates! 2021-06-07 04:49:25 +00:00
Chompstation Bot
e8d4d5b1e7 [MIRROR] Add CI annotations to compile errors/warnings. 2021-06-07 04:49:20 +00:00
Aronai Sieyes
f8ff773412 Merge pull request #10573 from VOREStation/upstream-merge-8120 
[MIRROR] Add CI annotations to compile errors/warnings.
 2021-06-07 04:49:20 +00:00
Chompstation Bot
5f5e934291 spider emotes weren't added to the list yet 2021-06-06 16:44:31 +00:00
Novacat
38a1de24cd Merge pull request #10576 from quixoticstargazer/patch-1 
spider emotes weren't added to the list yet
 2021-06-06 16:44:31 +00:00