Commit Graph

7210 Commits

Author SHA1 Message Date
deathride58 fe5db1194a fuk 2017-10-15 00:46:45 -04:00
deathride58 47195cdbf0 INTENSE BORGO BALANCE TWEAKS 2017-10-15 00:30:22 -04:00
CitadelStationBot b200389630 Automatic changelog generation for PR #3389 [ci skip] 2017-10-14 15:36:35 -05:00
kevinz000 80ac0313a7 Merge pull request #3389 2017-10-14 13:36:22 -07:00
kevinz000 e8bb77ba2c Merge pull request #3387 2017-10-14 13:35:04 -07:00
LetterJay dd18caa84e Merge pull request #3386 from Citadel-Station-13/upstream-merge-31670
[MIRROR] IC Issue also tells the ahelper that their ticket has been resolved
2017-10-14 16:20:30 -04:00
LetterJay 21ec35da1c Merge pull request #3385 from Citadel-Station-13/upstream-merge-31668
[MIRROR] Fixes slapping while restrained/etc...
2017-10-14 16:20:13 -04:00
CitadelStationBot 7d5db29a2f Allows simple animals to qdel, generally 2017-10-14 15:18:07 -05:00
vuonojenmustaturska f2413f047f Allows simple animals to qdel, generally (#31680)
* Allows simple animals to qdel, generally

* requested changes
2017-10-14 15:18:07 -05:00
CitadelStationBot 0c663a6a9c Automatic changelog generation for PR #3384 [ci skip] 2017-10-14 15:09:18 -05:00
LetterJay c10ff48ced Merge pull request #3384 from deathride58/noncentcomobjectives
Axes edglines from security objective
2017-10-14 16:09:16 -04:00
LetterJay 0ee34c7b3d Merge pull request #3383 from Citadel-Station-13/upstream-merge-31662
[MIRROR] Removes unused list
2017-10-14 15:41:09 -04:00
LetterJay 581ea5ac48 Merge pull request #3382 from Citadel-Station-13/upstream-merge-31655
[MIRROR] Slight change to the behavior of Assimilate_Air()
2017-10-14 15:38:21 -04:00
LetterJay 2d32e5f782 Merge pull request #3381 from Citadel-Station-13/upstream-merge-31693
[MIRROR] FIXES the NOT FIXED donk pocket issue by FIXING in some omnizine on grind
2017-10-14 15:38:10 -04:00
LetterJay 1e01c696b4 Merge pull request #3380 from Citadel-Station-13/upstream-merge-31454
[MIRROR] New Chaplain Weapon: Hammer of Pride!
2017-10-14 15:38:01 -04:00
CitadelStationBot 9c4d885710 Automatic changelog generation for PR #3379 [ci skip] 2017-10-14 14:37:18 -05:00
LetterJay 253f1e3f1c Merge pull request #3379 from Citadel-Station-13/upstream-merge-30570
[MIRROR] Flying mobs now clip past non flying mobs, various flightsuit/iontrail/movement tweaks/code improvements/bugfixes
2017-10-14 15:37:17 -04:00
CitadelStationBot 6f9123b955 Automatic changelog generation for PR #3365 [ci skip] 2017-10-14 14:37:01 -05:00
LetterJay 45619b0e1b Merge pull request #3365 from Citadel-Station-13/upstream-merge-31601
[MIRROR] Fix many instances of "the the"
2017-10-14 15:37:00 -04:00
LetterJay c056349055 Update flightsuit.dm 2017-10-14 13:57:22 -05:00
CitadelStationBot cb95086ca5 Fixes the last Href Token issues 2017-10-14 11:46:01 -05:00
Jordan Brown ccb0674988 Fixes the last Href Token issues (#31666) 2017-10-14 11:46:01 -05:00
LetterJay 47df292c54 Update angel.dm 2017-10-14 09:23:46 -05:00
LetterJay 1fcfa019f3 Update species.dm 2017-10-14 09:23:24 -05:00
LetterJay 49ffb814d5 Update flightsuit.dm 2017-10-14 09:23:01 -05:00
LetterJay 87e8c66d5f Merge pull request #3378 from Citadel-Station-13/upstream-merge-31649
[MIRROR] Fixes invisible wirecutters and made screwdrivers easier to see in DM
2017-10-14 10:21:27 -04:00
CitadelStationBot 8e5c8ef7e4 Automatic changelog generation for PR #3377 [ci skip] 2017-10-14 09:21:20 -05:00
LetterJay 0397bd57c1 Merge pull request #3377 from Citadel-Station-13/upstream-merge-31604
[MIRROR] Adds Toggle Underline button to PDA menu
2017-10-14 10:21:19 -04:00
CitadelStationBot 893a0eb891 Automatic changelog generation for PR #3376 [ci skip] 2017-10-14 09:21:11 -05:00
LetterJay dce56e3951 Merge pull request #3376 from Citadel-Station-13/upstream-merge-31598
[MIRROR] Smoke Machine Updates & Fixes
2017-10-14 10:21:09 -04:00
LetterJay 27bd0ffebb Merge pull request #3374 from Citadel-Station-13/upstream-merge-31635
[MIRROR] Small lighting perf tweak
2017-10-14 10:20:36 -04:00
LetterJay c442f49cde Merge pull request #3373 from Citadel-Station-13/upstream-merge-31645
[MIRROR] Cleans up explosives at syndie base
2017-10-14 10:20:27 -04:00
CitadelStationBot 0f8172a96c Automatic changelog generation for PR #3372 [ci skip] 2017-10-14 09:20:13 -05:00
LetterJay 4b48651380 Merge pull request #3372 from Citadel-Station-13/upstream-merge-31646
[MIRROR] You can now drag-drop people into open DNA scanners
2017-10-14 10:20:11 -04:00
CitadelStationBot 20e29c02af Automatic changelog generation for PR #3371 [ci skip] 2017-10-14 09:19:53 -05:00
LetterJay fea2807378 Merge pull request #3371 from Citadel-Station-13/upstream-merge-31648
[MIRROR] Medibots will no longer inject people in lockers/sleepers/etc
2017-10-14 10:19:52 -04:00
LetterJay 5bbf3b9735 Merge pull request #3370 from Citadel-Station-13/upstream-merge-31620
[MIRROR] Fixes various Nanotrasen capitalizations
2017-10-14 10:19:15 -04:00
LetterJay 9aa87f73c8 Merge pull request #3369 from Citadel-Station-13/upstream-merge-31628
[MIRROR] Various examine grammar fixes
2017-10-14 10:19:01 -04:00
LetterJay f7123f0f4b Merge pull request #3368 from Citadel-Station-13/upstream-merge-31623
[MIRROR] Fixes Shambrero Penguin Names
2017-10-14 10:18:43 -04:00
LetterJay 0aadce290c Merge pull request #3367 from Citadel-Station-13/upstream-merge-31615
[MIRROR] Adds new sabre sprites
2017-10-14 10:18:16 -04:00
CitadelStationBot 2c81a74aa0 Automatic changelog generation for PR #3366 [ci skip] 2017-10-14 09:17:19 -05:00
LetterJay 2e61af534e Merge pull request #3366 from Citadel-Station-13/upstream-merge-31420
[MIRROR] Bullet decals tweak
2017-10-14 10:17:18 -04:00
LetterJay d6903bcf3c Merge branch 'master' into upstream-merge-31601 2017-10-14 10:17:16 -04:00
CitadelStationBot 971439a86b IC Issue also tells the ahelper that their ticket has been resolved 2017-10-14 09:07:03 -05:00
Leo 506324fbec Merge pull request #31670 from tgstation/Cyberboss-patch-3
IC Issue also tells the ahelper that their ticket has been resolved
2017-10-14 09:07:03 -05:00
CitadelStationBot a69e6d599f Fixes slapping while restrained/etc... 2017-10-14 09:05:49 -05:00
Leo 635e430ec6 Merge pull request #31668 from tgstation/Cyberboss-patch-2
Fixes slapping while restrained/etc...
2017-10-14 09:05:49 -05:00
deathride58 5ea5dc40df hos ded 2017-10-14 03:42:08 -04:00
CitadelStationBot 704c90c9ed Removes unused list 2017-10-14 00:50:35 -05:00
AnturK f6f114af12 Removes unused list (#31662) 2017-10-14 00:50:35 -05:00