Commit Graph

2389 Commits

Author SHA1 Message Date
kevinz000
32f6427cf1 Merge pull request #8434 from Ghommie/Ghommie-cit16
I'm tired of my pulls on horizontal spacemen breaking off because of crawling delays.
2019-05-31 18:00:47 -07:00
Sishen1542
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
Sishen
6707d1b2fd Update species.dm 2019-05-27 23:24:52 -04:00
Sishen1542
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
Sishen1542
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
Sishen
8771ae5822 masochism and buttslap fixes 2019-05-27 18:51:52 -04:00
kevinz000
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
kevinz000
ff82569c6f Merge pull request #8404 from WhiteHusky/flavor-text-bugfix
Flavor text with special characters don't get partially unescaped
2019-05-27 03:31:49 -07:00
deathride58
375965d731 Item stripping no longer gets interrupted by changes in your actively held item 2019-05-26 16:22:15 -04:00
BurgerLua
125db4c6b4 Added 2019-05-25 21:21:52 -07:00
kevinz000
a4b2aa0420 Merge pull request #8296 from Trilbyspaceclone/patch-112
Nerfs Synda NPC block Rng to 25%
2019-05-25 11:31:30 -07:00
kevinz000
d0819246bc Merge pull request #8384 from nero1024/footstepB
Ports new footstep sounds from base /tg/
2019-05-25 11:30:57 -07:00
kevinz000
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
kevinz000
97609fb84e Merge pull request #8409 from Poojawa/why-is-arousal-code-is-bad
Fixes species getting genitals at all if NOGENITAL'd
2019-05-25 11:13:55 -07:00
Ghommie
0a1a7260cb no swapping places with lying mobs, thanks. 2019-05-25 10:04:04 +02:00
Ghommie
9864fe275d I'm tired of my grabs on horizontal spacemen breaking off because of cit crawling. 2019-05-25 08:22:27 +02:00
BlackMajor
f94cbe94f6 Ports TG firebots 2019-05-24 23:58:39 +12:00
Carlen White
1bddf2d5ae Added comment
For whoever comes across this code and wonders what am I doing.
2019-05-22 09:32:25 -04: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
bb2a8bdd59 Fixes flavor text from being removed when canceled.
This was because canceling really just sent a empty string and not null which caused it to set the flavor text to an empty string.
2019-05-22 00:38:18 -04:00
Carlen White
e9c450bf17 Flavor text with special characters don't get partially unescaped
Copying the text that was escaped would occasionally trim an escaping character. Now it's decoded, copied, then encoded to prevent it.
2019-05-21 22:04:14 -04:00
deathride58
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
BurgerLua
bcf563e132 Fixes ass slapping to be less annoying. 2019-05-20 21:53:47 -07:00
kevinz000
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
kevinz000
6c79587dad Merge pull request #8354 from Sishen1542/Get-Your-Ass-Back-Here!
Butt Slaps
2019-05-19 22:43:40 -07:00
kevinz000
8ceec4271e Merge pull request #8373 from Poojawa/vore-mobs-should-gurgle
Simple Mob vore toggle works again
2019-05-19 12:46:13 -07:00
Poojawa
28a1afa626 Properly adds NOGENITALS to species that wouldn't 2019-05-18 01:37:37 -05:00
Nero1024
2a4a656a4d Port new footsteps from tg 2019-05-17 18:10:03 -05:00
CalamaBanana
b3668a32d0 Fixes color of elf ears
Fixes color of elf ears
2019-05-17 20:29:43 +02:00
Poojawa
0d02956144 Fixes simple mob vore toggle 2019-05-17 05:28:54 -05:00
Poojawa
4f75f68a5d make hostile mobs gurgle people 2019-05-17 05:13:30 -05:00
Sishen
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
kevinz000
0e9717845e Update podpeople.dm 2019-05-16 19:03:32 -07:00
kevinz000
c69d9a38d7 Update podpeople.dm 2019-05-16 18:50:09 -07:00
Sishen
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
Sishen
afaf15bc59 Booty Calls!
Added butt slaps
2019-05-14 10:29:04 -04:00
deathride58
0d65e3d1ab Merge pull request #8306 from Poojawa/helmet-fiasco
Muzzled Medical hardsuit fix and sprite organization
2019-05-06 21:58:44 -04:00
deathride58
aaa06473b7 Merge pull request #8276 from Citadel-Station-13/hahaha
Unironically adds elf ears
2019-05-06 21:23:55 -04:00
deathride58
bb9c479566 Merge pull request #8313 from BurgerLUA/SlurringFix
Fixes a few Slurring bugs
2019-05-06 21:00:33 -04:00
kevinz000
1b387eb5e3 Merge pull request #8314 from Poojawa/mawp
Mawp
2019-05-04 23:18:14 -07:00
Poojawa
faeb4bc22d Mawp
Mawp
2019-05-01 00:58:19 -05:00
BurgerLua
b31127bcca Forgot this 2019-04-30 22:26:44 -07:00
Poojawa
9374e83e7d fixes armor plate oversight 2019-05-01 00:05:14 -05:00
BurgerLua
d3b856d95f slurring reduction 2019-04-30 22:00:27 -07:00
BurgerLua
22c0c9baec Slurring Fix 2019-04-30 21:29:28 -07:00
kevinz000
7466f48674 Merge pull request #8288 from BurgerLUA/Accesssssssssssss
Accessory Clothing Mayhem, or how I lost my fucking sanity making this PR.
2019-04-30 05:37:02 -07:00
Trilbyspaceclone
bd5e8241d6 Update syndicate.dm 2019-04-26 22:50:23 -04:00
BurgerLua
b44ac0dd74 Reorganizes accessory files, seperates underwear tops from bottoms, and removes gendered clothing. 2019-04-25 18:11:12 -07:00
BurgerLua
569a92485f Removed slurring being 0.15 as it was a little extreme. 2019-04-25 12:09:45 -07:00
BurgerLua
75816477a5 Slurring now related to your drunkenness level. 2019-04-25 12:09:10 -07:00