zerothebigboy
|
c7e16aabf8
|
ihatekeroncoats
|
2021-09-09 04:56:42 -04:00 |
|
zerothebigboy
|
5a8a069cd6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into intern
# Conflicts:
# icons/mob/clothing/suit.dmi
# icons/mob/clothing/suit_digi.dmi
# icons/obj/clothing/suits.dmi
|
2021-09-09 04:49:30 -04:00 |
|
silicons
|
6b503904a7
|
Merge pull request #15093 from LetterN/patch-9
Readme Update
|
2021-09-08 21:45:17 -07:00 |
|
CitadelStationBot
|
23e10d2fe6
|
Automatic changelog generation for PR #15056 [ci skip]
|
2021-09-08 23:17:03 -05:00 |
|
keronshb
|
4f54c465b2
|
ReebeReturns (#15056)
|
2021-09-09 06:17:00 +02:00 |
|
CitadelStationBot
|
cb4ba0b02a
|
Automatic changelog generation for PR #15039 [ci skip]
|
2021-09-08 22:41:03 -05:00 |
|
silicons
|
69bd477a72
|
Merge pull request #15039 from keronshb/gradiantport
Ports Colorist Quirk and Hair Gradients Preferences
|
2021-09-08 20:41:00 -07:00 |
|
CitadelStationBot
|
baa7bd0d5e
|
Automatic changelog generation for PR #15043 [ci skip]
|
2021-09-08 22:40:43 -05:00 |
|
silicons
|
82103d8c15
|
Merge pull request #15043 from BlueWildrose/dropitlikeitshot
CTRL + (combat mode) Right Click - positional dropping and item rotation
|
2021-09-08 20:40:41 -07:00 |
|
CitadelStationBot
|
eb88527b6b
|
Automatic changelog generation for PR #15058 [ci skip]
|
2021-09-08 22:40:23 -05:00 |
|
silicons
|
bb7ee63eae
|
Merge pull request #15058 from zeroisthebiggay/headass
the unatomized hypospray/medbay tools/emergency kits resprite
|
2021-09-08 20:40:20 -07:00 |
|
CitadelStationBot
|
6394e9f96d
|
Automatic changelog generation for PR #15069 [ci skip]
|
2021-09-08 22:40:01 -05:00 |
|
silicons
|
1fd311b983
|
Merge pull request #15069 from zeroisthebiggay/flashes
tgifies the cyborg tools
|
2021-09-08 20:39:59 -07:00 |
|
CitadelStationBot
|
60083b9823
|
Automatic changelog generation for PR #15064 [ci skip]
|
2021-09-08 22:39:48 -05:00 |
|
silicons
|
ff28789f27
|
Merge pull request #15064 from zeroisthebiggay/hammers
tg hammers port uwu
|
2021-09-08 20:39:46 -07:00 |
|
silicons
|
2002532e1f
|
Merge pull request #15090 from Putnam3145/making-lavaland-atmos-better
Removes flammable gases from planet atmos
|
2021-09-08 20:39:39 -07:00 |
|
CitadelStationBot
|
04a989bc11
|
Automatic changelog generation for PR #15089 [ci skip]
|
2021-09-08 22:39:32 -05:00 |
|
silicons
|
9968d92bdc
|
Merge pull request #15089 from keronshb/maskofmadness
Mask of Madness no longer wallhacks
|
2021-09-08 20:39:30 -07:00 |
|
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 |
|
Letter N
|
35bd9339df
|
Update README.md
|
2021-09-07 15:17:17 +08: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 |
|
Putnam3145
|
ae90ec541b
|
Normalizes planet atmos some
|
2021-09-06 20:00:32 -07:00 |
|
keronshb
|
d4383cb507
|
Mask of madness viewers
|
2021-09-06 22:38:56 -04:00 |
|
keronshb
|
7b514ef9ff
|
Merge remote-tracking branch 'upstream/master'
|
2021-09-06 22:21:51 -04: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 |
|