Commit Graph

2899 Commits

Author SHA1 Message Date
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
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 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
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
Fermi f7655cad25 All compiling errors fixed, except for a few weird ones that I need help 2019-05-11 15:40:06 +01: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
Ghommie f13e48b014 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-05-04 19:39:41 +02: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