 TrilbySpaceClone
|
ea7235d089
|
Merge branch 'master' into fruit
|
2019-08-29 21:15:18 -04:00 |
|
|
nik707andGitHub
|
2307f7a2a6
|
Merge pull request #9146 from Raptorizer/Botany-Peaches
New plant type: Peaches
|
2019-08-29 19:59:37 -05:00 |
|
|
nik707andGitHub
|
1132b75392
|
Merge pull request #9173 from Citadel-Station-13/kevinz000-patch-76
Removes duplicate definition of games and toys nodes and readds autoylathe
|
2019-08-29 19:53:37 -05:00 |
|
|
CitadelStationBot
|
07a731acc6
|
Automatic changelog generation for PR #9178 [ci skip]
|
2019-08-29 19:45:13 -05:00 |
|
|
nik707andGitHub
|
dfdbb23d99
|
Merge pull request #9178 from deathride58/polyfix
fixes the poly tgs command not working at all
|
2019-08-29 19:45:11 -05:00 |
|
|
Raptorizer
|
4e9077aa2d
|
aaaaaaa
|
2019-08-29 19:34:14 -05:00 |
|
|
CitadelStationBot
|
eacdd931d0
|
Automatic changelog generation for PR #9200 [ci skip]
|
2019-08-29 19:34:11 -05:00 |
|
|
nik707andGitHub
|
e7b267254b
|
Merge pull request #9200 from Owai-Seek/minor-fixes
Fixes Strawberries
|
2019-08-29 19:34:09 -05:00 |
|
|
nik707andGitHub
|
bff828d3be
|
Merge pull request #9202 from Trilbyspaceclone/patch-216
Ports "Fixes wallets #510" From KeplerStation
|
2019-08-29 19:33:08 -05:00 |
|
|
CitadelStationBot
|
649dbf8627
|
Automatic changelog generation for PR #9204 [ci skip]
|
2019-08-29 19:31:42 -05:00 |
|
|
nik707andGitHub
|
fccafd6bd9
|
Merge pull request #9204 from Trilbyspaceclone/patch-217
Fixes katana's being cursed when not cursed
|
2019-08-29 19:31:40 -05:00 |
|
|
Raptorizer
|
48f6b9408a
|
Cotton/Durathread added?
|
2019-08-29 19:31:11 -05:00 |
|
|
nik707andGitHub
|
01f732c57a
|
Merge pull request #9207 from Ghommie/Ghommie-cit189
Rawket lawnchair fix.
|
2019-08-29 19:29:14 -05:00 |
|
|
Raptorizer
|
daf2ce5182
|
HHHHHH
|
2019-08-29 19:29:01 -05:00 |
|
|
CitadelStationBot
|
c95492fcff
|
Automatic changelog generation for PR #9208 [ci skip]
|
2019-08-29 19:28:04 -05:00 |
|
|
nik707andGitHub
|
36a07f134b
|
Merge pull request #9208 from Ghommie/Ghommie-cit190
Socks uncolorability fix.
|
2019-08-29 19:28:01 -05:00 |
|
|
Raptorizer
|
a83f4f96bb
|
Update seeds.dmi
|
2019-08-29 19:27:49 -05:00 |
|
|
Raptorizer
|
54cee2ff87
|
Conflict Resolve
Updated to include cotton/durathread
|
2019-08-29 19:26:46 -05:00 |
|
|
CitadelStationBot
|
8bb54bd8dd
|
Automatic changelog generation for PR #9168 [ci skip]
|
2019-08-29 19:11:59 -05:00 |
|
|
nik707andGitHub
|
624d717d08
|
Merge pull request #9168 from Seris02/loochotkey
Adds looc hotkey - on examination, just makes it better
|
2019-08-29 19:11:57 -05:00 |
|
|
CitadelStationBot
|
aa6e3abaf6
|
Automatic changelog generation for PR #9172 [ci skip]
|
2019-08-29 19:11:20 -05:00 |
|
|
nik707andGitHub
|
121c2c2f53
|
Merge pull request #9172 from Citadel-Station-13/kevinz000-patch-75
You rack the riot shotgun
|
2019-08-29 19:11:19 -05:00 |
|
|
nik707andGitHub
|
fd2aec7efe
|
Merge pull request #9171 from Citadel-Station-13/kevinz000-patch-74
Fixes and optimizes ghost swords
|
2019-08-29 19:09:40 -05:00 |
|
|
nik707andGitHub
|
4f9b901a97
|
Merge pull request #9158 from Citadel-Station-13/kevinz000-patch-73
Rebalances the MASONrig
|
2019-08-29 19:06:04 -05:00 |
|
|
CitadelStationBot
|
607ce2ae7f
|
Automatic changelog generation for PR #9132 [ci skip]
|
2019-08-29 18:56:53 -05:00 |
|
|
nik707andGitHub
|
d2bb75c820
|
Merge pull request #9132 from Michiyamenotehifunana/Toricrates-Remastered
Toricrates: Remastered: Complete Edition 2019
|
2019-08-29 18:56:51 -05:00 |
|
|
nik707andGitHub
|
bfd17d66cd
|
Merge pull request #9074 from Citadel-Station-13/donator_grouping
Donator grouping system
|
2019-08-29 18:31:23 -05:00 |
|
|
CitadelStationBot
|
6a24d1fdc4
|
Automatic changelog generation for PR #9080 [ci skip]
|
2019-08-29 18:23:49 -05:00 |
|
|
nik707andGitHub
|
0a4090f4d3
|
Merge pull request #9080 from Thalpy/Newmusic
Adds 3 new Copyright compatible space-y music tracks to title
|
2019-08-29 18:23:47 -05:00 |
|
|
CitadelStationBot
|
55fbc7eb95
|
Automatic changelog generation for PR #9184 [ci skip]
|
2019-08-29 18:19:46 -05:00 |
|
|
nik707andGitHub
|
2f7402f591
|
Merge pull request #9184 from Ghommie/Ghommie-cit188
Removes an obnoxious temporary overlay var.
|
2019-08-29 18:19:44 -05:00 |
|
|
nik707andGitHub
|
9a0b6a21f9
|
Merge pull request #8904 from Citadel-Station-13/kevinz000-patch-64
Amber alert ERTs no longer get pulse weapons
|
2019-08-28 13:05:56 -05:00 |
|
|
CitadelStationBot
|
5bd87fe72d
|
Automatic changelog generation for PR #9186 [ci skip]
|
2019-08-28 00:02:41 -05:00 |
|
|
nik707andGitHub
|
8e40e9d887
|
Merge pull request #9186 from Sishen1542/walklikeanegyptian
spellcheck of pharaoh gear, added pharaoh gear to chappy vendor p2
|
2019-08-28 00:02:39 -05:00 |
|
|
CitadelStationBot
|
22aee03d30
|
Automatic changelog generation for PR #9180 [ci skip]
|
2019-08-27 22:51:01 -05:00 |
|
|
kevinz000andGitHub
|
bea4349056
|
Merge pull request #9180 from deathride58/buffspoly
grants poly the ability to automatically speak through the TGS relay (with a 0.01% chance)
|
2019-08-27 20:50:59 -07:00 |
|
|
Ghommie
|
0ffeb704af
|
Socks color fix.
|
2019-08-28 05:33:36 +02:00 |
|
|
Ghommie
|
18b023b127
|
arg
|
2019-08-28 04:47:53 +02:00 |
|
|
CitadelStationBot
|
93cea3272e
|
Automatic changelog generation for PR #8537 [ci skip]
|
2019-08-27 20:54:05 -05:00 |
|
|
BlackMajorandGitHub
|
4d6b9f5da1
|
Merge pull request #8537 from Ghommie/Ghommie-cit28
Fixes emags wasting charges on un-emaggable stuff.
|
2019-08-28 13:54:03 +12:00 |
|
|
Ghommie
|
e25697dc14
|
rocket fix.
|
2019-08-28 03:37:35 +02:00 |
|
|
TrilbyspacecloneandGitHub
|
6cf4783486
|
fixed
|
2019-08-27 13:56:47 -04:00 |
|
|
TrilbyspacecloneandGitHub
|
77863119f2
|
Update wallets.dm
|
2019-08-27 11:31:52 -04:00 |
|
|
Winter Flare
|
26c5aa6185
|
Update berries.dm
Actually fixes strawberries so they have visible growth stages and death icons.
|
2019-08-27 03:47:56 -04:00 |
|
|
CitadelStationBot
|
28f91949de
|
Automatic changelog generation for PR #9177 [ci skip]
|
2019-08-26 21:42:17 -05:00 |
|
|
kevinz000andGitHub
|
f07cdc0665
|
Merge pull request #9177 from JTGSZ/fix
Fixes gang bosses being able to be deconverted with headbeatings, Adds 1 more boss slot
|
2019-08-26 19:42:15 -07:00 |
|
|
kevinz000andGitHub
|
78c1ad972f
|
Merge pull request #9179 from chefferz/master
Gives His Grace stamina regeneration
|
2019-08-26 19:39:46 -07:00 |
|
|
CitadelStationBot
|
dd54cc9e7d
|
Automatic changelog generation for PR #9194 [ci skip]
|
2019-08-26 21:37:29 -05:00 |
|
|
kevinz000andGitHub
|
37642cdac2
|
Merge pull request #9194 from kappa-sama/kappa-sama-keys
Wallets can now hold vehicle keys.
|
2019-08-26 19:37:28 -07:00 |
|
|
CitadelStationBot
|
ade3f2f847
|
Automatic changelog generation for PR #9169 [ci skip]
|
2019-08-26 21:37:19 -05:00 |
|