Commit Graph

8567 Commits

Author SHA1 Message Date
CitadelStationBot d0fbc5bbee Multiple fixes in RPD and pipe construciton 2017-11-07 14:26:15 -06:00
ACCount 0d691189aa Multiple fixes in RPD and pipe construciton (#32399)
* Multiple fixes in RPD and pipe construciton

* Integrates another fix PR to avoid conflicts
2017-11-07 14:26:15 -06:00
CitadelStationBot 36234e94d4 Automatic changelog generation for PR #3840 [ci skip] 2017-11-07 04:46:47 -06:00
LetterJay 787994ca3c Merge pull request #3840 from Citadel-Station-13/upstream-merge-32437
[MIRROR] Adds an organ storage bag to the syndicate medborg
2017-11-07 04:46:44 -06:00
CitadelStationBot 757c2a1d3a Automatic changelog generation for PR #3839 [ci skip] 2017-11-07 04:46:35 -06:00
LetterJay c393addda3 Merge pull request #3839 from Citadel-Station-13/upstream-merge-32046
[MIRROR] Plush Ratvar can now fight plush Nar-Sie
2017-11-07 04:46:32 -06:00
LetterJay f254e6fb9d Merge pull request #3838 from Citadel-Station-13/upstream-merge-32408
[MIRROR] Fixes hand tele losing ranged portal-dispel function
2017-11-07 04:45:52 -06:00
LetterJay 46a2373ceb Merge pull request #3835 from Citadel-Station-13/upstream-merge-32436
[MIRROR] Fixes a direction in reflector map editor sprite
2017-11-07 04:45:39 -06:00
CitadelStationBot 36a37eaae6 Automatic changelog generation for PR #3834 [ci skip] 2017-11-07 04:45:31 -06:00
LetterJay 96134f876c Merge pull request #3834 from Citadel-Station-13/upstream-merge-32431
[MIRROR] Monkeys can no longer transmit diseases through hardsuits
2017-11-07 04:45:29 -06:00
LetterJay 3bae5fcef1 Merge pull request #3832 from Citadel-Station-13/upstream-merge-32427
[MIRROR] Cleans up wire varedits
2017-11-07 04:45:12 -06:00
LetterJay c3ecdfaade Merge pull request #3831 from Citadel-Station-13/upstream-merge-32425
[MIRROR] Adds admin away gateway.
2017-11-07 04:44:58 -06:00
LetterJay a5adcace3a Merge pull request #3830 from Citadel-Station-13/upstream-merge-32421
[MIRROR] Revert "Adds 'round' chat command"
2017-11-07 04:44:46 -06:00
LetterJay 1f2af245c8 Merge pull request #3829 from Citadel-Station-13/upstream-merge-32424
[MIRROR] Mining zlevel has a bomb cap of three times the configured cap
2017-11-07 04:44:31 -06:00
LetterJay e39e1605c3 Merge pull request #3828 from Citadel-Station-13/upstream-merge-32429
[MIRROR] Fix webhook
2017-11-07 04:44:22 -06:00
CitadelStationBot 66e10af333 Automatic changelog generation for PR #3842 [ci skip] 2017-11-07 04:44:11 -06:00
LetterJay 0ca35e765d Merge pull request #3842 from Citadel-Station-13/upstream-merge-32456
[MIRROR] [s] Removes a handful of ways ghosts can affect the world
2017-11-07 04:44:08 -06:00
CitadelStationBot decfc49f2b Automatic changelog generation for PR #3827 [ci skip] 2017-11-07 04:43:20 -06:00
LetterJay 3115e59b7e Merge pull request #3827 from Citadel-Station-13/upstream-merge-32133
[MIRROR] Blobbernauts and spores are no longer killed by blob victory
2017-11-07 04:43:17 -06:00
LetterJay 0256aa8881 Merge pull request #3826 from Citadel-Station-13/upstream-merge-32359
[MIRROR] fixes cult hardsuit size
2017-11-07 04:43:02 -06:00
LetterJay ce790ce437 Merge pull request #3825 from Citadel-Station-13/upstream-merge-32418
[MIRROR] Updates cape descriptions
2017-11-07 04:42:30 -06:00
CitadelStationBot cb8fbacee8 Automatic changelog generation for PR #3824 [ci skip] 2017-11-07 04:41:58 -06:00
LetterJay 2d07daca49 Merge pull request #3824 from Citadel-Station-13/upstream-merge-32417
[MIRROR] Fixes EMP wire pulsing
2017-11-07 04:41:55 -06:00
CitadelStationBot c102833d2d Automatic changelog generation for PR #3821 [ci skip] 2017-11-07 04:41:26 -06:00
LetterJay 48dfeb5f7a Merge pull request #3821 from Citadel-Station-13/upstream-merge-32406
[MIRROR] Refactors and improvements to xenobio slime processor
2017-11-07 04:41:23 -06:00
LetterJay 890ed4b2ba Merge pull request #3820 from Citadel-Station-13/upstream-merge-32276
[MIRROR] PKborgs can no longer activate projectile fields if someone is buckled
2017-11-07 04:41:04 -06:00
LetterJay e420734e3a Merge pull request #3819 from Citadel-Station-13/upstream-merge-32397
[MIRROR] Fixes Ark examine
2017-11-07 04:40:48 -06:00
LetterJay 78f8c4650c Merge pull request #3817 from Citadel-Station-13/upstream-merge-32402
[MIRROR] Increased gas filter UI size
2017-11-07 04:39:50 -06:00
LetterJay 472576dd1f Merge pull request #3816 from Citadel-Station-13/upstream-merge-32401
[MIRROR] Fixes flamethrower icon not updating on plasma tank removal
2017-11-07 04:39:37 -06:00
LetterJay 5b819699a2 Merge pull request #3815 from Citadel-Station-13/upstream-merge-32415
[MIRROR] Removes the Cerestation minimap
2017-11-07 04:39:27 -06:00
LetterJay f3ffc7434a Merge pull request #3814 from Citadel-Station-13/upstream-merge-32411
[MIRROR] removes search_contents_for proc
2017-11-07 04:39:16 -06:00
LetterJay b11ae3b119 Merge pull request #3796 from Citadel-Station-13/upstream-merge-32375
[MIRROR] Fixed required images being in the config folder
2017-11-07 03:50:16 -06:00
CitadelStationBot 70f3993f72 Automatic changelog generation for PR #3784 [ci skip] 2017-11-07 03:50:08 -06:00
LetterJay 1489019399 Merge pull request #3784 from Citadel-Station-13/upstream-merge-32260
[MIRROR] Shapeshift tweaks.
2017-11-07 03:50:05 -06:00
CitadelStationBot c614059143 Automatic changelog generation for PR #3775 [ci skip] 2017-11-07 03:49:48 -06:00
LetterJay 9e28d79b8c Merge pull request #3775 from Citadel-Station-13/upstream-merge-32334
[MIRROR] Adds around 30 new ambience sounds, and changes ambience code a little bit
2017-11-07 03:49:46 -06:00
LetterJay 83c6690721 Update closed.dm 2017-11-07 03:24:50 -06:00
LetterJay 6a1c0f6683 Update screen_objects.dm 2017-11-07 03:24:40 -06:00
CitadelStationBot 0042fcfd17 [s] Removes a handful of ways ghosts can affect the world 2017-11-06 21:48:43 -06:00
oranges 1068b8f22d Merge pull request #32456 from vuonojenmustaturska/ghostmemes
[s] Removes a handful of ways ghosts can affect the world
2017-11-06 21:48:42 -06:00
CitadelStationBot 7f2786bdf3 Adds an organ storage bag to the syndicate medborg 2017-11-06 15:15:10 -06:00
Anonmare 9c12ee48e1 Adds an organ storage bag to the syndicate medborg (#32437)
* Adds an organ storage bag to the syndicate medborg

* Adds the drill and extinguisher
2017-11-06 15:15:10 -06:00
CitadelStationBot d4c97671e5 Plush Ratvar can now fight plush Nar-Sie 2017-11-06 14:44:25 -06:00
Ashe Higgs 31dfd7e8fb Plush Ratvar can now fight plush Nar-Sie (#32046)
* Plush Ratvar can fight plush Nar-Sie

* Maintainer review

* Qdeleted checks
2017-11-06 14:44:25 -06:00
CitadelStationBot 527ddf515b Fixes hand tele losing ranged portal-dispel function 2017-11-06 14:43:14 -06:00
kevinz000 42deca4f72 Fixes hand tele losing ranged portal-dispel function (#32408)
* Fixes hand teles not dispelling at range
2017-11-06 14:43:14 -06:00
CitadelStationBot c177c76958 Fixes a direction in reflector map editor sprite 2017-11-06 08:30:05 -06:00
ACCount 6d4da84228 Fixes a direction in reflector map editor sprite (#32436) 2017-11-06 08:30:04 -06:00
CitadelStationBot 9e7437128e Monkeys can no longer transmit diseases through hardsuits 2017-11-05 20:45:35 -06:00
MoreRobustThanYou 1b1411f41f Monkeys can no longer transmit diseases through hardsuits (#32431) 2017-11-05 20:45:34 -06:00