c9cd134132
linter fix
2020-04-30 17:39:30 -07:00
c146c898c0
Merge branch 'master' into 91-files-changed-fml
2020-04-30 18:42:38 -05:00
f6736e862d
it compiles, now to fix the maps
2020-04-30 15:49:06 -05:00
c4250a41d2
Merge pull request #12017 from kevinz000/skills
...
Implements a basic skill system + adds surgery skill
2020-04-30 17:39:21 +00:00
02265010d6
fixes
2020-04-30 10:07:17 -07:00
7e8ebfde83
whew
2020-04-30 10:03:35 -07:00
615dc71069
fixes
2020-04-30 01:26:46 -07:00
bd7b1b1193
fixes
2020-04-30 01:23:21 -07:00
f028672e3c
Merge remote-tracking branch 'citadel/master' into 91-files-changed-fml
2020-04-30 01:00:08 -07:00
432724a388
fixes
2020-04-30 00:58:59 -07:00
1e42f3a3b7
Merge pull request #12023 from Ghommie/Ghommie-cit712
...
Fixing riding layers for human/cyborgs.
2020-04-29 12:03:29 -07:00
1191268430
kevs request
2020-04-27 07:34:23 -04:00
464fcd02cd
Merge remote-tracking branch 'citadel/master' into skills
2020-04-25 22:18:08 -07:00
d7f38faab9
Merge pull request #11971 from Putnam3145/fix-story-storyteller
...
More dynamic tweaks
2020-04-25 17:05:38 -07:00
d9b6ea5181
Merge pull request #11847 from Ghommie/Ghommie-cit679
...
A peeve with random bodies.
2020-04-25 16:59:07 -07:00
36512938a0
Merge pull request #11991 from DeltaFire15/nanite-repli-protocols
...
Adds nanite replication protocols to our techweb
2020-04-25 16:54:32 -07:00
da61b04ed0
Merge pull request #11997 from Ghommie/Ghommie-cit705
...
code for designs' security level requirements.
2020-04-25 16:53:48 -07:00
0bf1f1e34f
Merge pull request #12010 from Ghommie/Ghommie-cit709
...
Porting some VV updates from tg.
2020-04-25 16:51:27 -07:00
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
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
71be8ed2fc
ports all the tg junk for icemoon, not yet changed to make it all compile
2020-04-24 00:02:03 -05: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
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
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
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
kevinz000