Commit Graph
23830 Commits
Author SHA1 Message Date
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
DeltaFire 9f3e7755ae two line fix
tin
2020-07-27 21:30:13 +02: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
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
siliconsandGitHub d47b553527 Merge pull request #12892 from Literallynotpickles/hi
Reverts extinguishers into being alt-clickable
2020-07-26 22:56:22 -07:00
siliconsandGitHub 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
siliconsandGitHub 20d9c74f9f Merge pull request #12876 from timothyteakettle/species-are-dumb
tidies up species files
2020-07-26 22:52:00 -07:00
siliconsandGitHub 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
BlackMajorandGitHub 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
BlackMajorandGitHub 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
siliconsandGitHub 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
siliconsandGitHub ea1ea6dde1 Update weaponry.dm 2020-07-26 16:41:27 -07:00
siliconsandGitHub d52892f000 Update portable_turret.dm 2020-07-26 16:32:20 -07:00
siliconsandGitHub d954588c9a Update portable_turret.dm 2020-07-26 16:30:50 -07:00
siliconsandGitHub 3ee5611b1d Update living_active_block.dm 2020-07-26 16:19:43 -07:00
siliconsandGitHub 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
siliconsandGitHub 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
LinandGitHub 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