Commit Graph

3394 Commits

Author SHA1 Message Date
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
Poojawa
d14943d4b0 well we have footprints now, xenoblood back to blood subtype. 2019-05-07 05:29:45 -05: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
Poojawa
996662ebea adjust and reset things 2019-05-06 04:35:09 -05:00
Poojawa
105b40a4f8 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-05-06 02:53:42 -05: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
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
BurgerLua
fd19d67cc2 "Improves" how slurring works, and adjusts how fast you recover from slurring. 2019-04-25 11:57:02 -07:00
kevinz000
a5e750e20f skintone 2019-04-23 19:06:00 -07:00
kevinz000
64202b1444 Merge pull request #8247 from Poojawa/custom-race
Custom Species names
2019-04-22 21:41:31 -07:00
kevinz000
6892e8d01e Merge pull request #8265 from Trilbyspaceclone/patch-103
Reblances goliath stun.
2019-04-22 21:38:33 -07:00
Poojawa
fe1692eef3 t a b 2019-04-21 01:57:12 -05:00
Poojawa
b524c6741d double checking my work 2019-04-21 01:56:45 -05:00
Poojawa
ae7ce39f62 aaaAAAAaaaa 2019-04-20 23:28:43 -05:00
kevinz000
3d5d6e9212 Update podpeople.dm 2019-04-20 16:44:55 -07:00
Trilbyspaceclone
7a3f8704a2 Update goliath.dm 2019-04-20 14:16:30 -04:00
Poojawa
c65e551c07 makes travis shutup 2019-04-17 06:01:59 -05:00
Poojawa
fe6407d00c I need to do something else for a bit pending reviews 2019-04-17 04:33:56 -05:00
Poojawa
73098574b7 what to do when footprints are being a bitch.
why, we get rid of them :honk:
2019-04-17 01:18:21 -05:00
Poojawa
f244d3fdca system's mostly working
need to polish out the get_blood_dna_list runtime
2019-04-16 11:30:36 -05:00