Commit Graph

4325 Commits

Author SHA1 Message Date
Fermi
4b8cb81752 Compile safe. 2019-05-25 05:35:03 +01:00
Fermi
e2c1eb1d7c prebed fixes 2019-05-25 05:27:28 +01:00
BlackMajor
f94cbe94f6 Ports TG firebots 2019-05-24 23:58:39 +12:00
Fermi
310344e828 EVERYTHING BROKE AAAAAAAAAAAAAAAAAA 2019-05-23 20:21:52 +01:00
JTGSZ
196da05313 Brute deconv correct
woops
2019-05-23 02:49:35 -04:00
JTGSZ
9081b34cb8 blunt trauma deconv 2019-05-23 01:16:29 -04:00
Fermi
f932fadfc6 Blood commit. 2019-05-22 18:46:46 +01: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
Carlen White
d375284f42 Concating a string instead of a list
As per request.
2019-05-22 09:25:25 -04:00
Poojawa
971ddef989 reverts forensics components. If I can't figure it out, MURDER IT 2019-05-22 04:10:29 -05:00
Poojawa
f6f4c946e6 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-05-22 00:08:13 -05: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
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
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
Ghommie
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
Fermi
be4f188589 FermiChem? More like, FermiFixes! 2019-05-21 20:08:46 +01: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
Fermi
71088eace9 More fixes 2019-05-21 05:05:32 +01:00
Fermi
a9bc75fc0e why do I even bother 2019-05-21 02:53:17 +01:00
Fermi
bb4aecbd5f Progressional fixes 2019-05-20 07:44:39 +01: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
Ghommie
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
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
Poojawa
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
Fermi
538c6e98ac On-mob_life proc doesn't work for some reason. Fix it/badger helpers. 2019-05-16 01:26:46 +01:00
Fermi
246a344fed Mreac fixed, tongue health, pH vars+ (drink, food, pryo, tox remain) 2019-05-16 00:58:30 +01:00
Sishen
afaf15bc59 Booty Calls!
Added butt slaps
2019-05-14 10:29:04 -04:00
Poojawa
77abf6a179 just need the stupid component to work properly now 2019-05-14 02:36:23 -05:00
Poojawa
49a2f3cc63 I don't even fucking know anymore 2019-05-12 06:31:02 -05:00
Poojawa
1a047c0068 I think I got it.
Also gibs should be better too.
2019-05-12 04:06:35 -05:00
Fermi
f7655cad25 All compiling errors fixed, except for a few weird ones that I need help 2019-05-11 15:40:06 +01:00
Poojawa
fcdc748bf1 u h g. I hate this 2019-05-10 07:07:09 -05:00
Poojawa
11c54f5fba Update human_movement.dm 2019-05-09 14:43:12 -05:00
Poojawa
0f02562b51 Fixes Xenomorph blood related travis errors 2019-05-09 09:59:34 -05:00
Poojawa
7b6a65ce3b okay we're starting to pass our blood type to bloodmeme now
STILL JUST FUCKING FOOTSTEPS LEFT THO GOD FUCKING DAMNIT
2019-05-09 08:17:18 -05:00
Poojawa
5ad532f723 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-05-09 03:08:54 -05:00
Poojawa
5a67114d33 get blood id is my foe now. 2019-05-08 04:53:51 -05:00
Poojawa
69eca2ae4b progress, just need to fiddle with footprints again 2019-05-07 13:23:49 -05:00