Commit Graph

13614 Commits

Author SHA1 Message Date
deathride58 72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
deathride58 e3ad2643b2 maps first 2018-02-12 20:30:05 -05:00
CitadelStationBot dcbea24eee Automatic changelog generation for PR #5447 [ci skip] 2018-02-12 17:29:09 -06:00
deathride58 06b7f239c4 Merge pull request #5447 from Citadel-Station-13/upstream-merge-35433
[MIRROR] Cult Update? Cult Update!
2018-02-12 23:29:06 +00:00
deathride58 8b1a1e99ee Merge pull request #5449 from Citadel-Station-13/upstream-merge-35557
[MIRROR] Fixes PDA virus runtime
2018-02-12 23:24:45 +00:00
CitadelStationBot ceb1113f31 Fixes PDA virus runtime 2018-02-12 16:32:07 -06:00
vuonojenmustaturska a60410b347 Merge pull request #35557 from ShizCalev/pda-virus-fix
Fixes PDA virus runtime
2018-02-12 16:32:07 -06:00
deathride58 2a772a242e Merge pull request #5448 from Citadel-Station-13/upstream-merge-35603
[MIRROR] blacklists 512.1408 for basically being a wallhack (again)
2018-02-12 22:31:40 +00:00
CitadelStationBot 800c43de48 blacklists 512.1408 for basically being a wallhack (again) 2018-02-12 16:23:44 -06:00
Jordan Brown 59f7343c5e Merge pull request #35603 from MrStonedOne/patch-480
blacklists 512.1408 for basically being a wallhack (again)
2018-02-12 16:23:44 -06:00
deathride58 80baf4f9a4 Merge pull request #5444 from Citadel-Station-13/upstream-merge-35550
[MIRROR] Disables max errors on travis compile
2018-02-12 21:21:39 +00:00
CitadelStationBot 03c3f59e68 Automatic changelog generation for PR #5442 [ci skip] 2018-02-12 15:21:13 -06:00
deathride58 8a073796fe Merge pull request #5442 from Citadel-Station-13/upstream-merge-35517
[MIRROR] Cell chargers are now buildable and (upgradable!) machines.
2018-02-12 21:21:11 +00:00
CitadelStationBot 76e07e4050 Cult Update? Cult Update! 2018-02-12 15:18:21 -06:00
Robustin 1825c944b6 Cult Update? Cult Update! (#35433)
* Cult Fixes and Tweaks

* Master prompt and spelling fix

* Couple small fixes
2018-02-12 15:18:21 -06:00
CitadelStationBot 7b19f69935 Automatic changelog generation for PR #5445 [ci skip] 2018-02-12 14:04:33 -06:00
deathride58 dc01163eda Merge pull request #5445 from Citadel-Station-13/upstream-merge-35528
[MIRROR] Fix SCP-294 appearance
2018-02-12 20:04:30 +00:00
CitadelStationBot 4aac3f34cc Fix SCP-294 appearance 2018-02-12 12:50:12 -06:00
MoreRobustThanYou 37a1f6245d Fix SCP-294 appearance (#35528)
* Add files via upload

* Add files via upload
2018-02-12 12:50:12 -06:00
CitadelStationBot cfba3b96d7 Disables max errors on travis compile 2018-02-12 12:49:01 -06:00
Jordan Brown 16de4e4c90 Disables max errors on travis compile (#35550) 2018-02-12 12:49:01 -06:00
deathride58 f5eb7f7101 Update cell_charger.dm 2018-02-12 13:42:51 -05:00
Dax Dupont a0feb17597 Cell chargers are now buildable and (upgradable!) machines. 2018-02-12 11:15:52 -06:00
CitadelStationBot b6d5173420 Automatic changelog generation for PR #5438 [ci skip] 2018-02-12 10:05:00 -06:00
LetterJay 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
LetterJay 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
LetterJay 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
LetterJay 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
LetterJay 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
LetterJay 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 Dupont 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
vuonojenmustaturska 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
vuonojenmustaturska 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
vuonojenmustaturska 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
MoreRobustThanYou 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
deathride58 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
deathride58 081f7d3cbe Merge pull request #5408 from Michiyamenotehifunana/magrifle-fix
Fixes and Reimplements Magnetic Weapons
2018-02-11 23:34:45 +00:00
deathride58 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
deathride58 e69a597fb2 Update lavaland_ruin_code.dm 2018-02-11 18:31:57 -05:00
deathride58 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