shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,506 Commits 5 Branches 0 Tags
6884204edbe6378a7d8cc1e9af1cda8e82e9afac
Commit Graph
36506 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LinandGitHub 6884204edb Merge pull request #13000 from silicons/explosion_epicenter 
makes the thing that ensures explosives in bags hit everything in said bag only work if it's actually in the bag (no more pda bombs erase your entire inventory)
 2020-08-05 19:43:04 -05:00
CitadelStationBot 0f9f6f8ef9 Automatic changelog generation for PR #13006 [ci skip] 2020-08-05 19:42:31 -05:00
LinandGitHub bc2e97a2a4 Merge pull request #13006 from Citadel-Station-13/silicons-patch-68 
2x's volumetric storage minimum size because i'm going to stop pretending this ugly shit is usable when even i myself use opt-out to old interface
 2020-08-05 19:42:28 -05:00
Changelogs 4f46ec09f1 Automatic changelog compile [ci skip] 2020-08-06 00:12:03 +00:00
CitadelStationBot f5a5fdd111 Automatic changelog generation for PR #12963 [ci skip] 2020-08-05 17:44:51 -05:00
siliconsandGitHub 8442d69858 Merge pull request #12963 from Seris02/morefix 
ghost chilis fixed
 2020-08-05 15:44:48 -07:00
Seris02GitHubsilicons
 		9b02b6619d Update code/modules/hydroponics/grown/chili.dm 
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
 2020-08-06 06:44:17 +08:00
CitadelStationBot 9ce4972200 Automatic changelog generation for PR #12995 [ci skip] 2020-08-05 17:28:18 -05:00
siliconsandGitHub 57be216251 Merge pull request #12995 from timothyteakettle/travelling-traders 
a few small tweaks to travelling traders
 2020-08-05 15:28:15 -07:00
CitadelStationBot d381879b8c Automatic changelog generation for PR #12994 [ci skip] 2020-08-05 17:27:32 -05:00
siliconsandGitHub ed5aa7c9f7 Merge pull request #12994 from kappa-sama/patch-37 
removes dildo
 2020-08-05 15:27:29 -07:00
CitadelStationBot 6a61c17163 Automatic changelog generation for PR #12991 [ci skip] 2020-08-05 17:26:40 -05:00
siliconsandGitHub bb8dfa9236 Merge pull request #12991 from b1tt3r1n0/I'mAlreadyTracer 
I wanna be tracer
 2020-08-05 15:26:37 -07:00
CitadelStationBot 462346b55e Automatic changelog generation for PR #12990 [ci skip] 2020-08-05 17:26:07 -05:00
siliconsandGitHub f5f0d6be81 Merge pull request #12990 from timothyteakettle/tongue-patch 
make tongue preference pass through cloning
 2020-08-05 15:26:04 -07:00
CitadelStationBot 9f102ccffc Automatic changelog generation for PR #13003 [ci skip] 2020-08-05 17:25:51 -05:00
siliconsandGitHub 4720fedce9 Merge pull request #13003 from Hatterhat/crusher-glaive 
Proto-Kinetic Glaives - a crusher reskin
 2020-08-05 15:25:48 -07:00
siliconsandGitHub 164201ab27 Merge pull request #12956 from Arturlang/bloodsucker_death_lessspam 
Makes bloodsucker death not spam now actually working
 2020-08-05 15:15:30 -07:00
siliconsandGitHub 2d697e1867 Merge pull request #12926 from GlitchyCore/master 
Adds a new fun round end sound
 2020-08-05 15:14:20 -07:00
CitadelStationBot 6faf1e7116 Automatic changelog generation for PR #12889 [ci skip] 2020-08-05 17:13:56 -05:00
siliconsandGitHub add9d5d0a0 Merge pull request #12889 from timothyteakettle/quirks-are-dumb 
minor quirk changes
 2020-08-05 15:13:52 -07:00
CitadelStationBot fd0cb04792 Automatic changelog generation for PR #13008 [ci skip] 2020-08-05 17:13:17 -05:00
siliconsandGitHub b2052a16cb Merge pull request #13008 from zeroisthebiggay/powercreepislife 
nukies can buy holoparasites not including support ones
 2020-08-05 15:13:13 -07:00
CitadelStationBot 1accc4263a Automatic changelog generation for PR #13009 [ci skip] 2020-08-05 17:12:56 -05:00
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
Hatterhat aa10c17b52 slight tweak pt2 2020-08-05 16:56:02 -05:00
Hatterhat 5f7d70f7d0 handguard tweak 2020-08-05 07:05:15 -05: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 4df9efb076 heho attack text 2020-08-04 00:29:30 -05: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