 Lin
|
f7b91f9b65
|
Merge pull request #10238 from Ghommie/Ghommie-cit478
Brings in some mapping code updates.
|
2020-01-03 00:01:54 +00:00 |
|
|
Lin
|
b651bbcdb3
|
Merge branch 'master' into Ghommie-cit367
|
2019-12-31 22:37:59 +00:00 |
|
|
nik707
|
8a4e44758f
|
Merge pull request #10165 from Ghommie/Ghommie-cit456
Minor underwear fixes and tweaks.
|
2019-12-30 18:28:48 -06:00 |
|
|
Seris02
|
9653dc470b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into autoooc
|
2019-12-30 22:48:39 +08:00 |
|
|
Putnam3145
|
640419eed5
|
Merge pull request #10343 from Ghommie/Ghommie-cit494
[s] Fixes anti-ghost-role vars a little.
|
2019-12-29 20:54:55 -08:00 |
|
|
Ghommie
|
edd05cebea
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367
|
2019-12-30 00:28:36 +01:00 |
|
|
Ghommie
|
0ab817c208
|
[s] Fixes ghost anti-ghostrole timers a little.
|
2019-12-29 22:22:20 +01:00 |
|
|
Seris02
|
e093b5e5cd
|
roundend too
|
2019-12-29 18:51:10 +08:00 |
|
|
Ghom
|
e7cf680ca7
|
Merge pull request #10266 from shellspeed1/master
New insect marking customization option and three new wings.
|
2019-12-25 03:43:29 +01:00 |
|
|
Ghommie
|
e1949b0131
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367
|
2019-12-23 19:02:20 +01:00 |
|
|
kevinz000
|
fcfdf5e253
|
Merge pull request #10240 from Ghommie/Ghommie-cit481
Converts the main timsorts file from relative pathing to absolute pathing.
|
2019-12-22 14:04:53 -08:00 |
|
|
shellspeed1
|
1875ea3f58
|
new wings and fluff
|
2019-12-21 23:47:41 -08:00 |
|
|
Ghom
|
3df8619980
|
Merge pull request #10141 from Putnam3145/dynamic-statbus
Adds a bunch of statbus logging to dynamic
|
2019-12-21 11:45:44 +01:00 |
|
|
Ghommie
|
17306dbab4
|
Converts the main timsorts file from relative pathing to absolute pathing.
|
2019-12-19 16:14:40 +01:00 |
|
|
Ghommie
|
8566e2396d
|
Brings in some mapping code updates.
|
2019-12-19 00:44:14 +01:00 |
|
|
Ghommie
|
ba851d55b6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit456
|
2019-12-18 19:42:41 +01:00 |
|
|
Ghommie
|
b39ae815f3
|
Porting several quirks code updates.
|
2019-12-13 16:12:04 +01:00 |
|
|
Ghommie
|
c098d497ad
|
Minor underwear fixes and tweaks.
|
2019-12-13 06:50:14 +01:00 |
|
|
Putnam
|
cda0e3470a
|
Added a bunch of logging to dynamic.
|
2019-12-10 10:09:24 -08:00 |
|
|
Ghommie
|
a9335aa946
|
Fixes a long lasting runtime with filter data sorting.
|
2019-12-08 13:21:29 +01:00 |
|
|
kevinz000
|
b5595114c1
|
Merge pull request #9805 from Ghommie/Ghommie-cit352
Uplink items are now automatically sorted alphabetically.
|
2019-12-05 21:40:09 -07:00 |
|
|
kevinz000
|
c3dc0e7c71
|
Merge pull request #9893 from Putnam3145/threat-log-fixes
[DYNAMIC] Roundend threat log only shows changes that fully happened
|
2019-11-30 22:48:50 -07:00 |
|
|
Ghommie
|
af0110db40
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367
|
2019-11-27 21:16:20 +01:00 |
|
|
GrayRachnid
|
c8e52fb8e1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs
|
2019-11-22 15:24:15 -05:00 |
|
|
Ghommie
|
9f6d595ad5
|
Ouch
|
2019-11-22 05:08:58 +01:00 |
|
|
Ghommie
|
3cc0207e73
|
Ready for merge.
|
2019-11-22 01:04:39 +01:00 |
|
|
Ghommie
|
ee73806616
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit352
|
2019-11-21 09:18:14 +01:00 |
|
|
Putnam
|
435d2f893e
|
Makes roundend threat log only show actual changes.
|
2019-11-20 18:31:39 -08:00 |
|
|
Useroth
|
6e2ff6ce3c
|
Prevents storage bags from re-ordering their contents when items are removed.
|
2019-11-19 16:13:57 +01:00 |
|
|
Ghommie
|
b560ff8284
|
refactoring code to allow all living mobs to use shields.
|
2019-11-17 06:23:12 +01:00 |
|
|
Putnam
|
f3c4897b48
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic
|
2019-11-14 22:31:48 -08:00 |
|
|
kevinz000
|
02e8a73265
|
Merge pull request #9737 from Ghommie/Ghommie-cit326
Ports techweb backend refactor & co.
|
2019-11-14 16:45:09 -07:00 |
|
|
kevinz000
|
2f4562a63b
|
Merge pull request #9656 from Ghommie/Ghommie-cit290
Purging a lot of space indention in favor of tabs.
|
2019-11-14 15:55:04 -07:00 |
|
|
kevinz000
|
318c03cc28
|
Merge pull request #9683 from Ghommie/Ghommie-cit303
Dullahans fixes and QoL.
|
2019-11-14 15:52:11 -07:00 |
|
|
kevinz000
|
af0962088c
|
Merge pull request #9453 from Ghommie/Ghommie-cit226
Mitigates the ghost roles/mid-round antag lock out for suicide/cryo. And related fixes.
|
2019-11-14 15:47:18 -07:00 |
|
|
Putnam
|
304ce37d6c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic
|
2019-11-14 02:23:48 -08:00 |
|
|
kevinz000
|
3015ec5c04
|
Merge pull request #9764 from Ghommie/Ghommie-cit335
Dreamchecker compatibility changes, part 1.
|
2019-11-14 01:37:41 -07:00 |
|
|
Ghommie
|
b48ddb99fc
|
Uplink items are now automatically sorted alphabetically. Fixed categories.
|
2019-11-14 02:56:26 +01:00 |
|
|
Putnam
|
5e51cc63f9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic
|
2019-11-13 16:58:44 -08:00 |
|
|
kevinz000
|
4e3147b228
|
Merge pull request #9755 from Ghommie/Ghommie-cit331
lentext to length, yet another 513 requirement.
|
2019-11-12 23:59:31 -07:00 |
|
|
Putnam
|
2120526525
|
Merged upstream dynamic fixes ported by Ghommie.
|
2019-11-10 18:48:59 -08:00 |
|
|
Ghommie
|
4c1eba0d81
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226
|
2019-11-10 23:52:48 +01:00 |
|
|
Ghommie
|
e977ba6729
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290
|
2019-11-10 23:17:58 +01:00 |
|
|
Ghommie
|
1e49ce76d3
|
Dreamchecker compatibility changes, part 1.
|
2019-11-10 20:48:30 +01:00 |
|
|
kevinz000
|
1493863533
|
Merge pull request #9716 from Ghommie/Ghommie-cit317
Porting objective code refactor (ergo fixing abductors/abductees objective by updating the code)
|
2019-11-10 11:27:04 -07:00 |
|
|
Ghommie
|
c6e44a7fed
|
That's it: #46027, (a little bit of) #46132, #47100, #47341, #47351, #47395, #47457, #47491.
|
2019-11-10 17:59:40 +01:00 |
|
|
Ghommie
|
279c22b781
|
lentext to length.
|
2019-11-09 23:17:04 +01:00 |
|
|
Putnam
|
428ea5e5e1
|
Nuke disk being still now generates threat
|
2019-11-09 03:12:36 -08:00 |
|
|
Putnam
|
d0d469a45a
|
Better roundend logging
|
2019-11-09 01:00:35 -08:00 |
|
|
Ghommie
|
b2b1390bd3
|
Ports techweb backend refactor & co.
|
2019-11-07 05:07:38 +01:00 |
|