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
6a5e286ed2
Merge pull request #11942 from Trilbyspaceclone/cube-world
...
Cube world, aka - More dehydrated cubes! Modular Cubes and more!
2020-04-23 11:44:48 -07:00
45319b4942
Merge pull request #11976 from Citadel-Station-13/Ghommie-patch-1
...
Updates ammo_box/update_icon() to nowadays standards.
2020-04-23 11:41:51 -07:00
1e515b89f9
Update mob_movement.dm
2020-04-23 11:33:10 -07:00
0beb28d3bb
reagents value nerf and standardization.
2020-04-23 19:52:22 +02:00
f97f264fb7
Fixing more stuff
...
Mint machine compile fixes and the syndicate contractor program.
2020-04-23 20:09:42 +03:00
120615d472
Ports https://github.com/tgstation/tgstation/pull/44525 , and
...
And fixes to make stuff work
2020-04-23 17:36:13 +03:00
1a6f5eb131
If it compiles it works
...
Kidding, tested on local and it runs fine.
Adds nanite protocols to the techweb, without BEPIS, aswell as adding one more protocol onto the ones ported from /tg
2020-04-23 15:15:26 +02:00
b5abfd9273
thank you dreamchecker.
2020-04-23 14:49:05 +02:00
e4c6df71fc
Update tacklers.dm
2020-04-23 14:35:36 +02:00
9e2ba822ae
Ports https://github.com/tgstation/tgstation/pull/44655/
2020-04-23 15:16:43 +03:00
1d51b6a8c8
Ports https://github.com/tgstation/tgstation/pull/45444/
2020-04-23 15:08:24 +03:00
a8aa2e2014
Updates modular computers, begins work on shuttle stuff.
2020-04-23 15:06:35 +03:00
0b34e20f56
https://github.com/tgstation/tgstation/pull/49330/ and https://github.com/tgstation/tgstation/pull/49982/
2020-04-23 14:19:50 +03:00
321902c35a
Ports https://github.com/tgstation/tgstation/pull/50225
2020-04-23 13:28:09 +03:00
9d870893fb
Beginning work on DNA console TGUI, plus some camera console fixes
2020-04-23 13:24:43 +03:00
803efebf65
https://github.com/tgstation/tgstation/pull/49960 Port
2020-04-23 12:45:50 +03:00
67e0b95407
Shuttle stuffs and gateway refactor port https://github.com/tgstation/tgstation/pull/49868/
2020-04-23 12:36:42 +03:00
8bcdbf5fc6
Update weaponry.dm
2020-04-23 03:29:26 -04:00
7761990919
soooo this complies but does it work?
2020-04-23 03:13:07 -04:00
80b47ec1c0
Ports https://github.com/tgstation/tgstation/pull/50497
2020-04-23 09:55:28 +03:00
86abfefa1b
still dosnt work
2020-04-23 02:52:07 -04:00
f1a5ba0754
wew
2020-04-23 02:28:16 -04:00
b0e8c90531
Update spacevine.dm
2020-04-23 02:19:04 -04:00
c8b3032087
Merge branch 'master' into cube-world
2020-04-23 02:04:56 -04:00
b398e65416
Update mob_movement.dm
2020-04-22 22:46:42 -07:00
c43f4e2e5e
Update tacklers.dm
2020-04-22 22:27:48 -07:00
af222768fe
Revert "Update tacklers.dm"
...
This reverts commit b6a47a06ed
2020-04-22 22:27:17 -07:00
b6a47a06ed
Update tacklers.dm
2020-04-22 22:26:39 -07:00
b29c211772
Update bodyparts.dm
2020-04-22 18:44:59 -07:00
529a8e52c7
Merge pull request #11960 from Trilbyspaceclone/patch-352
...
Theirs a snake in my boot...
2020-04-22 18:42:46 -07:00
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
411622430f
Merge pull request #11985 from Ghommie/Ghommie-cit701
...
Removal of backward 512 compatibility.
2020-04-22 18:40:41 -07:00
57eedfbe63
fastpumpers no longer lose stam from pumping
2020-04-22 18:33:16 -05:00
371e54e2e4
funny meme text
2020-04-22 18:06:30 -05:00
42201343a9
Backward 512 compatibility removal.
2020-04-23 00:59:23 +02:00
c686ed193b
a book about mashing Z and LMB
2020-04-22 17:55:11 -05:00
511465ed7b
Update shields.dm
2020-04-22 18:13:09 -04:00
6a99c3b2c0
oops all the )
2020-04-22 18:07:13 -04:00
3418fe1541
Update weaponry.dm
2020-04-22 17:32:35 -04:00
2126ca1674
dot on casing name gone
2020-04-22 15:41:22 -05:00
7f271157c3
Merge pull request #11929 from Ghommie/Ghommie-cit692
...
Shielded Component
2020-04-22 20:33:12 +00:00
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
63362f74c9
Merge pull request #11912 from Seris02/betteruipref
...
toggle for tetris bags
2020-04-22 22:26:40 +02:00
63870cc9d1
Movespeed modifiers refactor port.
2020-04-22 22:01:39 +02:00
e4e2c0195c
epic
2020-04-22 12:04:47 -07:00
fe63eca817
kay
2020-04-22 11:04:01 -07:00
c551006295
catch dropped
2020-04-22 10:54:42 -07:00
3626cc5d28
okay
2020-04-22 10:50:03 -07:00
467497af54
woops
2020-04-22 10:45:13 -07:00
kevinz000