shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,929 Commits 5 Branches 0 Tags
f0935a784d57ca6b93f5a73083c424ffb7e3cdcf
Commit Graph

22942 Commits

Author SHA1 Message Date
Timothy Teakettle
f0935a784d two missing traits woops 2020-07-07 23:24:25 +01:00
Timothy Teakettle
e07909ebe2 does it in a far superior way 2020-07-07 23:12:36 +01:00
timothyteakettle
ab5795b3d3 Update pet_carrier.dm 2020-07-07 03:03:09 +01:00
timothyteakettle
d3448e04c9 fixes pet carrier edgecase 2020-07-04 03:00:35 +01:00
timothyteakettle
05fb7a67fc Merge branch 'tray-and-jar' of https://github.com/timothyteakettle/Citadel-Station-13 into tray-and-jar 2020-07-03 03:46:12 +01:00
timothyteakettle
1316f51a03 better resist and air 2020-07-03 03:46:08 +01:00
Timothy Teakettle
15e137dd18 Merge branch 'master' into tray-and-jar 2020-07-01 22:06:17 +01:00
Timothy Teakettle
8a0ab009dd give trays better capacity 2020-07-01 22:05:14 +01:00
Lin
fa1e92d588 Merge pull request #12656 from Ghommie/Ghommie-cit826 
Fixing two handed items and etcetera.
 2020-07-01 14:30:16 -05:00
Ghom
aaffe3ec12 Merge pull request #12647 from zeroisthebiggay/fuckfuckfuckfuck 
attempts to port Wizard Gamemode now ends when all wizards and wizard apprentices are dead #47514
 2020-07-01 19:46:16 +02:00
Ghom
8de00e80dd Update bag_of_holding.dm 2020-07-01 15:04:51 +02:00
silicons
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
Ghommie
cd1c5511a4 Fixing two handed items and etcetera. 2020-06-30 16:24:04 +02:00
silicons
837a77585c Update bag_of_holding.dm 2020-06-30 00:41:09 -07:00
timothyteakettle
1748088d42 small sprite improvement 2020-06-30 00:56:54 +01:00
timothyteakettle
b36ce5ee5f starts locked so it doesnt look ass 2020-06-30 00:47:38 +01:00
timothyteakettle
10a0e1b688 stick it on the right node 2020-06-30 00:46:27 +01:00
timothyteakettle
bbd9d3c61f better air 2020-06-30 00:38:33 +01:00
zerothebigboy
40c515b383 i hope this works 2020-06-29 19:13:26 -04:00
Timothy Teakettle
0e57e0dd7a atmos 2020-06-30 00:09:14 +01: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
Ghom
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
Timothy Teakettle
3eb5901a57 air is good 2020-06-29 22:56:25 +01:00
silicons
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
silicons
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
silicons
26fee48cec Merge pull request #12645 from Ghommie/Ghommie-cit825 
More and more fixes.
 2020-06-29 14:18:10 -07:00
Putnam3145
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
Putnam3145
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
Ghom
b280c0f550 Merge pull request #12622 from timothyteakettle/grammar-fixes 
big batch of spelling/grammar corrections
 2020-06-29 21:13:06 +02:00
Lin
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
Lin
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
Ghom
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
Ghom
8cc7b4fea0 Merge pull request #12643 from YakumoChen/master 
Minor fix
 2020-06-29 19:25:34 +02:00
Ghommie
0779dd560e More and more fixes. 2020-06-29 18:52:37 +02:00
Timothy Teakettle
70a2238f04 more pet carrier changes 2020-06-29 17:43:16 +01:00
Ghom
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
Timothy Teakettle
9d134f4fc9 blood fix 2020-06-29 16:34:55 +01:00
YakumoChen
3b802ac062 actually stocks the new clothing 2020-06-29 13:38:36 +00:00
silicons
6265cb190b Update bindings_client.dm 2020-06-29 05:04:28 -07:00
silicons
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
timothyteakettle
2e4c5e322d tray and jar 2020-06-29 02:49:31 +01:00
silicons
9b7690d90c Merge pull request #12633 from Ghommie/Ghommie-cit824 
Few issues, solved.
 2020-06-28 12:53:54 -07:00
silicons
abbbda15ef Merge pull request #12637 from timothyteakettle/fixes-my-dumb-mistakes 
fixes slime blood colour
 2020-06-28 12:53:36 -07:00
Lin
f1aedce87b Merge pull request #12621 from Citadel-Station-13/silicons-patch-6 
fixes a few things with the new Life()
 2020-06-28 13:36:55 -05:00
Timothy Teakettle
d6cfd957ad fix shoes 2020-06-28 17:26:50 +01:00
Timothy Teakettle
ae49152e10 fixes my stupid mistake 2020-06-28 17:05:30 +01:00
Ghommie
65ffadaa18 Few issues, solved. 2020-06-28 04:51:02 +02:00