Commit Graph

33279 Commits

Author SHA1 Message Date
Artur
f3ee184672 Clockwerkslab
Doesnt work yet.
2020-05-06 21:23:12 +03:00
Artur
2ec9068cbf Hellish 2020-04-29 09:55:11 +03:00
Artur
cfd9c3fe63 Fucking clockcult 2020-04-27 13:36:53 +03:00
Artur
5d53ead547 Fucky wucky gateway and ccslab 2020-04-27 10:43:08 +03:00
Artur
f97f264fb7 Fixing more stuff
Mint machine compile fixes and the syndicate contractor program.
2020-04-23 20:09:42 +03:00
Artur
120615d472 Ports https://github.com/tgstation/tgstation/pull/44525, and
And fixes to make stuff work
2020-04-23 17:36:13 +03:00
Artur
9e2ba822ae Ports https://github.com/tgstation/tgstation/pull/44655/ 2020-04-23 15:16:43 +03:00
Artur
1d51b6a8c8 Ports https://github.com/tgstation/tgstation/pull/45444/ 2020-04-23 15:08:24 +03:00
Artur
a8aa2e2014 Updates modular computers, begins work on shuttle stuff. 2020-04-23 15:06:35 +03:00
Artur
0b34e20f56 https://github.com/tgstation/tgstation/pull/49330/ and https://github.com/tgstation/tgstation/pull/49982/ 2020-04-23 14:19:50 +03:00
Artur
fe26034410 Kills old TGUI, hardsyncs TGUI to 3.0 2020-04-23 13:31:48 +03:00
Artur
321902c35a Ports https://github.com/tgstation/tgstation/pull/50225 2020-04-23 13:28:09 +03:00
Artur
9d870893fb Beginning work on DNA console TGUI, plus some camera console fixes 2020-04-23 13:24:43 +03:00
Artur
803efebf65 https://github.com/tgstation/tgstation/pull/49960 Port 2020-04-23 12:45:50 +03:00
Artur
67e0b95407 Shuttle stuffs and gateway refactor port https://github.com/tgstation/tgstation/pull/49868/ 2020-04-23 12:36:42 +03:00
Artur
80b47ec1c0 Ports https://github.com/tgstation/tgstation/pull/50497 2020-04-23 09:55:28 +03:00
kevinz000
055606b81b Revert "Update SDQL_2_wrappers.dm"
This reverts commit 685546551c.
2020-04-20 20:27:18 -07:00
kevinz000
685546551c Update SDQL_2_wrappers.dm 2020-04-20 20:26:50 -07:00
Lin
560cf8749b Merge pull request #11943 from Citadel-Station-13/Ghommie-patch-2
Ports text formatted round timer from skyrat.
2020-04-21 02:13:31 +00:00
Ghom
79eb0f5838 Merge pull request #11956 from Trilbyspaceclone/crafting_menu
Fixes Crafting menu
2020-04-21 01:25:46 +02:00
TrilbySpaceClone
c3fc133282 *crys* 2020-04-20 18:28:57 -04:00
TrilbySpaceClone
58cb5e391e *scream* 2020-04-20 18:22:13 -04:00
Ghom
50eae569eb Merge pull request #11940 from Detective-Google/null-roddies
Turns chaplain null rod selection into a radial function(port TG#50512)
2020-04-20 23:53:24 +02:00
Ghom
6679d13509 Merge pull request #11939 from Owai-Seek/weight-class-4-19-20
Reduces weight classes of several items.
2020-04-20 23:53:07 +02:00
Ghom
0dc489e8de Merge pull request #11798 from timothyteakettle/food-quality
adds a new feature to cooking: food quality
2020-04-20 23:48:35 +02:00
TrilbySpaceClone
747e27007f ***ahhhh*** 2020-04-20 17:26:22 -04:00
Ghom
a40f213325 Merge pull request #11951 from Putnam3145/fix-liver-runtime
Fixes a runtime in livers.
2020-04-20 23:11:31 +02:00
TrilbySpaceClone
4d55f169d5 oh god oh fuck 2020-04-20 17:05:03 -04:00
Ghom
c7780bde9e Merge pull request #11865 from Citadel-Station-13/kevinz000-patch-5
Shuffles resist embed higher up on the resist chain
2020-04-20 22:34:03 +02:00
Timothy Teakettle
c5b8c45bf0 Merge branch 'master' into food-quality 2020-04-20 19:53:39 +01:00
kevinz000
a984fc5e3d Update living.dm 2020-04-20 11:45:22 -07:00
kevinz000
096a182a84 Update living.dm 2020-04-20 11:44:59 -07:00
kevinz000
791c3029a8 Merge pull request #11897 from DeltaFire15/gang-decon-message
Snitches now get stitches
2020-04-20 11:43:37 -07:00
kevinz000
62418d3fb8 Merge pull request #11909 from Putnam3145/owai-broom-mop
Adds more service stuff to lathes.
2020-04-20 11:43:30 -07:00
kevinz000
85fcdbf673 Merge pull request #11916 from Trilbyspaceclone/crafting_menu
Cleans up misc tab in the crafting menu
2020-04-20 11:37:13 -07:00
kevinz000
893f57cb63 Merge pull request #11919 from Ghommie/Ghommie-cit690
Nerfing the bonus reagents from higher tier microwaves.
2020-04-20 11:34:53 -07:00
kevinz000
33cfb9a566 Merge pull request #11920 from Ghommie/Ghommie-cit691
Removing troublesome and filler uplink items.
2020-04-20 11:34:44 -07:00
kevinz000
cbc9f325f4 Merge pull request #11921 from necromanceranne/minor_fix_scarp_stammod
Sleeping Carp has a Stamina Mod again, gets Taser resistance, various fixes (no more universal pugilism)
2020-04-20 11:34:06 -07:00
kevinz000
ff651ac881 Merge pull request #11931 from Ghommie/Ghommie-cit694
Removes that one in a thousands chance of being spawned in the syndicate infiltrator roundstart.
2020-04-20 11:31:31 -07:00
Putnam
5df4287c8d Fixes a runtime in livers. 2020-04-20 11:10:43 -07:00
Ghom
af620582b1 Merge pull request #11924 from Trilbyspaceclone/patch-346
Moves barkeeps cryo fluid to emag only in the Soda Dispender
2020-04-20 19:35:31 +02:00
necromanceranne
9919a23966 This fixes everyone being a pugilist holy fuck 2020-04-21 00:36:54 +10:00
Ghom
10ae9bb51d Merge pull request #11944 from Trilbyspaceclone/patch-349
Corrects shield implants being invisable
2020-04-20 13:39:07 +02:00
Ghom
bb5c4d9dd4 Merge pull request #11948 from kevinz000/woops
potentially fixes biotypes breaking in viruses
2020-04-20 13:38:36 +02:00
kevinz000
dc97b65681 Revert "Revert "Update mobs.dm""
This reverts commit d8d6ae8555.
2020-04-20 04:03:13 -07:00
kevinz000
d8d6ae8555 Revert "Update mobs.dm"
This reverts commit 1b9bfe9674.
2020-04-20 04:01:57 -07:00
kevinz000
1b9bfe9674 Update mobs.dm 2020-04-20 04:00:47 -07:00
Trilbyspaceclone
6fcec77e9b Update shields.dm 2020-04-19 23:18:17 -04:00
Ghom
31d7fad1b4 Update time_track.dm 2020-04-20 02:39:40 +02:00
Ghom
d2cfb7608a Merge pull request #11926 from MrJWhit/adds-another-power-line-in-box
Fixing up of boxstation
2020-04-20 02:35:23 +02:00