cfa421bcd4
Fixes spider_infestation event
2018-02-13 10:23:28 -06:00
3c9966041d
Merge pull request #35571 from ShizCalev/spider_infestation-fix
...
Fixes spider_infestation event
2018-02-13 10:23:28 -06:00
322d8aa480
Merge pull request #5457 from Citadel-Station-13/upstream-merge-35565
...
[MIRROR] Fixes invalid throwat args
2018-02-13 15:02:20 +00:00
91f5b571e9
Fixes invalid throwat args
2018-02-13 07:14:47 -06:00
833a700cbb
Fixes invalid throwat args ( #35565 )
2018-02-13 07:14:47 -06:00
d7a7bea995
Merge pull request #5439 from Citadel-Station-13/upstream-merge-35512
...
[MIRROR] Split up Revert/Removal
2018-02-13 06:28:42 -06:00
de4869542c
Merge pull request #5443 from Citadel-Station-13/upstream-merge-35551
...
[MIRROR] Tests give 3 GBP
2018-02-13 06:28:33 -06:00
306e51f9bf
Automatic changelog generation for PR #5456 [ci skip]
2018-02-13 06:28:17 -06:00
66a2e037e7
Merge pull request #5456 from Citadel-Station-13/upstream-merge-35560
...
[MIRROR] Adds hooray emoji
2018-02-13 06:28:15 -06:00
7cf942250c
Merge pull request #5455 from Citadel-Station-13/upstream-merge-35572
...
[MIRROR] Fixes skateboard runtime
2018-02-13 06:28:05 -06:00
8a957d64bf
Merge pull request #5454 from Citadel-Station-13/upstream-merge-35576
...
[MIRROR] Fixes blood contracts being unusable if the popup is cancelled
2018-02-13 06:27:55 -06:00
5b6c0d433f
Automatic changelog generation for PR #5453 [ci skip]
2018-02-13 06:27:47 -06:00
4495bfa7b9
Merge pull request #5453 from Citadel-Station-13/upstream-merge-35354
...
[MIRROR] Tritium now produces water vapor when combusting.
2018-02-13 06:27:44 -06:00
6039a77d5e
Adds hooray emoji
2018-02-13 05:40:32 -06:00
789bf29661
Adds tada emoji ( #35560 )
2018-02-13 05:40:32 -06:00
700cbe7fb1
Fixes skateboard runtime
2018-02-12 23:43:32 -06:00
c45c1c17df
Fixes scooter runtime
2018-02-12 23:43:32 -06:00
4d12e598ac
Fixes blood contracts being unusable if the popup is cancelled
2018-02-12 23:42:20 -06:00
e3e65a5237
Fixes blood contracts being unusable if the popup is cancelled
2018-02-12 23:42:19 -06:00
1f02bfe662
Tritium now produces water vapor when combusting.
2018-02-12 21:11:22 -06:00
0c9bb1a249
Tritium now produces water vapor when combusting. ( #35354 )
...
* HYDROGEN+OXYGEN=WATER
* Burning Tritium now produces a lot of radiation.
* Fixes check and line positions
* No longer spews absurd quantities of radiation.
2018-02-12 21:11:22 -06:00
3077f794cc
Merge pull request #5450 from Citadel-Station-13/upstream-merge-35598
...
[MIRROR] [s] fixes announcement system exploit
2018-02-13 02:53:39 +00:00
bb2761edb0
[s] fixes announcement system exploit
2018-02-12 19:33:28 -06:00
aa4b92faad
Merge pull request #35598 from ShizCalev/announcement-exploit-fix
...
[s] fixes announcement system exploit
2018-02-12 19:33:28 -06:00
dcbea24eee
Automatic changelog generation for PR #5447 [ci skip]
2018-02-12 17:29:09 -06:00
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
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
ceb1113f31
Fixes PDA virus runtime
2018-02-12 16:32:07 -06:00
a60410b347
Merge pull request #35557 from ShizCalev/pda-virus-fix
...
Fixes PDA virus runtime
2018-02-12 16:32:07 -06:00
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
800c43de48
blacklists 512.1408 for basically being a wallhack (again)
2018-02-12 16:23:44 -06:00
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
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
03c3f59e68
Automatic changelog generation for PR #5442 [ci skip]
2018-02-12 15:21:13 -06:00
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
76e07e4050
Cult Update? Cult Update!
2018-02-12 15:18:21 -06:00
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
7b19f69935
Automatic changelog generation for PR #5445 [ci skip]
2018-02-12 14:04:33 -06:00
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
4aac3f34cc
Fix SCP-294 appearance
2018-02-12 12:50:12 -06:00
37a1f6245d
Fix SCP-294 appearance ( #35528 )
...
* Add files via upload
* Add files via upload
2018-02-12 12:50:12 -06:00
cfba3b96d7
Disables max errors on travis compile
2018-02-12 12:49:01 -06:00
16de4e4c90
Disables max errors on travis compile ( #35550 )
2018-02-12 12:49:01 -06:00
8f23870e79
Tests give 3 GBP
2018-02-12 12:47:48 -06:00
b6ca568ac1
Tests give 3 GBP ( #35551 )
2018-02-12 12:47:48 -06:00
f5eb7f7101
Update cell_charger.dm
2018-02-12 13:42:51 -05:00
a0feb17597
Cell chargers are now buildable and (upgradable!) machines.
2018-02-12 11:15:52 -06:00
b6d5173420
Automatic changelog generation for PR #5438 [ci skip]
2018-02-12 10:05:00 -06:00
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
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
CitadelStationBot