shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,524 Commits 5 Branches 0 Tags
79c4382b75d3d00eddadff0fb59608f34364defb
Commit Graph
24014 Commits
Author SHA1 Message Date
silicons c87c2bd850 smh 2020-07-28 12:31:35 -07:00
silicons 78b6a60e80 oh 2020-07-28 12:25:27 -07:00
silicons fd738fd16a spelling 2020-07-28 12:12:30 -07:00
silicons 4ab175d812 sigh 2020-07-28 12:10:34 -07:00
silicons c720e800df whew! 2020-07-28 12:08:02 -07:00
Adelphon 1f508ef15d Adds Camo To AutoDrobe (fix) 
Adds syndicate Camo to Autodrobe WITHOUT the armor bonuses.
 2020-07-28 15:04:58 -04:00
silicons 8313485632 fix 2020-07-28 11:31:28 -07:00
siliconsandGitHub 6c83beea02 Merge pull request #12937 from Ghommie/Ghommie-cit834 
Fixing new bugs and stuff.
 2020-07-28 10:46:17 -07:00
siliconsandGitHub cac1627d26 Merge pull request #12936 from zeroisthebiggay/weenjoystealingfashion 
Ports RP flannel jackets and a winter coat
 2020-07-28 10:45:54 -07:00
siliconsandGitHub a5063a92b9 Merge pull request #12941 from timothyteakettle/alien-embeds-work 
aliens can remove embeds now
 2020-07-28 10:45:31 -07:00
Timothy Teakettle c8960624d3 sorry artur 2020-07-28 18:37:01 +01:00
Keate Senior af02490739 still conflicts with clickdelays bluh whatever I'll fix it if its merged 2020-07-28 13:21:27 -04:00
siliconsandGitHub 475d8ed6fb Merge pull request #12950 from timothyteakettle/species-are-dumb 
tail wagging fix
 2020-07-28 10:15:17 -07:00
Keate Senior daed810c3a I didn't get to see if it'd still conflict with the clickdelay testmerge 
ugghh I shouldn't be coding when my second brain cell falls asleep but hey at least the change is incredibly small
 2020-07-28 12:59:34 -04:00
Timothy Teakettle 72972e1659 some species code fixes 2020-07-28 17:56:50 +01:00
Hatterhat 8a32cac8db window rotation fix 2020-07-28 10:47:07 -05:00
Sishen 0d85f0553b bumps krav down to 25, only give martyr to syndie iaa 2020-07-28 09:30:26 -06:00
Seris02 dcd2c11f4e yay indicator 2020-07-28 20:43:38 +08:00
Seris02 84e9f406c7 yay it fix time for indicator 2020-07-28 17:41:17 +08:00
Keate Senior e8d4d5b053 Revert "Revert "Revert "THIS COMMIT IS PURELY SO IT WORKS WITH KEVINS CLICKDELAYS #12834""" 
This reverts commit 0e6fe357da.
 2020-07-28 05:00:13 -04:00
Keate Senior 0e6fe357da Revert "Revert "THIS COMMIT IS PURELY SO IT WORKS WITH KEVINS CLICKDELAYS #12834"" 
This reverts commit 4b876ef9fb.
yo hol up I gotta see if the confliction is fixed first
 2020-07-28 04:59:58 -04:00
Keate Senior 4b876ef9fb Revert "THIS COMMIT IS PURELY SO IT WORKS WITH KEVINS CLICKDELAYS #12834" 
This reverts commit 7e1cab15ae.
 2020-07-28 04:07:41 -04:00
Keate Senior 7e1cab15ae THIS COMMIT IS PURELY SO IT WORKS WITH KEVINS CLICKDELAYS #12834 
REVERT IF CLICKDELAYS ARE UN-TESTMERGED
 2020-07-28 04:07:01 -04:00
silicons b0f03eac12 ok 2020-07-27 21:06:03 -07:00
siliconsandGitHub 2ba01663e5 Merge pull request #12945 from timothyteakettle/jar-fixes 
bluespace jar / pet carrier logic tweak so it works correctly
 2020-07-27 19:21:16 -07:00
timothyteakettle f36071bb64 wouldnt it be cool if i tested the small logic change 2020-07-28 03:09:07 +01:00
silicons ffcfd21613 fix 2020-07-27 14:24:10 -07:00
silicons 5bf4afcade sigh 2020-07-27 14:09:37 -07:00
Timothy Teakettle dc14c02570 fix crates 2020-07-27 21:55:51 +01:00
silicons dc278d7b02 woops 2020-07-27 13:11:26 -07:00
silicons 67b518bf42 experimental 2020-07-27 13:09:54 -07:00
GlitchyCore cf7678c7d4 hey let's forget to add the filetype to this instead of making sure it would actually work 2020-07-27 14:41:10 -05:00
DeltaFire 9f3e7755ae two line fix 
tin
 2020-07-27 21:30:13 +02:00
Timothy Teakettle bbda8dbf79 make detective the same, remove blood and paraplegic 2020-07-27 18:48:44 +01:00
Timothy Teakettle 8d9c94c087 aliens can remove embeds now 2020-07-27 17:59:05 +01:00
LinandGitHub 87eac49bbf Merge pull request #12862 from Citadel-Station-13/silicons-patch-44 
you can now shoot yourself with a gun by using disarm intent will this cause balance issues maybe do i care not really
 2020-07-27 11:46:37 -05:00
LinandGitHub 2514f4111d Merge pull request #12900 from Citadel-Station-13/silicons-patch-53 
drops 1.5 second taser alt fire delay to normal fire rate (0.4 seconds)
 2020-07-27 11:43:31 -05:00
LinandGitHub ea861148b9 Merge pull request #12822 from Citadel-Station-13/silicons-patch-37 
experimental change (testmerge this!): going from a higher slowdown to a lower slowdown will immediately allow you to move at the lower slowdown
 2020-07-27 11:33:04 -05:00
Sishen 27aba092e0 aaaaaaaaaa 2020-07-27 08:20:03 -06:00
GhomandGitHub 4fad4ad969 Merge pull request #12888 from Citadel-Station-13/silicons-patch-50 
sorry gamers, no more self healing with a medbeam
 2020-07-27 15:27:07 +02:00
GhomandGitHub f946a157f4 Update mapping.dm 2020-07-27 14:54:46 +02:00
GhomandGitHub 7e18e7a7a8 Update mapping.dm 2020-07-27 14:52:05 +02:00
Ghommie f1c242aadc Fixing new bugs and stuff. 2020-07-27 14:16:01 +02:00
silicons 22efdbffcd woops 2020-07-26 23:08:41 -07:00
siliconsandGitHub e90671c846 Merge pull request #12927 from Ludox235/we-cant-have-nice-things 
ZOMBIES. ACT LIKE ONE.
 2020-07-26 23:00:33 -07:00
siliconsandGitHub 32b8528b16 Merge pull request #12921 from TheObserver-sys/LOOKGORDONATAG! 
Adds tags to applicable clothing, stating the defenses and resistances said clothes have.
 2020-07-26 22:59:55 -07:00
siliconsandGitHub 6f9c310ea8 Merge pull request #12920 from zeroisthebiggay/blackboxfatcox 
Ports the Black Box theft objective from TG
 2020-07-26 22:58:43 -07:00
siliconsandGitHub 850bc0dc33 Merge pull request #12919 from SiliconMain/patch-5 
Dura belt tweaks
 2020-07-26 22:58:31 -07:00
siliconsandGitHub 16a77f9641 Merge pull request #12918 from SiliconMain/patch-3 
Minor paramed edit
 2020-07-26 22:57:58 -07:00
siliconsandGitHub 401e8cf967 Merge pull request #12901 from CameronWoof/trumpet-cargo 
Adds spaceman's trumpet seeds to the exotic seeds crate
 2020-07-26 22:56:59 -07:00