 Enric Gabriel
|
f759503b49
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-22 20:30:49 -03:00 |
|
|
Ghommie
|
fde859bca0
|
Removing priority overlays, update_icon() splitup for guns.
|
2020-08-20 18:33:23 +02:00 |
|
|
Enric Gabriel
|
06496434a4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-16 23:30:53 -03:00 |
|
|
kiwedespars
|
eb8574d6d6
|
heretics from tg (with changes)
|
2020-08-10 19:17:26 -07:00 |
|
|
Enric Gabriel
|
bae8c236f6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-09 18:34:33 -03:00 |
|
|
Letter N
|
c4b4801132
|
shockies
|
2020-08-08 15:20:03 +08:00 |
|
|
Enric Gabriel
|
935901593b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-07-29 09:52:32 -03:00 |
|
|
LinandGitHub
|
a5dd08a054
|
Merge pull request #12734 from silicons/shoelaces
shoelaces. untying people's shoelaces. admin smite to untie someone's shoelaces. credit to shaps/tg.
|
2020-07-28 21:51:43 -05:00 |
|
|
silicons
|
1f25c7f06d
|
Merge remote-tracking branch 'citadel/master' into shoelaces
|
2020-07-23 16:23:34 -07:00 |
|
|
Enric Gabriel
|
e0fdf3dce9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 / merge conflicts
|
2020-07-23 19:14:58 -03:00 |
|
|
silicons
|
ffd44b78ba
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-23 10:26:03 -07:00 |
|
|
silicons
|
692656b02d
|
Whew
|
2020-07-20 11:53:33 -07:00 |
|
|
Timothy TeakettleandGitHub
|
974b80a2fd
|
Merge branch 'master' into wound-port
|
2020-07-18 21:45:24 +01:00 |
|
|
Timothy Teakettle
|
93b4570f8d
|
more changes
|
2020-07-17 23:23:47 +01:00 |
|
|
Enric Gabriel
|
05593f84a0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-07-16 22:13:13 -03:00 |
|
|
timothyteakettle
|
584e74590f
|
port1
|
2020-07-17 02:01:33 +01:00 |
|
|
siliconsandGitHub
|
484da28600
|
Merge branch 'master' into shoelaces
|
2020-07-16 17:31:41 -07:00 |
|
|
siliconsandGitHub
|
e03948dcba
|
Merge pull request #12229 from Arturlang/TGUI-3.0
[READY]TGUI 3.0
|
2020-07-16 17:28:42 -07:00 |
|
|
Enric Gabriel
|
310b0e4e91
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-07-16 14:53:25 -03:00 |
|
|
Letter N
|
2afab07b4a
|
https://github.com/tgstation/tgstation/pull/52255
|
2020-07-16 20:05:37 +08:00 |
|
|
Artur
|
f5ee74803f
|
Updates minter to tg and the prereqs
|
2020-07-14 18:08:12 +03:00 |
|
|
Artur
|
5f9364c5f8
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-13 16:20:54 +03:00 |
|
|
Enric Gabriel
|
bed059d84a
|
Custom examine icons Skyrat13/pull/2167/files
|
2020-07-11 20:53:10 -03:00 |
|
|
silicons
|
3d80792e79
|
more
|
2020-07-11 00:37:56 -07:00 |
|
|
Timothy Teakettle
|
02f46322ad
|
port examine
|
2020-07-09 18:32:45 +01:00 |
|
|
Artur
|
f0154f3f1c
|
conflicts!!!
|
2020-07-03 15:45:11 +03:00 |
|
|
silicons
|
824d11b085
|
death to lists
|
2020-07-03 02:34:59 -07:00 |
|
|
silicons
|
d85edbf8fb
|
ok
|
2020-07-03 02:15:06 -07:00 |
|
|
Artur
|
20245f7319
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-06-30 02:30:29 +03:00 |
|
|
siliconsandGitHub
|
26fee48cec
|
Merge pull request #12645 from Ghommie/Ghommie-cit825
More and more fixes.
|
2020-06-29 14:18:10 -07:00 |
|
|
Ghommie
|
0779dd560e
|
More and more fixes.
|
2020-06-29 18:52:37 +02:00 |
|
|
Timothy Teakettle
|
9d134f4fc9
|
blood fix
|
2020-06-29 16:34:55 +01:00 |
|
|
Timothy Teakettle
|
ae49152e10
|
fixes my stupid mistake
|
2020-06-28 17:05:30 +01:00 |
|
|
siliconsandGitHub
|
45a6061958
|
Merge pull request #12596 from Ghommie/Ghommie-cit819
Porting further material datum features and improvements.
|
2020-06-27 14:53:28 -07:00 |
|
|
Timothy Teakettle
|
9c9868438c
|
some fixes
|
2020-06-26 22:49:43 +01:00 |
|
|
Timothy Teakettle
|
334d55bef3
|
add support for custom blood colours
|
2020-06-26 20:29:40 +01:00 |
|
|
Ghommie
|
c5cbfa64e5
|
Porting further material datum features and improvements.
|
2020-06-24 20:45:17 +02:00 |
|
|
Artur
|
c41d2e78be
|
Conflicts!!!
|
2020-06-22 17:39:24 +03:00 |
|
|
kevinz000
|
1b5ea90c8f
|
sigh
|
2020-06-18 08:16:05 -07:00 |
|
|
Timothy TeakettleandGitHub
|
2229db2214
|
Merge branch 'master' into embed-changes
|
2020-06-17 16:40:34 +01:00 |
|
|
kevinz000andGitHub
|
2e943e03a3
|
Merge pull request #12544 from SmArtKar/bee_shuttles
Shuttles from beestation
|
2020-06-17 08:35:34 -07:00 |
|
|
SmArtKar
|
46c3e9e54d
|
Shuttles
|
2020-06-16 18:16:14 +03:00 |
|
|
Timothy Teakettle
|
eba1e8f301
|
fixes the merge conflicts
|
2020-06-15 23:29:49 +01:00 |
|
|
Artur
|
ceba739231
|
Cooonflicts
|
2020-06-16 01:23:42 +03:00 |
|
|
kevinz000
|
3752aecfdb
|
fix
|
2020-06-13 11:30:37 -07:00 |
|
|
kevinz000
|
180b7d31d9
|
sigh
|
2020-06-13 09:24:22 -07:00 |
|
|
Artur
|
19f215477e
|
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
|
2020-05-30 18:52:02 +03:00 |
|
|
RohesieandGitHub
|
d88c815845
|
vars (#12373)
|
2020-05-28 01:18:26 +02:00 |
|
|
GhomandGitHub
|
85186a9714
|
Porting updates related to material datums. (#12317)
* Porting updates related to material datums.
* art_type
* oh oh
|
2020-05-25 14:21:00 -07:00 |
|
|
Artur
|
9d04b0835b
|
Conflicts galore
|
2020-05-21 21:08:12 +03:00 |
|