 kevinz000
|
b34d6cba0c
|
Merge pull request #10864 from Citadel-Station-13/Ghommie-patch-1
Hello subtler roleplayers, I see you.
|
2020-02-04 03:33:14 -07:00 |
|
|
Ghom
|
cc3955ecc7
|
Fixes pitch black characters
|
2020-02-04 06:04:43 +01:00 |
|
|
Ghom
|
f1e3261566
|
Update _logging.dm
|
2020-02-02 23:26:03 +01:00 |
|
|
Artur
|
e7ddfdd8d8
|
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
|
2020-02-02 13:31:54 +01:00 |
|
|
kevinz000
|
33577e0d82
|
Merge pull request #10813 from Ghommie/Ghommie-cit540
Unicode support updates from tgstation.
|
2020-02-02 01:47:24 -07:00 |
|
|
Putnam3145
|
33122d0d92
|
Merge branch 'master' into TGUIs_Nexties
|
2020-02-01 00:49:10 -08:00 |
|
|
Ghom
|
5257ab2e00
|
Merge pull request #10559 from Seris02/custompie
custom reagent pie smite
|
2020-02-01 01:46:15 +01:00 |
|
|
Seris02
|
70c41e5bd7
|
happy now
|
2020-01-31 15:08:16 +08:00 |
|
|
Ghommie
|
188f726ffd
|
unicode support port wip
|
2020-01-31 05:32:00 +01:00 |
|
|
Arturlang
|
83ce84cdc4
|
Merge branch 'master' into TGUIs_Nexties
|
2020-01-30 20:46:20 +02:00 |
|
|
Ghom
|
cf3466252e
|
Merge pull request #10694 from Citadel-Station-13/kevinz000-patch-4
[s] more reasonable reagent logging
|
2020-01-29 01:59:09 +01:00 |
|
|
kevinz000
|
3d3086ac23
|
Merge pull request #10736 from Citadel-Station-13/Ghommie-patch-3
An oversight with one of the new area helper procs.
|
2020-01-28 17:55:39 -07:00 |
|
|
Ghom
|
0ed72c7722
|
Merge pull request #10692 from Citadel-Station-13/TESTING
faster get_hearers_in_view/getallcontents i guess
|
2020-01-27 21:06:52 +01:00 |
|
|
Ghom
|
51aaa5d406
|
Update areas.dm
|
2020-01-26 17:24:25 +01:00 |
|
|
kevinz000
|
603ab65ed1
|
Merge pull request #10151 from Ghommie/Ghommie-cit450
refactors area code to allow for multiple areas to share the same APC, fire, air alarms etc.
|
2020-01-25 19:33:26 -07:00 |
|
|
kevinz000
|
3ccf7bcced
|
Update game.dm
|
2020-01-24 16:02:40 -07:00 |
|
|
kevinz000
|
8f8b6cc4bd
|
Update unsorted.dm
|
2020-01-24 15:59:54 -07:00 |
|
|
kevinz000
|
e6e3763705
|
Update game.dm
|
2020-01-24 15:59:09 -07:00 |
|
|
kevinz000
|
d837cf1fd0
|
Update game.dm
|
2020-01-24 15:57:48 -07:00 |
|
|
kevinz000
|
ea43724fc5
|
Update game.dm
|
2020-01-24 04:45:53 -07:00 |
|
|
kevinz000
|
60365e4a8c
|
Revert "Revert "Update _logging.dm""
This reverts commit 2b93d5c3dd.
|
2020-01-24 04:22:16 -07:00 |
|
|
kevinz000
|
2b93d5c3dd
|
Revert "Update _logging.dm"
This reverts commit 264431d3c8.
|
2020-01-24 04:22:08 -07:00 |
|
|
kevinz000
|
264431d3c8
|
Update _logging.dm
|
2020-01-24 04:15:35 -07:00 |
|
|
kevinz000
|
8816a8b3e4
|
i did a thing yay me
|
2020-01-24 03:34:53 -07:00 |
|
|
kevinz000
|
970f6f54ad
|
ok
|
2020-01-24 03:17:42 -07:00 |
|
|
kevinz000
|
2e49513439
|
ok
|
2020-01-23 19:29:41 -07:00 |
|
|
kevinz000
|
770e9eca4e
|
Update game.dm
|
2020-01-23 19:15:02 -07:00 |
|
|
Artur
|
255f2ce449
|
Testmerge Conflict fix?
|
2020-01-22 20:17:42 +01:00 |
|
|
Ghommie
|
5644617786
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450
|
2020-01-20 20:59:38 +01:00 |
|
|
Artur
|
f5ad854c2c
|
Conflict fix
|
2020-01-20 13:50:52 +02:00 |
|
|
Ghom
|
8a091c5140
|
Merge pull request #10614 from Putnam3145/suicide_option
Made suicide a config flag
|
2020-01-20 03:24:00 +01:00 |
|
|
Putnam
|
16f9c1bf78
|
feedback, EORG allowed
|
2020-01-19 18:01:21 -08:00 |
|
|
Seris02
|
0ea3e275e3
|
yep
|
2020-01-19 16:54:46 +08:00 |
|
|
Ghommie
|
3ee855ab77
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-18 22:14:06 +01:00 |
|
|
Ghom
|
07b3bac674
|
Merge pull request #10580 from Putnam3145/craft-log
Craft logging
|
2020-01-18 17:47:31 +01:00 |
|
|
Ghommie
|
9c0b78bc09
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-18 01:23:08 +01:00 |
|
|
Putnam
|
5ace1df9af
|
better logging, that also works
|
2020-01-16 19:09:13 -08:00 |
|
|
Putnam
|
a4cc73f219
|
some craft logging
|
2020-01-16 18:40:00 -08:00 |
|
|
Artur
|
472d18403c
|
Merge remote-tracking branch 'Upstream/master' into TGUIs_Nexties
|
2020-01-16 11:38:09 +02:00 |
|
|
Putnam
|
d29603ad77
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
|
2020-01-15 15:57:32 -08:00 |
|
|
Ghom
|
31c3b0f7bb
|
Merge pull request #10415 from kevinz000/tg_update_1
Small controller/backend updates from /tg/
|
2020-01-15 15:23:09 +01:00 |
|
|
Artur
|
8b8a112d2c
|
Ohkay
|
2020-01-15 09:41:33 +02:00 |
|
|
Ghommie
|
c14439494a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-12 19:18:03 +01:00 |
|
|
AffectedArc07
|
16a37e2769
|
Standardises all files from CRLF to LF
|
2020-01-12 14:28:01 +00:00 |
|
|
kevinz000
|
6396c95bec
|
Merge pull request #10480 from Putnam3145/more_flavor
Added second flavor text, not copied anywhere.
|
2020-01-12 00:41:47 -08:00 |
|
|
Putnam
|
48fadffbfb
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
|
2020-01-10 17:57:03 -08:00 |
|
|
Ghommie
|
825b4f01c2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-10 02:26:19 +01:00 |
|
|
deathride58
|
0b9d566076
|
Merge pull request #10469 from kevinz000/fail2topic
Ports fail2topic from Aurora
|
2020-01-08 22:19:22 -05:00 |
|
|
Putnam
|
244d46ee41
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
|
2020-01-08 17:08:01 -08:00 |
|
|
Putnam
|
12a04da2d2
|
Added second flavor text, not copied on save.
|
2020-01-08 00:57:42 -08:00 |
|