shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,302 Commits 5 Branches 0 Tags
3dca4dd3796d94de37a394d9423826903c75d59f
Commit Graph

2563 Commits

Author SHA1 Message Date
Fermi
c11d2bac80 Okay, now it checks the right thing. 2019-06-02 21:03:16 +01:00
Fermi
5b56225b72 Wait how can the dead inspect? 2019-06-02 21:01:05 +01:00
Thalpy
e0690c610a Added a check to ensure empath target isn't dead. 2019-06-02 20:53:41 +01:00
Thalpy
abb76baeca Update code/modules/mob/living/carbon/human/examine.dm 
Ghoomie's change.

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-06-02 19:14:08 +01: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
Fermi
5918b026aa Fixes, PLEASE CHECK HEADPATS IN MOODULAR. 2019-06-01 20:02:51 +01:00
Fermi
f8586c9699 Adds Friendly and empahty quirk from tg. 2019-06-01 18:51:25 +01:00
Fermi
44d13818f0 Inital paralysis. (https://github.com/tgstation/tgstation/pull/41140) 2019-06-01 16:52:58 +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
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
Trilbyspaceclone
5ead987d53 Update hierophant.dm 2019-05-28 19:01:32 -04:00
Trilbyspaceclone
69a39b4f67 Update hierophant.dm 2019-05-28 18:56:16 -04: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
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
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
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