Commit Graph
23666 Commits
Author SHA1 Message Date
AlonefromhellandLinzolle eee1ccbe2c merge oracle ui from kepler 2019-09-04 11:42:04 -05:00
TrilbySpaceClone 084b37ae4e tada 2019-09-04 10:13:32 -04:00
Sishen d431ee1a20 baseball bat 2019-09-04 03:01:47 -04:00
CitadelStationBot f742a34fb0 Automatic changelog generation for PR #9235 [ci skip] 2019-09-03 16:50:17 -05:00
kevinz000andGitHub 2b251d0f5a Merge pull request #9235 from YakumoChen/autoscan-autoban-revengeance
Nerfs Autocloning Pt. 2.1: Autoscan
2019-09-03 14:50:15 -07:00
YakumoChenandGitHub 807f7f4771 completely removes autoscan as originally intended 2019-09-03 06:03:46 +00:00
YakumoChenandGitHub fbcce02f78 still removes autoscan 2019-09-03 05:44:51 +00: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
Sishen 3f954f10a7 Update runes.dm 2019-09-02 02:09:59 -04:00
Sishen 0b6eb6e34c Update holy_weapons.dm 2019-09-01 22:36:39 -04:00
TrilbyspacecloneandGitHub 473cde6a9d huh 2019-08-31 21:16:14 -04:00
TrilbySpaceClone 58458a6740 the seeds 2019-08-31 21:12:27 -04:00
TrilbySpaceClone 4d16abc141 Merge branch 'master' into fruit 2019-08-31 21:11:22 -04:00
TrilbySpaceClone c2f189bbdb Merge branch 'master' into fruit 2019-08-31 21:09:59 -04: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
Ghommie 4085b479d1 Fixing clockie mass recall that I apparently didn't really fix before. 2019-09-01 01:45:33 +02:00
Sishen 3b40f73266 prayer beads no longer instantly deconvert, now inject holy water 2019-08-31 18:37:00 -04:00
TrilbyspacecloneandGitHub f9e12378e9 Update ids.dm 2019-08-31 18:34:20 -04:00
TrilbyspacecloneandGitHub a43a497114 Update ids.dm 2019-08-31 18:15:32 -04:00
Sishen b4f27b8841 allows renaming of non null rod holyweapons, fixes hypertool description 2019-08-31 18:05:09 -04:00
Sishen 279a6ed83e bibles now destroy runes instead of nullrods, due to holy weapons encompassing more typepaths 2019-08-31 17:57:36 -04:00
Sishen d9fff579b1 damage and stamina balances 2019-08-31 17:39:51 -04: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
Sishen ba5021af5b gives lasrifle the damage component, turns kevs divine lightblade into a hypereut to balance stats, adds hypertool 2019-08-31 02:55:29 -04: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
kappa-samaandGitHub db22ae64d4 im gonna go ape 2019-08-30 22:46:52 -04:00
kappa-samaandGitHub 38023a05fa update master
update master
2019-08-30 22:40:35 -04:00
lolman360andGitHub fee4209ec3 fffffffffffffffffffffffffffffffa 2019-08-31 10:16:03 +10:00
lolman360andGitHub c20bcccee8 gggggggggggggggggggggggg 2019-08-31 10:11:47 +10:00