Commit Graph
23428 Commits
Author SHA1 Message Date
FermiandFermi 12626c8db2 Okay I dunno why it does what it do but it do. 2019-09-10 20:51:22 +01:00
FermiandFermi 621851790e Damnit hat, don't get too excited now, y'all. 2019-09-10 20:46:38 +01:00
FermiandFermi 443f9e433d Final tweaks 2019-09-10 20:18:45 +01:00
FermiandFermi f03c9c236d Compile fixes and tweaks. 2019-09-10 18:54:47 +01:00
FermiandFermi 8b20df838d Just testing now. 2019-09-10 18:15:04 +01:00
FermiandFermi d883192cf9 Forgot to save 2019-09-08 02:53:11 +01:00
FermiandFermi 2a98f94b24 Rewrite 2019-09-08 02:52:22 +01:00
FermiandFermi 018ebc32ae All that remains is MK testing. 2019-09-08 02:46:43 +01:00
FermiandFermi d90b4769f1 MK, SDGF, Astrogen, Eigen, BE, furranium, hattmium tweaks and fixes. 2019-09-05 22:30:53 +01:00
FermiandFermi f1f762ef48 Darnit bobby 2019-09-04 21:45:55 +01:00
FermiandFermi 91cace6812 Merge remote-tracking branch 'upstream/master' into FERMICHEMCurTweaks 2019-09-03 20:33:33 +01:00
FermiandFermi 7890ad08d5 what is this 2019-09-03 20:30:21 +01:00
FermiandFermi 60bd6bf387 Merge branch 'FERMICHEMCurTweaks' of https://github.com/Thalpy/Citadel-Station-13 into FERMICHEMCurTweaks 2019-09-03 20:21:38 +01:00
FermiandFermi a605d2a776 Todo: finish new words and review langauge 2019-09-03 20:16:41 +01:00
CitadelStationBot c7941fda58 Automatic changelog generation for PR #9209 [ci skip] 2019-09-02 18:37:44 -05:00
nik707andGitHub 44c15897c7 Merge pull request #9209 from Sishen1542/ass-ass-ass
Adds support for trit, bz, and pluox to the SM
2019-09-02 18:37:42 -05:00
CitadelStationBot 024c44255a Automatic changelog generation for PR #9212 [ci skip] 2019-09-02 18:37:24 -05:00
nik707andGitHub 2fe5571887 Merge pull request #9212 from dapnee/plasmaglass-tables-spears
Plasmaglass Tables, Spears, Shards (Take 2)
2019-09-02 18:37:22 -05:00
nik707andGitHub 67f4276aab Merge pull request #9104 from Sishen1542/tbaton
classic & telebaton no longer have attack delay
2019-09-02 18:35:56 -05:00
nik707andGitHub ca8166f940 Merge pull request #9041 from Citadel-Station-13/kevinz000-patch-68
Buffs cult/clockcult wall explosion_block
2019-09-02 18:28:05 -05:00
CitadelStationBot 5e04cc2409 Automatic changelog generation for PR #9057 [ci skip] 2019-09-02 18:27:06 -05:00
nik707andGitHub dd7907c3d7 Merge pull request #9057 from EgoSumStultus/male-AI-vox
Adds the Male AI vox voice.
2019-09-02 18:27:03 -05:00
CitadelStationBot 2f42202f5c Automatic changelog generation for PR #8649 [ci skip] 2019-09-02 18:25:32 -05:00
nik707andGitHub 3ea520d443 Merge pull request #8649 from Ghommie/Ghommie-cit50
Increases the default space ruin z-level count to 2
2019-09-02 18:25:30 -05:00
CitadelStationBot bddaafe7de Automatic changelog generation for PR #8932 [ci skip] 2019-09-02 18:23:49 -05:00
nik707andGitHub df324b7f9a Merge pull request #8932 from EmeraldSundisk/gunrangebox
Adds a gun range to Box Station.
2019-09-02 18:23:48 -05:00
nik707andGitHub 238faae042 Merge pull request #8919 from Citadel-Station-13/kevinz000-patch-47
Increases click resolution to 0.5 seconds
2019-09-02 18:23:34 -05:00
CitadelStationBot 2f3bf39450 Automatic changelog generation for PR #9227 [ci skip] 2019-08-31 20:04:56 -05:00
nik707andGitHub bd60e00924 Merge pull request #9227 from Trilbyspaceclone/spritefiddles
Fixes missing peach and peach seed sprites
2019-08-31 20:04:54 -05:00
TrilbySpaceClone 98c268d6ac fix 2019-08-31 16:58:03 -04:00
CitadelStationBot 29967f0983 Automatic changelog generation for PR #9219 [ci skip] 2019-08-31 02:09:17 -05:00
nik707andGitHub e943cf0ae8 Merge pull request #9219 from Trilbyspaceclone/patch-219
Ports "Fixes slimes not feeding #44760"
2019-08-31 02:09:15 -05:00
CitadelStationBot 2f980a9c91 Automatic changelog generation for PR #9175 [ci skip] 2019-08-31 02:06:35 -05:00
nik707andGitHub c826e1b412 Merge pull request #9175 from lolman360/master
[READY] Adds durathread jumpskirts, rolled down jumpsuits and PROBABLY FIXES SPRITES
2019-08-31 02:06:33 -05:00
nik707andGitHub 7e8e32f848 idiot 2019-08-31 02:05:13 -05:00
nik707andGitHub daff8899dd retard 2019-08-31 02:04:58 -05:00
nik707andGitHub 1d49765d4e Merge pull request #9218 from Citadel-Station-13/kevinz000-patch-79
improves an exploit patch
2019-08-31 01:48:20 -05:00
CitadelStationBot 0a7a875d39 Automatic changelog generation for PR #9216 [ci skip] 2019-08-31 01:37:52 -05:00
nik707andGitHub 01e4e80cca Merge pull request #9216 from Trilbyspaceclone/patch-218
Fixes "Silver Core Luminescents Can Spawn "Oops" #9215"
2019-08-31 01:37:50 -05:00
lolman360andGitHub fee4209ec3 fffffffffffffffffffffffffffffffa 2019-08-31 10:16:03 +10:00
lolman360andGitHub c20bcccee8 gggggggggggggggggggggggg 2019-08-31 10:11:47 +10:00
lolman360andGitHub f2ed4c5085 Merge pull request #2 from lolman360/ddddddd
AAAAAAAAAAAAAAAAAAAAAAAAAAAA
2019-08-31 10:10:14 +10:00
lolman360andGitHub 15cfcfc8c3 ffffffff 2019-08-31 10:09:37 +10:00
lolman360andGitHub 689ba1246b eeeeee eeeeeee eeeeeeeeeeee 2019-08-31 10:08:31 +10:00
TrilbyspacecloneandGitHub 9c9e1b1da3 Update life.dm 2019-08-30 09:24:58 -04:00
kevinz000andGitHub 931527ff7c Update mob.dm 2019-08-29 22:54:41 -07:00
CitadelStationBot 0170c691da Automatic changelog generation for PR #9210 [ci skip] 2019-08-29 22:27:19 -05:00
nik707andGitHub 45914b64d2 Merge pull request #9210 from EmeraldSundisk/dcdfix1
[SPEEDMERGE NOW I THINK] Delta Chapel Driver fixes
2019-08-29 22:27:17 -05:00
EmeraldSundiskandGitHub 4f5e9893b3 Requested changes. 2019-08-29 19:32:32 -07:00
nik707andGitHub 2307f7a2a6 Merge pull request #9146 from Raptorizer/Botany-Peaches
New plant type: Peaches
2019-08-29 19:59:37 -05:00