shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,367 Commits 5 Branches 0 Tags
7eaec9f6cc1cf4628248c39bfae3bbcb9ee468e4
Commit Graph

44367 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
silicons
7eaec9f6cc Merge pull request #15095 from Putnam3145/thread-MC 
Allow atmos thread to slow itself down
 2021-09-08 20:39:09 -07:00
silicons
316278be7a Merge pull request #15098 from Citadel-Station-13/dependabot/pip/tools/pillow-8.3.2 
Bump pillow from 8.2.0 to 8.3.2 in /tools
 2021-09-08 20:39:00 -07:00
silicons
a6ace3194f Merge pull request #15104 from Putnam3145/pipes-dont-explode 
Zaps don't explode pipes
 2021-09-08 20:38:48 -07:00
Putnam3145
5eb272c0a6 Makes it so zaps don't explode pipes 2021-09-08 18:42:38 -07: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
Changelogs
98cb444ad4 Automatic changelog compile [ci skip] 2021-09-08 00:24:05 +00:00
Putnam3145
f04b0a68d2 division by zero, oh dear 2021-09-07 12:44:38 -07:00
Putnam3145
66fea518b8 Allow atmos thread to slow itself down 2021-09-07 12:30:54 -07:00
CitadelStationBot
233177b67d Automatic changelog generation for PR #15083 [ci skip] 2021-09-07 02:07:06 -05:00
silicons
11b07e3ddc Merge pull request #15083 from keronshb/outlinefix 
FIX Ghosts can no longer highlight your inventory
 2021-09-07 00:07:03 -07:00
CitadelStationBot
0c126014da Automatic changelog generation for PR #15080 [ci skip] 2021-09-07 02:06:53 -05:00
silicons
fd67801d3b Merge pull request #15080 from keronshb/paradeport 
PORT Adds new outfits for command and centcom staff!
 2021-09-07 00:06:50 -07:00
silicons
c0ee264dcf Merge pull request #15091 from Putnam3145/fix-auxmos 
Update auxmos
 2021-09-07 00:06:42 -07:00
Putnam3145
788cdf1d13 Some auxmos fixes 2021-09-06 22:14:31 -07:00
Changelogs
e7aea38841 Automatic changelog compile [ci skip] 2021-09-07 00:23:47 +00:00
CitadelStationBot
7f80a11f69 Automatic changelog generation for PR #15077 [ci skip] 2021-09-06 13:58:49 -05:00
Lin
56b3eafe6c Merge pull request #15077 from bunny232/master 
woopsies, pubby xenobio jank
 2021-09-06 13:58:47 -05:00
CitadelStationBot
0009d75eb8 Automatic changelog generation for PR #15076 [ci skip] 2021-09-06 13:53:23 -05:00
Lin
3aebe62819 Merge pull request #15076 from zeroisthebiggay/patch-19 
you can just about
 2021-09-06 13:53:21 -05:00
CitadelStationBot
d7ec2417fe Automatic changelog generation for PR #15081 [ci skip] 2021-09-06 13:53:10 -05:00
Lin
aeffa373cd Merge pull request #15081 from keronshb/gremlinfix 
FIX Dead Gremlins no longer give AA
 2021-09-06 13:53:08 -05:00
keronshb
5a0782e97c ACTUAL OBSERVER FIX 2021-09-05 21:34:33 -04:00
keronshb
306b6ed1b7 Merge remote-tracking branch 'upstream/master' 2021-09-05 21:23:11 -04:00
Changelogs
1c286bb80d Automatic changelog compile [ci skip] 2021-09-06 00:28:06 +00:00
keronshb
8904950cf5 Gremlinfix 2021-09-05 14:35:38 -04:00
keronshb
ea3b248e6c Ports Parade outfit changes 2021-09-05 14:17:52 -04:00
keronshb
dfdc4b5c02 Merge remote-tracking branch 'upstream/master' 2021-09-05 13:31:05 -04:00
Changelogs
a14d0b648a Automatic changelog compile [ci skip] 2021-09-05 00:26:09 +00:00
CitadelStationBot
478bf3d6be Automatic changelog generation for PR #15075 [ci skip] 2021-09-04 18:17:12 -05:00
silicons
82b62b3196 Merge pull request #15075 from DeltaFire15/unreadied-vote-fix 
Fixes the "unreadied player gamemode votes don't count" not working
 2021-09-04 16:17:09 -07:00
bunny232
103d6255a0 Update PubbyStation.dmm 2021-09-04 16:59:05 -04:00
zeroisthebiggay
0fd3ca1e3e Update tips.txt 2021-09-04 01:42:12 -04:00
Changelogs
4212c50504 Automatic changelog compile [ci skip] 2021-09-04 00:23:43 +00:00
DeltaFire
1d18c24deb e 2021-09-03 21:22:08 +02:00
CitadelStationBot
b276940619 Automatic changelog generation for PR #15049 [ci skip] 2021-09-03 13:56:22 -05:00
Lin
12146fbff8 Merge pull request #15049 from keronshb/vrfix 
Fixes Entering an already occupied VR Sleeper
 2021-09-03 13:56:19 -05:00
Lin
cf99861886 Merge pull request #15061 from Hatterhat/tooltips-nauseated 
theoretically makes mob examine tooltips respect examine tooltips pref
 2021-09-03 13:56:05 -05:00
CitadelStationBot
bf38b34048 Automatic changelog generation for PR #15068 [ci skip] 2021-09-03 13:53:33 -05:00
Lin
c6e6e443a4 Merge pull request #15068 from WanderingFox95/NoSpaceLavaland 
[Fix] Un-Spaces the Sunken Library.
 2021-09-03 13:53:30 -05:00
CitadelStationBot
f84e62a278 Automatic changelog generation for PR #15067 [ci skip] 2021-09-03 13:52:18 -05:00
Lin
3b10346961 Merge pull request #15067 from timothyteakettle/fixes-synth-markings 
makes the arm/leg markings for synthetic lizards appear as an option again
 2021-09-03 13:52:15 -05:00
keronshb
6b6034d34d Merge remote-tracking branch 'upstream/master' 2021-09-03 13:31:49 -04:00
CitadelStationBot
b895c24cb4 Automatic changelog generation for PR #15072 [ci skip] 2021-09-03 03:56:33 -05:00
silicons
3a5d168f80 Merge pull request #15072 from Putnam3145/fix-ghost-runtime 
Fixes a runtime in ghost update_icon
 2021-09-03 01:56:31 -07:00
Putnam3145
2692f6285f Fixes a runtime in ghost update_icon 
Please make sure that no overrides have arguments when you add a new argument to a method.
 2021-09-03 01:21:21 -07:00
Changelogs
99dd57ed29 Automatic changelog compile [ci skip] 2021-09-03 00:23:45 +00:00
CitadelStationBot
b15dcf3730 Automatic changelog generation for PR #15059 [ci skip] 2021-09-02 16:37:46 -05:00
Lin
9b888c7b01 Merge pull request #15059 from timothyteakettle/language-fixies 
fixes losing your additional language upon changing species
 2021-09-02 16:37:43 -05:00
Lin
63373e45c3 Merge pull request #15057 from Putnam3145/dupe-traitor-fix 
Fixes duplicate traitor listing in traitor panel
 2021-09-02 14:39:56 -05:00
Emily
04284f8025 Un-Spaces the Library and also removes some leftover snow. 2021-09-02 20:11:49 +02:00