 Putnam
|
c612462b8c
|
some demodularization + new eligibility stuff
|
2020-01-18 03:39:27 -08:00 |
|
|
kevinz000
|
d110d7bae9
|
Merge pull request #10347 from deathride58/stambufferbuff
[experimental] Buffs the stamina buffer by making it recharge for free.
|
2020-01-16 14:51:38 -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 |
|
|
kappa-sama
|
3f57f30e14
|
Merge branch 'master' into modularer
|
2020-01-13 16:32:00 -05:00 |
|
|
Xantholne
|
903e59d6ed
|
Merge branch 'master' into xantholne-christmas03
|
2020-01-12 22:29:59 -07:00 |
|
|
deathride58
|
bbdedd20b6
|
Merge branch 'master' into stambufferbuff
|
2020-01-12 20:35:31 -05:00 |
|
|
kappa-sama
|
3e199ed780
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into modularer
|
2020-01-12 14:23:38 -05: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 |
|
|
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 |
|
|
Ghom
|
c2b3e7b0ec
|
Merge pull request #10505 from LetterN/beep-boom
better electropack ui
|
2020-01-11 15:21:08 +01:00 |
|
|
kappa-sama
|
ab5223cb20
|
this took longer than all the other items combined
|
2020-01-10 22:40:10 -05:00 |
|
|
kappa-sama
|
0dbcf2085b
|
bye
|
2020-01-10 22:30:45 -05:00 |
|
|
kappa-sama
|
9f95fb5d9b
|
cya
|
2020-01-10 22:29:02 -05:00 |
|
|
kappa-sama
|
6abb7449c3
|
bye
|
2020-01-10 22:27:01 -05:00 |
|
|
kappa-sama
|
861a3c7a11
|
zee
|
2020-01-10 22:25:16 -05:00 |
|
|
kappa-sama
|
0f7b3f4ee8
|
death
|
2020-01-10 22:23:32 -05:00 |
|
|
kappa-sama
|
4ebc80e137
|
bye bye
|
2020-01-10 22:21:45 -05:00 |
|
|
kappa-sama
|
0079a5acad
|
byye
|
2020-01-10 22:19:13 -05:00 |
|
|
kappa-sama
|
820eeceb12
|
bye
|
2020-01-10 22:18:03 -05: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
|
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 |
|
|
Letter N
|
6ec3fde836
|
better-signalers
|
2020-01-10 18:06:55 +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 |
|
|
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 |
|
|
Unknown
|
6cc856d9af
|
Loadout Menu
|
2020-01-08 22:44:04 -07: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 |
|
|
kappa-sama
|
ff3370d382
|
bye
|
2020-01-08 16:50:49 -05:00 |
|
|
kappa-sama
|
87698297fb
|
bye bye
|
2020-01-08 16:47:28 -05:00 |
|
|
kappa-sama
|
a4da8a2dc4
|
bye
|
2020-01-08 16:37:38 -05:00 |
|
|
kappa-sama
|
ba20618bd0
|
this file does literally nothing
|
2020-01-08 10:00:33 -05:00 |
|
|
kappa-sama
|
d0cd6ae336
|
begone
|
2020-01-08 09:48:04 -05:00 |
|
|
kappa-sama
|
3dac4e568d
|
begone
|
2020-01-08 09:45:49 -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 |
|
|
Lin
|
718d4a080d
|
Merge pull request #9878 from Ghommie/Ghommie-cit382
Unmodularize several machinery and structures
|
2020-01-07 00:31:24 +00: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 |
|