Commit Graph

23804 Commits

Author SHA1 Message Date
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
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
silicons
49070d732b ohhhhhhh boy 2020-07-26 15:10:08 -07:00
silicons
7d7f40ce90 fixes 2020-07-26 14:56:03 -07:00
SiliconMain
63bb9fe0f3 the dangers of copypaste 2020-07-26 16:35:50 -05:00
SiliconMain
e11dab552f it just werks 2020-07-26 16:28:21 -05:00
SiliconMain
fdaa4b4372 aaaaaaaaaaa 2020-07-26 16:07:48 -05:00
SiliconMain
ad420c6633 AAAAAAAAAAAA 2020-07-26 15:53:08 -05:00
SiliconMain
abdafe15fa fuck 2020-07-26 15:21:24 -05: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
SiliconMain
54ed22d17d ye 2020-07-26 05:19:56 -05:00