Commit Graph
36396 Commits
Author SHA1 Message Date
Hatterhat a7a58ce81d this might work better 2020-08-17 18:30:00 -05:00
Hatterhat eb69035240 holy shit i despise the copypaste on this one 2020-08-17 12:39:49 -05:00
Hatterhat 8cd45c7275 hey travis are you workin yet bro 2020-08-16 01:36:41 -05:00
Hatterhat 76cad8f1bf bdm always spawns, duplicate removal maintained 2020-08-06 18:26:00 -05:00
Hatterhat 28c7ed87a2 no whitespace 2020-08-06 16:23:24 -05:00
Hatterhat e85b6a490b minimum spawns subsystem - squashed 2020-08-06 16:21:28 -05:00
CitadelStationBot e0114c6964 Automatic changelog generation for PR #12954 [ci skip] 2020-08-02 12:52:10 -05:00
LinandGitHub 2885b861f2 Merge pull request #12954 from silicons/killer_queen
bomb stands now use components
2020-08-02 12:52:07 -05:00
CitadelStationBot a5ac60222f Automatic changelog generation for PR #12989 [ci skip] 2020-08-02 12:50:38 -05:00
LinandGitHub 0c85e3f127 Merge pull request #12989 from dapnee/why-is-box-even-fucked-like-this,-smh
You Thought I Was Done Fucking With Box BUT YOU WERE WRONG!
2020-08-02 12:50:34 -05:00
CitadelStationBot a7ba1f0cb7 Automatic changelog generation for PR #12925 [ci skip] 2020-08-02 11:30:13 -05:00
siliconsandGitHub 06f5ce6401 buffs shoving (#12925)
* ^w^

* ok

* ok
2020-08-02 18:30:09 +02:00
CitadelStationBot 6618435ee4 Automatic changelog generation for PR #12912 [ci skip] 2020-08-02 01:12:52 -05:00
siliconsandGitHub f45329bfd7 Merge pull request #12912 from Linzolle/penlight
uv penlight icon
2020-08-01 23:12:49 -07:00
CitadelStationBot 2ef7e1bf0a Automatic changelog generation for PR #12999 [ci skip] 2020-08-01 23:05:54 -05:00
siliconsandGitHub 65d184c552 Merge pull request #12999 from KeRSedChaplain/guardianfix
Removes clockwork guardian's projectile deflection. OOPS!
2020-08-01 21:05:52 -07:00
silicons 25d1fb761a Merge remote-tracking branch 'citadel/master' into killer_queen 2020-08-01 20:51:38 -07:00
Dan-Neposh 6f2d4ac4df makes clockwork guardians have no projectile deflection 2020-08-01 23:36:36 -04:00
CitadelStationBot a8a1284541 Automatic changelog generation for PR #12983 [ci skip] 2020-08-01 19:45:45 -05:00
LinandGitHub d107d2ec49 Merge pull request #12983 from Citadel-Station-13/silicons-patch-63
fixes nukeops timer being from server start instead of roundstart which gives them 5 free minutes am i salty maybe just a little (no i'm not but we should fix this anyways)
2020-08-01 19:45:42 -05:00
Changelogs 8e021892ca Automatic changelog compile [ci skip] 2020-08-02 00:11:56 +00:00
CitadelStationBot b9f8af2779 Automatic changelog generation for PR #12993 [ci skip] 2020-08-01 15:31:36 -05:00
siliconsandGitHub 7e0e60c126 Merge pull request #12993 from KeRSedChaplain/toyslabfixfortravis
Toyslabfixfortravis
2020-08-01 13:31:33 -07:00
Dan-Neposh 44e6b6ccc7 I removed the Dread_Ipad, Clockwork Slab reigns supreme 2020-08-01 16:18:25 -04:00
CitadelStationBot 0d7572b777 Automatic changelog generation for PR #12976 [ci skip] 2020-08-01 05:35:49 -05:00
siliconsandGitHub e8ec73ba7d Merge pull request #12976 from Hatterhat/durathread-kits
Durathread Reinforcement Kits
2020-08-01 03:35:45 -07:00
CitadelStationBot d83db599c2 Automatic changelog generation for PR #12980 [ci skip] 2020-08-01 05:35:02 -05:00
siliconsandGitHub d2d598dcfe Merge pull request #12980 from dapnee/What-if-I-keep-fixing-maps
Map Edits Three: The Mappening
2020-08-01 03:34:59 -07:00
CitadelStationBot 3a7c6121bb Automatic changelog generation for PR #12970 [ci skip] 2020-08-01 05:34:21 -05:00
siliconsandGitHub 128225ca6f Merge pull request #12970 from kappa-sama/patch-35
salt pr
2020-08-01 03:34:17 -07:00
CitadelStationBot 0dbc52230f Automatic changelog generation for PR #12965 [ci skip] 2020-08-01 05:33:46 -05:00
siliconsandGitHub 2230a3665a Merge pull request #12965 from timothyteakettle/end-our-suffering
drastically lowers the damage-related benefits of combat mode
2020-08-01 03:33:43 -07:00
CitadelStationBot 66534fd5b6 Automatic changelog generation for PR #12947 [ci skip] 2020-08-01 05:29:19 -05:00
siliconsandGitHub 8dfa3fcce8 Merge pull request #12947 from Seris02/podpersonfix
replica pod fix bounty
2020-08-01 03:29:16 -07:00
siliconsandGitHub 30d82d66d1 Merge pull request #12939 from Sishen1542/iaa-iaa
Reflavors IAA, removes certain items from IAA uplinks, adds TC stealing functionality to uplinks
2020-08-01 02:24:01 -07:00
Heretical LizardandGitHub 71783cf760 Merge pull request #12 from Citadel-Station-13/master
updating my branch pog
2020-08-01 04:23:22 -04:00
CitadelStationBot 26a44997e8 Automatic changelog generation for PR #12975 [ci skip] 2020-08-01 02:51:21 -05:00
siliconsandGitHub 974fd83e45 Merge pull request #12975 from MrJWhit/abductor-spawntext
Changes to abductors spawntext
2020-08-01 00:51:18 -07:00
CitadelStationBot 78deda2a9a Automatic changelog generation for PR #12742 [ci skip] 2020-08-01 02:17:14 -05:00
siliconsandGitHub 320c91f4d3 Merge pull request #12742 from KeRSedChaplain/clockcultrework
Clockwork Cult rework
2020-08-01 00:17:11 -07:00
Dan-Neposh 11a0154ec1 changes Neovgre's sounds again 2020-08-01 01:26:35 -04:00
Dan-Neposh 9e36d65a05 HAHAHAHA NOTHING TO SEE HERE
THIS VARIABLE HAS ALWAYS BEEN THERE WHAT DO YOU MEAN HAHAHAHAHA
2020-08-01 00:00:41 -04:00
Dan-Neposh 7a0dff1f77 fixes the invisible slabs and buffs a couple scripture casting times 2020-07-31 23:03:59 -04:00
CitadelStationBot 3ac679f08b Automatic changelog generation for PR #12979 [ci skip] 2020-07-31 21:45:17 -05:00
siliconsandGitHub bc254eb31a Merge pull request #12979 from Auris456852/master
Adds roboticist cartridge to the PDA vendor
2020-07-31 19:45:15 -07:00
CitadelStationBot d9a6069122 Automatic changelog generation for PR #12966 [ci skip] 2020-07-31 21:44:42 -05:00
siliconsandGitHub 053e18247b Merge pull request #12966 from ike709/master
CentCom Galactic Ban DB
2020-07-31 19:44:40 -07:00
Dan-Neposh dc70f390bb Turns out I was the one screaming all along 2020-07-31 21:40:08 -04:00
Dan-Neposh aa605ec007 Changes the death sound for Ratvar to have more oomph behind it 2020-07-31 21:02:12 -04:00
Changelogs be0740a2e7 Automatic changelog compile [ci skip] 2020-08-01 00:11:48 +00:00