Commit Graph

9069 Commits

Author SHA1 Message Date
Putnam 257de9d4c9 Adds uplinks back to nukies. 2020-04-25 19:22:55 -07:00
Putnam d7c0834794 A couple important comments. 2020-04-25 17:22:12 -07:00
Putnam b9e88f85bb Allowed better admeme stuff for dynamic 2020-04-25 17:15:17 -07:00
kevinz000 565bfdb7b0 Merge pull request #11959 from Trilbyspaceclone/patch-351
Nerfs spiders defence stat against flyswatters - Alt  Australian crew buff.
2020-04-25 17:10:33 -07:00
kevinz000 af08e0fecf Merge pull request #11984 from Hatterhat/fastpump
The Neo-Russian Rifleman's Primer - a book that makes you pump shotguns and work rifle bolts faster
2020-04-25 17:07:29 -07:00
kevinz000 d7f38faab9 Merge pull request #11971 from Putnam3145/fix-story-storyteller
More dynamic tweaks
2020-04-25 17:05:38 -07:00
kevinz000 da61b04ed0 Merge pull request #11997 from Ghommie/Ghommie-cit705
code for designs' security level requirements.
2020-04-25 16:53:48 -07:00
kevinz000 4689e2aeb6 Merge pull request #11980 from Ghommie/Ghommie-cit700
Movespeed modifiers refactor port.
2020-04-25 16:51:14 -07:00
Lin 499e71c528 Merge pull request #11993 from Ghommie/Ghommie-cit704
porting CEV-Eris pickweight procs.
2020-04-25 18:30:26 +00:00
Ghommie 94f014589d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-25 17:09:34 +02:00
Ghommie fecf6cef2f Coin can be inserted in ID cards now. 2020-04-25 14:22:49 +02:00
Trilbyspaceclone 89bb18fe98 Update belt.dm 2020-04-25 00:50:03 -04:00
Ghom 21619b1ee3 Merge pull request #11925 from Trilbyspaceclone/patch-347
The Pr that nerfs crayon eating
2020-04-25 02:54:40 +02:00
Ghommie 0c1c879fb4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 2020-04-25 02:49:59 +02:00
Ghom 5ccdc55e42 Merge pull request #11979 from kevinz000/magnetic_harness
Cybernetic arm implant balance pass (namely: shields)
2020-04-25 02:47:28 +02:00
Putnam 17f6099013 new clamp 2020-04-24 16:18:34 -07:00
Putnam 95d1a25df7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into fix-story-storyteller 2020-04-24 16:07:38 -07:00
Detective Google 71be8ed2fc ports all the tg junk for icemoon, not yet changed to make it all compile 2020-04-24 00:02:03 -05:00
Ghommie e0a51903a1 Not yet implemented design security level requirements. 2020-04-24 00:51:04 +02:00
Ghommie de531bd047 porting CEV-Eris pickweight procs. 2020-04-23 21:47:54 +02:00
kevinz000 cf61795101 Merge pull request #11941 from kiwedespars/punch-bundle
re-adds north star gloves to traitors for 20 tc
2020-04-23 11:45:04 -07: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 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 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 67e0b95407 Shuttle stuffs and gateway refactor port https://github.com/tgstation/tgstation/pull/49868/ 2020-04-23 12:36:42 +03:00
Trilbyspaceclone 8bcdbf5fc6 Update weaponry.dm 2020-04-23 03:29:26 -04:00
Artur 80b47ec1c0 Ports https://github.com/tgstation/tgstation/pull/50497 2020-04-23 09:55:28 +03:00
TrilbySpaceClone c8b3032087 Merge branch 'master' into cube-world 2020-04-23 02:04:56 -04:00
kevinz000 1236e11eca Merge pull request #11950 from Citadel-Station-13/Ghommie-patch-3
Fixing a little mistake with a config.
2020-04-22 18:41:21 -07:00
kevinz000 411622430f Merge pull request #11985 from Ghommie/Ghommie-cit701
Removal of backward 512 compatibility.
2020-04-22 18:40:41 -07:00
Hatterhat 371e54e2e4 funny meme text 2020-04-22 18:06:30 -05:00
Ghommie 42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Hatterhat c686ed193b a book about mashing Z and LMB 2020-04-22 17:55:11 -05:00
Trilbyspaceclone 511465ed7b Update shields.dm 2020-04-22 18:13:09 -04:00
Trilbyspaceclone 6a99c3b2c0 oops all the ) 2020-04-22 18:07:13 -04:00
Trilbyspaceclone 3418fe1541 Update weaponry.dm 2020-04-22 17:32:35 -04:00
Ghommie 63870cc9d1 Movespeed modifiers refactor port. 2020-04-22 22:01:39 +02:00
kevinz000 fe63eca817 kay 2020-04-22 11:04:01 -07:00
kevinz000 c551006295 catch dropped 2020-04-22 10:54:42 -07:00
kevinz000 3626cc5d28 okay 2020-04-22 10:50:03 -07:00
kevinz000 467497af54 woops 2020-04-22 10:45:13 -07:00
kevinz000 3e09ee8328 Alright 2020-04-22 10:42:11 -07:00
Trilbyspaceclone 71e91a15b1 toxin healing bad I guess 2020-04-22 02:19:35 -04:00
Putnam 54820f0ecb Made midround/latejoin come faster if no roundstarts 2020-04-21 21:54:28 -07:00
Putnam 1bd3d4ceab Some storyteller tweaks. 2020-04-21 21:50:51 -07:00
Putnam e70eb60d95 Nono, it's the MOB that voluntary ghosts. 2020-04-21 21:33:19 -07:00
Putnam 2ac9c70763 Makes storyteller changing actually work. 2020-04-21 21:33:03 -07:00
Putnam 44925da1d8 Various dynamic tweaks 2020-04-21 20:52:33 -07:00