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

856 Commits

Author SHA1 Message Date
kevinz000 26c195dec8 Merge pull request #8971 from Linzolle/toxiclover 
makes slimepeople like toxic food
 2019-07-29 04:39:12 -07:00
kevinz000 11628431b4 Merge pull request #8976 from Ghommie/Ghommie-cit157 
Fixes combatmode disarm pushing people on inaccessible tables and more.
 2019-07-29 04:38:14 -07:00
Ghommie 1adaf01839 Fixes combatmode disarm pushing people on inaccessible tables and more. 2019-07-26 22:55:46 +02:00
Linzolle 99720f12e5 makes slimepeople like toxic food 2019-07-25 20:55:18 -05:00
Sishen 1a92134ad3 b 2019-07-25 21:43:02 -04:00
kevinz000 0f58585e5d Merge pull request #8939 from Ghommie/Ghommie-cit154 
Fixing towels and improving them.
 2019-07-23 20:34:09 -07:00
kevinz000 1028fe458a Merge pull request #8909 from Ghommie/Ghommie-cit143 
Fixes named arg Knockdown calls.
 2019-07-22 20:17:30 -07:00
Ghommie e8584720b3 Fixes suit worn overlay for towels. 2019-07-21 11:18:38 +02:00
kevinz000 c657244d9b Merge pull request #8920 from Ghommie/Ghommie-cit149 
Towels.
 2019-07-20 12:06:54 -07:00
Ghommie 4e6554076c item flags, not clothing flags. 2019-07-18 00:16:14 +02:00
Ghommie 589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
Ghommie b6f10c96a7 Modularity was a mistake. 2019-07-16 21:05:12 +02:00
Carlen White bb81a0850b Merge branch 'master' into batch-check-injuries 
# Conflicts:
#	code/modules/mob/living/carbon/human/human_defense.dm
 2019-07-14 20:49:52 -04:00
Carlen White 3504f15c01 Travis Bump 2019-07-14 20:29:23 -04:00
kevinz000 2ec5d3f02e Merge pull request #8886 from Ghommie/Ghommie-cit137 
Ports "Refactors NODROP flag into TRAIT_NODROP"
 2019-07-14 14:05:20 -07:00
kevinz000 b153294a24 Merge pull request #8857 from Ghommie/Ghoomie-cit127 
Refactoring underwear to allow custom color preferences.
 2019-07-14 03:38:45 -07:00
Ghommie 129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
kevinz000 1eaddd3ebf Merge pull request #8853 from Ghommie/Ghommie-cit125 
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
 2019-07-12 07:34:19 -07:00
Ghommie 143410c176 Blame Poojawa for the issue. 2019-07-11 07:39:29 +02:00
Ghommie ba7c24a0ec Refactoring underwear to allow custom color preferences. 2019-07-09 23:25:54 +02:00
Ghommie 490ae9daf2 Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant" 2019-07-09 07:58:22 +02:00
deathride58 42cee552fe Merge pull request #8709 from Trilbyspaceclone/Fel_port_1 
Ports "Fixes every issue in the slimes milestone. #44450"
 2019-07-08 18:10:46 -04:00
kevinz000 bce4ce31ab Merge pull request #8778 from Ghommie/Ghommie-cit97 
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
 2019-07-03 13:47:04 -07:00
kevinz000 75f1dca544 Merge pull request #8773 from Sishen1542/podgang 
Podweak now have all customization options.
 2019-07-03 13:46:08 -07:00
deathride58 4b83110db7 fuck copypasta; Fixes master not compiling. Stop blindly copy-pasting shit from other codebases without even so much as making sure it compiles. Holy fuck. 2019-06-30 05:02:51 -04:00
kevinz000 09c8a45fe2 Merge pull request #8770 from Arturlang/Carp_Deflecting 
Carp now deflects the bullets instead of making them dissapear.
 2019-06-29 20:08:47 -07:00
Ghommie ad3b709c40 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit97 2019-06-29 06:39:21 +02:00
Ghommie 0371a5513a Porting in 18 new drinks from the TGstation, plus tweaking and fixes. 2019-06-29 06:03:57 +02:00
kevinz000 c495a2aa47 Merge pull request #8739 from Sishen1542/makinggolemsgreatagain 
Ports additional tg golem types! Leather, cardboard, bronze & bone. Ports bone hurting juice as well!
 2019-06-28 20:32:15 -07:00
Sishen 1459ada045 adds customization options for podweak 2019-06-28 10:22:09 -04:00
Arturlang 442c21fdba For the actual deflecting! 2019-06-28 11:41:01 +03:00
kevinz000 05f304f9c0 Merge pull request #8692 from Ghommie/Ghommie-cit69 
[s] Ports "Fixes PDA TK exploits" and "Fixes pride mirror exploit"
 2019-06-23 06:56:17 -07:00
BlackMajor d6a31efaa2 Merge pull request #8684 from Citadel-Station-13/kevinz000-patch-5 
fixes piggybacking being delayless
 2019-06-24 01:31:40 +12:00
kevinz000 6f2fbd8577 Merge pull request #8677 from Trilbyspaceclone/patch-182 
buffs speedy step quirk by a half
 2019-06-23 06:20:58 -07:00
Sishen a2a440a92c golem gang golem gang golem gang golem gang 2019-06-23 04:27:50 -04:00
Thalpy 498c35b733 Fixes empathy antag check exploit. (#8690) 
* Fixes exploit

* Wrong way round..!

* Should be okay for antags now.

* Fixed githuba being dumb
 2019-06-21 19:33:34 -07:00
TrilbySpaseClone 771ac9724e ports Fel connet 
Shamelessly stealing content
 2019-06-21 04:39:10 -04:00
Ghommie 55795355fd Ports "[s] Fixes pride mirror exploit" 2019-06-19 03:31:36 +02:00
kevinz000 634f11d60d Update human.dm 2019-06-18 02:34:05 -07:00
Trilbyspaceclone 4e1ac41393 Update species.dm 2019-06-17 14:41:06 -04:00
Poojawa bf991cd2da Underwear overlays Gentials, can toggle each seperately (#8602) 
* Gentials layered under underclothes

* screm
 2019-06-17 11:20:25 -07:00
deathride58 d0bc89353c Merge pull request #8597 from Citadel-Station-13/kevinz000-patch-48 
pacifists can now let people piggyback (grab_passive). admins now can proccall buckle_mob on humans in a way that bypasses piggyback code block
 2019-06-16 22:50:15 -04:00
Poojawa d8dbad6e2e Digitigrade socks 2019-06-10 04:47:07 -05:00
kevinz000 b534f57374 Update human.dm 2019-06-08 23:44:27 -07:00
kevinz000 1cf5e24b4d Update human.dm 2019-06-08 23:23:21 -07:00
kevinz000 1a07f304c9 Update examine.dm 2019-06-08 17:32:36 -07:00
Thalpy 628482e53b Merge branch 'master' into FriendlyEmpathy 2019-06-08 23:45:37 +01: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
deathride58 aa53cc9ea9 Merge branch 'master' into fuckatmos 2019-06-07 04:38:47 -04:00