3224533a7c
Merge branch 'master' into spooder
2020-10-11 14:31:23 -05:00
19f1e99a8c
mass ports like 15 tg prs + counting ( #13386 )
...
* changes
* ok
* changes
* sigh
* fixes
* changes
* fix
* fix
* alright
* fixes
git pus
* fix
* fix
* fix
* test
* ok
* Update code/modules/paperwork/ticketmachine.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
* ok
* compile and other stuff
* ok
* fix
* fix
* Fix
* Update menu.dm
* Update view.dm
* Update preferences.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2020-10-10 12:20:33 +02:00
6b536c23c7
Merge pull request #13480 from Citadel-Station-13/silicons-patch-7
...
[OH GOD TESTMERGE THIS FIRST] another microoptimization to GetAllContents() because microoptimizations are fun
2020-10-07 15:09:26 -07:00
ec091f9f99
Merge pull request #13453 from Citadel-Station-13/silicons-patch-5
...
microoptimization to get rad contents
2020-10-07 15:08:32 -07:00
9819e90b30
all done
2020-10-05 20:08:55 +08:00
d2860b38c7
normalization
2020-10-01 18:46:31 -05:00
f1bc1ccafb
Merge branch 'master' into spooder
...
# Conflicts:
# code/modules/surgery/organs/eyes.dm
I have no idea if this will work
2020-10-01 17:10:42 -05:00
cfddef7769
Update unsorted.dm
2020-10-01 14:13:01 -07:00
6ac175f5b1
Update unsorted.dm
2020-10-01 02:47:44 -07:00
fd520349db
Update radiation.dm
2020-10-01 02:46:04 -07:00
945bf051bd
get railed
2020-10-01 11:28:56 +08:00
113b84ab50
Ports arachnids from WaspStation
2020-09-30 15:10:17 -05:00
7af979fffb
Update radiation.dm
2020-09-27 13:36:42 -07:00
6f6e330984
Removes removeNullsFromList, cause it doesn't work.
2020-09-24 01:15:22 -07:00
d493886875
Speedmerge fix
2020-09-23 19:14:50 +03:00
435565f1d8
Merge remote-tracking branch 'origin/master' into TGUI_Updoot
2020-09-21 00:16:12 +03:00
fd2ec66757
Ports "Fix bicon(icon2html) showing full dmis, fix asset cache hashes being incorrect." ( #13347 )
2020-09-06 09:23:28 +02:00
12c5680d58
Merge pull request #13324 from Putnam3145/extools-logging
...
Added threaded extools logging as an alternative to rust_g logging.
2020-09-04 04:10:02 -07:00
8d073bbce6
Merge remote-tracking branch 'upstream/master' into TGUI_Updoot
2020-09-02 19:05:18 +03:00
3bef4ba35e
TGUI updates + statpanel
2020-09-02 17:52:47 +03:00
c0b73f8d6a
Merge pull request #13306 from Citadel-Station-13/silicons-patch-28
...
new codebase policy do not use potentially volatile procs in character setup of all places so we can stop having the moments when everyone's characters get bricked for the 619634'th time.
2020-09-01 15:37:34 -07:00
b7a7170f7c
Actually I ain't using it so it goes away.
2020-09-01 15:32:22 -07:00
db28a50953
Merge pull request #13310 from Putnam3145/fix-fusion-display
...
Makes fusion analyze not assume we're still on fusion v5
2020-08-31 21:20:15 -07:00
77cf561f7f
Merge pull request #13316 from timothyteakettle/ckey-pref
...
pref for hiding your ckey from roundend report
2020-08-31 21:19:37 -07:00
735809a69b
Commented out threaded FFI.
2020-08-31 20:11:52 -07:00
2f3edb4491
Added threaded extools logging as an alternative to rust_g logging.
2020-08-31 19:56:49 -07:00
d859d12b9f
yes
2020-09-01 00:14:17 +01:00
af2c7b295e
ah yes
2020-08-31 02:25:54 +01:00
a9ec2254ba
hide your ckey
2020-08-31 01:47:49 +01:00
10586f3c3b
trend, trend!
2020-08-30 07:33:17 -07:00
5ba883bfe5
Fixes fusion power text to make sense.
2020-08-30 02:53:46 -07:00
a8f920f88c
Update _lists.dm
2020-08-29 22:48:26 -07:00
ae482c1bb8
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
2020-08-29 14:09:56 +08:00
2fa023346a
Merge pull request #13204 from timothyteakettle/donator-items
...
adds three t1 donator items
2020-08-23 05:08:50 -07:00
6ba29acd4e
uses some cit procs. and how the fuck did i forget to componentualize this
2020-08-22 16:08:05 +08:00
afe32406c0
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
2020-08-22 13:40:36 +08:00
3b7bca28b3
Functional* code
2020-08-20 13:50:33 +08:00
6392367df4
donator items
2020-08-18 17:28:09 +01:00
f5300750b5
Revert "[TESTMERGE ONLY] FUCK"
2020-08-17 03:18:36 +01:00
4cd731ce11
Revert "cease your shitcode: cum edition"
2020-08-16 19:06:57 -07:00
8dedcbcf76
Merge branch '13113'
2020-08-16 18:53:35 -07:00
1f240b883f
holy shit
2020-08-11 03:37:04 +01:00
eb8574d6d6
heretics from tg (with changes)
2020-08-10 19:17:26 -07:00
f20f01cc6b
Merge pull request #12853 from LetterN/TGUI-4
...
TGUI4 port
2020-08-09 05:46:21 -07:00
f1c4a7f6ac
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-08-09 14:54:16 +08:00
9bb3ba5c5a
added ethereals
2020-08-08 00:08:43 -07:00
c0ac492d07
ok
2020-08-04 21:01:06 -07:00
0a137d2584
whew
2020-08-04 20:52:35 -07:00
ed67801590
what if the tgui actualy recives it's topic?
2020-08-05 09:21:19 +08:00
e40470f553
h. Updates NTOS, and axes p2p filetransfer!
2020-07-30 20:54:13 +08:00
Tupinambis