a0073295e1
Updating from Cit, pre PR.
2019-05-26 01:49:58 +01:00
4fc31f6322
Merge branch 'master' into fuckatmos
2019-05-25 15:34:06 -04:00
a4b2aa0420
Merge pull request #8296 from Trilbyspaceclone/patch-112
...
Nerfs Synda NPC block Rng to 25%
2019-05-25 11:31:30 -07:00
d0819246bc
Merge pull request #8384 from nero1024/footstepB
...
Ports new footstep sounds from base /tg/
2019-05-25 11:30:57 -07: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
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
e3d3f30ea9
Could this be the final commit?!
2019-05-25 16:12:46 +01:00
0a1a7260cb
no swapping places with lying mobs, thanks.
2019-05-25 10:04:04 +02:00
9864fe275d
I'm tired of my grabs on horizontal spacemen breaking off because of cit crawling.
2019-05-25 08:22:27 +02:00
4b8cb81752
Compile safe.
2019-05-25 05:35:03 +01:00
e2c1eb1d7c
prebed fixes
2019-05-25 05:27:28 +01:00
f94cbe94f6
Ports TG firebots
2019-05-24 23:58:39 +12:00
310344e828
EVERYTHING BROKE AAAAAAAAAAAAAAAAAA
2019-05-23 20:21:52 +01: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
f932fadfc6
Blood commit.
2019-05-22 18:46:46 +01:00
1bddf2d5ae
Added comment
...
For whoever comes across this code and wonders what am I doing.
2019-05-22 09:32:25 -04:00
d375284f42
Concating a string instead of a list
...
As per request.
2019-05-22 09:25:25 -04:00
971ddef989
reverts forensics components. If I can't figure it out, MURDER IT
2019-05-22 04:10:29 -05:00
f6f4c946e6
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-05-22 00:08:13 -05: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
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
0d139a5549
Batch messages on checking yourself
...
Instead of sending a bunch of to_chat() functions, it'll just create an array and send it all out at once instead of freezing the client for a moment.
2019-05-21 23:03:06 -04:00
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
20124c24ec
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11
2019-05-21 22:48:59 +02:00
be4f188589
FermiChem? More like, FermiFixes!
2019-05-21 20:08:46 +01: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
71088eace9
More fixes
2019-05-21 05:05:32 +01:00
a9bc75fc0e
why do I even bother
2019-05-21 02:53:17 +01:00
bb4aecbd5f
Progressional fixes
2019-05-20 07:44:39 +01: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
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
28a1afa626
Properly adds NOGENITALS to species that wouldn't
2019-05-18 01:37:37 -05:00
2a4a656a4d
Port new footsteps from tg
2019-05-17 18:10:03 -05:00
b3668a32d0
Fixes color of elf ears
...
Fixes color of elf ears
2019-05-17 20:29:43 +02:00
0d02956144
Fixes simple mob vore toggle
2019-05-17 05:28:54 -05:00
4f75f68a5d
make hostile mobs gurgle people
2019-05-17 05:13:30 -05: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
b5b54c9f9f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11
2019-05-17 02:17:18 +02: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
0f6677b956
Blood colors happens to footprints now.
...
Different prints not working. splatter effect not working, I'm just sick of looking at this right now.
2019-05-16 08:23:53 -05:00
538c6e98ac
On-mob_life proc doesn't work for some reason. Fix it/badger helpers.
2019-05-16 01:26:46 +01:00
246a344fed
Mreac fixed, tongue health, pH vars+ (drink, food, pryo, tox remain)
2019-05-16 00:58:30 +01:00
afaf15bc59
Booty Calls!
...
Added butt slaps
2019-05-14 10:29:04 -04:00
77abf6a179
just need the stupid component to work properly now
2019-05-14 02:36:23 -05:00
49a2f3cc63
I don't even fucking know anymore
2019-05-12 06:31:02 -05:00
Fermi