 kevinz000
|
f85527ab4b
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-19 16:18:12 -07:00 |
|
|
Ghommie
|
9c0b78bc09
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-18 01:23:08 +01:00 |
|
|
kevinz000
|
aea0de30d1
|
Merge pull request #10125 from Ghommie/Ghommie-cit449
Ports a few projectile code updates by ke:b:inz.
|
2020-01-17 15:15:08 -07:00 |
|
|
kevinz000
|
7bcb37c5d1
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-16 21:12:56 -07:00 |
|
|
kevinz000
|
9ef4cbfa76
|
refactor tags
|
2020-01-16 20:58:00 -07:00 |
|
|
kevinz000
|
1d184b8cad
|
s
|
2020-01-16 00:21:21 -07:00 |
|
|
kevinz000
|
350c5aa060
|
compile
|
2020-01-16 00:18:40 -07:00 |
|
|
kevinz000
|
1acac87da3
|
compile
|
2020-01-15 23:54:30 -07:00 |
|
|
Putnam
|
fa0080d8d6
|
made climax with partner require EXPLICIT consent
|
2020-01-15 20:55:39 -08:00 |
|
|
Putnam
|
253a3a44ba
|
moved "aphro" magic string to a define
|
2020-01-15 20:15:40 -08:00 |
|
|
Putnam
|
a1922a459e
|
Moved Arousal tab stuff to IC tab
|
2020-01-15 20:14:23 -08:00 |
|
|
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 |
|
|
Hatterhat
|
7b322ff467
|
Merge branch 'master' into greytide-standard-uniform
|
2020-01-14 19:39:16 -06:00 |
|
|
Hatterhat
|
3622dd118b
|
forgive me, grey jumpsuit entry
|
2020-01-14 19:38:11 -06:00 |
|
|
Ghommie
|
1d948907f6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-13 23:26:21 +01:00 |
|
|
Xantholne
|
903e59d6ed
|
Merge branch 'master' into xantholne-christmas03
|
2020-01-12 22:29:59 -07:00 |
|
|
kevinz000
|
b341818f04
|
mobility flags
|
2020-01-12 11:00:12 -08:00 |
|
|
Hatterhat
|
7fac15caeb
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into greytide-standard-uniform
|
2020-01-12 12:39:57 -06:00 |
|
|
Ghommie
|
c14439494a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-12 19:18:03 +01:00 |
|
|
Ghommie
|
02fbbd4f95
|
Ouch.
|
2020-01-12 16:54:08 +01:00 |
|
|
AffectedArc07
|
16a37e2769
|
Standardises all files from CRLF to LF
|
2020-01-12 14:28:01 +00:00 |
|
|
Hatterhat
|
7216ae545c
|
how the hell did that fall out
|
2020-01-11 16:08:51 -06:00 |
|
|
Hatterhat
|
47fd3823e8
|
staff assistant jumpsuit gang
|
2020-01-11 15:58:24 -06: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 |
|
|
Lin
|
fb94bf5fa0
|
Merge pull request #10482 from kappa-sama/modularthing
modular citadel file destruction but only slightly
|
2020-01-11 00:30:58 +00:00 |
|
|
kevinz000
|
b6e14c6b86
|
compile
|
2020-01-10 14:30:20 -08:00 |
|
|
kevinz000
|
8f60099595
|
Merge pull request #10488 from Xantholne/xantholne-cowboy02
Red Dead Redemption 2 but it's a crappy 2D space man game
|
2020-01-10 14:01:06 -08:00 |
|
|
kevinz000
|
f1a4956afc
|
easier for me to type
|
2020-01-10 13:26:34 -08:00 |
|
|
kevinz000
|
830054c106
|
sigh
|
2020-01-10 13:25:47 -08:00 |
|
|
Lin
|
e5e2e4f012
|
Merge pull request #10329 from Ghommie/Ghommie-cit490
Ports reagents id removal and typepath usage.
|
2020-01-10 01:34:39 +00:00 |
|
|
Lin
|
c4cb06f8f0
|
Merge pull request #10112 from Ghommie/Ghommie-cit447
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
|
2020-01-10 01:31:20 +00:00 |
|
|
Unknown
|
6cc856d9af
|
Loadout Menu
|
2020-01-08 22:44:04 -07:00 |
|
|
kappa-sama
|
d0cd6ae336
|
begone
|
2020-01-08 09:48:04 -05:00 |
|
|
Putnam
|
c9fa4bc4eb
|
whoops that wasn't working
|
2020-01-07 17:37:03 -08:00 |
|
|
Putnam
|
8fd7a3db8b
|
added back climax with partner
|
2020-01-07 17:27:34 -08:00 |
|
|
Putnam
|
cd35e516ac
|
back by popular demand: maso/nympho
|
2020-01-07 17:01:14 -08:00 |
|
|
kevinz000
|
e4cfb1fa39
|
more
|
2020-01-07 12:03:46 -08:00 |
|
|
kevinz000
|
2a304800df
|
more reformatting
|
2020-01-07 11:46:32 -08:00 |
|
|
kevinz000
|
ae73927b67
|
patches
|
2020-01-07 02:39:16 -08:00 |
|
|
kevinz000
|
c77005af8a
|
changes
|
2020-01-06 04:17:53 -08:00 |
|
|
kevinz000
|
a8cc37eaf0
|
ok
|
2020-01-06 03:57:58 -08:00 |
|
|
kevinz000
|
7378d91684
|
([\W\.])Knockdown\(
|
2020-01-06 03:39:20 -08:00 |
|
|
Putnam
|
32043a9062
|
whoops forgot permaboner
|
2020-01-06 01:14:00 -08:00 |
|
|
Putnam
|
218e701fa9
|
whoops forgot update appearance
|
2020-01-05 21:48:04 -08:00 |
|
|
Putnam
|
e7684f5df7
|
whoops forgot to use sensitivity
|
2020-01-05 19:29:23 -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 |
|
|
kevinz000
|
1f2597784f
|
git commit death
|
2020-01-05 15:40:23 -08: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
|
0e74c94d8c
|
Merge pull request #10278 from Trilbyspaceclone/patch-248
Fixes Fermi plushie reaction. Removes carbonation of caramel
|
2020-01-05 15:17:14 +01:00 |
|