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

22963 Commits

Author SHA1 Message Date
silicons
94b001ad6b Merge pull request #12685 from Citadel-Station-13/Ghommie-patch-1 
Silences the skill panel check_rights() call.
 2020-07-04 00:10:29 -07:00
BlackMajor
7c21f7bd4e [s] Don't give these to your kids for christmas 
Someone did a fucky wucky.
 2020-07-04 17:17:34 +12:00
Ghom
22d0e7ee0b Merge pull request #12672 from Sonic121x/patch-3 
add crushed sodacan and some digitigrade uniform sprite.
 2020-07-03 19:59:36 +02:00
Ghom
ea8662572b Silences the skill panel check_rights() call. 2020-07-03 17:37:03 +02:00
silicons
824d11b085 death to lists 2020-07-03 02:34:59 -07:00
silicons
d85edbf8fb ok 2020-07-03 02:15:06 -07:00
Ghom
50716ee393 Merge pull request #12668 from Arturlang/strip_menu_helmet 
Hardsuit strip menu helmet toggle
 2020-07-03 00:41:03 +02:00
Ghom
7370b7c687 Merge pull request #12671 from Sonic121x/patch-2 
Fix Pilltype button (for real this time).also fix technode icon missing.
 2020-07-03 00:26:28 +02:00
Ghom
e586d03e0a text spans. 2020-07-02 19:47:05 +02:00
Ghom
c919075aca Thanks Timothy. 2020-07-02 19:46:10 +02:00
Ghom
4354b0bf6f Actually fixing a dum dum feature. 2020-07-02 19:26:52 +02:00
Sonic121x
4ca695020a add adigitigrade version of captain's female formal outfit. 2020-07-02 23:21:31 +08:00
Sonic121x
6240ade87d Add digitigrade version of cmoturtleneck 2020-07-02 23:20:01 +08:00
Sonic121x
4e2b05a22a Fix the missing Technode icon 2020-07-02 22:33:35 +08:00
Sonic121x
ea7fed0c8e givme that pilltype button 
Fix pill type button
 2020-07-02 22:30:28 +08:00
Ghom
ef60068f1c Merge pull request #12666 from timothyteakettle/more-blood-fixes 
More blood fixes
 2020-07-02 14:52:39 +02:00
silicons
5f11612078 Update preferences_savefile.dm 2020-07-02 03:00:35 -07:00
silicons
bb67ab5ddd Merge pull request #12664 from Ghommie/Ghommie-cit827 
Porting a few asset cache related PRs.
 2020-07-02 01:49:27 -07:00
silicons
9ae040b904 Merge pull request #12657 from bunny232/witchhunterhat 
Witch hunter hat tweak.
 2020-07-02 01:48:19 -07:00
silicons
7b99e69583 Merge pull request #12661 from LetterN/cool-fucked-up-another-master-branch-fixes-assetthing 
Fix broken UI icons
 2020-07-02 01:46:14 -07:00
silicons
3f1119fcdb Merge pull request #12630 from Ghommie/Ghommie-cit822 
You can't (un)equip garments on/from obscured inventory slots anymore.
 2020-07-02 01:44:59 -07:00
silicons
cbad654371 Merge pull request #12632 from Ghommie/Ghommie-cit823 
Ups melee stam cost multiplier from 0.8 back to 1, made stam cost for throwing mobs scale with mob_size
 2020-07-02 01:44:09 -07:00
silicons
9abeb9c07e Merge pull request #12631 from Citadel-Station-13/Ghommie-patch-1 
Nerfing shaft miners' paycheck.
 2020-07-02 01:43:53 -07:00
Artur
582d672109 Hardsuit strip menu helmet toggle 2020-07-02 01:31:15 +03:00
Timothy Teakettle
84d60a455e wow its still spelt wrong 2020-07-01 21:53:34 +01:00
Timothy Teakettle
1cb1b4d7e6 oh my god its not even defined right 2020-07-01 21:29:10 +01:00
Timothy Teakettle
311e149562 fix bloodpacks 2020-07-01 21:00:01 +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
Ghommie
f7de8034a1 Put an end to the null stack traces from icon2html's register_asset. 2020-07-01 19:26:09 +02:00
Ghommie
94f7dae62e Porting "Fix asset cache verification" and other tiny bits. 2020-07-01 16:24:12 +02:00
Ghom
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
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
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
silicons
837a77585c Update bag_of_holding.dm 2020-06-30 00:41:09 -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
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
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