Commit Graph

2421 Commits

Author SHA1 Message Date
Fermi e58a94bcc7 Merge remote-tracking branch 'upstream/master' 2019-06-01 03:12:38 +01: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
Fermi 2eceb6f57b Added a cybernetic tongue and sprites. Fixed furranium. 2019-06-01 01:28:52 +01:00
Fermi abfcc25e91 No changed, just staching a comment. 2019-05-31 23:54:30 +01:00
Fermi e1577111a0 TO BE TESTED: Added the ability for slimes to make MKUltra. 2019-05-31 05:09:07 +01:00
Fermi f8005dd625 Moved the secret cat to the respective fermi.dms. 2019-05-31 02:47:08 +01:00
Thalpy 90949f406d Fixed the forceMove issue. 2019-05-29 20:17:22 +01:00
Thalpy 71eb285472 Few tweaks and fixes to last commits. 2019-05-29 20:04:52 +01:00
Thalpy 6811896f34 Bloodmath redone. 2019-05-29 18:30:22 +01:00
Fermi ae35366e97 Some fixes before bed. 2019-05-29 05:41:12 +01:00
Fermi 6b4188ab86 British spellingggg 2019-05-29 04:33:46 +01:00
Fermi 336ba8dbad Tidying code. 2019-05-29 02:33:15 +01:00
Fermi 89665de8a7 Last round of test checks. 2019-05-28 22:33:04 +01: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
Fermi 8282819c84 CHECK PLASMA THOUGH! 2019-05-28 05:03:58 +01: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
Fermi df2a14880e Beginning comment purge. 2019-05-28 00:35:33 +01: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
Fermi 5771fd9442 Should be the last fix. 2019-05-27 20:52:05 +01:00
Fermi a1afeb880f Final testing. Added pH meter too. Compile safe. 2019-05-27 15:00:19 +01: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
Fermi 4607a2b6c3 Compile safe. Today's fixes. 2019-05-27 05:39:52 +01:00
deathride58 375965d731 Item stripping no longer gets interrupted by changes in your actively held item 2019-05-26 16:22:15 -04:00
Fermi 4cb697d2ec Final changes before checks. 2019-05-26 17:37:20 +01:00
BurgerLua 125db4c6b4 Added 2019-05-25 21:21:52 -07:00
Fermi 91f10442cf Merge branch 'pr/12' 2019-05-26 02:05:48 +01:00
Fermi a0073295e1 Updating from Cit, pre PR. 2019-05-26 01:49:58 +01: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
Fermi e3d3f30ea9 Could this be the final commit?! 2019-05-25 16:12:46 +01: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
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
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
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
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