Artur
|
9e73788714
|
Gah
|
2020-07-16 17:40:05 +03:00 |
|
Arturlang
|
92ed5d3201
|
Merge branch 'master' into TGUI-3.0
|
2020-07-16 15:59:37 +03:00 |
|
Artur
|
af65b626e3
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-16 15:56:08 +03:00 |
|
nik707
|
fa8a6dd3e1
|
Merge pull request #12788 from silicons/gasmixture_vv
"""user-friendly""" vv handling for new c++ atmos gas mixtures
|
2020-07-16 01:19:20 -05:00 |
|
timothyteakettle
|
8bfc30c8ac
|
i can't spell
|
2020-07-16 02:54:31 +01:00 |
|
timothyteakettle
|
03bd806c73
|
pickle
|
2020-07-16 02:51:07 +01:00 |
|
silicons
|
7f9571f239
|
ok
|
2020-07-15 17:17:09 -07:00 |
|
silicons
|
b279c82bb2
|
whew
|
2020-07-15 17:10:08 -07:00 |
|
silicons
|
dba5855929
|
epic
|
2020-07-15 17:01:22 -07:00 |
|
silicons
|
96fb3cad8f
|
ok
|
2020-07-15 17:00:17 -07:00 |
|
silicons
|
6fbd7914f5
|
stuff
|
2020-07-15 16:58:44 -07:00 |
|
Timothy Teakettle
|
a7e2668eff
|
funniest
|
2020-07-15 23:50:39 +01:00 |
|
silicons
|
147a905b5d
|
Merge pull request #12783 from Sneakyrat6/oocNotesExploit
Fixes seeing real name in OOC Notes
|
2020-07-15 14:48:55 -07:00 |
|
Timothy Teakettle
|
0184739005
|
undo the woopsy
|
2020-07-15 19:53:37 +01:00 |
|
Sneakyrat6
|
538e7c62cd
|
Fixes seeing real name in OOC Notes
|
2020-07-15 13:32:56 -05:00 |
|
silicons
|
6121cbd091
|
Merge pull request #12738 from timothyteakettle/travelling-traders
the travelling trader midround event
|
2020-07-15 08:50:20 -07:00 |
|
Lin
|
b6d8167c1e
|
Merge pull request #12760 from Sonic121x/patch-2
Fix Paramedic Jumpsuit
|
2020-07-14 14:22:17 -05:00 |
|
Artur
|
57e0cafb15
|
Fixes clockwork sleepers
|
2020-07-14 20:01:04 +03:00 |
|
Artur
|
8af78d1189
|
Merge remote-tracking branch 'origin/TGUI-3.0' into TGUI-3.0
|
2020-07-14 18:10:29 +03:00 |
|
Artur
|
f5ee74803f
|
Updates minter to tg and the prereqs
|
2020-07-14 18:08:12 +03:00 |
|
Arturlang
|
75eb276c98
|
Merge branch 'master' into TGUI-3.0
|
2020-07-14 16:17:23 +03:00 |
|
Artur
|
d0f1a805e4
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-14 16:15:48 +03:00 |
|
Artur
|
c964cadd85
|
Makes amber alert work
|
2020-07-14 16:15:32 +03:00 |
|
silicons
|
c333a71c74
|
Update life.dm
|
2020-07-14 04:30:38 -07:00 |
|
Timothy Teakettle
|
8de062adbb
|
fix
|
2020-07-13 19:46:51 +01:00 |
|
Lin
|
004c00325f
|
Merge pull request #12747 from Citadel-Station-13/silicons-patch-24
refactors circuit screens a bit, no more messages coming out of the floor
|
2020-07-13 12:22:58 -05:00 |
|
Lin
|
2be790e8d7
|
Merge pull request #12736 from Citadel-Station-13/silicons-patch-21
hey let's not have 25% micro borgs going around killing people
|
2020-07-13 11:51:10 -05:00 |
|
Lin
|
55c4e40fbb
|
Merge pull request #12706 from silicons/records
adds security/medical records to character setup
|
2020-07-13 11:50:02 -05:00 |
|
Lin
|
e143b69aa6
|
Merge pull request #12741 from Hatterhat/vog-but-with-less-line-changes
removing vog's ability to commit sin, probably
|
2020-07-13 11:31:25 -05:00 |
|
Lin
|
ba4a77fc30
|
Merge pull request #12737 from Citadel-Station-13/silicons-patch-22
hey can we not have circuit fusion bombs
|
2020-07-13 11:29:23 -05:00 |
|
Lin
|
1b3112528c
|
Merge pull request #12746 from silicons/react
chemical reactions now have priority - "the first grenade helped with the revenant and the second blew up the evacuation shuttle"
|
2020-07-13 11:28:52 -05:00 |
|
Artur
|
732a1ca438
|
Fixes linter and conflict shit
|
2020-07-13 16:35:12 +03:00 |
|
Artur
|
5f9364c5f8
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-13 16:20:54 +03:00 |
|
Artur
|
d1b3990875
|
Fixed scanner export
|
2020-07-13 16:20:21 +03:00 |
|
Sonic121x
|
b128a21309
|
Paramedic jump suit adjust
paramedic jump suit now adjust able.
light version of paramedic jump suit now have a digitigrade version
|
2020-07-13 20:33:59 +08:00 |
|
Timothy Teakettle
|
29628dd82a
|
cows
|
2020-07-12 21:40:16 +01:00 |
|
Timothy Teakettle
|
c0687886e4
|
using initial is better practice
|
2020-07-12 21:38:09 +01:00 |
|
Linzolle
|
8f578da614
|
PLS NO PREF BREAK
|
2020-07-12 14:32:19 -05:00 |
|
Timothy Teakettle
|
0705130448
|
small edgecase
|
2020-07-12 17:31:37 +01:00 |
|
silicons
|
fbbb5f7ea8
|
Merge pull request #12678 from Ghommie/Ghommie-cit831
Updating rust-g dependencies to 0.4.4
|
2020-07-12 08:23:29 -07:00 |
|
silicons
|
6bf209d9a5
|
Update output.dm
|
2020-07-12 06:56:48 -07:00 |
|
silicons
|
d9a7e860dd
|
Update output.dm
|
2020-07-12 06:13:19 -07:00 |
|
silicons
|
b94c1ab709
|
Update output.dm
|
2020-07-12 06:10:26 -07:00 |
|
silicons
|
047a36c973
|
fix
|
2020-07-12 05:37:07 -07:00 |
|
silicons
|
72c5c2234e
|
ok
|
2020-07-12 05:15:55 -07:00 |
|
silicons
|
f99a0564de
|
Merge pull request #12693 from Owai-Seek/trashbag-7-4-20
Trashbag Whitelist Update
|
2020-07-11 21:28:12 -07:00 |
|
silicons
|
f7b476bc64
|
Update preferences.dm
|
2020-07-11 21:23:06 -07:00 |
|
Hatterhat
|
eb0e0b6cbd
|
i may not test my shit but at least i can have less line changes motherfucker
|
2020-07-11 23:18:17 -05:00 |
|
timothyteakettle
|
3e5f981825
|
speed 4 for embeds
|
2020-07-12 03:17:50 +01:00 |
|
timothyteakettle
|
fbb9fe2d9c
|
better fork
|
2020-07-12 02:14:50 +01:00 |
|