 Fermi
|
713d849c03
|
Merge remote-tracking branch 'upstream/master'
|
2019-06-19 21:02:30 +01:00 |
|
|
Poojawa
|
bf991cd2da
|
Underwear overlays Gentials, can toggle each seperately (#8602)
* Gentials layered under underclothes
* screm
|
2019-06-17 11:20:25 -07:00 |
|
|
Thalpy
|
41eee65b15
|
Merge branch 'master' into master
|
2019-06-17 12:18:40 +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
|
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 |
|
|
Poojawa
|
80659a540b
|
Update modular_citadel/code/modules/arousal/organs/testicles.dm
I guess
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-06-09 09:59:31 -05:00 |
|
|
Poojawa
|
6bdf5f585a
|
fixes testicle runtimes
|
2019-06-09 00:49:40 -05:00 |
|
|
Ghommie
|
d3d2b8d898
|
should be ready.
|
2019-06-06 19:24:20 +02: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 |
|
|
Thalpy
|
90949f406d
|
Fixed the forceMove issue.
|
2019-05-29 20:17:22 +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
|
543dc9a399
|
Final fixes, finally fixed all problems.
|
2019-05-29 01:33:07 +01:00 |
|
|
Fermi
|
12eb5e9b17
|
ARGH
|
2019-05-28 23:35:50 +01:00 |
|
|
Fermi
|
89665de8a7
|
Last round of test checks.
|
2019-05-28 22:33:04 +01:00 |
|
|
Fermi
|
48ae55d61d
|
Sishen implementation
|
2019-05-28 19:25:31 +01:00 |
|
|
Fermi
|
8282819c84
|
CHECK PLASMA THOUGH!
|
2019-05-28 05:03:58 +01:00 |
|
|
Fermi
|
df2a14880e
|
Beginning comment purge.
|
2019-05-28 00:35:33 +01:00 |
|
|
Fermi
|
79a7b6b45b
|
Fixes.
|
2019-05-27 20:25:57 +01:00 |
|
|
Fermi
|
4607a2b6c3
|
Compile safe. Today's fixes.
|
2019-05-27 05:39:52 +01:00 |
|
|
Poojawa
|
2aa86157e1
|
Fixes rendering issues. Adds balls to be rendered
|
2019-05-26 04:52:31 -05:00 |
|
|
Fermi
|
bd85095590
|
Prebed tweaks
|
2019-05-26 05:34:28 +01:00 |
|
|
Fermi
|
91f10442cf
|
Merge branch 'pr/12'
|
2019-05-26 02:05:48 +01:00 |
|
|
Fermi
|
87deaf07c5
|
Update breasts.dm
I do not like how git works sometimes.
|
2019-05-26 01:55:59 +01:00 |
|
|
Fermi
|
a0073295e1
|
Updating from Cit, pre PR.
|
2019-05-26 01:49:58 +01:00 |
|
|
kevinz000
|
e434b9ceb5
|
Merge pull request #8397 from WhiteHusky/arousal-related-styling-fixes
Changed arousal message styling.
|
2019-05-25 11:30:18 -07:00 |
|
|
Fermi
|
e3d3f30ea9
|
Could this be the final commit?!
|
2019-05-25 16:12:46 +01:00 |
|
|
Fermi
|
e2c1eb1d7c
|
prebed fixes
|
2019-05-25 05:27:28 +01:00 |
|
|
Fermi
|
b4624c5537
|
I really hate genitals.
|
2019-05-25 03:15:15 +01:00 |
|
|
Fermi
|
faf6585b69
|
Winding down to the final commits.
|
2019-05-25 01:04:00 +01:00 |
|
|
Fermi
|
05aaeb4d70
|
Current state
|
2019-05-24 06:06:25 +01:00 |
|
|
Fermi
|
b1c11071de
|
Fixed acid to water and funbits.
|
2019-05-24 01:50:33 +01:00 |
|
|
Fermi
|
645dfca14a
|
Compile ready.
|
2019-05-23 23:17:17 +01:00 |
|
|
Fermi
|
2f7a4082ab
|
woooah.
|
2019-05-23 23:09:32 +01:00 |
|
|
Fermi
|
8a8178a0b1
|
I uh, I'm worried this won't compile for some reason.
|
2019-05-23 20:52:20 +01:00 |
|
|
Fermi
|
310344e828
|
EVERYTHING BROKE AAAAAAAAAAAAAAAAAA
|
2019-05-23 20:21:52 +01:00 |
|
|
Fermi
|
7cb7f5de73
|
Update of master required.
|
2019-05-22 16:50:53 +01:00 |
|
|
Poojawa
|
25463f22b2
|
Fixes species getting genitals at all if NOGENITAL'd
Holy FUCK this code is bad.
|
2019-05-21 23:52:19 -05:00 |
|
|
Fermi
|
e86585935f
|
MidFix - compile unsafe.
|
2019-05-22 02:25:05 +01:00 |
|
|
Fermi
|
be4f188589
|
FermiChem? More like, FermiFixes!
|
2019-05-21 20:08:46 +01:00 |
|
|
Fermi
|
a9bc75fc0e
|
why do I even bother
|
2019-05-21 02:53:17 +01:00 |
|