shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,982 Commits 5 Branches 0 Tags
b1bdc8bf995d7161aeee3c844252ed0e5fd280dc
Commit Graph

43982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lin b1bdc8bf99 Merge pull request #14967 from Putnam3145/fix-space-loop-lord 
Makes HE pipe min temp diff 0.01 instead of 20
 2021-07-26 15:09:06 -05:00
Changelogs 13b1967350 Automatic changelog compile [ci skip] 2021-07-26 00:23:08 +00:00
Lin 0066fc6755 Merge pull request #14959 from Citadel-Station-13/table-floodfills 
rewrites subtler_around_table to be slightly cleaner and (probably) work?
 2021-07-25 13:56:35 -07:00
CitadelStationBot 76cf6b2435 Automatic changelog generation for PR #14966 [ci skip] 2021-07-25 02:44:45 -05:00
Lin e0a2f6b1c6 Merge pull request #14966 from SandPoot/remove-unused-button-nobody-noticed 
Quickly removes a transform button that does nothing on the vore panel
 2021-07-25 00:44:43 -07:00
Changelogs aeca55b667 Automatic changelog compile [ci skip] 2021-07-25 00:23:17 +00:00
Changelogs e64c324016 Automatic changelog compile [ci skip] 2021-07-24 00:22:28 +00:00
SandPoot ab039ecbfb Update vorepanel.dm 2021-07-23 18:16:07 -03:00
CitadelStationBot 0906281894 Automatic changelog generation for PR #14910 [ci skip] 2021-07-23 15:35:15 -05:00
Lin 321ee05fa7 Merge pull request #14910 from MrJWhit/boxstation-maint-room 
Boxstation rooms 'n fixes
 2021-07-23 13:35:13 -07:00
MrJWhit a05bcd1ffe Merge pull request #3 from Linzolle/mrjwhit-boxstation 
Mrjwhit boxstation
 2021-07-23 16:28:14 -04:00
Linzolle 4c58c1a427 Merge branch 'master' of github.com:Citadel-Station-13/Citadel-Station-13 into mrjwhit-boxstation 2021-07-23 13:18:33 -07:00
CitadelStationBot 978969bb81 Automatic changelog generation for PR #14960 [ci skip] 2021-07-23 13:41:05 -05:00
Lin 8105a3c692 Merge pull request #14960 from Putnam3145/hallucination-tweaks 
Some hallucination tweaks
 2021-07-23 11:41:03 -07:00
CitadelStationBot 64e11f8835 Automatic changelog generation for PR #14963 [ci skip] 2021-07-23 13:36:50 -05:00
Lin fda11230a4 Merge pull request #14963 from cadyn/patch-3 
Auxmos bump so reactions can work in linux
 2021-07-23 11:36:47 -07:00
Putnam3145 4b310cc354 Makes HE pipe min temp diff not so low 2021-07-22 20:12:00 -07:00
Changelogs fabd9008dd Automatic changelog compile [ci skip] 2021-07-23 00:24:04 +00:00
MrJWhit 96878c28cf Update BoxStation.dmm 2021-07-22 15:12:41 -04:00
MrJWhit b2ccb22888 fixing theater access and adding a whoopsie light 2021-07-22 15:09:44 -04:00
CitadelStationBot 82244ccee0 Automatic changelog generation for PR #14874 [ci skip] 2021-07-22 02:53:56 -05:00
Lin 01ed21bb92 Merge pull request #14874 from Citadel-Station-13/silicons-patch-41 
slight baton powercreep tweak (5 --> 3.5 seconds rmb cooldown, 35 --> 40 damage)
 2021-07-22 00:53:53 -07:00
Lin ef556b7824 Merge pull request #14902 from silicons/combat_patches_1 
misc patches, fixes, some small refactors
 2021-07-22 00:53:03 -07:00
silicons 224fb7f22c Update tables_racks.dm 2021-07-21 21:34:10 -07:00
silicons d38a775a16 Update tables_racks.dm 2021-07-21 21:33:46 -07:00
cadyn afa4ed6ded Auxmos bump so reactions can work in linux 
Currently reactions don't work on linux, after way too many hours of debugging and crying I found the issue and made a workaround
 2021-07-21 20:30:15 -07:00
Changelogs fe337c34bd Automatic changelog compile [ci skip] 2021-07-22 00:23:47 +00:00
Putnam3145 90bc48f579 Some hallucination tweaks 2021-07-20 22:49:08 -07:00
silicons 16622ac95a Update tables_racks.dm 2021-07-20 18:06:49 -07:00
silicons 1044ea6ae9 Update say_vr.dm 2021-07-20 18:00:36 -07:00
Changelogs e19ff4c480 Automatic changelog compile [ci skip] 2021-07-21 00:25:59 +00:00
Changelogs ff0f9f651a Automatic changelog compile [ci skip] 2021-07-19 00:23:46 +00:00
Lin 06cd2e3b51 Merge pull request #14952 from silicons/why 
fixes boxstation line endings
 2021-07-18 15:26:47 -07:00
silicons 806ecf63ca why 2021-07-18 15:16:34 -07:00
silicons 60436f9991 ??? 2021-07-18 15:13:23 -07:00
silicons 3070f178e0 Merge remote-tracking branch 'citadel/master' into combat_patches_1 2021-07-18 15:12:52 -07:00
CitadelStationBot 94dc98ccfa Automatic changelog generation for PR #14946 [ci skip] 2021-07-18 17:07:38 -05:00
silicons bb337b92dd Merge pull request #14946 from timothyteakettle/cow-tail 
anthros can now select the cow tail
 2021-07-18 15:07:36 -07:00
CitadelStationBot 03f8f799bb Automatic changelog generation for PR #14940 [ci skip] 2021-07-18 17:07:32 -05:00
silicons 24c2ab8b8c Merge pull request #14940 from timothyteakettle/trash-eating 
adds a neutral trash eating quirk
 2021-07-18 15:07:29 -07:00
CitadelStationBot ba51785fac Automatic changelog generation for PR #14947 [ci skip] 2021-07-18 17:07:14 -05:00
silicons b0c53fcc57 Merge pull request #14947 from Arturlang/crafting_fixes 
Crafting menu cleaning up
 2021-07-18 15:07:12 -07:00
CitadelStationBot 4ebb6fa1ee Automatic changelog generation for PR #14949 [ci skip] 2021-07-18 17:07:04 -05:00
silicons 91cdc7c13f Merge pull request #14949 from MrJWhit/oom-fix-port 
Port of "[s] Fixes a major memory leak in shuttle code (KILO IS FREE)"
 2021-07-18 15:07:01 -07:00
silicons 7847f6b69c Merge pull request #14916 from WanderingFox95/WanderingFox95-clearcatsurgeonannouncement 
[Ready] Another Cat Surgeon Announcement PR? It's more likely than you think!
 2021-07-18 15:06:48 -07:00
CitadelStationBot f858c9380d Automatic changelog generation for PR #14943 [ci skip] 2021-07-18 17:06:33 -05:00
silicons 89d0c590e6 Merge pull request #14943 from WanderingFox95/WanderingFox95-custom-kegs 
Custom Kegs
 2021-07-18 15:06:30 -07:00
CitadelStationBot 1047af5e27 Automatic changelog generation for PR #14926 [ci skip] 2021-07-18 17:06:24 -05:00
silicons 5895eb0d31 Merge pull request #14926 from YakumoChen/human-leather-hats 
Human leather hats
 2021-07-18 15:06:22 -07:00
CitadelStationBot f22ad2c795 Automatic changelog generation for PR #14930 [ci skip] 2021-07-18 17:06:06 -05:00