Commit Graph

15392 Commits

Author SHA1 Message Date
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 321902c35a Ports https://github.com/tgstation/tgstation/pull/50225 2020-04-23 13:28:09 +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 7761990919 soooo this complies but does it work? 2020-04-23 03:13:07 -04:00
Artur 80b47ec1c0 Ports https://github.com/tgstation/tgstation/pull/50497 2020-04-23 09:55:28 +03:00
TrilbySpaceClone 86abfefa1b still dosnt work 2020-04-23 02:52:07 -04:00
Trilbyspaceclone f1a5ba0754 wew 2020-04-23 02:28:16 -04:00
Trilbyspaceclone b0e8c90531 Update spacevine.dm 2020-04-23 02:19:04 -04:00
TrilbySpaceClone c8b3032087 Merge branch 'master' into cube-world 2020-04-23 02:04:56 -04:00
kevinz000 b398e65416 Update mob_movement.dm 2020-04-22 22:46:42 -07:00
kevinz000 c43f4e2e5e Update tacklers.dm 2020-04-22 22:27:48 -07:00
kevinz000 af222768fe Revert "Update tacklers.dm"
This reverts commit b6a47a06ed.
2020-04-22 22:27:17 -07:00
kevinz000 b6a47a06ed Update tacklers.dm 2020-04-22 22:26:39 -07:00
kevinz000 b29c211772 Update bodyparts.dm 2020-04-22 18:44:59 -07: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
Hatterhat 57eedfbe63 fastpumpers no longer lose stam from pumping 2020-04-22 18:33:16 -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
Hatterhat 2126ca1674 dot on casing name gone 2020-04-22 15:41:22 -05:00
Lin 7f271157c3 Merge pull request #11929 from Ghommie/Ghommie-cit692
Shielded Component
2020-04-22 20:33:12 +00:00
Ghommie 63f5e101a2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit700 2020-04-22 22:30:10 +02:00
Ghom 63362f74c9 Merge pull request #11912 from Seris02/betteruipref
toggle for tetris bags
2020-04-22 22:26:40 +02:00
Ghommie 63870cc9d1 Movespeed modifiers refactor port. 2020-04-22 22:01:39 +02:00
kevinz000 e4e2c0195c epic 2020-04-22 12:04:47 -07:00
kevinz000 c551006295 catch dropped 2020-04-22 10:54:42 -07:00
kevinz000 467497af54 woops 2020-04-22 10:45:13 -07:00
kevinz000 3e09ee8328 Alright 2020-04-22 10:42:11 -07:00
Lin df4452468a Merge pull request #11932 from Ghommie/Ghommie-cit695
Some mispelled filepaths.
2020-04-22 16:09:33 +00:00
Lin 20f2d5d961 Merge pull request #11964 from Citadel-Station-13/Ghommie-patch-2
Makes the human form ling power work again.
2020-04-22 16:07:49 +00:00
kevinz000 5c17902628 compile 2020-04-22 08:50:51 -07:00
kevinz000 5984fa02b8 more changes 2020-04-22 08:49:21 -07:00
kevinz000 1bcca265ac buff neurotox 2020-04-22 08:35:08 -07:00
kevinz000 d259519bff changes 2020-04-22 08:31:09 -07:00
kevinz000 0eac988f52 okay! 2020-04-22 08:22:52 -07:00
Ghom 0c15c09e48 Update _box_magazine.dm 2020-04-22 16:30:30 +02:00
Seris02 39199a3a79 there 2020-04-22 12:31:55 +08:00
Putnam 44925da1d8 Various dynamic tweaks 2020-04-21 20:52:33 -07:00
Ghom 6467cc9647 Merge pull request #11958 from Putnam3145/ling-kill-once
Makes ling kill objectives kill-once
2020-04-22 04:05:06 +02:00
Ghom aab62f196d Merge pull request #11954 from Trilbyspaceclone/patch-350
Makes medical hardsuits a smig faster
2020-04-22 03:32:07 +02:00
Ghom 9b27f1f6ec Merge pull request #11922 from Trilbyspaceclone/patch-345
Nerfs most soda and reagents
2020-04-22 03:31:32 +02:00
Ghom 1a9bcddc61 Merge pull request #11938 from Owai-Seek/crab-meat-4-19-2020
Ups Crab Meat from 1 to 4
2020-04-22 03:31:19 +02:00
Ghommie e9bf432a0d Scavenging element. 2020-04-22 03:30:40 +02:00
Lin 3483ab7947 Merge pull request #11957 from Ghommie/Ghommie-cit696
Fixing CE jump suit/skirt and accessory overlays.
2020-04-21 22:17:16 +00:00
kevinz000 2c08b7847e Merge pull request #11967 from Putnam3145/fix-the-damn-tesla-delams
Replaces, a ^  in supermatter calculations with **
2020-04-21 14:00:13 -07:00
Putnam3145 45f032a600 Merge pull request #11854 from Citadel-Station-13/Ghommie-patch-1
Something about configs and integers.
2020-04-21 13:04:31 -07:00
Putnam a9600cffaa Replaces a xor with a power?? 2020-04-21 13:01:50 -07:00
Anonymous e6159b1a82 Actually, this is better. 2020-04-21 22:24:38 +03:00
Anonymous 21c304c5ad Fixes cosmetic tactifool sprite not using digi
Also adds " to the armor values
2020-04-21 22:10:19 +03:00
Ghommie e6d777584f Eh? 2020-04-21 20:49:49 +02:00
Ghommie 01f444b761 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-04-21 20:45:58 +02:00