Commit Graph

2417 Commits

Author SHA1 Message Date
deathride58
1dde6b90ae Merge pull request #8538 from dtfe3/dtfe3-hair-twintail
Hair - Long Twintails
2019-06-08 01:37:29 -04:00
deathride58
8bf5777844 Merge pull request #8474 from Citadel-Station-13/adrenal_nerf
Adrenal rebalancing/nerfing. Again. And a very slight meth buff.
2019-06-08 01:07:56 -04:00
deathride58
aa53cc9ea9 Merge branch 'master' into fuckatmos 2019-06-07 04:38:47 -04:00
kevinz000
31a942a63a Merge pull request #8534 from dtfe3/dtfe3-pink-panties
Pink Panties
2019-06-06 06:52:57 -07:00
dtfe3
3de6e2d71a twintails...
title
2019-06-05 19:41:23 +02:00
dtfe3
d1d0f38460 Revert "test" 2019-06-05 19:29:53 +02:00
dtfe3
2e47c973c6 Pink Panties 2019-06-05 16:15:38 +02:00
kevinz000
2c84d75ae6 Merge pull request #8528 from Poojawa/marking-mysteries
Fixes prosthetic invisible hands, improves female markings
2019-06-05 02:02:40 -07:00
kevinz000
980c48180c Merge pull request #8387 from JTGSZ/gangs
Ports gang mode
2019-06-05 01:55:19 -07:00
kevinz000
89bf36e6a9 Merge pull request #8491 from Ghommie/Ghommie-cit24
zero, , null, and empty text strings, all fulfill the ! operator.
2019-06-05 01:52:17 -07:00
kevinz000
adbbb2944a Merge pull request #8517 from Poojawa/shitcode-is-so-bad-and-people-like-it-I-guess
Adds visible balls and multi-breasts
2019-06-05 01:42:48 -07:00
kevinz000
58bdac6965 Merge pull request #8524 from BurgerLUA/Ass-Blast-USA
Adds a trait that makes you immune to ass slapping: BUNS OF STEEL.
2019-06-05 01:40:28 -07:00
kevinz000
81ba2011d3 Merge pull request #8510 from Sishen1542/ghostmanbad
Subtle 2: No Ghost Boogaloo
2019-06-05 01:32:42 -07:00
Poojawa
a2b4f4261c Fixes missing hands and marking overlap
cleans up the code a bit too. Improves female chest sprites.
2019-06-05 02:33:25 -05:00
BurgerLua
ed7d0575b2 Ass Blast USA 2019-06-03 14:40:57 -07:00
Poojawa
17ad519f24 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into shitcode-is-so-bad-and-people-like-it-I-guess 2019-06-02 03:00:46 -05:00
Sishen
9347ad57b1 sneaky erp 2019-06-01 20:20:55 -04:00
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
Ghommie
fa4cf533cb honestly AP bullet spam is ballocks too. 2019-05-30 20:20:05 +02:00
Ghommie
85ab988842 0, null, and "", all fulfill the ! operator. 2019-05-30 20:09:19 +02:00
kevinz000
8cd0b69b61 adrenals 2019-05-28 01:00:41 -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
Poojawa
84aafb87f9 Lizard tails are actually marked 2019-05-26 04:52:44 -05:00
BurgerLua
125db4c6b4 Added 2019-05-25 21:21:52 -07:00
deathride58
4fc31f6322 Merge branch 'master' into fuckatmos 2019-05-25 15:34:06 -04: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
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
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