 kevinz000
|
f6542b381c
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 23:29:25 -07:00 |
|
|
Ghommie
|
8fbfd07692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-22 00:55:32 +01:00 |
|
|
kevinz000
|
a784a74ccb
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 13:35:26 -07:00 |
|
|
kevinz000andGitHub
|
ca777c6c8b
|
Merge pull request #11153 from Ghommie/Ghommie-cit587
Fixing addiction moodlets not going away and secret sauce recipe paper.
|
2020-02-20 06:17:33 -07:00 |
|
|
Ghommie
|
057b6f591c
|
HEEY
|
2020-02-19 14:23:12 +01:00 |
|
|
kevinz000
|
0229db9c61
|
trait comsigs
|
2020-02-18 18:23:01 -07:00 |
|
|
kevinz000
|
eca0e0f2dc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-13 00:39:20 -07:00 |
|
|
Artur
|
a9a167b9d3
|
Suffering and co
|
2020-02-11 20:18:32 +02:00 |
|
|
r4d6
|
5316cc3665
|
Make dwarves not have an accent when speaking dwarvish
|
2020-02-08 23:02:32 -05:00 |
|
|
kevinz000
|
6a8a606f97
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-04 16:01:25 -07:00 |
|
|
Ghommie
|
a726f09201
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-04 03:54:52 +01:00 |
|
|
Ghommie
|
63c8612ccd
|
Refactoring mob holders into an element.
|
2020-02-04 01:42:59 +01:00 |
|
|
GhomandGitHub
|
6f66d76680
|
Merge pull request #10705 from kevinz000/revert_poojawa_blood_1
Cleanup/Partial revert of RGB blood ""rework""
|
2020-02-02 19:08:57 +01:00 |
|
|
Ghommie
|
95db5084ab
|
Screw commit history.
|
2020-02-02 01:26:04 +01:00 |
|
|
Artur
|
8bb0e30036
|
Initial Commit V3
|
2020-01-31 18:17:14 +01:00 |
|
|
kevinz000
|
611fd7ea89
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-27 23:35:35 -07:00 |
|
|
kevinz000
|
24cbe67f27
|
optimizations, unnecessary crap, undocumented ipc change
|
2020-01-24 21:18:19 -07:00 |
|
|
kevinz000andGitHub
|
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
|
f85527ab4b
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-19 16:18:12 -07:00 |
|
|
Ghommie
|
eaff51ff40
|
Kevinz let some files fall back to CRLF.
|
2020-01-17 23:26:05 +01:00 |
|
|
kevinz000
|
7bcb37c5d1
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-16 21:12:56 -07:00 |
|
|
Ghommie
|
f45f979c27
|
Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435
|
2020-01-12 23:21:03 +01:00 |
|
|
AffectedArc07
|
16a37e2769
|
Standardises all files from CRLF to LF
|
2020-01-12 14:28:01 +00:00 |
|
|
kevinz000
|
2c245a18fd
|
compile
|
2020-01-10 13:43:53 -08:00 |
|
|
keronshb
|
a7af5203e7
|
This is a test to see if they all work together
Title
|
2020-01-06 20:29:44 -05:00 |
|
|
keronshb
|
35cd77d433
|
Adds the nanite remote for some programs
Adds a new remote function from tg
|
2020-01-06 20:28:33 -05:00 |
|
|
kevinz000
|
7006f2b1be
|
more compile stuff
|
2020-01-06 04:23:52 -08:00 |
|
|
Ghommie
|
356304f68f
|
Fixes roundstart mushpeople not having MUSH PUUUUUUUUUUUUNCH!!
|
2020-01-04 20:34:31 +01:00 |
|
|
Ghommie
|
395457f7ef
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit471
|
2019-12-21 17:59:32 +01:00 |
|
|
Ghommie
|
80402a0d88
|
Ports some hud and update_icon code updates.
|
2019-12-16 23:29:20 +01:00 |
|
|
Ghommie
|
80f47872d7
|
My head splodes.
|
2019-12-15 20:31:36 +01:00 |
|
|
Ghommie
|
081d3df750
|
This is one serious Pepe Silvia complex.
|
2019-12-14 22:52:40 +01:00 |
|
|
Ghommie
|
e5d45faee8
|
deadchat, not deathchat.
|
2019-12-14 18:53:53 +01:00 |
|
|
Ghommie
|
3891c91799
|
virtual reality component improvements, fixes and documentation.
|
2019-12-14 17:19:48 +01:00 |
|
|
Ghommie
|
7cc332960b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329
|
2019-12-07 05:30:07 +01:00 |
|
|
Ghommie
|
91e628c73d
|
Ports timestop and sepia extracts improvements/tweaks.
|
2019-12-06 19:01:42 +01:00 |
|
|
kevinz000andGitHub
|
f937c4d877
|
Merge pull request #10046 from Ghommie/Ghommie-cit424
Ports flag for bespoke elements.
|
2019-12-05 21:50:19 -07:00 |
|
|
kevinz000andGitHub
|
29497320c1
|
Merge pull request #10025 from Linzolle/butchering
refactor butchering component
|
2019-12-05 21:19:57 -07:00 |
|
|
BlackMajorandGitHub
|
a6f48ea74c
|
Merge pull request #9372 from Weblure/Xenobio-Hotkeys
[Ready] [Test Merge] Ports Xenobio Hotkeys
|
2019-12-06 11:29:34 +13:00 |
|
|
Ghommie
|
07bd51f79a
|
Ports flag for bespoke elements.
|
2019-12-04 19:38:25 +01:00 |
|
|
Linzolle
|
19b004edab
|
update butchering
|
2019-12-01 14:35:11 -06:00 |
|
|
Ghommie
|
dd9116ee70
|
Ports elements: Lightweight shared/global components.
|
2019-11-28 01:47:20 +01:00 |
|
|
Ghommie
|
f9680130f9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329
|
2019-11-27 18:48: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
|
f401e622c3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329
|
2019-11-15 01:01:08 +01:00 |
|
|
kevinz000andGitHub
|
6909857e04
|
Merge pull request #9632 from Ghommie/Ghommie-cit281
Porting multi-z support updates.
|
2019-11-14 15:58:53 -07:00 |
|
|
kevinz000andGitHub
|
318c03cc28
|
Merge pull request #9683 from Ghommie/Ghommie-cit303
Dullahans fixes and QoL.
|
2019-11-14 15:52:11 -07:00 |
|
|
Ghommie
|
4ef1d64356
|
PR #47500, #47501, #47557, #47588.
|
2019-11-12 19:00:45 +01:00 |
|
|
Ghommie
|
c5a7c28a1b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281
|
2019-11-12 16:04:05 +01:00 |
|
|
WeblureandGitHub
|
3dac695d53
|
Merge branch 'master' into Xenobio-Hotkeys
|
2019-11-10 21:55:22 -07:00 |
|