shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,699 Commits 5 Branches 0 Tags
49941ea2e675ee2a9ce54e4fa4e4159a48ca89e1
Commit Graph

15433 Commits

Author SHA1 Message Date
silicons
1b97c9954f Merge pull request #12712 from TheObserver-sys/Imadeanoops 
Hey, what if you could actually make the donuts?
 2020-07-08 22:54:53 -07:00
silicons
be49be022b Merge pull request #12710 from Sneakyrat6/hoodieFix 
Fixes hair falling out of hoodies
 2020-07-08 22:52:20 -07:00
Putnam
a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07:00
HeroWithYay
bed6f4ac91 Adds "Telecrystal Dust" a useless, red waste of syndicate resources that can be obtained by grinding raw telecrystals in a blender. 
Also makes it so you can sell raw telecrystals at cargo 1000 points each which is also a considerable waste of TC.
 2020-07-09 16:32:14 +12:00
DeltaFire
7aa160029f changes sent's healing a bit 
No more killing augmented followers, it heals them aswell. Ratvar is a machine god afterall.
 2020-07-08 23:45:35 +02:00
silicons
6d1ca993f6 Merge pull request #12648 from timothyteakettle/tray-and-jar 
bluespace tray + bluespace jar
 2020-07-08 03:10:44 -07:00
Letter N
2d447019c5 woops 2020-07-08 16:59:22 +08:00
Letter N
05684e7196 no config filter thing yet, but the code for it is "ready" 2020-07-08 16:36:58 +08:00
Letter N
f757e54db9 muh immursion 2020-07-08 15:59:44 +08:00
Letter N
45a3c47608 removes fun 2020-07-08 15:10:49 +08:00
silicons
6cbab55ef8 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-07 21:07:58 -07:00
silicons
22c3d9fe3e ok 2020-07-07 21:07:13 -07:00
silicons
bd8cc4791f whew 2020-07-07 21:02:23 -07:00
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Sneakyrat6
3569e8da1e Fixes hair falling out of hoodies 2020-07-07 22:31:00 -05:00
Cirno
37f4022bfc Changed slime core to slime nucleus 2020-07-07 13:35:30 -03:00
Artur
280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
Cirno
fe45971e43 Added a slime core in the place of brains for jelly people 2020-07-07 12:05:06 -03:00
silicons
6634e43be4 fix 2020-07-07 07:41:33 -07:00
silicons
cee15792b7 ok 2020-07-07 07:25:10 -07:00
silicons
9910867345 Update SDQL_2.dm 2020-07-07 06:19:17 -07:00
silicons
0c0bf46f7f Merge pull request #12696 from Chiirno/emichemmastertweak 
increased the amount of stuff the chem master can dispense from 10 to 20
 2020-07-06 17:34:50 -07:00
silicons
4fa7a461ef Merge pull request #12684 from Owai-Seek/foodport-p1-7/1/20 
Food ports, tweaks, and fixes.
 2020-07-06 17:19:07 -07:00
Ghom
c2746c723e Merge pull request #12698 from Owai-Seek/beebalmfix-7-4-20 
Fixes Bee Balm
 2020-07-07 00:22:33 +02:00
Ghom
e7d19f512e Merge pull request #12397 from Rohesie/cooldown 
Ports TGMC timer cooldowns
 2020-07-06 22:54:58 +02:00
Ghom
bc5e7d1513 Merge pull request #12688 from Weblure/small-strides-fix 
[READY] Fixes Small Strides Formula
 2020-07-06 22:48:09 +02:00
Artur
8cbe248465 Updates paper to TG 2020-07-06 13:09:02 +03:00
Artur
3154e8c596 Updates components to TG and fixes can 2020-07-06 10:58:48 +03:00
Winter Flare
482785d922 Fixes Bee Balm 2020-07-05 19:14:03 -04:00
Cirno
45d97b2251 increased the amount of stuff the chem master can dispense from 10 to 20 2020-07-05 11:17:37 -03:00
Lin
4d29aa9148 Merge pull request #12650 from Citadel-Station-13/silicons-patch-7 
adds a keybind to toggle active blocking instead of only press-hold
 2020-07-04 14:13:18 -05:00
Lin
d04b335d1a Merge pull request #12652 from silicons/cool 
cybernetic implant shields will now automatically extend and be used to block if the user has no item to block with
 2020-07-04 14:12:43 -05:00
Cirno
c2ba973c88 Merge remote-tracking branch 'origin' into emi 2020-07-04 15:59:47 -03:00
Cirno
020da9fa07 i hope this works 2020-07-04 15:47:38 -03:00
Ghom
871993ce14 Merge pull request #12593 from silicons/autobunker 
adds verb to auto bunker override on linked servers
 2020-07-04 18:36:59 +02:00
Ghom
17ee8c5960 Merge pull request #12660 from YakumoChen/master 
Reverts improv small arms, makes guncrafting easier and faster
 2020-07-04 18:35:22 +02:00
Ghom
c5b94a4d00 Update code/modules/antagonists/revenant/revenant.dm 2020-07-04 18:30:01 +02:00
silicons
ca6fc8d813 Update revenant.dm 2020-07-04 06:48:00 -07:00
Artur
a304ed7f49 Canister and paper updates 
should fix papah exploits, though some runtiming is occuring
 2020-07-04 16:14:42 +03:00
silicons
03aa8fcc2b Update autobunker.dm 2020-07-04 00:14:32 -07:00
silicons
ae5fb008c7 Update client_defines.dm 2020-07-04 00:13:34 -07:00
silicons
c10350f10e Merge pull request #12677 from Ghommie/Ghommie-cit830 
Fixes items' skills list keys missing associated traits and improves modulability a little.
 2020-07-04 00:12:37 -07:00
silicons
dbf88a1408 Merge pull request #12676 from Ghommie/Ghommie-cit829 
Improvements to the recent clothing menu toggle hardsuit helmet feature.
 2020-07-04 00:12:29 -07:00
silicons
a61e22de71 Merge pull request #12675 from Ghommie/Ghommie-cit828 
Fixing (un)equip penalties from obscured inv slots.
 2020-07-04 00:12:04 -07:00
silicons
103b8b7600 Merge pull request #12662 from kappa-sama/patch-29 
makes bows and arrows more feasible improv weapons
 2020-07-04 00:11:45 -07:00
silicons
e9c4ac8c3c Merge pull request #12658 from timothyteakettle/okay-its-bad 
slightly tweaks the cooking oil damage formula
 2020-07-04 00:11:09 -07:00
silicons
f6be57269d Merge pull request #12687 from Ghommie/Ghommie-cit832 
Fixing obscured inventory slots unequip block, for real.
 2020-07-04 00:10:49 -07:00
Weblure
832bea9ca5 Fixed sentence formatting, removed Skyrat comments 2020-07-03 21:55:42 -07:00
Weblure
c9ec6d4a03 Fixes a button, rewords text to be clearer 2020-07-03 21:51:22 -07: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