Commit Graph

41 Commits

Author SHA1 Message Date
Poojawa
00a630abe5 Fixes errant ball behaviour 2019-06-26 07:42:02 -05:00
Poojawa
bf991cd2da Underwear overlays Gentials, can toggle each seperately (#8602)
* Gentials layered under underclothes

* screm
2019-06-17 11:20:25 -07: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
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
2aa86157e1 Fixes rendering issues. Adds balls to be rendered 2019-05-26 04:52:31 -05: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
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
Carlen White
51f2a37e6e Changed arousal message styling.
Now with less gaudy green.
2019-05-20 17:47:10 -04:00
Poojawa
b95bc24def mission accomplished 2019-05-17 04:24:23 -05:00
Poojawa
e4ba220eb7 oh god, oh fuck. why 2019-05-16 14:10:31 -05:00
BurgerLua
1557c33008 Adds Penis Enlargement Pills 2019-05-02 14:55:04 -07:00
BurgerLua
36fc30f7a7 fugg 2019-04-28 13:39:24 -07:00
BurgerLua
6021e80a8b Update penis.dm 2019-04-28 13:23:16 -07:00
kevinz000
7645317558 Revert "Adds realism to pleasure (#7986)"
This reverts commit 2f2b089db1.
2019-02-14 17:19:28 -08:00
Poojawa
2f2b089db1 Adds realism to pleasure (#7986) 2019-02-13 20:45:16 -08:00
Ghommie
4bd1af0915 purifies /datum from this filth. 2019-01-19 00:55:15 +01:00
Ghommie
6d51dff3eb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit2 2019-01-19 00:28:24 +01:00
Ghommie
4cefeb9ce2 1 2019-01-18 06:54:48 +01:00
Ragolution
245b2c1968 Removed knot conditionals
whatever
2019-01-12 03:45:25 -05:00
Ragolution
1fd7bfe969 oh whoops 2019-01-12 02:50:03 -05:00
Ragolution
18d2572e57 Code Improvements (again)
Knowing what I know now makes me wanna go revamp every instance of suicide code but geez.
2019-01-12 02:31:25 -05:00
Ragolution
77a28abccf Code improvements
Thanks to @Ghommie for the suggestion.
2019-01-09 22:07:11 -05:00
Ragolution
2ab86321c3 Conforms with changes requested by the BhjinBot
Really cool bot I can't believe we have something so advanced for our codebase.
2019-01-04 16:45:06 -05:00
Ragolution
b3a5b22578 TRAVIS LEAVE ME ALONE 2019-01-04 07:18:28 -05:00
Ragolution
2292b06ad1 Improved attack verbs on dildos+ suicide improvements
Adds a bracket that kept the suicide message from appearing and grants each dildo its own attack message, mostly.
2019-01-04 02:45:34 -05:00
Ragolution
6aed6d5612 Fixes all vg/5th port uniforms that aren't commented out for whatever reason.
I'm pissy that this was so easy and nobody else bothered to do it.
2019-01-04 01:55:33 -05:00
Ragolution
52a68d2121 Suicide_Acts for Dildos
By request.
2019-01-04 01:19:06 -05:00
izzyinbox
14b7768772 adds option to hide genitals without clothes 2018-09-19 04:30:58 -05:00
guppylaxx
dedb703d0a fuck2 2018-09-07 16:21:12 -04:00
guppylaxx
9c820743d5 fuck 2018-09-07 16:18:40 -04:00
ShizCalev
901dd94253 Corrects climax cooldown timer message, makes relieve message pronounsensitive (#7086) 2018-06-13 19:27:19 -07:00
kevinz000
7b91a07658 kek 2018-04-02 19:53:36 -07:00
kevinz000
2cd98340de typed 2018-03-24 06:08:58 -07:00
kevinz000
c73d2763e5 Update arousal.dm 2018-03-24 05:52:08 -07:00
kevinz000
bef056c034 why did we have that there 2018-03-24 05:39:35 -07:00
kevinz000
037d800e34 performant arousal 2018-03-24 05:37:49 -07:00
Poojawa
86b11050b6 Citadel's folder's end (#5828)
* ERP, miscreants, clothing

* github pls

* guns, dogborg, areas, vendor

* finishes moving around the last of the stuffs

* cleaned up shit. italics on subtle messages

vore code to modular_citadel too

* updates codeowners and recompiles tgui

because it's a healthy thing to do

* reee, I had that spawner set byond

* cleans up a bad pipe

does the thing I've been meaning to do for a while now as well.

* bumps up xenobio console requirements

inb4 reee

* snowflake commenting
2018-03-06 17:40:48 -06:00