 Enric Gabriel
|
c2bad415cf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-08 17:29:49 -03:00 |
|
|
siliconsandGitHub
|
a668251de6
|
Merge pull request #13353 from timothyteakettle/accent-tidyup
further accent modifications because holy shit
|
2020-09-08 10:31:45 -07:00 |
|
|
Enric Gabriel
|
76ea11562a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-07 22:11:20 -03:00 |
|
|
BlackMajorandGitHub
|
1f96766699
|
Merge pull request #13273 from Citadel-Station-13/silicons-patch-2
slightly more intuitive eyebeam clamping
|
2020-09-08 12:05:10 +12:00 |
|
|
Timothy Teakettle
|
98a7332e23
|
is this really the root of the issue
|
2020-09-06 21:02:24 +01:00 |
|
|
Timothy Teakettle
|
8fe55e1317
|
travis what the fuck
|
2020-09-06 19:16:30 +01:00 |
|
|
Timothy Teakettle
|
d51fb00ebf
|
makes more sense this way
|
2020-09-06 18:57:17 +01:00 |
|
|
Timothy Teakettle
|
5f5455add1
|
yes
|
2020-09-06 18:48:59 +01:00 |
|
|
Timothy Teakettle
|
de640254c7
|
tidyup
|
2020-09-05 20:32:22 +01:00 |
|
|
Enric Gabriel
|
20b25372e1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-05 13:09:14 -03:00 |
|
|
Timothy Teakettle
|
c690e59085
|
change accent names
|
2020-09-05 16:26:55 +01:00 |
|
|
Enric Gabriel
|
c10471fac9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-30 01:42:29 -03:00 |
|
|
siliconsandGitHub
|
cf85d68ec2
|
Update eyes.dm
|
2020-08-27 09:39:27 -07:00 |
|
|
siliconsandGitHub
|
0351686399
|
Update eyes.dm
|
2020-08-27 09:38:39 -07:00 |
|
|
timothyteakettle
|
8d6a026153
|
yep
|
2020-08-27 00:01:54 +01:00 |
|
|
Enric Gabriel
|
4afad43f88
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-26 13:18:58 -03:00 |
|
|
siliconsandGitHub
|
c264d90140
|
Update eyes.dm (#13254)
|
2020-08-26 18:00:27 +02:00 |
|
|
Enric Gabriel
|
bae8c236f6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-09 18:34:33 -03:00 |
|
|
Putnam
|
bdee7bdc63
|
linters are always your friend
|
2020-08-08 21:38:53 -07:00 |
|
|
Putnam
|
9bb3ba5c5a
|
added ethereals
|
2020-08-08 00:08:43 -07:00 |
|
|
Enric Gabriel
|
ac559d57d8
|
forgot this
|
2020-08-05 12:27:52 -03:00 |
|
|
Enric Gabriel
|
d82cb8b9e8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-03 17:03:13 -03:00 |
|
|
Seris02andGitHub
|
5551e323cc
|
Update tails.dm
|
2020-08-03 21:41:30 +08:00 |
|
|
Seris02
|
82790cffed
|
fixes lizard code
|
2020-08-03 21:39:11 +08:00 |
|
|
Enric Gabriel
|
935901593b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-07-29 09:52:32 -03:00 |
|
|
Enric Gabriel
|
e0fdf3dce9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 / merge conflicts
|
2020-07-23 19:14:58 -03:00 |
|
|
silicons
|
ffd44b78ba
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-23 10:26:03 -07:00 |
|
|
silicons
|
416b989e12
|
changes
|
2020-07-20 11:35:10 -07:00 |
|
|
timothyteakettle
|
7714fcfaba
|
more changes
|
2020-07-18 01:26:38 +01:00 |
|
|
Enric Gabriel
|
674af2dc86
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-07-13 17:30:11 -03:00 |
|
|
LinandGitHub
|
e143b69aa6
|
Merge pull request #12741 from Hatterhat/vog-but-with-less-line-changes
removing vog's ability to commit sin, probably
|
2020-07-13 11:31:25 -05:00 |
|
|
Hatterhat
|
eb0e0b6cbd
|
i may not test my shit but at least i can have less line changes motherfucker
|
2020-07-11 23:18:17 -05:00 |
|
|
Enric Gabriel
|
7b593d16fb
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-07-11 03:13:42 -03:00 |
|
|
Putnam
|
a625d6562b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
|
2020-07-08 22:02:03 -07:00 |
|
|
Enric Gabriel
|
83522c8571
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-07-04 17:18:13 -03:00 |
|
|
Enric GabrielandGitHub
|
72f993fdbd
|
Pulls #1706 from Skyrat (#18)
|
2020-07-02 02:20:27 -03:00 |
|
|
Enric GabrielandGitHub
|
1f4bd7e6a4
|
Sagaru language (#17)
* stupid super custom species
* makes people actually able to speak it + solves minor problems
|
2020-07-02 00:43:04 -03:00 |
|
|
silicons
|
f03343b516
|
fix
|
2020-06-30 05:19:50 -07:00 |
|
|
silicons
|
7a2818d657
|
fix
|
2020-06-29 23:45:18 -07:00 |
|
|
silicons
|
6a91ce8416
|
fix
|
2020-06-29 23:43:53 -07:00 |
|
|
silicons
|
3b3a3ad44e
|
nayser
|
2020-06-29 23:37:51 -07:00 |
|
|
Ghommie
|
c5cbfa64e5
|
Porting further material datum features and improvements.
|
2020-06-24 20:45:17 +02:00 |
|
|
Ghommie
|
50171db408
|
Makes fermichem properly logged in the reagents logs, tiny astrogen fix.
|
2020-05-21 03:04:26 +02:00 |
|
|
Putnam
|
8458f97692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
|
2020-05-12 13:34:31 -07:00 |
|
|
kevinz000andGitHub
|
395d434e6e
|
Merge pull request #12200 from Ghommie/Ghommie-cit738
nutrition adjustment wrapper procs from tg.
|
2020-05-12 12:28:02 -07:00 |
|
|
Putnam
|
f4f80594bd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
|
2020-05-11 17:10:55 -07:00 |
|
|
Putnam
|
e8d7da56f4
|
Ported C++mos from yogs (help me)
|
2020-05-11 15:44:26 -07:00 |
|
|
Ghommie
|
667c12d413
|
nutrition adjustment wrapper procs.
|
2020-05-10 21:41:50 +02:00 |
|
|
Ghommie
|
2858ddd90b
|
Porting "Refactors language holder"
|
2020-05-08 22:44:02 +02:00 |
|
|
Ghommie
|
592198d659
|
Makes privates not spew around upon disembowelment or gibbing.
|
2020-05-02 20:01:54 +02:00 |
|