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
9edac9fc6c
Merge pull request #8540 from BurgerLUA/assssssssssssssssssssssss
...
Rebalanced Ass Slapping
2019-06-08 01:17:04 -07:00
aa53cc9ea9
Merge branch 'master' into fuckatmos
2019-06-07 04:38:47 -04:00
d3d2b8d898
should be ready.
2019-06-06 19:24:20 +02:00
44358e054a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit29
2019-06-06 15:24:31 +02:00
0e630680ba
forgot to pull from upstream. One second.
2019-06-06 15:20:27 +02:00
8778349821
added
2019-06-05 11:43:28 -07:00
2c84d75ae6
Merge pull request #8528 from Poojawa/marking-mysteries
...
Fixes prosthetic invisible hands, improves female markings
2019-06-05 02:02:40 -07:00
980c48180c
Merge pull request #8387 from JTGSZ/gangs
...
Ports gang mode
2019-06-05 01:55:19 -07:00
89bf36e6a9
Merge pull request #8491 from Ghommie/Ghommie-cit24
...
zero, , null, and empty text strings, all fulfill the ! operator.
2019-06-05 01:52:17 -07:00
adbbb2944a
Merge pull request #8517 from Poojawa/shitcode-is-so-bad-and-people-like-it-I-guess
...
Adds visible balls and multi-breasts
2019-06-05 01:42:48 -07:00
a2b4f4261c
Fixes missing hands and marking overlap
...
cleans up the code a bit too. Improves female chest sprites.
2019-06-05 02:33:25 -05:00
ed7d0575b2
Ass Blast USA
2019-06-03 14:40:57 -07:00
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
85ab988842
0, null, and "", all fulfill the ! operator.
2019-05-30 20:09:19 +02:00
c57968ec13
Update code/modules/mob/living/carbon/human/species.dm
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2019-05-28 00:29:56 -04:00
6707d1b2fd
Update species.dm
2019-05-27 23:24:52 -04:00
0a11e98950
Update code/modules/mob/living/carbon/human/species.dm
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2019-05-27 20:53:42 -04:00
e07493b0fa
Update code/modules/mob/living/carbon/human/species.dm
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2019-05-27 20:53:35 -04:00
8771ae5822
masochism and buttslap fixes
2019-05-27 18:51:52 -04:00
76314e463e
Merge pull request #8443 from deathride58/stripfix
...
Item stripping no longer gets interrupted by changes in your actively held item
2019-05-27 14:08:04 -07:00
375965d731
Item stripping no longer gets interrupted by changes in your actively held item
2019-05-26 16:22:15 -04:00
84aafb87f9
Lizard tails are actually marked
2019-05-26 04:52:44 -05:00
125db4c6b4
Added
2019-05-25 21:21:52 -07:00
4fc31f6322
Merge branch 'master' into fuckatmos
2019-05-25 15:34:06 -04:00
deffcb3226
Merge pull request #8398 from BurgerLUA/AntiAssSlap
...
Nerfs Ass Slapping, or how a meme PR made me butthurt, or how I'm now resorting to making degenerate PRs such as this since my permaban from Aurora
2019-05-25 11:28:39 -07:00
196da05313
Brute deconv correct
...
woops
2019-05-23 02:49:35 -04:00
9081b34cb8
blunt trauma deconv
2019-05-23 01:16:29 -04:00
25463f22b2
Fixes species getting genitals at all if NOGENITAL'd
...
Holy FUCK this code is bad.
2019-05-21 23:52:19 -05:00
efe8d73372
Merge pull request #8269 from Citadel-Station-13/kevinz000-patch-39
...
adds variant of podpersons with 20% brute/burn heal and 70% toxheal and 75% nutrition/light factor of normal for roundstart pod species
2019-05-21 08:04:57 -04:00
bcf563e132
Fixes ass slapping to be less annoying.
2019-05-20 21:53:47 -07:00
626ede8464
Merge pull request #8367 from Poojawa/genital-improvements
...
[READY] Genital fixes and skintone sync [Adds erections[]
2019-05-19 22:47:01 -07:00
6c79587dad
Merge pull request #8354 from Sishen1542/Get-Your-Ass-Back-Here!
...
Butt Slaps
2019-05-19 22:43:40 -07:00
28a1afa626
Properly adds NOGENITALS to species that wouldn't
2019-05-18 01:37:37 -05:00
b3668a32d0
Fixes color of elf ears
...
Fixes color of elf ears
2019-05-17 20:29:43 +02:00
267661e078
Tail Wagging
...
Makes it so nymphos will continue wagging their tails when booty or face slapped
2019-05-17 01:56:44 -04:00
0e9717845e
Update podpeople.dm
2019-05-16 19:03:32 -07:00
c69d9a38d7
Update podpeople.dm
2019-05-16 18:50:09 -07:00
ac04e23e31
Nympho Traiting & Arousal!
...
Butt slaps 2.0
Added nympho to defined traits, added arousal damage to ass slapping (arousal system needs to be enabled), and added forced orgasms to nymphos at max arousal
2019-05-16 10:17:16 -04:00
afaf15bc59
Booty Calls!
...
Added butt slaps
2019-05-14 10:29:04 -04:00
aaa06473b7
Merge pull request #8276 from Citadel-Station-13/hahaha
...
Unironically adds elf ears
2019-05-06 21:23:55 -04:00
bb9c479566
Merge pull request #8313 from BurgerLUA/SlurringFix
...
Fixes a few Slurring bugs
2019-05-06 21:00:33 -04:00
1b387eb5e3
Merge pull request #8314 from Poojawa/mawp
...
Mawp
2019-05-04 23:18:14 -07:00
faeb4bc22d
Mawp
...
Mawp
2019-05-01 00:58:19 -05:00
b31127bcca
Forgot this
2019-04-30 22:26:44 -07:00
22c0c9baec
Slurring Fix
2019-04-30 21:29:28 -07:00
569a92485f
Removed slurring being 0.15 as it was a little extreme.
2019-04-25 12:09:45 -07:00
75816477a5
Slurring now related to your drunkenness level.
2019-04-25 12:09:10 -07:00
fd19d67cc2
"Improves" how slurring works, and adjusts how fast you recover from slurring.
2019-04-25 11:57:02 -07:00
a5e750e20f
skintone
2019-04-23 19:06:00 -07:00
kevinz000