shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,567 Commits 5 Branches 0 Tags
54e76e8ffb9bc53c424d1d75112213d24ef7ea0f
Commit Graph

2703 Commits

Author SHA1 Message Date
Ghommie
54e76e8ffb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 2020-05-01 21:49:52 +02:00
kevinz000
269db0c7d6 Identification components + chameleon clothing from uplink is now obfuscated (#12045) 
* fine we'll use components

* syndie kits

* Whew

* examine

* flags

* whew

* compile

* fix

* fix

* ok

* ok

* ok

* done
 2020-05-01 18:39:45 +02:00
Lin
c4250a41d2 Merge pull request #12017 from kevinz000/skills 
Implements a basic skill system + adds surgery skill
 2020-04-30 17:39:21 +00:00
kevinz000
1e42f3a3b7 Merge pull request #12023 from Ghommie/Ghommie-cit712 
Fixing riding layers for human/cyborgs.
 2020-04-29 12:03:29 -07:00
TrilbySpaceClone
1191268430 kevs request 2020-04-27 07:34:23 -04:00
kevinz000
464fcd02cd Merge remote-tracking branch 'citadel/master' into skills 2020-04-25 22:18:08 -07:00
kevinz000
d7f38faab9 Merge pull request #11971 from Putnam3145/fix-story-storyteller 
More dynamic tweaks
 2020-04-25 17:05:38 -07:00
kevinz000
d9b6ea5181 Merge pull request #11847 from Ghommie/Ghommie-cit679 
A peeve with random bodies.
 2020-04-25 16:59:07 -07:00
kevinz000
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
kevinz000
da61b04ed0 Merge pull request #11997 from Ghommie/Ghommie-cit705 
code for designs' security level requirements.
 2020-04-25 16:53:48 -07:00
kevinz000
0bf1f1e34f Merge pull request #12010 from Ghommie/Ghommie-cit709 
Porting some VV updates from tg.
 2020-04-25 16:51:27 -07:00
kevinz000
4689e2aeb6 Merge pull request #11980 from Ghommie/Ghommie-cit700 
Movespeed modifiers refactor port.
 2020-04-25 16:51:14 -07:00
Lin
499e71c528 Merge pull request #11993 from Ghommie/Ghommie-cit704 
porting CEV-Eris pickweight procs.
 2020-04-25 18:30:26 +00:00
Ghommie
d2d5fda0e2 Fixing riding layers for human/cyborgs. 2020-04-25 16:54:17 +02:00
kevinz000
3625d88b47 fixes 2020-04-25 03:41:15 -07:00
kevinz000
866b3789ab ok 2020-04-25 01:54:26 -07:00
kevinz000
a362060d72 ok 2020-04-25 01:40:42 -07:00
kevinz000
5f46f301a6 ok 2020-04-25 01:21:03 -07:00
kevinz000
388224b576 ok 2020-04-25 01:20:57 -07:00
kevinz000
ec4a40fa37 ok 2020-04-25 01:05:12 -07:00
kevinz000
cce3bad0d6 okay 2020-04-25 00:58:12 -07:00
kevinz000
6c5d42b5f5 oh boy 2020-04-25 00:48:56 -07:00
Ghom
7b877eb9e0 Merge pull request #11832 from Seris02/storagewhitelist 
adds extra functionality to storage whitelists
 2020-04-25 02:50:56 +02:00
Ghommie
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
Ghom
f01cb896e5 Apply suggestions from code review 2020-04-25 02:43:56 +02:00
Putnam
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
Ghommie
e17c51a85d Porting some VV updates from tg. 2020-04-25 00:49:51 +02:00
Ghommie
e0a51903a1 Not yet implemented design security level requirements. 2020-04-24 00:51:04 +02:00
Ghommie
de531bd047 porting CEV-Eris pickweight procs. 2020-04-23 21:47:54 +02:00
DeltaFire
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
kevinz000
529a8e52c7 Merge pull request #11960 from Trilbyspaceclone/patch-352 
Theirs a snake in my boot...
 2020-04-22 18:42:46 -07:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02: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
Putnam
44925da1d8 Various dynamic tweaks 2020-04-21 20:52:33 -07:00
Ghommie
824904844c Componentized for sanity. 2020-04-21 19:51:44 +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
Trilbyspaceclone
6dd89ec1e0 Update pockets.dm 2020-04-20 21:50:25 -04:00
Ghom
79eb0f5838 Merge pull request #11956 from Trilbyspaceclone/crafting_menu 
Fixes Crafting menu
 2020-04-21 01:25:46 +02:00
TrilbySpaceClone
c3fc133282 *crys* 2020-04-20 18:28:57 -04:00
TrilbySpaceClone
58cb5e391e *scream* 2020-04-20 18:22:13 -04:00
TrilbySpaceClone
747e27007f ***ahhhh*** 2020-04-20 17:26:22 -04:00
TrilbySpaceClone
4d55f169d5 oh god oh fuck 2020-04-20 17:05:03 -04:00
Timothy Teakettle
c5b8c45bf0 Merge branch 'master' into food-quality 2020-04-20 19:53:39 +01: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
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
necromanceranne
9919a23966 This fixes everyone being a pugilist holy fuck 2020-04-21 00:36:54 +10:00