Lin
|
f659c036ef
|
Merge pull request #12036 from kevinz000/electrochromatic_windows
Electrochromatic (dim-on-demand) windows
|
2020-05-02 19:13:29 +00: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
|
830e1b46c8
|
Merge pull request #12028 from Putnam3145/fix-story-storyteller
Some more admeme potential for dynamic
|
2020-04-29 12:02:21 -07:00 |
|
Ghom
|
858c697acc
|
Merge pull request #11977 from kevinz000/xenomorph_balancing_pass
Xenomorph balancing pass
|
2020-04-26 14:03:15 +02: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
|
da61b04ed0
|
Merge pull request #11997 from Ghommie/Ghommie-cit705
code for designs' security level requirements.
|
2020-04-25 16:53:48 -07:00 |
|
kevinz000
|
7d688126c8
|
Merge pull request #12008 from Ghommie/Ghommie-cit707
VR Levels are not a subset of Away Missions anymore.
|
2020-04-25 16:51:52 -07:00 |
|
kevinz000
|
4689e2aeb6
|
Merge pull request #11980 from Ghommie/Ghommie-cit700
Movespeed modifiers refactor port.
|
2020-04-25 16:51:14 -07:00 |
|
Putnam
|
82fe5f0455
|
Allow rigged dynamic roundstarts (whoops)
|
2020-04-25 16:28:58 -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 |
|
kevinz000
|
e6b0fb4929
|
this was a mistake
|
2020-04-25 01:02:47 -07:00 |
|
Ghom
|
283440e8eb
|
Merge pull request #11848 from Putnam3145/experimental-major-optimization
Removing SS_TICKER from the lighting subsystem
|
2020-04-25 03:08:27 +02:00 |
|
Ghommie
|
a9be1e06e2
|
Fixing stuff, it now should be ready.
|
2020-04-24 23:00:31 +02:00 |
|
Ghommie
|
58fc679cce
|
WIP
|
2020-04-24 20:49:15 +02:00 |
|
Ghommie
|
d1ec18a0ce
|
what the?!
|
2020-04-24 00:57:40 +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 |
|
kevinz000
|
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 |
|
Ghommie
|
42201343a9
|
Backward 512 compatibility removal.
|
2020-04-23 00:59:23 +02:00 |
|
Ghommie
|
63870cc9d1
|
Movespeed modifiers refactor port.
|
2020-04-22 22:01:39 +02:00 |
|
kevinz000
|
0eac988f52
|
okay!
|
2020-04-22 08:22:52 -07:00 |
|
Putnam3145
|
45f032a600
|
Merge pull request #11854 from Citadel-Station-13/Ghommie-patch-1
Something about configs and integers.
|
2020-04-21 13:04:31 -07:00 |
|
Lin
|
560cf8749b
|
Merge pull request #11943 from Citadel-Station-13/Ghommie-patch-2
Ports text formatted round timer from skyrat.
|
2020-04-21 02:13:31 +00:00 |
|
kevinz000
|
ff651ac881
|
Merge pull request #11931 from Ghommie/Ghommie-cit694
Removes that one in a thousands chance of being spawned in the syndicate infiltrator roundstart.
|
2020-04-20 11:31:31 -07:00 |
|
Ghom
|
7c6c20ec7a
|
Update game_options.dm
|
2020-04-20 16:04:55 +02:00 |
|
Ghom
|
31d7fad1b4
|
Update time_track.dm
|
2020-04-20 02:39:40 +02:00 |
|
kevinz000
|
ab01d91971
|
Merge pull request #11903 from Ghommie/Ghommie-cit687
fix for my relatively minuscule backend refactor for holodeck.
|
2020-04-18 19:32:50 -07:00 |
|
Ghommie
|
d5a43be181
|
Removes that one in a thousands chance of being spawned in the syndicate infiltrator roundstart.
|
2020-04-19 03:07:45 +02:00 |
|
Ghommie
|
ac662a46c1
|
Extra support for bussed/lateloaded holodeck maps.
|
2020-04-18 03:15:05 +02:00 |
|
Ghommie
|
523672b6a5
|
fix for my relatively minuscule backend refactor for holodeck.
|
2020-04-18 02:32:10 +02:00 |
|
Ghom
|
7a47debe9e
|
Merge branch 'master' into Ghommie-patch-1
|
2020-04-18 01:27:00 +02:00 |
|
kevinz000
|
61f833b953
|
Merge pull request #11852 from Ghommie/Ghommie-cit681
Custom skin tone preferences.
|
2020-04-17 05:16:04 -07:00 |
|
Ghommie
|
2200c690f7
|
configs
|
2020-04-16 18:44:05 +02:00 |
|
Ghom
|
6c977f347d
|
Update game_options.dm
|
2020-04-14 20:40:59 +02:00 |
|
Putnam
|
4703af111d
|
actually let's just delete this file
|
2020-04-14 10:12:17 -07:00 |
|
UristMcAstronaut
|
1eafcbeb1e
|
Add files via upload
|
2020-04-14 16:22:16 +00:00 |
|
kevinz000
|
7861b044ea
|
Merge pull request #11826 from Ghommie/Ghommie-cit675
Body size preferences! Oh no!
|
2020-04-14 01:35:46 -07:00 |
|
kevinz000
|
2961bf8698
|
Merge pull request #11838 from kappa-sama/gamingtime
makes circuit theft admin only
|
2020-04-14 01:33:06 -07:00 |
|
Putnam
|
3543da036b
|
actually i don't know what this does
|
2020-04-13 17:37:03 -07:00 |
|
Putnam
|
dabe56fea1
|
Experimental major optimization
|
2020-04-13 17:30:49 -07:00 |
|
kevinz000
|
6d7cc834f6
|
Merge pull request #11379 from Ghommie/Ghommie-cit611
Polychromic element.
|
2020-04-13 17:10:45 -07:00 |
|
Ghom
|
25f1a83473
|
Merge pull request #11834 from deathride58/linuxfail2topic
adds rudimentary linux iptables support for fail2topic (and makes fail2topic disabled by default while i'm at it)
|
2020-04-13 16:44:15 +02:00 |
|
Ghommie
|
db43f53ac4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
|
2020-04-13 16:15:40 +02:00 |
|
kappa-sama
|
efe36a02e0
|
bye
|
2020-04-12 22:19:10 -04:00 |
|
kevinz000
|
6b6683846b
|
Merge pull request #11819 from Ghommie/Ghommie-cit672
Minor action datum refactor and spellcasting fix.
|
2020-04-12 17:02:36 -07:00 |
|
Ghommie
|
05a954f000
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
|
2020-04-13 02:01:01 +02:00 |
|
Ghom
|
d0af60a2d3
|
Merge pull request #11817 from Putnam3145/dynamic-lings-2
More dynamic tweaks + dynamic latejoin changelings
|
2020-04-13 01:48:12 +02:00 |
|
deathride58
|
53d893a67e
|
adds rudimentary linux iptables support for fail2topic
|
2020-04-12 16:21:51 -04:00 |
|