DeltaFire
65c14cf289
Merge pull request #13537 from silicons/permissions
...
support update for event manager permissions
2020-12-22 16:12:03 +01:00
Lin
3ad777f8f7
Merge pull request #13755 from silicons/colormates
...
ports colormates from rp/vorestation
2020-12-20 18:14:48 +00:00
silicons
0fae2d4cc9
Update shell.dm
2020-12-17 19:39:55 -07:00
Timothy Teakettle
866220aefb
better cooldown
2020-12-13 02:33:57 +00:00
Timothy Teakettle
85b6248f48
remove the second check
2020-12-13 02:32:09 +00:00
timothyteakettle
76b291c0b5
action
2020-12-13 01:16:25 +00:00
Timothy Teakettle
7dfb097bcc
close enough
2020-12-12 23:48:21 +00:00
timothyteakettle
3a017d1173
it works
2020-12-12 01:49:50 +00:00
Timothy Teakettle
99f50addc7
wip
2020-12-11 20:35:37 +00:00
silicons
3f4702a99c
done
2020-12-11 05:52:09 -07:00
silicons
90608e8cfd
ok
2020-12-11 05:21:27 -07:00
silicons
599a1f0419
fix
2020-12-11 05:06:44 -07:00
silicons
76e7caad33
colormates
2020-12-11 04:54:30 -07:00
silicons
803bff4e5f
funny
2020-11-12 23:34:42 -07:00
Tupinambis
3224533a7c
Merge branch 'master' into spooder
2020-10-11 14:31:23 -05:00
silicons
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
Putnam3145
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
Putnam3145
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
silicons
8e83dcd697
event permissions
2020-10-07 14:43:53 -07:00
Letter N
9819e90b30
all done
2020-10-05 20:08:55 +08:00
Tupinambis
d2860b38c7
normalization
2020-10-01 18:46:31 -05:00
Tupinambis
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
silicons
cfddef7769
Update unsorted.dm
2020-10-01 14:13:01 -07:00
silicons
6ac175f5b1
Update unsorted.dm
2020-10-01 02:47:44 -07:00
silicons
fd520349db
Update radiation.dm
2020-10-01 02:46:04 -07:00
Letter N
945bf051bd
get railed
2020-10-01 11:28:56 +08:00
Tupinambis
113b84ab50
Ports arachnids from WaspStation
2020-09-30 15:10:17 -05:00
silicons
7af979fffb
Update radiation.dm
2020-09-27 13:36:42 -07:00
Putnam
6f6e330984
Removes removeNullsFromList, cause it doesn't work.
2020-09-24 01:15:22 -07:00
Artur
d493886875
Speedmerge fix
2020-09-23 19:14:50 +03:00
Artur
435565f1d8
Merge remote-tracking branch 'origin/master' into TGUI_Updoot
2020-09-21 00:16:12 +03:00
Letter N
fd2ec66757
Ports "Fix bicon(icon2html) showing full dmis, fix asset cache hashes being incorrect." ( #13347 )
2020-09-06 09:23:28 +02:00
silicons
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
Artur
8d073bbce6
Merge remote-tracking branch 'upstream/master' into TGUI_Updoot
2020-09-02 19:05:18 +03:00
Artur
3bef4ba35e
TGUI updates + statpanel
2020-09-02 17:52:47 +03:00
Putnam3145
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
Putnam
b7a7170f7c
Actually I ain't using it so it goes away.
2020-09-01 15:32:22 -07:00
silicons
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
silicons
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
Putnam
735809a69b
Commented out threaded FFI.
2020-08-31 20:11:52 -07:00
Putnam
2f3edb4491
Added threaded extools logging as an alternative to rust_g logging.
2020-08-31 19:56:49 -07:00
Timothy Teakettle
d859d12b9f
yes
2020-09-01 00:14:17 +01:00
timothyteakettle
af2c7b295e
ah yes
2020-08-31 02:25:54 +01:00
timothyteakettle
a9ec2254ba
hide your ckey
2020-08-31 01:47:49 +01:00
Putnam
10586f3c3b
trend, trend!
2020-08-30 07:33:17 -07:00
Putnam
5ba883bfe5
Fixes fusion power text to make sense.
2020-08-30 02:53:46 -07:00
silicons
a8f920f88c
Update _lists.dm
2020-08-29 22:48:26 -07:00
Letter N
ae482c1bb8
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
2020-08-29 14:09:56 +08:00
silicons
2fa023346a
Merge pull request #13204 from timothyteakettle/donator-items
...
adds three t1 donator items
2020-08-23 05:08:50 -07:00
Letter N
6ba29acd4e
uses some cit procs. and how the fuck did i forget to componentualize this
2020-08-22 16:08:05 +08:00
