Ghommie
|
72413c893f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54
|
2019-07-27 01:38:20 +02:00 |
|
Poojawa
|
8c63ea7b6d
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
|
2019-07-26 17:36:46 -05:00 |
|
kevinz000
|
d976dd016a
|
Merge remote-tracking branch 'origin/master' into trait_blacklisting
|
2019-07-25 15:20:46 -07:00 |
|
Ghommie
|
6623dd4896
|
As if they'd care anyway.
|
2019-07-24 02:03:52 +02:00 |
|
Ghommie
|
3bd0ba0275
|
Cleaning up Arousal code & co.
|
2019-07-23 06:39:53 +02:00 |
|
kevinz000
|
1028fe458a
|
Merge pull request #8909 from Ghommie/Ghommie-cit143
Fixes named arg Knockdown calls.
|
2019-07-22 20:17:30 -07:00 |
|
EgoSumStultus
|
4a800e1431
|
blind quirk
|
2019-07-21 23:48:53 -07:00 |
|
Thalpy
|
15ab1a26a4
|
Merge branch 'master' into master
|
2019-07-21 01:50:41 +01:00 |
|
kevinz000
|
08fd6af7fc
|
Merge pull request #8830 from Ghommie/Ghommie-cit114
Ports the toggleable dark mode to the game!
|
2019-07-20 11:57:13 -07:00 |
|
kevinz000
|
08d9732fb8
|
Merge pull request #8925 from BurgerLUA/Autolathe-Fix
Makes the autolathe shock wire actually shock you
|
2019-07-20 11:49:39 -07:00 |
|
kevinz000
|
94f5573e3a
|
Update nanites.dm
|
2019-07-19 17:45:44 -07:00 |
|
BurgerLua
|
b2379198aa
|
Makes the autolathe shock wire actually shock you lmao
|
2019-07-19 02:01:16 -07:00 |
|
deathride58
|
77360259ae
|
Merge pull request #8855 from Citadel-Station-13/kevinz000-patch-15
Fixes and buffs nano-boost symptom
|
2019-07-17 17:53:02 -04:00 |
|
deathride58
|
7e12cfc9ff
|
Merge pull request #8868 from Citadel-Station-13/kevinz000-patch-57
Nanites in non /livings are no longer immune to EMPs
|
2019-07-17 17:51:15 -04:00 |
|
deathride58
|
d7cbbfc8a4
|
Merge pull request #8866 from Citadel-Station-13/kevinz000-patch-54
Fixes nanites getting instant nuked by EMPs and shocks and removes the random drain in favor of a scaled drain
|
2019-07-17 17:48:38 -04:00 |
|
Ghommie
|
ee32e1680f
|
Ports "Replaces radio channel names and keys with defines"
|
2019-07-17 00:52:41 +02:00 |
|
Ghommie
|
b6f10c96a7
|
Modularity was a mistake.
|
2019-07-16 21:05:12 +02:00 |
|
kevinz000
|
f16328c6e7
|
Update ert.dm
|
2019-07-15 16:55:40 -07:00 |
|
Thalpy
|
9c7b1dee97
|
Merge branch 'master' into master
|
2019-07-15 21:23:04 +01:00 |
|
Ghommie
|
dbb17a258a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54
|
2019-07-15 17:52:34 +02:00 |
|
Ghommie
|
16a7f6e5b2
|
Merge branch 'master' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit54
|
2019-07-15 17:46:13 +02:00 |
|
Ghommie
|
fac3e65c68
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11
|
2019-07-15 17:42:47 +02:00 |
|
Ghommie
|
1e1f8e627f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
|
2019-07-15 17:33:41 +02:00 |
|
Ghommie
|
4df4cbd721
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-07-15 17:23:01 +02:00 |
|
Seris02
|
59f45d3e35
|
adds abductor replication lab with advanced tools
|
2019-07-15 15:18:04 +08:00 |
|
kevinz000
|
102bede4be
|
Merge pull request #7544 from deathride58/nanitepoolnerf
Nerfs nanite pools
|
2019-07-14 14:15:53 -07:00 |
|
Fermi
|
8d12d0f017
|
I am very smart
|
2019-07-13 20:02:53 +01:00 |
|
Thalpy
|
4c4dbd0e17
|
Merge branch 'master' into master
|
2019-07-13 19:33:46 +01:00 |
|
Ghommie
|
129ca9d71f
|
Ports "Refactors NODROP flag into TRAIT_NODROP"
|
2019-07-13 10:27:39 +02:00 |
|
kevinz000
|
e5d445c4d3
|
Merge pull request #8846 from Ghommie/Ghommie-cit122
Rubber toolboxes.
|
2019-07-12 07:35:25 -07:00 |
|
kevinz000
|
c30a3aafb6
|
Update nanites.dm
|
2019-07-10 22:49:31 -07:00 |
|
kevinz000
|
db05432778
|
Update nanites.dm
|
2019-07-10 22:44:21 -07:00 |
|
kevinz000
|
2995b22907
|
Update nanites.dm
|
2019-07-10 22:38:43 -07:00 |
|
Poojawa
|
c4f736eb94
|
Merge branch 'master' into job-menu-improvements
|
2019-07-10 18:55:29 -05:00 |
|
Fermi
|
ce390fb595
|
Tweaks to MK
|
2019-07-09 23:27:37 +01:00 |
|
kevinz000
|
7bca0c6d88
|
Update nanites.dm
|
2019-07-08 23:48:22 -07:00 |
|
Ghommie
|
490ae9daf2
|
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
|
2019-07-09 07:58:22 +02:00 |
|
Thalpy
|
c418312cc6
|
Merge branch 'master' into master
|
2019-07-09 05:33:09 +01:00 |
|
kevinz000
|
adf2166c57
|
t
|
2019-07-08 12:31:15 -07:00 |
|
Ghommie
|
2af4cfa0ce
|
component fixes.
|
2019-07-08 15:09:18 +02:00 |
|
Ghommie
|
9043402483
|
Rubber toolboxes.
|
2019-07-08 14:34:14 +02:00 |
|
kevinz000
|
1b4df74efb
|
Merge pull request #8802 from Ghommie/Ghommie-cit101
Ports in RPGs for nuke ops, failsafe uplink codes, some carp plushie exploit fix etc.
|
2019-07-07 02:39:07 -07:00 |
|
kevinz000
|
e227d5575c
|
Merge pull request #8825 from Ghommie/Ghommie-cit110
Ports "Fixes default supplypods exploding their contents" & co.
|
2019-07-07 02:34:47 -07:00 |
|
kevinz000
|
fd592e5815
|
Merge pull request #8827 from Ghommie/Ghommie-cit112
Ports "Makes looping sounds use client time"
|
2019-07-07 02:31:10 -07:00 |
|
Thalpy
|
cc39c9f896
|
Merge branch 'master' into master
|
2019-07-06 16:03:17 +01:00 |
|
Ghommie
|
3ca31617aa
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit114
|
2019-07-05 23:06:57 +02:00 |
|
Ghommie
|
03315d1cbb
|
Ports a toggleable darkmode to the game!
|
2019-07-05 22:29:50 +02:00 |
|
kevinz000
|
77743c9a0f
|
Merge pull request #8794 from Ghommie/Ghommie-cit100
Fixes the uplink category indexing.
|
2019-07-05 06:56:22 -07:00 |
|
Ghommie
|
7be9305b03
|
Ports "Makes looping sounds use client time"
|
2019-07-04 22:50:11 +02:00 |
|
Ghommie
|
b41e289db3
|
Ports "Fixes default supplypods exploding their contents" & co.
|
2019-07-04 22:35:13 +02:00 |
|