Enric Gabriel
6ae97d5991
quick little make ip clickable
2020-08-29 17:11:25 -03:00
SandPoot and GitHub
89a55525f5
[TESTMERGE] New tgs commands + modification of a existant one ( #58 )
2020-08-29 15:45:02 -03:00
Enric Gabriel
f70b74eca3
here
2020-08-26 12:05:06 -03:00
Enric Gabriel
b0cf18fc5a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-08-20 13:29:24 -03:00
Putnam
81dc6c7ee5
Ports reftracking from TG.
2020-08-18 20:41:43 -07:00
Enric Gabriel
600c3b3528
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-08-18 23:31:57 -03:00
Letter N and GitHub
fa7b82694d
src.islazy = TRUE
2020-08-19 10:04:56 +08:00
Letter N and GitHub
b59d449a75
Update adminhelp.dm
2020-08-19 09:59:41 +08:00
SandPoot and GitHub
66541bbe67
Adds tgstation's fix air for admins ( #49 )
2020-08-17 14:55:59 -03: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
silicons and GitHub
d2f5c6688b
Merge pull request #13084 from Putnam3145/ic-wording-fix
...
Made IC issue wording less salt-assuming
2020-08-09 05:41:10 -07:00
silicons and GitHub
3068accd2b
Merge pull request #13082 from Putnam3145/anaphro
...
Removed (an)aphrodisiacs.
2020-08-09 05:39:56 -07:00
Putnam
9dcfceb8e9
Made IC issue wording less assuming-salt
2020-08-08 01:32:18 -07:00
Putnam
467f66b2a6
Removed crocin/hexacrocin.
2020-08-08 00:46:30 -07:00
Putnam
9bb3ba5c5a
added ethereals
2020-08-08 00:08:43 -07:00
Enric Gabriel
8558cc8747
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-08-04 01:48:59 -03:00
Timothy Teakettle
289c186f32
Merge remote-tracking branch 'upstream/master' into wounds-part-2
2020-08-02 18:11:07 +01:00
Enric Gabriel
372b486daf
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-08-01 10:07:19 -03:00
Unknown
16722c47c3
CentCom Galactic Ban DB
2020-07-29 21:39:58 -05:00
Timothy Teakettle and GitHub
9721025582
Merge branch 'master' into wounds-part-2
2020-07-29 15:47:44 +01: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
Lin and GitHub
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
1990f75957
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-25 23:46:27 -07:00
timothyteakettle
3ca098fe98
bugfixes
2020-07-25 00:22:24 +01:00
timothyteakettle
315e7e1f99
bugfixes
2020-07-24 23:49:15 +01:00
Timothy Teakettle
7fb55a02a5
section one
2020-07-24 22:34:22 +01: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
Lin and GitHub
7352e21877
Merge pull request #12844 from Citadel-Station-13/silicons-patch-41
...
fixes traitor jobban link
2020-07-23 13:19:25 -05:00
silicons
ffd44b78ba
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-23 10:26:03 -07:00
Enric Gabriel
d0f16c666b
removes some useless |
2020-07-23 02:24:28 -03:00
Enric Gabriel
f0904c6b10
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2020-07-21 01:19:25 -03:00
silicons and GitHub
6e08865b36
Update topic.dm
2020-07-20 17:30:35 -07:00
Timothy Teakettle and GitHub
75a2035774
Merge branch 'master' into wound-port
2020-07-21 01:10:51 +01:00
silicons and GitHub
a7144d2404
Merge pull request #12829 from timothyteakettle/fried-component
...
the fried component
2020-07-20 16:59:36 -07:00
Lin and GitHub
f0df3689dc
Merge pull request #12790 from Citadel-Station-13/silicons-patch-30
...
truncates sdql2 output to 2500 objects instead of 20000 because it's a real epic gamer moment when admins crash their clients doing SELECT /datum/gas_mixture
2020-07-20 18:20:27 -05:00
silicons
416b989e12
changes
2020-07-20 11:35:10 -07:00
Timothy Teakettle
b06948bed4
fry smite
2020-07-20 17:48:37 +01:00
Timothy Teakettle and GitHub
974b80a2fd
Merge branch 'master' into wound-port
2020-07-18 21:45:24 +01:00
Timothy Teakettle
a4478b0cda
it continues
2020-07-17 22:38:28 +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
silicons and GitHub
484da28600
Merge branch 'master' into shoelaces
2020-07-16 17:31:41 -07:00
silicons and GitHub
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
Arturlang and GitHub
92ed5d3201
Merge branch 'master' into TGUI-3.0
2020-07-16 15:59:37 +03:00
Letter N
7eab0263ba
https://github.com/tgstation/tgstation/pull/51213
2020-07-16 20:51:25 +08:00
timothyteakettle
03bd806c73
pickle
2020-07-16 02:51:07 +01:00
silicons and GitHub
4785a753ba
Update SDQL_2.dm
2020-07-15 17:12:48 -07:00
Artur
5f9364c5f8
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
silicons
98e727ec03
ok
2020-07-11 00:55:23 -07:00
Enric Gabriel