Commit Graph

24553 Commits

Author SHA1 Message Date
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
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
Sishen 27aba092e0 aaaaaaaaaa 2020-07-27 08:20:03 -06: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 22efdbffcd woops 2020-07-26 23:08:41 -07: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 8f9abfd63a no return 2020-07-26 17:30:20 -07: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 69335bae0e buff 2020-07-26 17:20:21 -07:00
silicons 4256826aae epic 2020-07-26 17:15:12 -07:00
silicons 308c52df00 ok 2020-07-26 17:14:38 -07:00
silicons 0b17c761e7 whew 2020-07-26 17:11:23 -07:00
silicons 3ab4b62dc1 huh 2020-07-26 17:03:52 -07:00
silicons 279b3e7aed fix 2020-07-26 16:52:16 -07:00
silicons 349874e512 haha 2020-07-26 16:49:47 -07:00
silicons 21988d47f5 woops 2020-07-26 16:42:51 -07:00
silicons ea1ea6dde1 Update weaponry.dm 2020-07-26 16:41:27 -07:00
silicons d52892f000 Update portable_turret.dm 2020-07-26 16:32:20 -07:00
silicons d954588c9a Update portable_turret.dm 2020-07-26 16:30:50 -07:00
silicons 3ee5611b1d Update living_active_block.dm 2020-07-26 16:19:43 -07:00
silicons cebd21696f Update living_active_parry.dm 2020-07-26 16:18:12 -07:00
silicons 791bfabc9b walls 2020-07-26 16:03:57 -07:00
silicons bf4b2dfbf5 ok 2020-07-26 15:59:56 -07:00
DeltaFire 53482e6bd6 modifies the ark, aswell as changing a tiny bit of stuff for stable gateways
The ark no longer immediately activates when summoned. Instead, an cultist needs to activate it. Once on, it cannot be turned off again save by destroying it.

Also, the stable-gateway deactivation doafter now has an actual beam-animation.
2020-07-27 00:52:35 +02: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