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
Trilbyspaceclone
ccca78a1ca
Update spellcard.dm
2020-07-28 00:34:32 -04:00
Trilbyspaceclone
3a6d72af54
Update spellcard.dm
2020-07-28 00:20:14 -04:00
Trilbyspaceclone
c8fff28395
Update spellcard.dm
2020-07-28 00:12:00 -04:00
silicons
b0f03eac12
ok
2020-07-27 21:06:03 -07:00
silicons
ffcfd21613
fix
2020-07-27 14:24:10 -07:00
silicons
5bf4afcade
sigh
2020-07-27 14:09:37 -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
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
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
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
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
308c52df00
ok
2020-07-26 17:14:38 -07:00
silicons
0b17c761e7
whew
2020-07-26 17:11:23 -07:00
silicons
349874e512
haha
2020-07-26 16:49:47 -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
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
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
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
timothyteakettle
28bf5d2344
remove c
2020-07-26 23:15:56 +01:00
silicons
49070d732b
ohhhhhhh boy
2020-07-26 15:10:08 -07:00