 Ghommie
|
af2598035a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
|
2019-06-05 19:32:17 +02:00 |
|
|
Ghommie
|
0513f3464a
|
one
|
2019-06-05 19:20:25 +02:00 |
|
|
Poojawa
|
11d10d3805
|
fuckit, I'm just gunna wholesale port from baycode I guess
|
2019-06-05 04:55:36 -05:00 |
|
|
kevinz000
|
980c48180c
|
Merge pull request #8387 from JTGSZ/gangs
Ports gang mode
|
2019-06-05 01:55:19 -07: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 |
|
|
Poojawa
|
1f1f951924
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-06-03 05:35:52 -05: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 |
|
|
Fermi
|
a3e60843bc
|
Renamed blood trait and spelt minutes right.
|
2019-06-02 22:35:16 +01:00 |
|
|
Fermi
|
4513dd9815
|
MINUTE define changes.
|
2019-06-02 22:26:53 +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 |
|
|
Fermi
|
0105dbf562
|
Removed duplicate headpat code.
|
2019-06-01 20:04:41 +01:00 |
|
|
Fermi
|
5918b026aa
|
Fixes, PLEASE CHECK HEADPATS IN MOODULAR.
|
2019-06-01 20:02:51 +01: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 |
|
|
Fermi
|
01c3f66f7c
|
Great, merge conflicts.
|
2019-06-01 02:42:55 +01:00 |
|
|
kevinz000
|
59e88e0808
|
Merge pull request #8477 from deathride58/portsnerditems
Ports the zulie cloak and blackredgold coat donor items from RP
|
2019-05-31 17:58:48 -07:00 |
|
|
kevinz000
|
8c6d8eb20b
|
Merge pull request #8471 from Sishen1542/buttslol
Butt slaps fix & Masochism! (fixed)
|
2019-05-31 17:45:07 -07:00 |
|
|
Fermi
|
2eceb6f57b
|
Added a cybernetic tongue and sprites. Fixed furranium.
|
2019-06-01 01:28:52 +01:00 |
|
|
Fermi
|
e1577111a0
|
TO BE TESTED: Added the ability for slimes to make MKUltra.
|
2019-05-31 05:09:07 +01:00 |
|
|
Fermi
|
1244b848bf
|
Compile safe.
|
2019-05-31 04:29:35 +01:00 |
|
|
Fermi
|
adeffe0c47
|
Fixed lungs.
|
2019-05-31 04:16:18 +01:00 |
|
|
Fermi
|
08e72ba05e
|
Why does adjustLungLoss not workkkkkkkkkkkkkkkkk
|
2019-05-31 03:49:25 +01:00 |
|
|
Fermi
|
f8005dd625
|
Moved the secret cat to the respective fermi.dms.
|
2019-05-31 02:47:08 +01:00 |
|
|
Fermi
|
ee2d75ae22
|
Removed special screen obj, as I didn't like how they looked.
|
2019-05-30 20:05:06 +01:00 |
|
|
deathride58
|
9e35f91706
|
suggested changes from asky
|
2019-05-30 13:18:05 -04:00 |
|
|
Thalpy
|
4077ab1fe3
|
.5
|
2019-05-29 21:22:07 +01:00 |
|
|
Thalpy
|
a58766c885
|
Fixed explosions not occuring when temps were high enough.
|
2019-05-29 21:11:21 +01:00 |
|
|
Thalpy
|
621f973cac
|
Fixed pH disappearing and changed how strongly reactions shifted the pH.
|
2019-05-29 20:25:32 +01:00 |
|
|
Thalpy
|
90949f406d
|
Fixed the forceMove issue.
|
2019-05-29 20:17:22 +01:00 |
|
|
Thalpy
|
af80bf3204
|
MINUTE defines.
|
2019-05-29 18:41:51 +01:00 |
|
|
Fermi
|
1ce25acb0c
|
Forgot to save this too.
|
2019-05-29 05:41:33 +01:00 |
|
|
Fermi
|
ae35366e97
|
Some fixes before bed.
|
2019-05-29 05:41:12 +01:00 |
|
|
Fermi
|
455ebc2a7c
|
Edited Astrogen.
|
2019-05-29 04:50:21 +01:00 |
|
|
Fermi
|
42513fda9b
|
Pre extra file culling.
|
2019-05-29 03:49:14 +01:00 |
|
|
Fermi
|
d4d955b138
|
Finished.
|
2019-05-29 03:29:17 +01:00 |
|
|
Fermi
|
01a38479fa
|
Why did I fiddle with things I shouldn't have.
|
2019-05-29 03:16:11 +01:00 |
|
|
Fermi
|
91cfd8e052
|
Before say component remove.
|
2019-05-29 03:01:47 +01:00 |
|
|
Fermi
|
336ba8dbad
|
Tidying code.
|
2019-05-29 02:33:15 +01:00 |
|
|
Fermi
|
c1544ffe46
|
Tweak.
|
2019-05-29 01:57:31 +01:00 |
|
|
Fermi
|
db3369ab43
|
Scrubbing messages and cleaning code.
|
2019-05-29 01:51:07 +01:00 |
|
|
Fermi
|
331c2887ea
|
Small recipie changes.
|
2019-05-29 01:41:30 +01:00 |
|
|
Fermi
|
543dc9a399
|
Final fixes, finally fixed all problems.
|
2019-05-29 01:33:07 +01:00 |
|
|
deathride58
|
3feb11f12a
|
Ports the zulie cloak and blackredgold coat donor items from RP
|
2019-05-28 19:38:08 -04:00 |
|
|
Fermi
|
12eb5e9b17
|
ARGH
|
2019-05-28 23:35:50 +01:00 |
|