silicons
8b36cf6f64
Merge pull request #13375 from timothyteakettle/emp-rework
...
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
2020-10-01 03:01:18 -07:00
Timothy Teakettle
106b8ccead
Merge branch 'master' into heterochromia
2020-09-24 22:09:03 +01:00
Artur
410550220b
Fixed admin hide most verbs
2020-09-21 10:39:09 +03:00
Timothy Teakettle
58737e42b9
empulse using range
2020-09-10 19:52:34 +01:00
timothyteakettle
e0f44ef717
new emps
2020-09-10 03:49:47 +01:00
Artur
c79e9fbc0b
https://github.com/tgstation/tgstation/pull/53263
2020-09-02 18:48:09 +03:00
Artur
3bef4ba35e
TGUI updates + statpanel
2020-09-02 17:52:47 +03:00
Timothy Teakettle
1d943a34ef
heterochromia
2020-08-28 18:30:28 +01:00
Letter N
57a008d567
fixes adminbus
2020-08-26 11:22:57 +08:00
Letter N
c13a22a841
stops kevinz from leaking his IP
2020-08-24 18:42:48 +08:00
Letter N
b8d812fb47
"what if adminbus stops leaking confidential adminchat" and also updates admin things. you can now do obj/structure/singulo:50
2020-08-23 17:18:32 +08:00
Letter N
271c66ad40
travis moment
2020-08-22 17:03:10 +08:00
Letter N
0b159b218a
revert moment
2020-08-22 16:30:56 +08:00
Letter N
afe32406c0
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
2020-08-22 13:40:36 +08:00
Letter N
3b7bca28b3
Functional* code
2020-08-20 13:50:33 +08:00
Putnam
81dc6c7ee5
Ports reftracking from TG.
2020-08-18 20:41:43 -07:00
Letter N
fa7b82694d
src.islazy = TRUE
2020-08-19 10:04:56 +08:00
Letter N
b59d449a75
Update adminhelp.dm
2020-08-19 09:59:41 +08:00
silicons
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
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
Timothy Teakettle
289c186f32
Merge remote-tracking branch 'upstream/master' into wounds-part-2
2020-08-02 18:11:07 +01:00
Unknown
16722c47c3
CentCom Galactic Ban DB
2020-07-29 21:39:58 -05:00
Timothy Teakettle
9721025582
Merge branch 'master' into wounds-part-2
2020-07-29 15:47:44 +01:00
Lin
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
Lin
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
silicons
6e08865b36
Update topic.dm
2020-07-20 17:30:35 -07:00
Timothy Teakettle
75a2035774
Merge branch 'master' into wound-port
2020-07-21 01:10:51 +01:00
silicons
a7144d2404
Merge pull request #12829 from timothyteakettle/fried-component
...
the fried component
2020-07-20 16:59:36 -07:00
Lin
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
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
silicons
484da28600
Merge branch 'master' into shoelaces
2020-07-16 17:31:41 -07:00
silicons
e03948dcba
Merge pull request #12229 from Arturlang/TGUI-3.0
...
[READY]TGUI 3.0
2020-07-16 17:28:42 -07:00
Arturlang
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
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
