shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,962 Commits 5 Branches 0 Tags
cdebccf38fde1afeb384ecbf002193561fa4a982
Commit Graph
34962 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
GhomandGitHub 8de00e80dd Update bag_of_holding.dm 2020-07-01 15:04:51 +02:00
Letter N b35e3f2b93 fix: R&D Console, Vending, and chem master 2020-07-01 19:07:03 +08:00
siliconsGitHubGhom
 		8f30d7f4d1 Update code/datums/components/storage/concrete/bag_of_holding.dm 
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-06-30 20:27:30 -07:00
silicons 434a53340b groan 2020-06-30 20:21:59 -07:00
bunny232 afe9b2dfbd Update holy_weapons.dm 2020-06-30 11:15:40 -04:00
Ghommie cd1c5511a4 Fixing two handed items and etcetera. 2020-06-30 16:24:04 +02:00
siliconsandGitHub 837a77585c Update bag_of_holding.dm 2020-06-30 00:41:09 -07:00
Changelogs 28fd6304e2 Automatic changelog compile [ci skip] 2020-06-30 00:08:43 +00:00
CitadelStationBot 005e548288 Automatic changelog generation for PR #12288 [ci skip] 2020-06-29 19:05:08 -05:00
Putnam3145andGitHub 062768c273 Merge pull request #12288 from Ghommie/Ghommie-cit765 
Porting the twohanded component.
 2020-06-29 17:05:04 -07:00
zerothebigboy 40c515b383 i hope this works 2020-06-29 19:13:26 -04:00
Ghommie 9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
GhomandGitHub 3c4a288ecc Merge pull request #12625 from Citadel-Station-13/silicons-patch-9 
maybe fixes edge cases where half the server has their client input system broken
 2020-06-30 00:21:42 +02:00
CitadelStationBot 491b225631 Automatic changelog generation for PR #12629 [ci skip] 2020-06-29 16:51:02 -05:00
siliconsandGitHub 771714cc78 Merge pull request #12629 from kappa-sama/patch-28 
https://github.com/tgstation/tgstation/pull/51886 by Fikou
 2020-06-29 14:50:59 -07:00
CitadelStationBot 9f35c8475f Automatic changelog generation for PR #12598 [ci skip] 2020-06-29 16:47:28 -05:00
siliconsandGitHub 52953cae4d Merge pull request #12598 from timothyteakettle/improves-char-customization 
speech options on char customization, small skeleton changes
 2020-06-29 14:47:25 -07:00
Timothy Teakettle a7c905dfe9 handles skeletons better 2020-06-29 22:37:04 +01:00
siliconsandGitHub bfbe472114 Merge pull request #12587 from Ragolution/peachesnz 
Peachening 2 Even with Master Boogaloo
 2020-06-29 14:22:32 -07:00
CitadelStationBot 2d6035c84f Automatic changelog generation for PR #12645 [ci skip] 2020-06-29 16:18:15 -05:00
siliconsandGitHub 26fee48cec Merge pull request #12645 from Ghommie/Ghommie-cit825 
More and more fixes.
 2020-06-29 14:18:10 -07:00
CitadelStationBot fdd8fec4ef Automatic changelog generation for PR #12390 [ci skip] 2020-06-29 14:44:36 -05:00
Putnam3145andGitHub ee2fedd4af Merge pull request #12390 from Ghommie/Ghommie-cit800 
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
 2020-06-29 12:44:33 -07:00
CitadelStationBot 62b4c54064 Automatic changelog generation for PR #12416 [ci skip] 2020-06-29 14:44:11 -05:00
Putnam3145andGitHub 42809d8b0c Merge pull request #12416 from Ghommie/Ghommie-cit792 
TGUI-next Check Skills menu.
 2020-06-29 12:44:08 -07:00
Ghommie fa25858fd7 Fix. :) 2020-06-29 21:31:24 +02:00
CitadelStationBot 9930244aae Automatic changelog generation for PR #12622 [ci skip] 2020-06-29 14:13:09 -05:00
GhomandGitHub b280c0f550 Merge pull request #12622 from timothyteakettle/grammar-fixes 
big batch of spelling/grammar corrections
 2020-06-29 21:13:06 +02:00
LinandGitHub 74a3f05c2a Merge pull request #12608 from Citadel-Station-13/silicons-patch-5 
maybe allows players to use !notify
 2020-06-29 13:14:43 -05:00
CitadelStationBot 4484b1b7d6 Automatic changelog generation for PR #12605 [ci skip] 2020-06-29 13:12:29 -05:00
LinandGitHub 0a59453ce6 Merge pull request #12605 from Citadel-Station-13/silicons-patch-4 
adds line numbers to config errors
 2020-06-29 13:12:25 -05:00
CitadelStationBot 29e4f1ee09 Automatic changelog generation for PR #12595 [ci skip] 2020-06-29 13:11:42 -05:00
LinandGitHub 1966c6daca Merge pull request #12595 from silicons/squish 
*squish
 2020-06-29 13:11:38 -05:00
CitadelStationBot a3f275a804 Automatic changelog generation for PR #12623 [ci skip] 2020-06-29 12:30:52 -05:00
GhomandGitHub a749dab2b2 Merge pull request #12623 from Citadel-Station-13/silicons-patch-7 
i would appreciate it if outgoing mentorpms didn't sear my eyes out of my head
 2020-06-29 19:30:49 +02:00
CitadelStationBot 7c1328a4ca Automatic changelog generation for PR #12626 [ci skip] 2020-06-29 12:27:10 -05:00
GhomandGitHub a8046d072a Merge pull request #12626 from Citadel-Station-13/silicons-patch-10 
prevents duplicate chatboxes from typing indicators by inserting 28 macros into the basic macro sets that just trigger a nonsensical verb that does nothing
 2020-06-29 19:27:07 +02:00
GhomandGitHub 8cc7b4fea0 Merge pull request #12643 from YakumoChen/master 
Minor fix
 2020-06-29 19:25:34 +02:00
Ghommie bda7eada3d Icons for later. 2020-06-29 19:23:52 +02:00
Ghommie 0779dd560e More and more fixes. 2020-06-29 18:52:37 +02:00
GhomandGitHub 58e606b4f2 Merge pull request #12640 from Citadel-Station-13/silicons-patch-6 
fixes independent bindings not registering keyups
 2020-06-29 18:34:07 +02:00
CitadelStationBot 5967a552bf Automatic changelog generation for PR #12644 [ci skip] 2020-06-29 11:29:11 -05:00
GhomandGitHub 3264ece150 Merge pull request #12644 from timothyteakettle/more-blood-fixes 
simple mob blood is no longer white
 2020-06-29 18:29:07 +02:00
Timothy Teakettle 9d134f4fc9 blood fix 2020-06-29 16:34:55 +01:00
YakumoChenandGitHub 3b802ac062 actually stocks the new clothing 2020-06-29 13:38:36 +00:00
YakumoChenandGitHub 2f3f823997 Merge pull request #2 from Citadel-Station-13/master 
k
 2020-06-29 09:37:22 -04:00
siliconsandGitHub 6265cb190b Update bindings_client.dm 2020-06-29 05:04:28 -07:00
siliconsandGitHub 9697e1b946 Update bindings_client.dm 2020-06-29 04:42:58 -07:00
Ghommie 5307676317 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792 2020-06-29 06:55:35 +02:00
Changelogs 53a9dd560b Automatic changelog compile [ci skip] 2020-06-29 00:09:07 +00:00