Commit Graph
920 Commits
Author SHA1 Message Date
LetterJayandGitHub fd26d0eccd Merge pull request #555 from Citadel-Station-13/upstream-merge-26501
[MIRROR] Small abductors refactor
2017-04-25 20:10:20 -05:00
LetterJayandGitHub 081d935114 Merge pull request #553 from Citadel-Station-13/upstream-merge-26497
[MIRROR] Fixes flashlight eyes
2017-04-25 20:10:01 -05:00
LetterJayandGitHub 61fee734f0 Merge pull request #530 from Citadel-Station-13/upstream-merge-26450
[MIRROR] Merge conflict tags aren't touched if github doesn't calculate them in time
2017-04-25 20:08:15 -05:00
CitadelStationBot 50f28f99b9 Automatic changelog generation for PR #543 [ci skip] 2017-04-25 20:07:28 -05:00
LetterJayandGitHub 2362b1ff46 Merge pull request #543 from Citadel-Station-13/upstream-merge-26456
[MIRROR] fixes people with no skin/golems dropping skin when gibbed
2017-04-25 20:07:26 -05:00
CitadelStationBot 607ab2b784 Fixes monkey transformation instantly killing a person 2017-04-25 15:45:27 -05:00
CitadelStationBot fc0ff20e75 Dance Machine ~Fixes~ 2017-04-25 15:14:54 -05:00
CitadelStationBot a96ba5aae3 Removes a few spawns 2017-04-25 14:36:18 -05:00
CitadelStationBot d8a3294686 Refactors T-Ray Scanners 2017-04-25 14:30:08 -05:00
CitadelStationBot 441efa81ca Piggybacking on humans now takes a 1.5 second delay before you actually grab on 2017-04-25 13:47:26 -05:00
CitadelStationBot 5fde47917d Examining a window gives tips for construction/deconstruction 2017-04-25 09:39:30 -05:00
CitadelStationBot 62348f9049 Fixes alien spit visual not disappearing 2017-04-25 09:36:23 -05:00
CitadelStationBot fb61c31470 Small abductors refactor 2017-04-25 03:59:08 -05:00
CitadelStationBot d931e5801c A bunch of Initialize()s now have return values 2017-04-25 03:51:57 -05:00
CitadelStationBot 8e4c9f69d6 Fixes flashlight eyes 2017-04-25 03:50:52 -05:00
LetterJay 306e7c1cba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-04-25 03:27:32 -05:00
LetterJay 3fc34d1ded fix it 2017-04-25 03:27:03 -05:00
LetterJayandGitHub 8c56b5645b Merge pull request #552 from Citadel-Station-13/upstream-merge-26509
[MIRROR] [s]Exploit whack-a-mole
2017-04-25 02:26:53 -05:00
LetterJay 76ed57f90c rej cleanup 2017-04-25 02:11:11 -05:00
LetterJay 172380af2b Merge branch 'upstream-merge-26509' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26509 2017-04-25 02:09:52 -05:00
LetterJay 496107120f the fun never ends 2017-04-25 02:09:21 -05:00
LetterJayandGitHub 9df952873b Update type2type.dm 2017-04-25 01:55:12 -05:00
LetterJayandGitHub 31e8bee39e Update type2type.dm 2017-04-25 01:54:53 -05:00
LetterJay 3d51a07243 world fix 2017-04-25 01:52:49 -05:00
CitadelStationBot 607868a5de [s]Exploit whack-a-mole 2017-04-25 01:31:50 -05:00
LetterJay d0c28c0d51 wrong map loaded 2017-04-25 01:31:34 -05:00
LetterJay 1a8b8ad66c fix dme 2017-04-25 01:25:09 -05:00
LetterJay 8088ce38cc rej file cleanup 2017-04-25 01:15:04 -05:00
CitadelStationBot 81fadec9e4 Automatic changelog generation for PR #528 [ci skip] 2017-04-25 01:14:18 -05:00
LetterJayandGitHub 88d4703ebf Merge pull request #528 from Citadel-Station-13/upstream-merge-26292
[MIRROR] [Deltastation] Access Fixes [Ready for Review]*
2017-04-25 01:14:17 -05:00
LetterJayandGitHub fc0246d388 Merge pull request #538 from Citadel-Station-13/upstream-merge-26444
[MIRROR] Cerestation Tweaks MKIV
2017-04-25 01:13:55 -05:00
LetterJayandGitHub a7a08f6cae Merge pull request #548 from Citadel-Station-13/upstream-merge-26496
[MIRROR] Removes active turfs from Pubby, Box and Crashed Ship ruin
2017-04-25 01:13:41 -05:00
LetterJayandGitHub b9ab919c22 Merge pull request #521 from Citadel-Station-13/upstream-merge-26376
[MIRROR] Grammar edit for flashbangs tip
2017-04-25 01:10:58 -05:00
LetterJayandGitHub a06c6a2994 Merge pull request #508 from Citadel-Station-13/upstream-merge-26337
[MIRROR] Refactors picture frames to use wall frames system
2017-04-25 01:10:40 -05:00
CitadelStationBot 5dd5363828 Automatic changelog generation for PR #545 [ci skip] 2017-04-25 01:02:39 -05:00
LetterJayandGitHub e27c5c8db3 Merge pull request #545 from Citadel-Station-13/upstream-merge-26397
[MIRROR] Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker
2017-04-25 01:02:38 -05:00
CitadelStationBot 6dd45dee7f Automatic changelog generation for PR #547 [ci skip] 2017-04-25 01:02:24 -05:00
LetterJayandGitHub 8fcb5d761e Merge pull request #547 from Citadel-Station-13/upstream-merge-26491
[MIRROR] Fixes turfs on Omegastation
2017-04-25 01:02:23 -05:00
LetterJayandGitHub d78e5c196d Rename tgstation.2.1.3.dmm.rej to broken.rej 2017-04-25 01:01:11 -05:00
LetterJayandGitHub 4ea582ddef Update tgstation.2.1.3.dmm.rej 2017-04-25 01:00:20 -05:00
CitadelStationBot c84484f0f8 Automatic changelog generation for PR #550 [ci skip] 2017-04-25 00:57:22 -05:00
LetterJayandGitHub 7d03fff752 Merge pull request #550 from Citadel-Station-13/upstream-merge-26443
[MIRROR] Improves Skeleton Hitboxes
2017-04-25 00:57:21 -05:00
LetterJayandGitHub cf0906597b Merge pull request #551 from Citadel-Station-13/upstream-merge-26506
[MIRROR] >We still let old code in the codebase
2017-04-25 00:57:08 -05:00
LetterJay de1d8188ae removes rej files 2017-04-24 21:34:58 -05:00
CitadelStationBot 198fb4e343 Automatic changelog generation for PR #542 [ci skip] 2017-04-24 21:31:33 -05:00
LetterJayandGitHub 88da83f504 Merge pull request #542 from Citadel-Station-13/upstream-merge-26416
[MIRROR] Ghosts no longer drift in space
2017-04-24 21:31:32 -05:00
LetterJayandGitHub f38f1e383b Merge pull request #488 from Citadel-Station-13/upstream-merge-26344
[MIRROR] Fixes double warnings on new players connecting.
2017-04-24 21:27:40 -05:00
LetterJayandGitHub 6070000c9a Merge pull request #537 from Citadel-Station-13/upstream-merge-26485
[MIRROR] Renames "Hard Reset" to "Reboot World"
2017-04-24 21:23:31 -05:00
LetterJayandGitHub 832233000e Merge pull request #546 from Citadel-Station-13/upstream-merge-26479
[MIRROR] Getting uncuffed resets your clickdelay
2017-04-24 21:22:46 -05:00
CitadelStationBot ef68586e4f Automatic changelog generation for PR #544 [ci skip] 2017-04-24 21:22:13 -05:00