Detective Google
|
5bef1281a4
|
Merge branch '91-files-changed-fml' of https://github.com/Detective-Google/Citadel-Station-13 into 91-files-changed-fml
|
2020-05-02 17:45:02 -05:00 |
|
Detective Google
|
25d84a6317
|
brings the engioutpost ruin over as well
|
2020-05-02 17:44:23 -05:00 |
|
Detective-Google
|
6db5655ceb
|
Merge branch 'master' into 91-files-changed-fml
|
2020-05-02 17:16:18 -05:00 |
|
Lin
|
f659c036ef
|
Merge pull request #12036 from kevinz000/electrochromatic_windows
Electrochromatic (dim-on-demand) windows
|
2020-05-02 19:13:29 +00:00 |
|
Ghommie
|
42d7d57ad6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit698
|
2020-05-02 19:17:48 +02:00 |
|
Ghommie
|
c38c1755cd
|
Done, tested, too many options.
|
2020-05-02 19:05:41 +02:00 |
|
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 |
|
Detective Google
|
7ef5246b19
|
fixes a bunch of mismatch atmos in ruins
|
2020-05-01 01:33:14 -05:00 |
|
Detective Google
|
2832b86e11
|
some map fixes, fixes the station_ruin loader shitting out errors this commit took 2 hours of my fucking life
|
2020-05-01 01:17:56 -05:00 |
|
kevinz000
|
c9cd134132
|
linter fix
|
2020-04-30 17:39:30 -07:00 |
|
Detective-Google
|
c146c898c0
|
Merge branch 'master' into 91-files-changed-fml
|
2020-04-30 18:42:38 -05:00 |
|
Detective Google
|
f6736e862d
|
it compiles, now to fix the maps
|
2020-04-30 15:49:06 -05: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
|
02265010d6
|
fixes
|
2020-04-30 10:07:17 -07:00 |
|
kevinz000
|
7e8ebfde83
|
whew
|
2020-04-30 10:03:35 -07:00 |
|
kevinz000
|
615dc71069
|
fixes
|
2020-04-30 01:26:46 -07:00 |
|
kevinz000
|
bd7b1b1193
|
fixes
|
2020-04-30 01:23:21 -07:00 |
|
kevinz000
|
f028672e3c
|
Merge remote-tracking branch 'citadel/master' into 91-files-changed-fml
|
2020-04-30 01:00:08 -07:00 |
|
kevinz000
|
432724a388
|
fixes
|
2020-04-30 00:58:59 -07: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
|
28da033111
|
fine
|
2020-04-26 17:37:27 -07:00 |
|
kevinz000
|
bf7962d8f9
|
wow lotsa effort huh
|
2020-04-26 03:36:09 -07:00 |
|
kevinz000
|
af3651172c
|
wow lotsa effort huh
|
2020-04-26 03:29:31 -07: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 |
|
Detective Google
|
71be8ed2fc
|
ports all the tg junk for icemoon, not yet changed to make it all compile
|
2020-04-24 00:02:03 -05: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 |
|