shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,415 Commits 5 Branches 0 Tags
95bf86f765bec7ab00b1eadbbd4e71c71c5fdedf
Commit Graph

40415 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fermi
95bf86f765 Hmm 2021-01-08 00:40:54 +00:00
Fermi
e78b6a7b04 Merge remote-tracking branch 'upstream/master' into Dispencer-UI-change 2021-01-08 00:29:05 +00:00
silicons
eeb4807d3f Merge pull request #13982 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/axios-0.21.1 
Bump axios from 0.19.2 to 0.21.1 in /tgui
 2021-01-07 17:22:52 -07:00
CitadelStationBot
f7f4656c64 Automatic changelog generation for PR #13980 [ci skip] 2021-01-07 18:22:45 -06:00
silicons
f06a7c1ec3 Merge pull request #13980 from MrJWhit/first-things-first 
Makes gas sensors fireproof
 2021-01-07 17:22:41 -07:00
CitadelStationBot
a342e099af Automatic changelog generation for PR #13983 [ci skip] 2021-01-07 18:22:31 -06:00
silicons
21101e62dd Merge pull request #13983 from shellspeed1/xenohybrid-stuff 
Adds some flavor stuff for the xenohybrid species tongue as well as wings. No longer includes language.
 2021-01-07 17:22:28 -07:00
DeltaFire
d100fe1d58 Merge pull request #13981 from MrJWhit/caution-sign 
Porting the ability to wear the caution sign (plus a random metastation fix)
 2021-01-07 20:17:03 +01:00
DeltaFire
51f8739ad8 Merge pull request #13984 from silicons/toner 
fixes removing toner from photocopiers (this is an untested fix but it probably works because it compiled)
 2021-01-07 06:31:58 +01:00
CitadelStationBot
7b3c21c072 Automatic changelog generation for PR #13978 [ci skip] 2021-01-06 23:22:09 -06:00
DeltaFire
3d09edfc4b Merge pull request #13978 from Citadel-Station-13/silicons-patch-3 
removes c4 mob gibbing
 2021-01-07 06:22:06 +01:00
DeltaFire
e1aae6445e Merge pull request #13989 from Citadel-Station-13/silicons-patch-4 
[s] thingy
 2021-01-07 04:11:23 +01:00
silicons
90826aeb28 Update robot_parts.dm 2021-01-06 19:39:28 -07:00
MrJWhit
8108109965 Fixes a mistake on metastation 2021-01-06 18:04:40 -05:00
shellspeed1
0144a06964 Removes language to be done later 2021-01-06 11:59:37 -08:00
MrJWhit
ba98a0aacd Update miscellaneous.dm 2021-01-06 14:42:00 -05:00
CitadelStationBot
03e8ca2e55 Automatic changelog generation for PR #13834 [ci skip] 2021-01-06 12:29:21 -06:00
DeltaFire
3f736aaa36 Merge pull request #13834 from zeroisthebiggay/pogbox 
ports the traitor assistant POGBOX that scales damage with tc from /TG/
 2021-01-06 19:29:17 +01:00
DeltaFire
8b876aa6e3 Merge pull request #13957 from Citadel-Station-13/silicons-patch-1 
[s] logging patch 36735734
 2021-01-06 19:23:09 +01:00
silicons
5964fd0390 fix 2021-01-06 02:12:37 -08:00
shellspeed1
98f8af853c Minor xenohybrid changeschanges 
Adds wings, xeno tongue, and makes xenomorphs speak xenohybrid by default
 2021-01-06 01:58:58 -08:00
MrJWhit
b9a2111a8d Fuck you travis what do you mean too many requests 2021-01-06 04:34:39 -05:00
dependabot[bot]
5e25fe4da2 Bump axios from 0.19.2 to 0.21.1 in /tgui 
Bumps [axios](https://github.com/axios/axios) from 0.19.2 to 0.21.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.19.2...v0.21.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-01-06 09:13:54 +00:00
MrJWhit
abffac67b2 Port'n 2021-01-06 03:16:08 -05:00
MrJWhit
1cf951c4d4 Update atmos_control.dm 2021-01-06 02:38:37 -05:00
CitadelStationBot
d7c950ab20 Automatic changelog generation for PR #13961 [ci skip] 2021-01-06 00:40:14 -06:00
silicons
e4e029a061 Merge pull request #13961 from MrJWhit/snipping-the-ai-thread 
Fuck it, I'll just fix a whole bunch of stuff on cogstation
 2021-01-05 23:40:07 -07:00
CitadelStationBot
00697cc7e0 Automatic changelog generation for PR #13970 [ci skip] 2021-01-06 00:39:58 -06:00
silicons
e6aac9d4fb Merge pull request #13970 from TripleShades/fixies-oops 
Meta Surgery Fixies
 2021-01-05 23:39:53 -07:00
CitadelStationBot
e28be2b96f Automatic changelog generation for PR #13972 [ci skip] 2021-01-06 00:39:49 -06:00
silicons
73adf82f62 Merge pull request #13972 from MrJWhit/boxstation-fix-that-only-i-care-about 
Fixing maint areas in boxstation
 2021-01-05 23:39:46 -07:00
CitadelStationBot
b62fc22c89 Automatic changelog generation for PR #13968 [ci skip] 2021-01-06 00:39:40 -06:00
silicons
6c9c3cc2d8 Merge pull request #13968 from Arturlang/pray_sounds 
Ding for prayers
 2021-01-05 23:39:37 -07:00
silicons
ab59a0d035 Update plastic.dm 2021-01-05 23:38:33 -07:00
TripleShades
3bb244410c oops leftover decal 2021-01-05 22:13:57 -08:00
MrJWhit
98520dc519 Update CogStation.dmm 2021-01-05 19:38:30 -05:00
MrJWhit
ab856c75bb Update CogStation.dmm 2021-01-05 19:25:44 -05:00
MrJWhit
f88957986f Update BoxStation.dmm 2021-01-05 16:21:37 -05:00
Lin
f724554059 Merge pull request #13964 from Citadel-Station-13/silicons-patch-2 
fixes parrying working while otherwise paralyzed
 2021-01-05 16:48:20 +00:00
Fermi
00ed164a2c Fixes tgui problem! 2021-01-05 10:21:56 +00:00
CitadelStationBot
7e1819edcd Automatic changelog generation for PR #13856 [ci skip] 2021-01-05 03:52:45 -06:00
silicons
cfc560ed3d Merge pull request #13856 from Putnam3145/harness-tweak-2 
Actually made gear harness properly adjustable
 2021-01-05 02:52:41 -07:00
MrJWhit
1a49d9738a Update CogStation.dmm 2021-01-05 00:54:34 -05:00
MrJWhit
3fd72b9ec2 Update BoxStation.dmm 2021-01-04 20:33:36 -05:00
TripleShades
518da2ea06 Update MetaStation.dmm 2021-01-04 15:39:08 -08:00
Artur
9e16df56aa Ding for prayers 2021-01-04 23:23:55 +02:00
Fermi
619490b040 oops 2021-01-04 16:32:06 +00:00
Fermi
fa9e066b71 Merged upstream fixes 2021-01-04 16:23:32 +00:00
Fermi
5b703e84a4 Merge branch 'master' into Dispencer-UI-change 2021-01-04 16:21:06 +00:00
Fermi
c14beae1b9 Merge remote-tracking branch 'upstream/master' 2021-01-04 16:20:27 +00:00