4689e2aeb6
Merge pull request #11980 from Ghommie/Ghommie-cit700
...
Movespeed modifiers refactor port.
2020-04-25 16:51:14 -07:00
499e71c528
Merge pull request #11993 from Ghommie/Ghommie-cit704
...
porting CEV-Eris pickweight procs.
2020-04-25 18:30:26 +00:00
d2d5fda0e2
Fixing riding layers for human/cyborgs.
2020-04-25 16:54:17 +02:00
3625d88b47
fixes
2020-04-25 03:41:15 -07:00
866b3789ab
ok
2020-04-25 01:54:26 -07:00
a362060d72
ok
2020-04-25 01:40:42 -07:00
5f46f301a6
ok
2020-04-25 01:21:03 -07:00
388224b576
ok
2020-04-25 01:20:57 -07:00
ec4a40fa37
ok
2020-04-25 01:05:12 -07:00
cce3bad0d6
okay
2020-04-25 00:58:12 -07:00
6c5d42b5f5
oh boy
2020-04-25 00:48:56 -07:00
7b877eb9e0
Merge pull request #11832 from Seris02/storagewhitelist
...
adds extra functionality to storage whitelists
2020-04-25 02:50:56 +02:00
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
f01cb896e5
Apply suggestions from code review
2020-04-25 02:43:56 +02:00
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
e17c51a85d
Porting some VV updates from tg.
2020-04-25 00:49:51 +02:00
e0a51903a1
Not yet implemented design security level requirements.
2020-04-24 00:51:04 +02:00
de531bd047
porting CEV-Eris pickweight procs.
2020-04-23 21:47:54 +02: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
a8aa2e2014
Updates modular computers, begins work on shuttle stuff.
2020-04-23 15:06:35 +03:00
321902c35a
Ports https://github.com/tgstation/tgstation/pull/50225
2020-04-23 13:28:09 +03:00
67e0b95407
Shuttle stuffs and gateway refactor port https://github.com/tgstation/tgstation/pull/49868/
2020-04-23 12:36:42 +03:00
80b47ec1c0
Ports https://github.com/tgstation/tgstation/pull/50497
2020-04-23 09:55:28 +03:00
529a8e52c7
Merge pull request #11960 from Trilbyspaceclone/patch-352
...
Theirs a snake in my boot...
2020-04-22 18:42:46 -07:00
42201343a9
Backward 512 compatibility removal.
2020-04-23 00:59:23 +02: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
44925da1d8
Various dynamic tweaks
2020-04-21 20:52:33 -07:00
122067c5f4
wip
2020-04-22 03:52:45 +02:00
e9bf432a0d
Scavenging element.
2020-04-22 03:30:40 +02:00
824904844c
Componentized for sanity.
2020-04-21 19:51:44 +02:00
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
1659e2804e
Deletes lots of autoylathe copypasta.
2020-04-21 04:04:10 +02:00
6dd89ec1e0
Update pockets.dm
2020-04-20 21:50:25 -04:00
79eb0f5838
Merge pull request #11956 from Trilbyspaceclone/crafting_menu
...
Fixes Crafting menu
2020-04-21 01:25:46 +02:00
c3fc133282
*crys*
2020-04-20 18:28:57 -04:00
58cb5e391e
*scream*
2020-04-20 18:22:13 -04:00
747e27007f
***ahhhh***
2020-04-20 17:26:22 -04:00
4d55f169d5
oh god oh fuck
2020-04-20 17:05:03 -04:00
c5b8c45bf0
Merge branch 'master' into food-quality
2020-04-20 19:53:39 +01:00
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
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
9919a23966
This fixes everyone being a pugilist holy fuck
2020-04-21 00:36:54 +10:00
2cf8dad8ae
Merge pull request #11928 from Putnam3145/traitor-class-reroll
...
Made traitor classes rerollable, reassignable by admins
2020-04-20 02:30:33 +02:00
792af56b67
Update riding.dm
2020-04-19 00:48:51 -07:00
f714403d6e
Merge pull request #11895 from Seris02/piggybackfix
...
fixes piggyback merging
2020-04-19 04:56:04 +02:00
24370db5eb
Merge pull request #11930 from Ghommie/Ghommie-cit693
...
More ToS Compliance.
2020-04-18 19:33:10 -07:00
b65ad491b4
Merge pull request #11902 from Citadel-Station-13/revert-11611-patch-2
...
Revert "Makes so turning in place updates riders when riding someone's back"
2020-04-18 19:32:34 -07:00
kevinz000