Commit Graph
13592 Commits
Author SHA1 Message Date
Jordan BrownandCitadelStationBot 16de4e4c90 Disables max errors on travis compile (#35550) 2018-02-12 12:49:01 -06:00
CitadelStationBot b6d5173420 Automatic changelog generation for PR #5438 [ci skip] 2018-02-12 10:05:00 -06:00
LetterJayandGitHub 6f117401de Merge pull request #5438 from Citadel-Station-13/upstream-merge-35524
[MIRROR] Fatshaming the AI, moving him two tiles upward when mass_recall() happens
2018-02-12 10:04:56 -06:00
LetterJayandGitHub 2171016baa Merge pull request #5436 from Citadel-Station-13/upstream-merge-35549
[MIRROR] Removes old golem items
2018-02-12 10:04:31 -06:00
LetterJayandGitHub ef8ce89fe2 Merge pull request #5435 from Citadel-Station-13/upstream-merge-35558
[MIRROR] fulton pack not allowed on supply shuttle
2018-02-12 10:04:12 -06:00
CitadelStationBot 302c187018 Automatic changelog generation for PR #5434 [ci skip] 2018-02-12 10:03:19 -06:00
LetterJayandGitHub 5a9b7a5173 Merge pull request #5434 from Citadel-Station-13/upstream-merge-35541
[MIRROR] Fixes lye/plastic/charcoal conflicts
2018-02-12 10:03:16 -06:00
CitadelStationBot c88c4f2d27 Automatic changelog generation for PR #5433 [ci skip] 2018-02-12 10:03:08 -06:00
LetterJayandGitHub e4c49c3ce4 Merge pull request #5433 from Citadel-Station-13/upstream-merge-35566
[MIRROR] Urinal cakes can now be picked up again
2018-02-12 10:03:05 -06:00
LetterJayandGitHub 15572d1d5f Merge pull request #5430 from Citadel-Station-13/upstream-merge-35514
[MIRROR] Fixes wrong ID for syndicate ghost roles
2018-02-12 10:01:42 -06:00
CitadelStationBot b09288e006 Fatshaming the AI, moving him two tiles upward when mass_recall() happens 2018-02-12 09:20:53 -06:00
Dax DupontandCitadelStationBot c40925f529 Fatshaming the AI, moving him two tiles upward when mass_recall() happens (#35524) 2018-02-12 09:20:52 -06:00
CitadelStationBot c2e02e3b8a Removes old golem items 2018-02-12 09:09:14 -06:00
vuonojenmustaturskaandCitadelStationBot 3d5e49f06d Merge pull request #35549 from KorPhaeron/golem
Removes old golem items
2018-02-12 09:09:14 -06:00
CitadelStationBot 902a77dd0d fulton pack not allowed on supply shuttle 2018-02-12 09:07:02 -06:00
vuonojenmustaturskaandCitadelStationBot 0d40303254 Merge pull request #35558 from praisenarsie/patch-28
fulton pack not allowed on supply shuttle
2018-02-12 09:07:02 -06:00
CitadelStationBot 173c6fa686 Fixes lye/plastic/charcoal conflicts 2018-02-12 09:02:42 -06:00
vuonojenmustaturskaandCitadelStationBot 379ff0546a Merge pull request #35541 from 81Denton/chem-conflicts
Fixes lye/plastic/charcoal conflicts
2018-02-12 09:02:42 -06:00
CitadelStationBot 29273f88d3 Urinal cakes can now be picked up again 2018-02-12 09:01:28 -06:00
MoreRobustThanYouandCitadelStationBot 0af6af731a Urinal cakes can now be picked up again (#35566)
* Urinal cakes can now be picked up again

* Update watercloset.dm

* Update watercloset.dm

* Update watercloset.dm
2018-02-12 09:01:28 -06:00
CitadelStationBot 512d696a83 Automatic changelog generation for PR #5427 [ci skip] 2018-02-11 17:35:31 -06:00
deathride58andGitHub 17ed07d3b2 Merge pull request #5427 from Citadel-Station-13/upstream-merge-35417
[MIRROR] The chef is also a cook
2018-02-11 23:35:29 +00:00
CitadelStationBot 2c02dbf53d Automatic changelog generation for PR #5408 [ci skip] 2018-02-11 17:34:48 -06:00
deathride58andGitHub 081f7d3cbe Merge pull request #5408 from Michiyamenotehifunana/magrifle-fix
Fixes and Reimplements Magnetic Weapons
2018-02-11 23:34:45 +00:00
deathride58andGitHub 75249cab07 Merge pull request #5431 from Citadel-Station-13/upstream-merge-35518
[MIRROR] Actually fixes broken accesses
2018-02-11 23:34:13 +00:00
deathride58andGitHub e69a597fb2 Update lavaland_ruin_code.dm 2018-02-11 18:31:57 -05:00
deathride58andGitHub cfc52b01de Merge pull request #5429 from Citadel-Station-13/upstream-merge-35519
[MIRROR] Highlander antag datum
2018-02-11 23:31:06 +00:00
CitadelStationBot 38479da184 Automatic changelog generation for PR #5428 [ci skip] 2018-02-11 17:30:34 -06:00
deathride58andGitHub 9b4ab9a45e Merge pull request #5428 from Citadel-Station-13/upstream-merge-35515
[MIRROR] Makes urinal cakes more realistic
2018-02-11 23:30:32 +00:00
deathride58andGitHub 1d758999ae Merge pull request #5426 from Citadel-Station-13/upstream-merge-35555
[MIRROR] Fix sql error in exp updates
2018-02-11 23:30:21 +00:00
CitadelStationBot 161d1a16a7 Actually fixes broken accesses 2018-02-11 15:48:40 -06:00
Jordan BrownandCitadelStationBot ebd82bfe50 Merge pull request #35518 from ShizCalev/ACCESS-FIXES-MK2
Actually fixes broken accesses
2018-02-11 15:48:40 -06:00
deathride58andGitHub 8aacd2c804 Update job_exp.dm 2018-02-11 16:44:29 -05:00
Jordan BrownandCitadelStationBot e2b4e3c567 Fixes wrong ID for syndicate ghost roles 2018-02-11 15:35:14 -06:00
CitadelStationBot 0b56129932 Highlander antag datum 2018-02-11 15:33:02 -06:00
AnturKandCitadelStationBot 4615696173 Highlander antag datum (#35519)
* Highlander antag datum

* Forgot debug line

* Also this
2018-02-11 15:33:02 -06:00
CitadelStationBot 98fcd0c54c Makes urinal cakes more realistic 2018-02-11 15:29:47 -06:00
MoreRobustThanYouandCitadelStationBot 6337c294d9 Makes urinal cakes more realistic (#35515)
* Add files via upload

* Makes urinal cakes blue

* Add files via upload

* Delete urinalcake_squish.png
2018-02-11 15:29:47 -06:00
CitadelStationBot 96714a87bc The chef is also a cook 2018-02-11 15:26:33 -06:00
vuonojenmustaturskaandCitadelStationBot 95c2eb283a The chef is also a cook (#35417)
* just a lowly, lowly cook

* come on, that's not striking an officer
2018-02-11 15:26:33 -06:00
Jordan BrownandCitadelStationBot 08a12bba53 Fix sql error in exp updates 2018-02-11 15:25:23 -06:00
CitadelStationBotandGitHub 4b88853918 Merge pull request #5424 from Citadel-Station-13/upstream-merge-35511
[MIRROR] Removes Map Merge 1
2018-02-11 13:19:15 -06:00
CitadelStationBot d5306f43de Automatic changelog generation for PR #5423 [ci skip] 2018-02-11 13:18:30 -06:00
CitadelStationBotandGitHub 88e7fdabd6 Merge pull request #5423 from Citadel-Station-13/upstream-merge-35501
[MIRROR] Removed admin requirement for the notify chat command
2018-02-11 13:18:27 -06:00
CitadelStationBot 0eb199d59e Automatic changelog generation for PR #5422 [ci skip] 2018-02-11 13:18:11 -06:00
CitadelStationBotandGitHub 39b4f8283d Merge pull request #5422 from Citadel-Station-13/upstream-merge-35508
[MIRROR] Fixes scaner circuit typo
2018-02-11 13:18:09 -06:00
CitadelStationBot 4f4ce8dc75 Automatic changelog generation for PR #5421 [ci skip] 2018-02-11 13:17:52 -06:00
CitadelStationBotandGitHub fc8b7ed23b Merge pull request #5421 from Citadel-Station-13/upstream-merge-35510
[MIRROR] Megafauna doesn't go in machines
2018-02-11 13:17:50 -06:00
CitadelStationBot 8833c5da21 Automatic changelog generation for PR #5420 [ci skip] 2018-02-11 13:17:33 -06:00
CitadelStationBotandGitHub c997056471 Merge pull request #5420 from Citadel-Station-13/upstream-merge-35509
[MIRROR] Removes duplicate air alarm on meta.
2018-02-11 13:17:31 -06:00