Commit Graph

9242 Commits

Author SHA1 Message Date
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
Lin 4c83af2cc2 Merge pull request #11953 from kevinz000/shieldbash2
Fixes shield bashing
2020-04-22 01:51:57 +00:00
Ghommie e9bf432a0d Scavenging element. 2020-04-22 03:30:40 +02:00
Ghom 5a6a205b9d Merge pull request #11868 from Arturlang/tackling_and_lunge
Ports TG Tackling and uses it to rework bloodsucker lunge
2020-04-21 15:50:44 +02:00
Ghommie 1659e2804e Deletes lots of autoylathe copypasta. 2020-04-21 04:04:10 +02:00
Ghommie c93f028a97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-21 01:53:41 +02:00
Ghommie e0d219650f Ready for testing. 2020-04-21 01:26:34 +02:00
Trilbyspaceclone e769d28a2d Update weaponry.dm 2020-04-20 18:47:18 -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
kevinz000 3e9b1a6875 Update shields.dm 2020-04-20 14:02:39 -07:00
Trilbyspaceclone ec9b0573aa even reagents 2020-04-20 15:45:37 -04:00
kevinz000 7e2a54d5d6 fix 2020-04-20 12:30:20 -07:00
kevinz000 6428f4a0c2 ok 2020-04-20 12:18:09 -07:00
kevinz000 90f6904f44 fix 2020-04-20 12:16:42 -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 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 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
Ghom 9df0982da3 Update mirror.dm 2020-04-20 17:57:08 +02:00
Trilbyspaceclone 6fcec77e9b Update shields.dm 2020-04-19 23:18:17 -04:00
kiwedespars 842483190a Update code/game/objects/items/storage/uplink_kits.dm
my brain is small when working git.

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
2020-04-19 17:18:14 -07:00
kiwedespars b21ee932cf maybe this is travis's issue? 2020-04-19 17:06:21 -07:00
kiwedespars 42fac43807 Merge branch 'master' into punch-bundle 2020-04-19 16:50:01 -07:00
kiwedespars 25e0c47225 oops 2020-04-19 16:48:37 -07:00
kevinz000 ae27bf90e4 Merge pull request #11846 from Putnam3145/vore-optimization
Optimizing vore + commenting out simplemob vore (sorry)
2020-04-19 16:45:44 -07:00
TrilbySpaceClone 25b1b889dc amazing truely amazing 2020-04-19 19:09:20 -04:00
kiwedespars c3905c8c2b Update uplink_kits.dm 2020-04-19 15:56:31 -07:00
Detective Google 0c2f0a99d5 fixes the fact that some citadel null rods aren't null rod subtypes 2020-04-19 17:18:40 -05:00
Detective Google 5376ca81b5 Turns chaplain null rod selection into a radial function(port TG#50512) 2020-04-19 16:57:02 -05:00