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

35105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
silicons cee15792b7 ok 2020-07-07 07:25:10 -07:00
CitadelStationBot 1d791c4808 Automatic changelog generation for PR #12702 [ci skip] 2020-07-06 19:38:27 -05:00
silicons 5b09b68c6d Merge pull request #12702 from DeltaFire15/actually-kill-once 
[s] Fixes the 'Kill once' objective
 2020-07-06 17:38:24 -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
CitadelStationBot 94825ec073 Automatic changelog generation for PR #12697 [ci skip] 2020-07-06 19:34:40 -05:00
silicons fb23905f42 Merge pull request #12697 from EmeraldSundisk/cogmedsci 
Updates Cog's chemistry lab.
 2020-07-06 17:34:36 -07:00
CitadelStationBot 00f1818dbc Automatic changelog generation for PR #12684 [ci skip] 2020-07-06 19:19:10 -05: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
Changelogs b3b04f02e3 Automatic changelog compile [ci skip] 2020-07-07 00:09:53 +00:00
CitadelStationBot 0432eaf6d9 Automatic changelog generation for PR #12698 [ci skip] 2020-07-06 17:22:37 -05: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
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
Ghom e7d19f512e Merge pull request #12397 from Rohesie/cooldown 
Ports TGMC timer cooldowns
 2020-07-06 22:54:58 +02:00
DeltaFire 18d8b5b0a8 Merge remote-tracking branch 'upstream/master' 2020-07-06 22:54:04 +02:00
CitadelStationBot d6364259d5 Automatic changelog generation for PR #12688 [ci skip] 2020-07-06 15:48:12 -05: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
CitadelStationBot 028f4d11e8 Automatic changelog generation for PR #12699 [ci skip] 2020-07-06 15:47:50 -05:00
Ghom af1f715b3e Merge pull request #12699 from KasparoVy/silverlwraps-fix 
Shifts South Dir of Silver LWraps Right 1px
 2020-07-06 22:47:48 +02:00
KasparoVy b41ed4c9f5 Shifts South Dir of Silver LWraps Right 1px 
Not sure when this happened.
 2020-07-05 21:28:57 -04:00
Winter Flare 482785d922 Fixes Bee Balm 2020-07-05 19:14:03 -04:00
EmeraldSundisk 672f86a318 Add files via upload 2020-07-05 09:39:53 -07:00
EmeraldSundisk 75b2a7dad5 Update CogStation.dmm 2020-07-05 09:18:26 -07: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
EmeraldSundisk d9f269280b Update CogStation.dmm 2020-07-04 23:45:08 -07:00
EmeraldSundisk 45a14f16d4 Revert "?" 
This reverts commit c6b5bac0d8.
 2020-07-04 21:39:23 -07:00
EmeraldSundisk c6b5bac0d8 ? 2020-07-04 21:33:29 -07:00
EmeraldSundisk 99168e3ed0 Merge pull request #47 from Citadel-Station-13/master 
7/4
 2020-07-04 17:19:06 -07:00
Changelogs 8753680cf9 Automatic changelog compile [ci skip] 2020-07-05 00:10:19 +00:00
CitadelStationBot 4f5d262ee3 Automatic changelog generation for PR #12651 [ci skip] 2020-07-04 14:16:09 -05:00
Lin 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
CitadelStationBot 3200bbb6db Automatic changelog generation for PR #12650 [ci skip] 2020-07-04 14:13:21 -05: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
CitadelStationBot 27d4bcab18 Automatic changelog generation for PR #12652 [ci skip] 2020-07-04 14:12:46 -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
CitadelStationBot 21209ada03 Automatic changelog generation for PR #12593 [ci skip] 2020-07-04 11:37:02 -05: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
CitadelStationBot c5a88f1cb7 Automatic changelog generation for PR #12660 [ci skip] 2020-07-04 11:35:25 -05: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 5864f7de95 Merge pull request #12691 from Citadel-Station-13/silicons-patch-16 
fixes revenants
 2020-07-04 18:30:14 +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
silicons 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
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
CitadelStationBot f3f9429257 Automatic changelog generation for PR #12677 [ci skip] 2020-07-04 02:12:40 -05: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
CitadelStationBot 671b955b4b Automatic changelog generation for PR #12662 [ci skip] 2020-07-04 02:11:48 -05:00