shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,054 Commits 5 Branches 0 Tags
c720e800dfbb5237d3de7dd6dd1e707a2b3cae2f
Commit Graph

23670 Commits

Author SHA1 Message Date
silicons c720e800df whew! 2020-07-28 12:08:02 -07:00
silicons 6c83beea02 Merge pull request #12937 from Ghommie/Ghommie-cit834 
Fixing new bugs and stuff.
 2020-07-28 10:46:17 -07:00
silicons cac1627d26 Merge pull request #12936 from zeroisthebiggay/weenjoystealingfashion 
Ports RP flannel jackets and a winter coat
 2020-07-28 10:45:54 -07:00
silicons a5063a92b9 Merge pull request #12941 from timothyteakettle/alien-embeds-work 
aliens can remove embeds now
 2020-07-28 10:45:31 -07:00
silicons 475d8ed6fb Merge pull request #12950 from timothyteakettle/species-are-dumb 
tail wagging fix
 2020-07-28 10:15:17 -07:00
Timothy Teakettle 72972e1659 some species code fixes 2020-07-28 17:56:50 +01:00
silicons 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
Timothy Teakettle 8d9c94c087 aliens can remove embeds now 2020-07-27 17:59:05 +01:00
Lin 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
Lin 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
Lin 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
Ghom 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
Ghom f946a157f4 Update mapping.dm 2020-07-27 14:54:46 +02:00
Ghom 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 e90671c846 Merge pull request #12927 from Ludox235/we-cant-have-nice-things 
ZOMBIES. ACT LIKE ONE.
 2020-07-26 23:00:33 -07:00
silicons 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
silicons 6f9c310ea8 Merge pull request #12920 from zeroisthebiggay/blackboxfatcox 
Ports the Black Box theft objective from TG
 2020-07-26 22:58:43 -07:00
silicons 850bc0dc33 Merge pull request #12919 from SiliconMain/patch-5 
Dura belt tweaks
 2020-07-26 22:58:31 -07:00
silicons 16a77f9641 Merge pull request #12918 from SiliconMain/patch-3 
Minor paramed edit
 2020-07-26 22:57:58 -07:00
silicons 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
silicons d47b553527 Merge pull request #12892 from Literallynotpickles/hi 
Reverts extinguishers into being alt-clickable
 2020-07-26 22:56:22 -07:00
silicons e240453044 Merge pull request #12884 from timothyteakettle/fix-a-bad-bug/exploit 
fixes a dumb bug to do with material crafting
 2020-07-26 22:52:30 -07:00
silicons 20d9c74f9f Merge pull request #12876 from timothyteakettle/species-are-dumb 
tidies up species files
 2020-07-26 22:52:00 -07:00
silicons 67c002de7a Merge pull request #12817 from kappa-sama/patch-34 
boosts stimpak cost back up to 5 from 3
 2020-07-26 22:51:24 -07:00
zerothebigboy 6329b2a760 a 2020-07-26 23:32:36 -04:00
BlackMajor dd6fefa43e Merge pull request #12917 from Citadel-Station-13/silicons-patch-57 
FIXES. STUNBATONS. FOR. THE LAST. TIME - WINGET IS A SLEEP() AND NO ONE REALIZED THAT MAKING BATONS MAKE PEOPLE -GLORF WOULD MAKE THEM BREAK UNDER LAG
 2020-07-27 13:20:38 +12:00
BlackMajor 5e3cb62790 Merge pull request #12903 from Sishen1542/zoom-zoom-go-boom-boom 
removes zoomba/roomba borg sprites
 2020-07-27 13:00:17 +12:00
silicons b5e21e5555 Merge pull request #12896 from timothyteakettle/jar-fixes 
makes some small tweaks to pet carriers / bluespace jars
 2020-07-26 17:21:28 -07:00
silicons e13b6d36da Merge pull request #12895 from Hatterhat/bokken 
Training Bokkens - "funny wood sticks for parrying and beating the shit out of people"
 2020-07-26 15:52:35 -07:00
Lin 8aa20d10b8 Merge pull request #12863 from Citadel-Station-13/clownops 
clown mobss are now allied to each other and clownops are now allied to clown mobs
 2020-07-26 17:51:00 -05:00
Hatterhat aabb60b5c5 shit damn boys its another fucking day 2020-07-26 17:42:24 -05:00
Lin 6514fced3c Merge pull request #12893 from timothyteakettle/picklefix 
pickles don't die until their contents is released
 2020-07-26 17:27:23 -05:00
Lin c36bf1b5ed Merge pull request #12871 from Citadel-Station-13/silicons-patch-47 
ports some tg changes to make clients properly garbage collect
 2020-07-26 17:26:38 -05:00
Lin 6b12563abe Merge pull request #12881 from Citadel-Station-13/silicons-patch-48 
since it's a little hard to fix the actual issue let's just make the projectile safety check that's causing stuff to freeze when something goes wrong more lenient so things don't freeze and people don't think anything is wrong
 2020-07-26 17:26:19 -05:00
Lin 04b6d854f8 Merge pull request #12914 from Citadel-Station-13/silicons-patch-56 
forensic scanners no longer pick up color in blood dna
 2020-07-26 17:24:33 -05:00
Lin 4b56dc65af Merge pull request #12897 from Citadel-Station-13/silicons-patch-51 
fixes clothes repairs
 2020-07-26 17:24:21 -05:00
Lin ea737d63dd Merge pull request #12904 from Citadel-Station-13/silicons-patch-54 
proper fix for every borg being able to have mops, but doesn't remove the upgrade entirely
 2020-07-26 17:22:47 -05:00
Lin b3722d0a43 Merge pull request #12913 from Citadel-Station-13/silicons-patch-55 
atmos microoptimizations
 2020-07-26 17:22:03 -05:00
Ludox fee4dd6d14 ZOMBIES. ACT LIKE ONE. 
This is why we can't have nice things in life.
 2020-07-27 00:16:31 +02:00
Hatterhat 6bf53859d2 wow maybe i should make it compile first 2020-07-26 14:42:45 -05:00
Hatterhat af08e8a37f altclick for fucked up parries! also bugfixes 2020-07-26 13:02:56 -05:00
The0bserver 129297dfa5 this commit intentionally left blank 2 2020-07-26 10:06:35 -04:00
The0bserver 556fedacd0 this commit intentionally left blank 2020-07-26 09:56:46 -04:00
The0bserver dd16a509f2 Initial Commit: MIGHT add tags 2020-07-26 09:18:32 -04:00
zerothebigboy 27bf41ac5f a 2020-07-26 06:29:10 -04:00
zerothebigboy ee2de61b17 a 2020-07-26 06:27:30 -04:00
SiliconMain 1a78098885 on second thought 2020-07-26 05:20:53 -05:00
zerothebigboy 40d12fd02f a 2020-07-26 06:20:06 -04:00