shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,604 Commits 5 Branches 0 Tags
1b99cb92017fc1f0daa6c204d0bb3d7b2ba51b35
Commit Graph
23376 Commits
Author SHA1 Message Date
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
siliconsandGitHub 9910867345 Update SDQL_2.dm 2020-07-07 06:19:17 -07:00
timothyteakettle ab5795b3d3 Update pet_carrier.dm 2020-07-07 03:03:09 +01:00
siliconsandGitHub 5b09b68c6d Merge pull request #12702 from DeltaFire15/actually-kill-once 
[s] Fixes the 'Kill once' objective
 2020-07-06 17:38:24 -07:00
siliconsandGitHub 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
siliconsandGitHub 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
GhomandGitHub c2746c723e Merge pull request #12698 from Owai-Seek/beebalmfix-7-4-20 
Fixes Bee Balm
 2020-07-07 00:22:33 +02:00
DeltaFire eeadc9a0e7 fixes the kill once objective 
the target being afk / disconnecting is now only accepted at roundend, and doesn't lead to it being regarded as permanently completed midround.
 2020-07-06 23:00:36 +02:00
GhomandGitHub e7d19f512e Merge pull request #12397 from Rohesie/cooldown 
Ports TGMC timer cooldowns
 2020-07-06 22:54:58 +02:00
GhomandGitHub bc5e7d1513 Merge pull request #12688 from Weblure/small-strides-fix 
[READY] Fixes Small Strides Formula
 2020-07-06 22:48:09 +02:00
Ghommie afb5b5237c linter & stuff. 2020-07-06 22:42:32 +02:00
Keate Senior 4ee72305d0 Post This Justiciar 
sprites and object
 2020-07-06 06:34:38 -04: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
Artur 7ebc785437 fIXES UPLINK 2020-07-05 21:52:24 +03: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
Ghommie 562b57095d mowing down the experimental cloner copypasta. 2020-07-05 03:04:53 +02:00
Winter Flare 767290d8e9 Trashbag Whitelist Update 
Trashbag can now hold:
All Organs
Most Shoes

Trashbags cannot hold:
Jackbooks
Workboots
Clown Shoes
Nuke Disk
Wallets (Nuke Disk Nesting)
Brains
 2020-07-04 21:03:31 -04:00
LinandGitHub 703d03453b Merge pull request #12651 from Citadel-Station-13/silicons-patch-9 
lowers shield blocking stamcost/second 3.5 to 2.5
 2020-07-04 14:16:06 -05:00
LinandGitHub 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
LinandGitHub 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
Ghommie 3ba077be71 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit833 2020-07-04 21:04:33 +02:00
Ghommie 780f30bd4d Fixing cloning 2020-07-04 21:01:44 +02:00
GhomandGitHub 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
GhomandGitHub 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
GhomandGitHub c5b94a4d00 Update code/modules/antagonists/revenant/revenant.dm 2020-07-04 18:30:01 +02:00
siliconsandGitHub 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
siliconsandGitHub bb065abab7 Merge pull request #12690 from BlackMajor/master 
[s] Inheritance is something often overlooked.
 2020-07-04 01:52:13 -07:00
BlackMajor afdf8c698a fuck 2020-07-04 19:30:20 +12:00
siliconsandGitHub 03aa8fcc2b Update autobunker.dm 2020-07-04 00:14:32 -07:00
siliconsandGitHub ae5fb008c7 Update client_defines.dm 2020-07-04 00:13:34 -07:00
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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
BlackMajorandGitHub 7c21f7bd4e [s] Don't give these to your kids for christmas 
Someone did a fucky wucky.
 2020-07-04 17:17:34 +12:00
WeblureandGitHub 832bea9ca5 Fixed sentence formatting, removed Skyrat comments 2020-07-03 21:55:42 -07:00
WeblureandGitHub c9ec6d4a03 Fixes a button, rewords text to be clearer 2020-07-03 21:51:22 -07:00
timothyteakettle d3448e04c9 fixes pet carrier edgecase 2020-07-04 03:00:35 +01:00
WeblureandGitHub bc76fa615d Fixed small strides formula 2020-07-03 17:05:56 -07:00
GhomandGitHub 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
Ghommie e3b1ca4942 Linter. 2020-07-03 19:57:38 +02:00