Fermi
|
be36a8bb33
|
Cleanup
|
2019-06-15 18:04:06 +01:00 |
|
Fermi
|
79d176336c
|
A few minor fixes.
|
2019-06-15 11:36:38 +01:00 |
|
Fermi
|
3d78905394
|
Catto fix
|
2019-06-15 10:29:49 +01:00 |
|
Fermi
|
7a66039f0c
|
Fixing merge errors.
Testmerge ready.
|
2019-06-14 21:55:17 +01:00 |
|
Fermi
|
6b9becce71
|
Merge branch 'pr/14'
|
2019-06-14 21:29:04 +01:00 |
|
Fermi
|
aa1cb22edc
|
Eigenstate fixes.
|
2019-06-14 16:26:08 +01:00 |
|
Fermi
|
b4beb006f9
|
More fixes.
|
2019-06-14 15:43:48 +01:00 |
|
Fermi
|
d7cffadc13
|
Fixes
|
2019-06-14 13:43:57 +01:00 |
|
Fermi
|
2365f7337c
|
Adventures in bitflags!
|
2019-06-14 12:47:22 +01:00 |
|
Fermi
|
ab35b018db
|
Indents and eigenstate var reduction.
|
2019-06-14 11:24:21 +01:00 |
|
Fermi
|
45e51cb68d
|
tweaks
|
2019-06-13 08:48:58 +01:00 |
|
Fermi
|
2a76cfa285
|
Logging
|
2019-06-13 07:51:46 +01:00 |
|
Fermi
|
9fb7c9866d
|
Splitting larger fermi_reagents.
|
2019-06-13 06:59:46 +01:00 |
|
Fermi
|
aa7805eaa4
|
Fixes.
|
2019-06-13 06:35:12 +01:00 |
|
Fermi
|
378af882d3
|
Ramping up to logging and a few more fixes.
|
2019-06-13 05:51:28 +01:00 |
|
Fermi
|
da6f1da624
|
The great src cull
|
2019-06-13 04:53:33 +01:00 |
|
Fermi
|
14aa7084a8
|
Breast rename.
|
2019-06-13 04:37:03 +01:00 |
|
Fermi
|
097c338ded
|
PE replaced with... You know what.
|
2019-06-13 04:32:52 +01:00 |
|
Fermi
|
a3aa0408a3
|
Tongue
|
2019-06-13 03:37:15 +01:00 |
|
Fermi
|
eab52a51e6
|
Fixed compile errors.
|
2019-06-13 03:05:34 +01:00 |
|
Fermi
|
981c1644c9
|
Holder changes; removed ferminew.
|
2019-06-13 02:47:05 +01:00 |
|
Fermi
|
8edecb64a6
|
pHMeter fix
|
2019-06-13 01:20:36 +01:00 |
|
Fermi
|
b51a9e70e5
|
Fix for pHbooklet.
|
2019-06-13 01:13:47 +01:00 |
|
kevinz000
|
54b3568319
|
Merge pull request #8599 from Poojawa/pacifistic-vore
Pacifists can nom things now, but not feed to others
|
2019-06-11 11:13:01 -07:00 |
|
AnalWerewolf
|
8337692650
|
Merge branch 'master' into Fritz-cute
|
2019-06-10 15:15:41 +10:00 |
|
Poojawa
|
3f1b7e4dd6
|
Pacifists can nom things now, but not feed to others
|
2019-06-09 02:23:53 -05:00 |
|
kevinz000
|
be9a551eea
|
Merge pull request #8566 from Ghommie/Ghommie-cit39
Different combat mode message if user is on help intent.
|
2019-06-08 12:05:17 -07:00 |
|
Ghommie
|
53d5ad5820
|
no exclamation point.
|
2019-06-08 14:45:26 +02:00 |
|
Ghommie
|
fc536dcfe4
|
Urist McSpaceman goes vigilant!
Urist McSpaceman seems attentive!
Urist McSpaceman looks alert!
|
2019-06-08 14:44:40 +02:00 |
|
kevinz000
|
eb1c767ab7
|
Merge pull request #8553 from Poojawa/ghost-erp
Clarifies a few things about subtler and how it should be used
|
2019-06-08 01:24:36 -07:00 |
|
kevinz000
|
1ad200fcf4
|
Merge pull request #8548 from dtfe3/dtfe3-loadout-schoolgirl
Schoolgirl outfits for the loadout menu
|
2019-06-08 01:22:52 -07:00 |
|
kevinz000
|
ab565d2483
|
Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
|
2019-06-08 01:22:16 -07:00 |
|
Ghommie
|
57246b5c4f
|
No combat mode message if user is on help intent.
|
2019-06-07 19:36:09 +02:00 |
|
deathride58
|
aa53cc9ea9
|
Merge branch 'master' into fuckatmos
|
2019-06-07 04:38:47 -04:00 |
|
AnalWerewolf
|
4ff12eebd0
|
he bork and he woof
|
2019-06-07 18:10:22 +10:00 |
|
Poojawa
|
67eb76b360
|
clarifies a few things
|
2019-06-06 18:56:26 -05:00 |
|
Fermi
|
83666abfea
|
Small text edits and tightening up of self MKU OD.
|
2019-06-06 22:56:59 +01:00 |
|
dtfe3
|
0b1da3f025
|
Update uniform.dm
|
2019-06-06 20:50:14 +02:00 |
|
Ghommie
|
d3d2b8d898
|
should be ready.
|
2019-06-06 19:24:20 +02:00 |
|
kevinz000
|
cd38a29449
|
Merge pull request #8506 from CalamaBanana/Elf-Ears-and-Deer-taurs-for-mammals
Ports RP's deer taur and adds Elven ears to mammals
|
2019-06-05 01:44:05 -07:00 |
|
Fermi
|
228ab5b7c9
|
+Acute hepatic pharmacokinesis. (untested, will test with alterations)CC
|
2019-06-05 00:23:42 +01:00 |
|
Fermi
|
255aa60441
|
Final pooj changes.
|
2019-06-02 22:57:50 +01:00 |
|
Fermi
|
0eec1ed3f3
|
Pooj changes.
|
2019-06-02 22:49:04 +01:00 |
|
Poojawa
|
25458fad63
|
I refuse to eat crow.
|
2019-06-02 08:40:51 -05:00 |
|
Poojawa
|
69b1373209
|
compile testing and tweaks
|
2019-06-02 08:06:16 -05:00 |
|
Poojawa
|
818ec19561
|
Working as intended, fixed a few other missing sprites
Started groundwork for multi-breasts and hidden balls.
|
2019-06-02 04:44:57 -05:00 |
|
Poojawa
|
17ad519f24
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into shitcode-is-so-bad-and-people-like-it-I-guess
|
2019-06-02 03:00:46 -05:00 |
|
CalamaBanana
|
a37f84fb9b
|
Ports RP Deer taur and adds Elf Ears to Mammals
Ports RP Deer taur and adds Elf Ears to Mammals
|
2019-06-01 17:28:17 +02:00 |
|
Fermi
|
40aa231b64
|
Made MKUltra's OD on self turn the player into a narcissist.
|
2019-06-01 04:31:34 +01:00 |
|
Fermi
|
e58a94bcc7
|
Merge remote-tracking branch 'upstream/master'
|
2019-06-01 03:12:38 +01:00 |
|