shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,526 Commits 5 Branches 0 Tags
e1cf63e0ac1663ffb3079581f2d3bc1491fe02f5
Commit Graph

701 Commits

Author SHA1 Message Date
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
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
deathride58
6f2cf0b636 [s] adds a cooldown to area creation attempts 2020-01-07 10:04:09 -05:00
kevinz000
fa7dcad49a compile 2020-01-07 04:54:11 -08:00
kevinz000
ab2292dfd5 Fail2Topic 2020-01-07 04:48:39 -08:00
Putnam
fba7a8abb0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-05 19:12:28 -08:00
Putnam
d75a525b3c let's fix arousal huh 2020-01-05 19:10:48 -08:00
Ghom
e18244671f Merge pull request #10350 from Putnam3145/dojo-ghostrole 
Ghost cafe quality-of-life, plus making ghost role eligibility an element
 2020-01-05 23:05:13 +01:00
Ghommie
592422ee70 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-05 22:53:00 +01:00
Ghom
499907f9b7 Merge pull request #10191 from Citadel-Station-13/michael_labs 
Custom Holoforms for pAIs and AIs oh and adds certain cyborg pai holograms. also mild pai nerf.
 2020-01-04 14:07:25 +01:00
Ghommie
f5b251db66 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-03 18:24:39 +01:00
kevinz000
031f485e4d updates 2020-01-02 23:24:47 -08:00
Putnam
adf87c7595 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole 2020-01-02 22:52:24 -08:00
Lin
f7b91f9b65 Merge pull request #10238 from Ghommie/Ghommie-cit478 
Brings in some mapping code updates.
 2020-01-03 00:01:54 +00:00
Ghommie
4d06d231f8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-02 17:49:01 +01:00
kevinz000
094d225874 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-31 19:54:01 -08:00
Lin
b651bbcdb3 Merge branch 'master' into Ghommie-cit367 2019-12-31 22:37:59 +00:00
kevinz000
f920e7b73c changes 2019-12-31 10:08:14 -08:00
nik707
8a4e44758f Merge pull request #10165 from Ghommie/Ghommie-cit456 
Minor underwear fixes and tweaks.
 2019-12-30 18:28:48 -06:00
Putnam
71fcd23f1f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole 2019-12-30 13:31:15 -08:00
Ghommie
49f1176170 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-30 16:06:16 +01: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
Putnam
90ebbdfdb9 elements are so good. they're so good 2019-12-30 00:53:03 -08:00
kevinz000
24e3b88a34 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-30 00:32:25 -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
Ghommie
21cfb2914b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-27 17:49:59 +01: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
d571bbd292 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-24 00:07:32 +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
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +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
kevinz000
2c228571f3 nerfs 2019-12-16 15:39:22 -07:00
kevinz000
a784235e35 scanline 2019-12-16 02:05:52 -07:00
kevinz000
80ffb13f06 bypass joblock 2019-12-15 23:24:43 -07:00
kevinz000
57748fcdc8 changes 2019-12-15 22:28:41 -07:00