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

35142 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
silicons
9828d6fe85 Merge pull request #12700 from KeRSedChaplain/POSTRATVAR 
Post This Ratvar, OR how I regained my contributor role in one simple step, OR how I buffed clock cult unknowingly.
 2020-07-08 22:51:36 -07:00
Changelogs
d79e1cdb9d Automatic changelog compile [ci skip] 2020-07-09 00:10:33 +00:00
CitadelStationBot
ba9a6cbbf3 Automatic changelog generation for PR #12648 [ci skip] 2020-07-08 05:10:48 -05:00
silicons
6d1ca993f6 Merge pull request #12648 from timothyteakettle/tray-and-jar 
bluespace tray + bluespace jar
 2020-07-08 03:10:44 -07:00
Changelogs
bfa54f7e23 Automatic changelog compile [ci skip] 2020-07-08 00:09:46 +00:00
Keate Senior
150a31a584 new and improved, less jarring poster 
as it says on the tin, makes the text static on the sprite
 2020-07-07 19:56:46 -04:00
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
Lin
33f56fd168 Merge pull request #12694 from Ghommie/Ghommie-cit833 
mowing down experimental cloner copypasta.
 2020-07-07 13:23:25 -05:00
timothyteakettle
8eda04bc60 Merge branch 'tray-and-jar' of https://github.com/timothyteakettle/Citadel-Station-13 into tray-and-jar 2020-07-07 03:03:32 +01:00
timothyteakettle
ab5795b3d3 Update pet_carrier.dm 2020-07-07 03:03:09 +01: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
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
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
Ghommie
e12c3382de undefined variable. 2020-07-05 03:48:41 +02:00
Ghommie
562b57095d mowing down the experimental cloner copypasta. 2020-07-05 03:04:53 +02: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
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