shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,451 Commits 5 Branches 0 Tags
f3e0255f7f57b0fe0dcb6c34c023e5e9d5332782
Commit Graph
36451 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
siliconsandGitHub f3e0255f7f Merge pull request #13009 from Ludox235/ai-screams 
Total law changes: 110
 2020-08-05 15:12:53 -07:00
CitadelStationBot 0eaec51c70 Automatic changelog generation for PR #13017 [ci skip] 2020-08-05 17:09:18 -05:00
siliconsandGitHub ffe3eeecde Merge pull request #13017 from Hatterhat/coor-dharges 
door charges no longer unconscious() you
 2020-08-05 15:09:14 -07:00
CitadelStationBot 806fa8b147 Automatic changelog generation for PR #13025 [ci skip] 2020-08-05 17:07:59 -05:00
siliconsandGitHub 9b14dff46b Merge pull request #13025 from Trilbyspaceclone/tea 
Tea Party
 2020-08-05 15:07:55 -07:00
CitadelStationBot 16aacadf43 Automatic changelog generation for PR #13028 [ci skip] 2020-08-05 17:07:05 -05:00
siliconsandGitHub 52fbd72608 Merge pull request #13028 from dapnee/meta-tcomms 
AI Open
 2020-08-05 15:07:01 -07:00
siliconsandGitHub 5578f2520b Merge pull request #13005 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/elliptic-6.5.3 
Bump elliptic from 6.5.2 to 6.5.3 in /tgui
 2020-08-05 14:58:26 -07:00
CitadelStationBot 58d88f7a90 Automatic changelog generation for PR #13036 [ci skip] 2020-08-05 04:08:26 -05:00
siliconsandGitHub 9f5004e637 Merge pull request #13036 from lolman360/AshwalkerFix 
fixes ashwalker languages
 2020-08-05 02:08:22 -07:00
lolman360 61ed83027d asj 2020-08-05 18:40:33 +10:00
LinandGitHub 96fde52eab Merge pull request #13016 from Citadel-Station-13/silicons-patch-69 
fixes turrets being machine guns
 2020-08-04 21:15:17 -05:00
dapnee 7cd5217871 AI Open 
What if Engies didn't have to ask the AI to open the way to tcomms so they could fix it?
 2020-08-04 19:00:44 -06:00
TrilbySpaceClone 5d5459a318 Merge branch 'tea' of https://github.com/Trilbyspaceclone/Citadel-Station-13 into tea 2020-08-04 10:07:10 -04:00
TrilbySpaceClone f2e4b7eacc grammer 2020-08-04 10:07:04 -04:00
TrilbyspacecloneandGitHub 4ea05ab07e Update drink_reagents.dm 2020-08-04 09:33:05 -04:00
TrilbySpaceClone 0f29235e6a Tea Party 2020-08-04 09:15:44 -04:00
Hatterhat 6420914290 k 2020-08-03 23:45:34 -05:00
siliconsandGitHub 3b1826ce82 Update portable_turret.dm 2020-08-03 18:29:11 -07:00
Hatterhat 157d5c29a6 door charge nerf (tentative) 2020-08-03 19:47:04 -05:00
Changelogs 625fa368e7 Automatic changelog compile [ci skip] 2020-08-04 00:11:43 +00:00
Hatterhat 03567f8d17 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-08-03 18:09:36 -05:00
CitadelStationBot 57d381ad67 Automatic changelog generation for PR #12894 [ci skip] 2020-08-03 16:43:10 -05:00
siliconsandGitHub a4132c04ea Merge pull request #12894 from timothyteakettle/wounds-part-2 
port of wounds part 2
 2020-08-03 14:43:07 -07:00
CitadelStationBot d517a7c579 Automatic changelog generation for PR #13010 [ci skip] 2020-08-03 14:54:04 -05:00
siliconsandGitHub db8abc006a Merge pull request #13010 from Seris02/fixeslizards 
lizards no longer break their spines ~~roundstart~~ EVER AGAIN I FUCKING FIXED THE DOUBLE SET_SPECIES LIZARD BUG
 2020-08-03 12:54:00 -07:00
Seris02andGitHub 5551e323cc Update tails.dm 2020-08-03 21:41:30 +08:00
Seris02 82790cffed fixes lizard code 2020-08-03 21:39:11 +08:00
CitadelStationBot ec9f0d8919 Automatic changelog generation for PR #13004 [ci skip] 2020-08-03 04:31:01 -05:00
siliconsandGitHub d5a19ea4b2 Merge pull request #13004 from zeroisthebiggay/tailwagfuckyou 
prefs for headpat wagging
 2020-08-03 02:30:57 -07:00
Seris02 aeec3a3404 lizards no longer have broken spines 2020-08-03 17:29:32 +08:00
Ludox f7045a55a2 Le shitcode has arrived. 2020-08-03 07:18:46 +02:00
Ludox f8838d4a8c Lets people fuck with the AI harder 
I am a masochist.
 2020-08-03 07:16:49 +02:00
Changelogs a9cb6378d0 Automatic changelog compile [ci skip] 2020-08-03 00:37:27 +00:00
Changelogs d851b3955d Automatic changelog compile [ci skip] 2020-08-03 00:11:50 +00:00
CitadelStationBot e0114c6964 Automatic changelog generation for PR #12954 [ci skip] 2020-08-02 12:52:10 -05:00
LinandGitHub 2885b861f2 Merge pull request #12954 from silicons/killer_queen 
bomb stands now use components
 2020-08-02 12:52:07 -05:00
CitadelStationBot a5ac60222f Automatic changelog generation for PR #12989 [ci skip] 2020-08-02 12:50:38 -05:00
LinandGitHub 0c85e3f127 Merge pull request #12989 from dapnee/why-is-box-even-fucked-like-this,-smh 
You Thought I Was Done Fucking With Box BUT YOU WERE WRONG!
 2020-08-02 12:50:34 -05:00
Timothy Teakettle 289c186f32 Merge remote-tracking branch 'upstream/master' into wounds-part-2 2020-08-02 18:11:07 +01:00
Timothy Teakettle 03d01d917f Merge branch 'master' into wounds-part-2 2020-08-02 18:10:31 +01:00
CitadelStationBot a7ba1f0cb7 Automatic changelog generation for PR #12925 [ci skip] 2020-08-02 11:30:13 -05:00
siliconsandGitHub 06f5ce6401 buffs shoving (#12925) 
* ^w^

* ok

* ok
 2020-08-02 18:30:09 +02:00
zerothebigboy aa782f1105 a 2020-08-02 02:27:24 -04:00
CitadelStationBot 6618435ee4 Automatic changelog generation for PR #12912 [ci skip] 2020-08-02 01:12:52 -05:00
siliconsandGitHub f45329bfd7 Merge pull request #12912 from Linzolle/penlight 
uv penlight icon
 2020-08-01 23:12:49 -07:00
dependabot[bot]andGitHub 0210e0261b Bump elliptic from 6.5.2 to 6.5.3 in /tgui 
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.2...v6.5.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-02 05:41:37 +00:00
zerothebigboy 34a8d8f798 a 2020-08-02 01:38:23 -04:00
CitadelStationBot 2ef7e1bf0a Automatic changelog generation for PR #12999 [ci skip] 2020-08-01 23:05:54 -05:00
siliconsandGitHub 65d184c552 Merge pull request #12999 from KeRSedChaplain/guardianfix 
Removes clockwork guardian's projectile deflection. OOPS!
 2020-08-01 21:05:52 -07:00