 IronEleven
|
d2e6f4abf0
|
Comment Typo Fix
Might as well fix that while I'm in here
|
2020-01-31 19:02:59 -05:00 |
|
|
Putnam
|
809f57a15d
|
also added kill-once objectives
|
2020-01-31 12:25:19 -08:00 |
|
|
Artur
|
8bb0e30036
|
Initial Commit V3
|
2020-01-31 18:17:14 +01:00 |
|
|
Seris02
|
6304ddbc9e
|
one fix
|
2020-01-31 12:44:38 +08:00 |
|
|
Seris02
|
5f1a2bed76
|
rising bass changes
|
2020-01-31 12:42:22 +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 |
|
|
Ghommie
|
d2520ee5f4
|
Topic_input helper removal.
|
2020-01-30 19:45:01 +01:00 |
|
|
Artur
|
1bf2a3e7ca
|
Initial Commit
|
2020-01-30 17:28:02 +01:00 |
|
|
kevinz000
|
9df12f94d4
|
Merge branch 'master' into one_last_taser_attempt
|
2020-01-29 16:27:58 -07:00 |
|
|
Ghom
|
7839724013
|
Merge pull request #10295 from Citadel-Station-13/kevinz000-patch-2
Brain surgery can now fix an abductee's mindsnap objectives
|
2020-01-29 05:34:49 +01:00 |
|
|
Detective Google
|
cc2ce746d8
|
Merge remote-tracking branch 'upstream/master' into the-p-o-o-l
|
2020-01-28 20:19:55 -06:00 |
|
|
kevinz000
|
3bf0e1d5c4
|
Merge pull request #10701 from Ghommie/Ghommie-cit527
Ported further runtime fixes by AnturK.
|
2020-01-28 17:57:26 -07:00 |
|
|
kevinz000
|
611fd7ea89
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-27 23:35:35 -07:00 |
|
|
kevinz000
|
4c2b0a826a
|
WEW LAD
|
2020-01-27 23:26:24 -07:00 |
|
|
kevinz000
|
57b977c2e5
|
why
|
2020-01-27 20:41:45 -07:00 |
|
|
kevinz000
|
7d53d6e162
|
s
|
2020-01-27 20:24:02 -07:00 |
|
|
r4d6
|
ad55c7235d
|
I knew I forgot something
|
2020-01-26 21:21:26 -05:00 |
|
|
r4d6
|
09448b86e3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Moar-Engines
|
2020-01-26 20:58:37 -05:00 |
|
|
r4d6
|
4884165d4f
|
Add TEG, Code & config
|
2020-01-26 20:58:16 -05:00 |
|
|
Seris02
|
e45cc4933c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup
|
2020-01-27 08:33:38 +08:00 |
|
|
kevinz000
|
dc3e5e24fd
|
Merge remote-tracking branch 'citadel/master' into the-p-o-o-l
|
2020-01-25 19:36:06 -07: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
|
ebff6c9f38
|
compile, jump board crash to ground
|
2020-01-25 17:25:15 -07:00 |
|
|
kevinz000
|
443f1716e1
|
Merge remote-tracking branch 'citadel/master' into the-p-o-o-l
|
2020-01-25 17:04:37 -07:00 |
|
|
Ghom
|
00667eeecd
|
Merge pull request #10698 from Putnam3145/ghost-dojo-ban
Made ghost cafe mobs dust upon leaving, allowed ghost cafe bans
|
2020-01-25 15:25:26 +01:00 |
|
|
kevinz000
|
f199b720aa
|
Merge pull request #10689 from Ghommie/Ghommie-cit524
Even more runtime fixes.
|
2020-01-25 05:54:20 -07:00 |
|
|
kevinz000
|
d502f6d6a8
|
Merge pull request #10670 from Seris02/sneezingnope
stops sneezing, sniffing, coughing, etc from doing anything if the affected person doesn't breathe
|
2020-01-24 16:16:03 -07:00 |
|
|
kevinz000
|
ac6695bd68
|
Merge pull request #10679 from Ghommie/Ghommie-cit517
neuter/plural gender fixes.
|
2020-01-24 16:15:44 -07:00 |
|
|
Ghommie
|
f6beadb494
|
missed this little one.
|
2020-01-24 23:45:50 +01:00 |
|
|
Artur
|
e360ac1d36
|
Conflict fix
|
2020-01-24 23:06:32 +01:00 |
|
|
Ghommie
|
856ef236f3
|
Further runtime fixes by AnturK.
|
2020-01-24 23:01:30 +01:00 |
|
|
Putnam
|
847b3c0a09
|
Fixed flavor objectives and added more.
|
2020-01-24 10:46:07 -08:00 |
|
|
Putnam
|
11b5881721
|
wait no this should be 2
|
2020-01-24 09:15:43 -08:00 |
|
|
Putnam
|
0493db0ac6
|
allowed dojo banning, made dojo mobs dust upon leaving
|
2020-01-24 09:11:33 -08:00 |
|
|
kevinz000
|
831ac91917
|
Merge pull request #10073 from Ghommie/Ghommie-cit435
Ports timestop and sepia extracts improvements/tweaks.
|
2020-01-24 00:25:53 -07:00 |
|
|
kevinz000
|
f8ec01676a
|
Merge pull request #10609 from Putnam3145/cold-blooded-buff
Moved cold-blooded to negative, made it cost -2
|
2020-01-24 00:22:08 -07:00 |
|
|
Ghommie
|
1ba4c19c64
|
A couple more.
|
2020-01-24 03:50:44 +01:00 |
|
|
Seris02
|
9761d68f4b
|
more merge conflict fixes
|
2020-01-24 10:14:31 +08:00 |
|
|
Ghommie
|
78934c52fe
|
A handful of runtime fixes.
|
2020-01-24 02:27:06 +01:00 |
|
|
kevinz000
|
e7bf1738cd
|
ok putnom
|
2020-01-23 18:00:33 -07:00 |
|
|
kevinz000
|
5cbe2226e1
|
Merge remote-tracking branch 'citadel/master' into hijack
|
2020-01-23 17:15:49 -07:00 |
|
|
Ghommie
|
56d31b0c8c
|
neuter/plural gender fixes.
|
2020-01-23 22:50:30 +01:00 |
|
|
Seris02
|
5499638c5e
|
yes
|
2020-01-23 15:41:49 +08:00 |
|
|
Seris02
|
934c8fe533
|
updates + thingamajig
|
2020-01-23 15:25:45 +08:00 |
|
|
Ghom
|
047059617c
|
Merge pull request #10645 from r4d6/Modular-Lavaland
Modularize the mining base
|
2020-01-23 02:53:34 +01:00 |
|
|
kevinz000
|
cd0fc537b6
|
lgoic
|
2020-01-22 16:03:56 -07:00 |
|
|
Artur
|
255f2ce449
|
Testmerge Conflict fix?
|
2020-01-22 20:17:42 +01:00 |
|
|
kevinz000
|
ccb5d32ab2
|
varnames
|
2020-01-22 05:38:09 -07:00 |
|
|
kevinz000
|
ff98fe7bf5
|
update
|
2020-01-22 05:35:21 -07:00 |
|