Commit Graph
6029 Commits
Author SHA1 Message Date
LetterJayandGitHub f610a6110b Merge pull request #3903 from Citadel-Station-13/upstream-merge-32597
[MIRROR] Fixes stimulum decay
2017-11-13 11:45:00 -06:00
LetterJayandGitHub 228aed8b35 Merge pull request #3902 from Citadel-Station-13/upstream-merge-32546
[MIRROR] Refactor of base machinery a tiny bit more. DONE
2017-11-13 11:44:46 -06:00
LetterJayandGitHub 55e2d08b06 Merge pull request #3901 from Citadel-Station-13/upstream-merge-32566
[MIRROR] Space vacuum damage doubled
2017-11-13 11:44:33 -06:00
LetterJayandGitHub 6e3e6ef6b8 Merge pull request #3900 from Citadel-Station-13/upstream-merge-32585
[MIRROR] adjusted default internet song volume to 25
2017-11-13 11:44:25 -06:00
LetterJayandGitHub 0d65074f44 Merge pull request #3899 from Citadel-Station-13/upstream-merge-32635
[MIRROR] Fixes fleeing the station message accuracy
2017-11-13 11:44:16 -06:00
LetterJayandGitHub 4142105fe6 Merge pull request #3895 from Citadel-Station-13/upstream-merge-32435
[MIRROR] Disposal pipes and pipe dispensers refactor
2017-11-13 11:44:04 -06:00
LetterJayandGitHub 97757d2c87 Merge pull request #3894 from Citadel-Station-13/upstream-merge-32559
[MIRROR] Makes false alarm use more explicit in event code.
2017-11-13 11:42:53 -06:00
LetterJayandGitHub 9a80e5f91c Merge pull request #3893 from Citadel-Station-13/upstream-merge-32582
[MIRROR] Fixes 512 compile reminders
2017-11-13 11:42:40 -06:00
LetterJayandGitHub 34b3607211 Merge pull request #3867 from Citadel-Station-13/upstream-merge-32504
[MIRROR] Weakrefs
2017-11-13 11:41:38 -06:00
LetterJayandGitHub 3e55cec1b0 Merge pull request #3862 from Citadel-Station-13/upstream-merge-32498
[MIRROR] Fixes VV not displaying false values in keyed lists
2017-11-13 11:41:18 -06:00
LetterJayandGitHub 9ff35c5b2c Merge branch 'master' into upstream-merge-32435 2017-11-13 11:30:06 -06:00
LetterJayandGitHub 7e6283a3f0 Merge branch 'master' into upstream-merge-32504 2017-11-12 23:11:53 -06:00
LetterJayandGitHub a62be6b939 Merge branch 'master' into upstream-merge-32498 2017-11-12 23:10:50 -06:00
LetterJayandGitHub 9fefd15f66 Merge branch 'master' into upstream-merge-32247 2017-11-12 23:09:10 -06:00
LetterJayandGitHub 3ea8808201 Merge pull request #3673 from Citadel-Station-13/upstream-merge-32161
[MIRROR] 512 forward compatibility merge
2017-11-12 23:06:55 -06:00
LetterJayandGitHub aa020ea9e8 Update electropack.dm 2017-11-12 16:00:15 -06:00
LetterJayandGitHub de8e064e45 Update electropack.dm 2017-11-12 15:42:44 -06:00
LetterJayandGitHub 768e80544e Update autolathe_designs.dm 2017-11-12 15:41:25 -06:00
AnturKandCitadelStationBot d987dcdda8 Fixes stimulum decay (#32597)
* Fixes stimulum decay

* Nitryl too

* This too.

* Makes stimulum actually apply it's anti-stun changes.
2017-11-12 15:33:20 -06:00
LetterJayandGitHub f812be1ee0 Update autolathe_designs.dm 2017-11-12 14:46:18 -06:00
LetterJayandGitHub e97bc1028e Update examine.dm 2017-11-12 14:09:20 -06:00
JalleoandCitadelStationBot 300c471da9 Refactor of base machinery a tiny bit more. DONE (#32546)
* Moves a base uid from machienry to a bunch of children as it was literally setting a var that most machines never used. This is probably a good candidate for a component replacement.

* Just checking something

* Does this fix the compiling not working properly?

* And this?

* What is going wrong ugh!

* params["target"] instead of params["set"] bug was there before I even touched it but my compiling of TGUI caused it or something?

* Slight tidying up for what Cyberboss and Antur likes.

* Fixes the things that I was asked to fix
2017-11-12 13:19:23 -06:00
LetterJayandGitHub fa6b955dcf Update tgui.dm 2017-11-12 13:18:42 -06:00
LetterJayandGitHub 5ca3389cc2 Update clipboard.dm 2017-11-12 13:17:59 -06:00
LetterJayandGitHub 8d78a999e1 Update jellypeople.dm 2017-11-12 13:17:41 -06:00
LetterJayandGitHub 6da7d8e8b5 Update posibrain.dm 2017-11-12 13:17:08 -06:00
nicbnandCitadelStationBot 1b5a1c369b Space vacuum damage doubled (#32566) 2017-11-12 12:54:43 -06:00
Jordan BrownandCitadelStationBot de54b1cdd8 Merge pull request #32585 from Qbopper/turnitdown
adjusted default internet song volume to 25
2017-11-12 12:52:31 -06:00
LeoandCitadelStationBot 8814c55bfb Merge pull request #32635 from AnturK/cowardsallofthem
Fixes fleeing the station message accuracy
2017-11-12 11:40:57 -06:00
LetterJayandGitHub 439723caff Update adminhelp.dm 2017-11-12 11:18:11 -06:00
LetterJayandGitHub 1c8d9b3a4e Update electropack.dm 2017-11-12 10:38:30 -06:00
LetterJayandGitHub 77d261aa8a Update camera_bug.dm 2017-11-12 10:02:32 -06:00
LetterJayandGitHub d8c25f656b Update admin_investigate.dm 2017-11-12 08:56:53 -06:00
LetterJayandGitHub 298ddc8fa9 Update scrolls.dm 2017-11-12 08:56:30 -06:00
LetterJayandGitHub ef700ef8d7 Merge pull request #3898 from Citadel-Station-13/upstream-merge-32627
[MIRROR] Fixes AI anti-cheat false positives
2017-11-12 08:21:56 -06:00
LetterJayandGitHub 94578d2f37 Merge pull request #3897 from Citadel-Station-13/upstream-merge-32621
[MIRROR] Fixes colossus projectiles only shooting north
2017-11-12 08:21:39 -06:00
LetterJayandGitHub 07afeccfe9 Merge pull request #3885 from Citadel-Station-13/upstream-merge-32602
[MIRROR] Items no longer need to check for tools in attackby
2017-11-12 08:21:26 -06:00
LetterJayandGitHub 9b406f88a7 Merge pull request #3879 from Citadel-Station-13/upstream-merge-32400
[MIRROR] Assmos tweaks/minor additions.
2017-11-12 08:21:09 -06:00
LetterJayandGitHub f2ef581114 Merge pull request #3878 from Citadel-Station-13/upstream-merge-32545
[MIRROR] clamps view range and add view range to a minimum of 7
2017-11-12 08:20:58 -06:00
LetterJayandGitHub 94bdcb6848 Merge pull request #3876 from Citadel-Station-13/upstream-merge-32556
[MIRROR] Fixed teleporting food out of the deep fryer
2017-11-12 08:20:10 -06:00
LetterJayandGitHub 1c8ae63808 Merge pull request #3836 from Citadel-Station-13/upstream-merge-32453
[MIRROR] Little change. More the same
2017-11-12 08:20:01 -06:00
LetterJayandGitHub 7eccc3b2db Merge pull request #3875 from Citadel-Station-13/upstream-merge-32445
[MIRROR] ok now i kinda tested the ark examine
2017-11-12 08:19:30 -06:00
LetterJayandGitHub c2d3ad9c3f Update RPD.dm 2017-11-12 08:15:18 -06:00
LetterJayandGitHub 75e30e0dd8 Update pipe_dispenser.dm 2017-11-12 08:14:00 -06:00
LetterJayandGitHub 4f5a728415 Update weightless.dm 2017-11-12 08:12:54 -06:00
LetterJayandGitHub c7a25534e4 Update spontaneous_appendicitis.dm 2017-11-12 08:12:43 -06:00
LetterJayandGitHub 65daec8f75 Update prison_break.dm 2017-11-12 08:12:32 -06:00
LetterJayandGitHub a29c317a1d Update mass_hallucination.dm 2017-11-12 08:12:21 -06:00
LetterJayandGitHub eb193ef22b Update ion_storm.dm 2017-11-12 08:12:11 -06:00
LetterJayandGitHub e8e18ebc5f Update friday13th.dm 2017-11-12 08:11:50 -06:00