Commit Graph
23436 Commits
Author SHA1 Message Date
Linzolle e009a4cc3d Revert "pooj fixed this anyway"
This reverts commit 6ce8db8d7b.
2019-10-05 22:15:48 -05:00
Linzolle caa61fa0b4 hide your ass 2019-10-05 12:24:10 -05:00
Linzolle 1ec0685e62 I couldn't tell you how this happened 2019-10-05 10:59:02 -05:00
Linzolle 4fc9385e44 oops 2019-10-05 10:40:31 -05:00
Linzolle 6ce8db8d7b pooj fixed this anyway 2019-10-05 10:38:17 -05:00
Linzolle d36715ee7b blue cross 2019-09-05 18:53:03 -05:00
Linzolle 92f3e4b4ee add sprites for spaceold 2019-09-05 15:01:24 -05:00
Linzolle 0280ea134d use the one from RP but edited 2019-09-05 14:06:28 -05:00
Linzolle 04325af2d6 resprite cmo hardsuit for nagas 2019-09-05 13:55:26 -05:00
Linzolle 38926ddf75 pawbs 2019-09-05 12:58:30 -05:00
Linzolle b36caabfe6 taur fixes 2019-09-05 12:47:55 -05:00
nik707andGitHub 80e2f6e7c2 Merge pull request #9245 from jakeramsay007/GLASS-MACHINE-BROKE
[SPEEDMERGE] Glass Machine :b:roke
2019-09-05 10:43:05 -05:00
Chayse Ramsay 0cf1415969 [SPEEDMERGE] Glass Machine :b:roke 2019-09-05 16:28:18 +01:00
nik707andGitHub d8dee76d28 Merge pull request #9222 from Citadel-Station-13/kevinz000-patch-80
TK dusting now uses the proper removal procs to prevent bugs
2019-09-04 20:14:06 -05:00
nik707andGitHub 586eb56977 Merge pull request #9230 from Ghommie/Ghommie-cit191
Fixing clockie mass recall that I apparently didn't really fix correctly before.
2019-09-04 19:45:19 -05: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
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
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