shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,377 Commits 5 Branches 0 Tags
28ca8dee46ea7b80a51ef375418adecb7d68bb9f
Commit Graph

2070 Commits

Author SHA1 Message Date
kevinz000 27333276de Merge pull request #8570 from Trilbyspaceclone/patch-170 
Ports origami skills for paper wiz loot
 2019-06-16 19:40:01 -07:00
deathride58 fdc0e4f957 Merge pull request #8611 from Poojawa/digitigrade-socks 
Digitigrade socks
 2019-06-14 20:50:05 -04:00
deathride58 b1f1b2a57d Merge pull request #8609 from Poojawa/simple_mob_nomming-I-guess 
Client check to possibly fix #8542
 2019-06-14 20:49:28 -04:00
Poojawa d8dbad6e2e Digitigrade socks 2019-06-10 04:47:07 -05:00
Poojawa 17629d4feb client check I guess 2019-06-10 03:28:56 -05:00
Poojawa 3f1b7e4dd6 Pacifists can nom things now, but not feed to others 2019-06-09 02:23:53 -05:00
kevinz000 ec9ae5348f Merge remote-tracking branch 'origin/master' into kevinz000-patch-48 2019-06-08 19:10:59 -07:00
kevinz000 1a07f304c9 Update examine.dm 2019-06-08 17:32:36 -07:00
kevinz000 5cf0a9e67f Update carbon_defense.dm 2019-06-08 17:30:50 -07:00
Thalpy 628482e53b Merge branch 'master' into FriendlyEmpathy 2019-06-08 23:45:37 +01:00
kevinz000 1488af1a52 Merge pull request #8554 from Ghommie/Ghommie-cit33 
Adds AI core screen selection to character preferences and turns icon selection menu into a radial.
 2019-06-08 01:24:59 -07:00
kevinz000 ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29 
Moves traits to datums and turn the accessors into defines
 2019-06-08 01:22:16 -07:00
kevinz000 9edac9fc6c Merge pull request #8540 from BurgerLUA/assssssssssssssssssssssss 
Rebalanced Ass Slapping
 2019-06-08 01:17:04 -07:00
kevinz000 61d0ac9993 Merge pull request #8476 from Trilbyspaceclone/patch-157 
Tweaks/Buffs hierophant
 2019-06-08 01:05:28 -07: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
Trilbyspaceclone 79a456a0ac Update carbon_defense.dm 2019-06-07 18:29:42 -04:00
deathride58 aa53cc9ea9 Merge branch 'master' into fuckatmos 2019-06-07 04:38:47 -04:00
Ghommie 455332a717 movin back to the core when selecting a new display. 2019-06-07 04:20:15 +02:00
Ghommie 0b53df47de Enough clowning around. 2019-06-07 03:22:26 +02:00
Ghommie d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Ghommie 44358e054a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit29 2019-06-06 15:24:31 +02:00
Ghommie 0e630680ba forgot to pull from upstream. One second. 2019-06-06 15:20:27 +02:00
BurgerLua 8778349821 added 2019-06-05 11:43:28 -07: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
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
Fermi 1a73cf6efe This is why you compile test. 2019-06-02 21:09:31 +01:00
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
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
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
deathride58 375965d731 Item stripping no longer gets interrupted by changes in your actively held item 2019-05-26 16:22:15 -04:00